old, cleanup

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

3 files changed, 14 insertions, 68 deletions

diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index 026ae5b431c2..e90ac22ad0d9 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -2,7 +2,6 @@ AUX a52dec-0.7.4-build.patch 1113 RMD160 5b6142d108cb7a2dad04bfa0a4eae0cb599cb60
 AUX a52dec-0.7.4-freebsd.patch 343 RMD160 29981d434e6d1fcbbceb36a6200554302d4ef898 SHA1 5631e11ada36c5d0f11bf924cf0bbc5e106e2bd2 SHA256 61a2852445843dcb3cee283cbcd44ce28a1e5d018f60879ba8e8de184668367d
 AUX a52dec-0.7.4-tests-optional.patch 299 RMD160 fc64a44b56d25c2dacc62625909a5fe611baf694 SHA1 86c211487eab6712b6b42b11ac216b6ee4eec6a9 SHA256 d0dd7ad5d6f070ef385bf76ff48e1d54be7cb9d5ba3d7d71e5b1b4657bdfb9ba
 DIST a52dec-0.7.4.tar.gz 241507 RMD160 5b63b34c5840e7182b733cad41e916a8d4875eb1 SHA1 79b33bd8d89dad7436f85b9154ad35667aa37321 SHA256 a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33
-EBUILD a52dec-0.7.4-r5.ebuild 1262 RMD160 840106242299c30b4c45623e537485988397e8cd SHA1 4b005038599d0ba1c76b657d5f39b29b81d66333 SHA256 202ea09636cf0fd8b634d6f159751e6855191a4a4f060204cf0fd4e215b375be
-EBUILD a52dec-0.7.4-r6.ebuild 1385 RMD160 4a0d3e7ced79efe2fb034c90d494532a95481a26 SHA1 662015df55bc61ed8f656733fa385aa3ea6c91b3 SHA256 fe71fb6c9e5e4dfe0666f286c27e4d14d1850ff4b959c6a1c6671383a4244173
+EBUILD a52dec-0.7.4-r6.ebuild 1352 RMD160 57b1c88c5181c237f6ffa0c134c98450fa5d41f5 SHA1 bddd0f2cd23040644900e1af6826649601b8d8df SHA256 2ba11677a721c7c9c212f694a4453cfd9ec054c50ec00c429979a7eb70e9691e
 MISC ChangeLog 8454 RMD160 56c81c0ec6ffead862f5f9c153227d64011c30e5 SHA1 0b40638de85584e6bd4618e59851fb0a6707ca6c SHA256 c43bbc3c44be051eb997ff777f819330882fb43af2e8bfddd3511d60d0f7c1ca
 MISC metadata.xml 263 RMD160 c5058962ee3e28f9d59f96166a74491c8921876b SHA1 cd5010261b69c760edfd60bc8398cffc15a3aa3e SHA256 938b5d7b1489d64aa1d2479633cc25916bc5381e6a080dd96a7b339ea7690d24
diff --git a/media-libs/a52dec/a52dec-0.7.4-r5.ebuild b/media-libs/a52dec/a52dec-0.7.4-r5.ebuild
deleted file mode 100644
index b5825dbd137f..000000000000
--- a/media-libs/a52dec/a52dec-0.7.4-r5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.4-r5.ebuild,v 1.19 2008/06/13 14:06:16 loki_val Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit eutils flag-o-matic libtool autotools
-
-DESCRIPTION="library for decoding ATSC A/52 streams used in DVD"
-HOMEPAGE="http://liba52.sourceforge.net/"
-SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="oss djbfft"
-
-RDEPEND="djbfft? ( sci-libs/djbfft )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-build.patch"
-	epatch "${FILESDIR}/${P}-freebsd.patch"
-
-	eautoreconf
-	epunt_cxx
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-
-	local myconf="--enable-shared"
-	use oss || myconf="${myconf} --disable-oss"
-	econf \
-		$(use_enable djbfft) \
-		${myconf} || die
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html install || die
-
-	insinto /usr/include/a52dec
-	doins "${S}"/liba52/a52_internal.h
-
-	dodoc AUTHORS ChangeLog HISTORY NEWS README TODO doc/liba52.txt
-}
diff --git a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
index 5dab34a104a4..755e9a301269 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.4-r6.ebuild,v 1.9 2009/06/19 21:35:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.4-r6.ebuild,v 1.10 2009/08/21 20:10:29 ssuominen Exp $
 
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit eutils flag-o-matic libtool autotools
+EAPI=2
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="library for decoding ATSC A/52 streams used in DVD"
 HOMEPAGE="http://liba52.sourceforge.net/"
@@ -19,14 +17,10 @@ IUSE="oss djbfft"
 RDEPEND="djbfft? ( sci-libs/djbfft )"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-build.patch"
-	epatch "${FILESDIR}/${P}-freebsd.patch"
-	epatch "${FILESDIR}/${P}-tests-optional.patch"
-
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-freebsd.patch \
+		"${FILESDIR}"/${P}-tests-optional.patch
 	eautoreconf
 	epunt_cxx
 }
@@ -38,7 +32,10 @@ src_compile() {
 	use oss || myconf="${myconf} --disable-oss"
 	econf \
 		$(use_enable djbfft) \
-		${myconf} || die
+		${myconf}
+}
+
+src_compile() {
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
@@ -48,7 +45,8 @@ src_test() {
 }
 
 src_install() {
-	make DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html install || die
+	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html \
+		install || die "emake install failed"
 
 	insinto /usr/include/a52dec
 	doins "${S}"/liba52/a52_internal.h