summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-04-30 08:50:54 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-04-30 08:50:54 +0000
commitdcd74d4d4c14e1a0542ca786c83862909fd7bcdc (patch)
tree1a44b7369923c243d836cce538cab9bd1543ca06 /media-sound
parentInclude cdda_interface.h for cdda_paranoia.h wrt #257607 (diff)
downloadhistorical-dcd74d4d4c14e1a0542ca786c83862909fd7bcdc.tar.gz
historical-dcd74d4d4c14e1a0542ca786c83862909fd7bcdc.tar.bz2
historical-dcd74d4d4c14e1a0542ca786c83862909fd7bcdc.zip
File collision /usr/bin/ams wrt #247812
Package-Manager: portage-2.1.6.11/cvs/Linux x86_64
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/ams/ChangeLog9
-rw-r--r--media-sound/ams/Manifest4
-rw-r--r--media-sound/ams/ams-1.8.8_rc2.ebuild24
3 files changed, 21 insertions, 16 deletions
diff --git a/media-sound/ams/ChangeLog b/media-sound/ams/ChangeLog
index 45451cc73269..cf2e738a40d7 100644
--- a/media-sound/ams/ChangeLog
+++ b/media-sound/ams/ChangeLog
@@ -1,13 +1,16 @@
# ChangeLog for media-sound/ams
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ChangeLog,v 1.23 2008/04/11 21:03:12 maekke Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ChangeLog,v 1.24 2009/04/30 08:50:54 ssuominen Exp $
+
+ 30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org> ams-1.8.8_rc2.ebuild:
+ File collision /usr/bin/ams wrt #247812
11 Apr 2008; Markus Meier <maekke@gentoo.org> ams-1.8.8_rc2.ebuild:
x86 stable, bug #216891
*ams-1.8.8_rc2 (10 Apr 2008)
- 10 Apr 2008; Samuli Suominen <drac@gentoo.org>
+ 10 Apr 2008; Samuli Suominen <ssuominen@gentoo.org>
+files/ams-1.8.8_rc2-spectrumscreen.patch, +ams-1.8.8_rc2.ebuild:
Version bump and mark it stable for amd64 wrt #216891.
diff --git a/media-sound/ams/Manifest b/media-sound/ams/Manifest
index cf2f8386a934..4370a954eca3 100644
--- a/media-sound/ams/Manifest
+++ b/media-sound/ams/Manifest
@@ -1,5 +1,5 @@
AUX ams-1.8.8_rc2-spectrumscreen.patch 1106 RMD160 e11561d074be77e231d086b3deea7228e1fa7ef2 SHA1 a93c75bd4a473a63ce63a685c9964f3f11055840 SHA256 3f772bb18919c133b1466d81e065a720fcb8f24dad739ccc550196d337a3735f
DIST ams-1.8.8-rc2.tar.bz2 172362 RMD160 807cd6fa2589b55fcc3f02b53db150ee513c3c8e SHA1 526c10117105dadfbeedff0352e840adf42a8095 SHA256 00b5199aac1a3d18bccda1ae1fd94335e5a720a9b1f9b43df63f38b9ba8e78cc
-EBUILD ams-1.8.8_rc2.ebuild 1209 RMD160 a05a34bacbd3e7a156b3c3559c33388e07e4893d SHA1 165a92722c94837a675424f3df099bc87e640674 SHA256 a0a4f008ea716598c3f375c223f9b749c279e8ff4c140d0cc490ea8a40fc224f
-MISC ChangeLog 2875 RMD160 adfa71c8acff9a2361247498b11bb1d5e7430734 SHA1 ee8ef1b20c1967e1161b521c36fde6e51a29ef70 SHA256 5f676744be3f7bddd1946e8eab76342544caf7841f122d9abf4d942348f8e83c
+EBUILD ams-1.8.8_rc2.ebuild 1264 RMD160 323379107bcd5bd507edf8470c555eae7e92e033 SHA1 ded70e120d60fb4fcc98deec8ab1d50d9243053e SHA256 3f102f4c8d6e5135b9e2d29ddf2ccdb4141ea45f2e872fc70e75a670ea72541b
+MISC ChangeLog 3002 RMD160 d2b581fb17af7507f535c676d1a0b67669f06c33 SHA1 57026bf5df2e1f6d0a35413d601bde1aa5361cd4 SHA256 074849bcd6862b67fdd357e81781948fc2fbc93b8d6405af9e21d2243e46d485
MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/ams/ams-1.8.8_rc2.ebuild b/media-sound/ams/ams-1.8.8_rc2.ebuild
index 820d474f50b5..46288a4ce794 100644
--- a/media-sound/ams/ams-1.8.8_rc2.ebuild
+++ b/media-sound/ams/ams-1.8.8_rc2.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/media-sound/ams/ams-1.8.8_rc2.ebuild,v 1.4 2008/04/11 21:03:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ams/ams-1.8.8_rc2.ebuild,v 1.5 2009/04/30 08:50:54 ssuominen Exp $
inherit eutils qt3
@@ -14,15 +14,17 @@ KEYWORDS="amd64 ~ppc x86"
IUSE=""
RDEPEND="media-libs/alsa-lib
- media-sound/jack-audio-connection-kit
- =x11-libs/qt-3*
- =sci-libs/fftw-2*
- media-libs/ladspa-sdk
- media-libs/ladspa-cmt
- media-plugins/mcp-plugins
- media-plugins/swh-plugins
- media-libs/libclalsadrv"
-DEPEND="${RDEPEND}"
+ media-sound/jack-audio-connection-kit
+ =x11-libs/qt-3*
+ =sci-libs/fftw-2*
+ media-libs/ladspa-sdk
+ media-libs/ladspa-cmt
+ media-plugins/mcp-plugins
+ media-plugins/swh-plugins
+ media-libs/libclalsadrv"
+# File collision /usr/bin/ams wrt #247812
+DEPEND="${RDEPEND}
+ !dev-ruby/amrita"
S=${WORKDIR}/${P/_/-}