Clean up.

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27.7 i686)

4 files changed, 5 insertions, 52 deletions

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index 9779082eea5f..24f9c4e85e15 100644
--- a/media-libs/faac/ChangeLog
+++ b/media-libs/faac/ChangeLog
@@ -1,10 +1,6 @@
 # ChangeLog for media-libs/faac
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.65 2008/01/07 14:24:43 drac Exp $
-
-  07 Jan 2008; Samuli Suominen <drac@gentoo.org> -faac-1.24.ebuild,
-  faac-1.24-r2.ebuild, -faac-1.24-r3.ebuild, -faac-1.26.ebuild:
-  Remove old ebuilds and leave ebuild behind with only KEYWORDS ~mips wrt #199973
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.66 2008/11/30 11:08:27 ssuominen Exp $
 
   26 Nov 2007; Jeroen Roovers <jer@gentoo.org> faac-1.26-r1.ebuild:
   Stable for HPPA (bug #199973).
diff --git a/media-libs/faac/faac-1.24-r2.ebuild b/media-libs/faac/faac-1.24-r2.ebuild
deleted file mode 100644
index 7a4793e2db0d..000000000000
--- a/media-libs/faac/faac-1.24-r2.ebuild
+++ /dev/null
@@ -1,43 +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/faac/faac-1.24-r2.ebuild,v 1.8 2008/01/07 14:24:43 drac Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit libtool eutils autotools
-
-DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
-HOMEPAGE="http://www.audiocoding.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~mips"
-IUSE=""
-
-RDEPEND=">=media-libs/libsndfile-1.0.0"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.3.5
-	sys-devel/automake
-	!<media-libs/faad2-2.0-r3"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-faad.patch"
-	epatch "${FILESDIR}/${P}-tracknumber.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	eautoreconf
-	elibtoolize
-	epunt_cxx
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO docs/libfaac.pdf
-}
diff --git a/media-libs/faac/faac-1.24-r4.ebuild b/media-libs/faac/faac-1.24-r4.ebuild
index 2b1e5eae7643..ad10a26e3ec7 100644
--- a/media-libs/faac/faac-1.24-r4.ebuild
+++ b/media-libs/faac/faac-1.24-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.24-r4.ebuild,v 1.1 2007/03/12 03:39:03 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.24-r4.ebuild,v 1.2 2008/11/30 11:08:27 ssuominen Exp $
 
 inherit libtool eutils autotools
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libsndfile-1.0.0
diff --git a/media-libs/faac/faac-1.25.ebuild b/media-libs/faac/faac-1.25.ebuild
index e61ee51e1212..31b693d5c985 100644
--- a/media-libs/faac/faac-1.25.ebuild
+++ b/media-libs/faac/faac-1.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.25.ebuild,v 1.7 2007/10/15 05:59:13 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.25.ebuild,v 1.8 2008/11/30 11:08:27 ssuominen Exp $
 
 inherit libtool eutils autotools flag-o-matic
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.audiocoding.com/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ppc ppc64 sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 RDEPEND=">=media-libs/libsndfile-1.0.0
 	media-libs/libmp4v2"