x86 stable and remove old, bug #217525

(Portage version: 2.1.5_rc4)

3 files changed, 7 insertions, 59 deletions

diff --git a/media-libs/aubio/ChangeLog b/media-libs/aubio/ChangeLog
index df9f304aabc2..5a1e04852dd4 100644
--- a/media-libs/aubio/ChangeLog
+++ b/media-libs/aubio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/aubio
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/ChangeLog,v 1.9 2008/04/14 18:28:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/ChangeLog,v 1.10 2008/04/18 22:14:30 maekke Exp $
+
+  18 Apr 2008; Markus Meier <maekke@gentoo.org> -aubio-0.3.2.ebuild,
+  aubio-0.3.2-r1.ebuild:
+  x86 stable and remove old, bug #217525
 
   14 Apr 2008; Markus Rothe <corsair@gentoo.org> aubio-0.3.2-r1.ebuild:
   Stable on ppc64; bug #217525
diff --git a/media-libs/aubio/aubio-0.3.2-r1.ebuild b/media-libs/aubio/aubio-0.3.2-r1.ebuild
index e91b9ec50494..8b7dd7e55790 100644
--- a/media-libs/aubio/aubio-0.3.2-r1.ebuild
+++ b/media-libs/aubio/aubio-0.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild,v 1.4 2008/04/14 18:28:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild,v 1.5 2008/04/18 22:14:30 maekke Exp $
 
 WANT_AUTOMAKE=1.8
 
@@ -14,7 +14,7 @@ SRC_URI="http://aubio.piem.org/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 
 RDEPEND="=sci-libs/fftw-3*
 	media-libs/libsndfile
diff --git a/media-libs/aubio/aubio-0.3.2.ebuild b/media-libs/aubio/aubio-0.3.2.ebuild
deleted file mode 100644
index 9af894fb3fe5..000000000000
--- a/media-libs/aubio/aubio-0.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.3.2.ebuild,v 1.6 2008/01/31 20:35:28 armin76 Exp $
-
-IUSE="alsa doc jack lash"
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="http://aubio.piem.org"
-SRC_URI="http://aubio.piem.org/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
-
-RDEPEND="=sci-libs/fftw-3*
-	    >=dev-util/pkgconfig-0.9.0
-		media-libs/libsndfile
-		media-libs/libsamplerate
-		>=dev-lang/swig-1.3.0
-		dev-lang/python
-		alsa? ( media-libs/alsa-lib )
-		jack? ( media-sound/jack-audio-connection-kit )
-		lash? ( media-sound/lash )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen virtual/latex-base )"
-
-src_compile() {
-	econf $(use_enable jack) \
-		$(use_enable alsa) \
-		$(use_enable lash) \
-		|| die "econf failed"
-	emake || die "emake failed"
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		cd "${S}/doc"
-		doxygen user.cfg || die "creating user doc failed"
-		doxygen devel.cfg || die "creating devel doc failed"
-		doxygen examples.cfg || die "creating examples doc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO
-	doman doc/*.1
-	if use doc; then
-		mv doc/user/html doc/user/user
-		dohtml -r doc/user/user
-		mv doc/devel/html doc/devel/devel
-		dohtml -r doc/devel/devel
-		mv doc/examples/html doc/examples/examples
-		dohtml -r doc/examples/examples
-	fi
-
-}