graaff 15/04/13 18:26:46 Modified: launchy-2.4.3.ebuild ChangeLog Log: Add blocker on x11-misc/launchy to avoid file collisions, bug 545170. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Revision Changes Path 1.4 dev-ruby/launchy/launchy-2.4.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/launchy/launchy-2.4.3.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/launchy/launchy-2.4.3.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/launchy/launchy-2.4.3.ebuild?r1=1.3&r2=1.4 Index: launchy-2.4.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/launchy/launchy-2.4.3.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- launchy-2.4.3.ebuild 11 Apr 2015 08:39:50 -0000 1.3 +++ launchy-2.4.3.ebuild 13 Apr 2015 18:26:46 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/launchy/launchy-2.4.3.ebuild,v 1.3 2015/04/11 08:39:50 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/launchy/launchy-2.4.3.ebuild,v 1.4 2015/04/13 18:26:46 graaff Exp $ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21 ruby22" @@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~x86" IUSE="" -ruby_add_rdepend ">=dev-ruby/addressable-2.3" +# File collision conflict with x11-misc/launchy, bug 545170 +ruby_add_rdepend ">=dev-ruby/addressable-2.3 !!x11-misc/launchy" ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.0:5 )" 1.9 dev-ruby/launchy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/launchy/ChangeLog?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/launchy/ChangeLog?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/launchy/ChangeLog?r1=1.8&r2=1.9 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/launchy/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ChangeLog 13 Apr 2015 18:24:22 -0000 1.8 +++ ChangeLog 13 Apr 2015 18:26:46 -0000 1.9 @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/launchy # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/launchy/ChangeLog,v 1.8 2015/04/13 18:24:22 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/launchy/ChangeLog,v 1.9 2015/04/13 18:26:46 graaff Exp $ + + 13 Apr 2015; Hans de Graaff <[email protected]> launchy-2.4.3.ebuild: + Add blocker on x11-misc/launchy to avoid file collisions, bug 545170. 13 Apr 2015; Hans de Graaff <[email protected]> -launchy-2.3.0-r1.ebuild, -launchy-2.4.2.ebuild:
