diff options
| -rw-r--r-- | dev-ruby/launchy/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-ruby/launchy/launchy-2.4.3.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-ruby/launchy/ChangeLog b/dev-ruby/launchy/ChangeLog index 6299724bd321..95f29ccb62fd 100644 --- a/dev-ruby/launchy/ChangeLog +++ b/dev-ruby/launchy/ChangeLog @@ -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 <graaff@gentoo.org> launchy-2.4.3.ebuild: + Add blocker on x11-misc/launchy to avoid file collisions, bug 545170. 13 Apr 2015; Hans de Graaff <graaff@gentoo.org> -launchy-2.3.0-r1.ebuild, -launchy-2.4.2.ebuild: diff --git a/dev-ruby/launchy/launchy-2.4.3.ebuild b/dev-ruby/launchy/launchy-2.4.3.ebuild index 43cd4f8c223d..6cfbee953fc6 100644 --- a/dev-ruby/launchy/launchy-2.4.3.ebuild +++ b/dev-ruby/launchy/launchy-2.4.3.ebuild @@ -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 @@ SLOT="0" 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 )" |