Drop audacious USE-flag, versioned depend on old release. Remove old ebuild. Herd approval by Mr_Bones_.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

4 files changed, 9 insertions, 54 deletions

diff --git a/app-emulation/uade/ChangeLog b/app-emulation/uade/ChangeLog
index c065f82f9a0f..04e910c86d7c 100644
--- a/app-emulation/uade/ChangeLog
+++ b/app-emulation/uade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/uade
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/ChangeLog,v 1.56 2010/01/24 01:41:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/ChangeLog,v 1.57 2010/03/01 22:57:12 chainsaw Exp $
+
+  01 Mar 2010; <chainsaw@gentoo.org> -uade-2.12.ebuild, uade-2.13.ebuild,
+  metadata.xml:
+  Drop audacious USE-flag, versioned depend on old release. Remove old
+  ebuild. Herd approval by Mr_Bones_.
 
   23 Jan 2010; Brent Baude <ranger@gentoo.org> uade-2.13.ebuild:
   stable ppc, bug 299699
diff --git a/app-emulation/uade/metadata.xml b/app-emulation/uade/metadata.xml
index 769fa30ef7c5..8d22178c5c03 100644
--- a/app-emulation/uade/metadata.xml
+++ b/app-emulation/uade/metadata.xml
@@ -5,8 +5,4 @@
 <maintainer>
 	<email>spock@gentoo.org</email>
 </maintainer>
-<use>
-	<flag name='audacious'>Enables support for
-		<pkg>media-sound/audacious</pkg></flag>
-</use>
 </pkgmetadata>
diff --git a/app-emulation/uade/uade-2.12.ebuild b/app-emulation/uade/uade-2.12.ebuild
deleted file mode 100644
index 4cd91afe36cb..000000000000
--- a/app-emulation/uade/uade-2.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/uade-2.12.ebuild,v 1.4 2008/11/30 19:32:10 spock Exp $
-
-inherit eutils
-
-DESCRIPTION="Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation"
-HOMEPAGE="http://zakalwe.fi/uade"
-SRC_URI="http://zakalwe.fi/uade/uade2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="audacious"
-
-RDEPEND="media-libs/libao
-	audacious? ( >=media-sound/audacious-0.2 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/uade-2.12-asneeded.patch
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--package-prefix="${D}" \
-		$(use_with audacious) \
-		--with-uade123 \
-		--with-text-scope \
-		--without-xmms \
-		|| die "configure failed"
-	emake || die 'emake failed'
-}
-
-src_install() {
-	make install || die 'make install failed'
-	dodoc AUTHORS ChangeLog doc/BUGS doc/PLANS
-	doman doc/uade123.1
-}
diff --git a/app-emulation/uade/uade-2.13.ebuild b/app-emulation/uade/uade-2.13.ebuild
index b687d2538302..e3e978b6d84a 100644
--- a/app-emulation/uade/uade-2.13.ebuild
+++ b/app-emulation/uade/uade-2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/uade-2.13.ebuild,v 1.3 2010/01/24 01:41:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/uade-2.13.ebuild,v 1.4 2010/03/01 22:57:12 chainsaw Exp $
 
 inherit eutils
 
@@ -11,10 +11,9 @@ SRC_URI="http://zakalwe.fi/uade/uade2/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="audacious"
+IUSE=""
 
-RDEPEND="media-libs/libao
-	audacious? ( <=media-sound/audacious-2.1 )"
+RDEPEND="media-libs/libao"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -23,7 +22,6 @@ src_compile() {
 	./configure \
 		--prefix=/usr \
 		--package-prefix="${D}" \
-		$(use_with audacious) \
 		--with-uade123 \
 		--with-text-scope \
 		--without-xmms \