summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-04-30 08:51:55 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-04-30 08:51:55 +0000
commit28c0be96b321d0d0731926036ddadca23392917a (patch)
treea4039da27b7b089342668784091c77da8595272a /dev-ruby/amrita
parentFile collision /usr/bin/ams wrt #247812 (diff)
downloadhistorical-28c0be96b321d0d0731926036ddadca23392917a.tar.gz
historical-28c0be96b321d0d0731926036ddadca23392917a.tar.bz2
historical-28c0be96b321d0d0731926036ddadca23392917a.zip
File collision /usr/bin/ams wrt #247812
Package-Manager: portage-2.1.6.11/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/amrita')
-rw-r--r--dev-ruby/amrita/ChangeLog8
-rw-r--r--dev-ruby/amrita/Manifest4
-rw-r--r--dev-ruby/amrita/amrita-1.8.2-r1.ebuild8
3 files changed, 13 insertions, 7 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/Manifest b/dev-ruby/amrita/Manifest
index a6ac0e804839..e82f1cbfe37e 100644
--- a/dev-ruby/amrita/Manifest
+++ b/dev-ruby/amrita/Manifest
@@ -1,4 +1,4 @@
DIST amrita-1.8.2.tar.gz 222894 RMD160 60e3437f9b77e47463a45685dba67dbf2a92d81a SHA1 319ac58ca5b4c2734323d84d6ef5ec489617118b SHA256 4e5e199e9ac72ad9d67a6c45a9a2ea5167a1463422f4aa45d1d348cf2efd4f20
-EBUILD amrita-1.8.2-r1.ebuild 558 RMD160 4f6f3393f5aed3cfae004660b24d33595fcfb528 SHA1 cf2182ea18dce23eea1a4fc9f61ecf7f4b455ab4 SHA256 604c9306b82b0408e19d25cc3dbe0b8f2d91010005b1f88e0a1eb2514744ff9a
-MISC ChangeLog 2979 RMD160 d3653db9861f33a3b6ffe5444e574a8f9b32885d SHA1 b8708fe7c77be9d66930c7018b0728a6e4bec201 SHA256 696350f81a0acd8036835f5b1fb7c685286511574edbac357a3249394a139c81
+EBUILD amrita-1.8.2-r1.ebuild 622 RMD160 6924eff2e8c7669990a59bcfdd3a54820b63b487 SHA1 7eb7244f690f1b1234551e8071d46976f7d8127e SHA256 e2590a66ad7c8d729fac8a9e12e0d080241b22e617644a318c9831c7ecc6ed97
+MISC ChangeLog 3106 RMD160 b7a792f49e266cb58ca2922fc6fb2a3b3dc02c25 SHA1 5378aa8168c88caa325722028a3e651ec69a4ec5 SHA256 f9780918190ee47687d37b2551473378be50e2ad52efacb21154d0e5626d35a3
MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
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"