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
commit9aa6a80ab1f93f69f9619bb18f776d4be8c84e2c (patch)
treea65bbb1a650a5fd7dd75e83e4dc8616ac2ffaf6d /media-sound/ams
parentInclude cdda_interface.h for cdda_paranoia.h wrt #257607 (diff)
downloadgentoo-2-9aa6a80ab1f93f69f9619bb18f776d4be8c84e2c.tar.gz
gentoo-2-9aa6a80ab1f93f69f9619bb18f776d4be8c84e2c.tar.bz2
gentoo-2-9aa6a80ab1f93f69f9619bb18f776d4be8c84e2c.zip
File collision /usr/bin/ams wrt #247812
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/ams')
-rw-r--r--media-sound/ams/ChangeLog9
-rw-r--r--media-sound/ams/ams-1.8.8_rc2.ebuild24
2 files changed, 19 insertions, 14 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/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/_/-}