diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-04-30 08:51:55 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-04-30 08:51:55 +0000 |
| commit | 9b75e1400858a2a2fdfc8f7946c7725caab2189b (patch) | |
| tree | a6c72270aca09d5eb4a7647335a06ca81a1fe545 /dev-ruby | |
| parent | File collision /usr/bin/ams wrt #247812 (diff) | |
| download | gentoo-2-9b75e1400858a2a2fdfc8f7946c7725caab2189b.tar.gz gentoo-2-9b75e1400858a2a2fdfc8f7946c7725caab2189b.tar.bz2 gentoo-2-9b75e1400858a2a2fdfc8f7946c7725caab2189b.zip | |
File collision /usr/bin/ams wrt #247812
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/amrita/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-ruby/amrita/amrita-1.8.2-r1.ebuild | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-ruby/amrita/ChangeLog b/dev-ruby/amrita/ChangeLog index f87bd616d725..9d556a52d004 100644 --- a/dev-ruby/amrita/ChangeLog +++ b/dev-ruby/amrita/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/amrita -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amrita/ChangeLog,v 1.25 2008/03/26 03:34:01 ricmm Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amrita/ChangeLog,v 1.26 2009/04/30 08:51:55 ssuominen Exp $ + + 30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org> + amrita-1.8.2-r1.ebuild: + File collision /usr/bin/ams wrt #247812 25 Mar 2008; <ricmm@gentoo.org> amrita-1.8.2-r1.ebuild: Drop to ~mips due to unstable deps diff --git a/dev-ruby/amrita/amrita-1.8.2-r1.ebuild b/dev-ruby/amrita/amrita-1.8.2-r1.ebuild index fdf358253ca9..42edf70148e8 100644 --- a/dev-ruby/amrita/amrita-1.8.2-r1.ebuild +++ b/dev-ruby/amrita/amrita-1.8.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amrita/amrita-1.8.2-r1.ebuild,v 1.20 2008/03/26 03:34:01 ricmm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amrita/amrita-1.8.2-r1.ebuild,v 1.21 2009/04/30 08:51:55 ssuominen Exp $ inherit ruby @@ -13,4 +13,6 @@ LICENSE="Ruby" SLOT="0" USE_RUBY="ruby18 ruby19" KEYWORDS="alpha hppa ia64 ~mips ppc ppc64 sparc x86" -DEPEND=">=dev-lang/ruby-1.8.0" +# File collision /usr/bin/ams wrt #247812 +DEPEND=">=dev-lang/ruby-1.8.0 + !media-sound/ams" |