Make stable version build shared, too. Removing -r1.

6 files changed, 28 insertions, 61 deletions

diff --git a/media-libs/a52dec/ChangeLog b/media-libs/a52dec/ChangeLog
index eee969e3f25b..732fd8dd6871 100644
--- a/media-libs/a52dec/ChangeLog
+++ b/media-libs/a52dec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/a52dec
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/ChangeLog,v 1.20 2004/10/01 13:58:31 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/ChangeLog,v 1.21 2004/10/04 08:37:13 eradicator Exp $
+
+  04 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -a52dec-0.7.4-r1.ebuild:
+  Make stable version build shared, too. Removing -r1.
 
 *a52dec-0.7.4-r2 (01 Oct 2004)
 
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index 0f42c0f5b9ce..95a414cf6f3d 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -1,8 +1,16 @@
-MD5 3af601384df0090f3f3f0c3010024d10 a52dec-0.7.4.ebuild 1028
-MD5 e1f68113ed462d43e2205cdbd238ed88 a52dec-0.7.4-r2.ebuild 1043
-MD5 76e92f288eebfdb16b3efbbe23744009 ChangeLog 2920
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 de290c0400384a59257ecb5b48147c87 a52dec-0.7.4.ebuild 941
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 3c6370fdff5cfa3f9ed308393e07909a a52dec-0.7.4-r1.ebuild 1014
-MD5 d98b1ff993cc74290d145feadc2542ff files/digest-a52dec-0.7.4-r1 64
-MD5 d98b1ff993cc74290d145feadc2542ff files/digest-a52dec-0.7.4-r2 64
+MD5 483a4eeaf96efe5b6dd5c2926e863521 ChangeLog 3062
+MD5 234b3ff5d39d0f83a02ec9fff3e23f0a a52dec-0.7.4-r2.ebuild 1030
 MD5 d98b1ff993cc74290d145feadc2542ff files/digest-a52dec-0.7.4 64
+MD5 d98b1ff993cc74290d145feadc2542ff files/digest-a52dec-0.7.4-r2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBYQvFArHZZzCEUG0RApL6AJwNQfNjgrt5xfudUBQSpWhwX7Om4gCcCJvo
+y6v5PyQ7Pi+uiSq3AAjmIDE=
+=DXXb
+-----END PGP SIGNATURE-----
diff --git a/media-libs/a52dec/a52dec-0.7.4-r1.ebuild b/media-libs/a52dec/a52dec-0.7.4-r1.ebuild
deleted file mode 100644
index 6e215a01ba8a..000000000000
--- a/media-libs/a52dec/a52dec-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 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-r1.ebuild,v 1.7 2004/09/28 02:04:20 vapier Exp $
-
-inherit flag-o-matic
-
-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 ~ppc ppc64 ~ppc-macos ~sparc ~x86"
-IUSE="oss static djbfft"
-
-DEPEND=">=sys-devel/autoconf-2.52d-r1
-	djbfft? ( dev-libs/djbfft )"
-RDEPEND="virtual/libc"
-
-src_compile() {
-	append-flags -fPIC
-	filter-flags -fprefetch-loop-arrays
-
-	local myconf
-	use oss \
-		|| myconf="${myconf} --disable-oss"
-	econf \
-		$(use_enable static) \
-		$(use_enable djbfft) \
-		${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall docdir=${D}/usr/share/doc/${PF}/html || die
-	dodoc AUTHORS ChangeLog HISTORY NEWS README TODO doc/liba52.txt
-}
diff --git a/media-libs/a52dec/a52dec-0.7.4-r2.ebuild b/media-libs/a52dec/a52dec-0.7.4-r2.ebuild
index f3684ad495bf..6f2cf363ab76 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r2.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r2.ebuild,v 1.1 2004/10/01 13:58:31 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.4-r2.ebuild,v 1.2 2004/10/04 08:37:13 eradicator Exp $
 
 inherit flag-o-matic
 
@@ -21,12 +21,9 @@ src_compile() {
 	append-flags -fPIC
 	filter-flags -fprefetch-loop-arrays
 
-	local myconf
-	myconf="--enable-shared"
-	use oss \
-		|| myconf="${myconf} --disable-oss"
-	econf \
-		$(use_enable static) \
+	local myconf="--enable-shared"
+	use oss || myconf="${myconf} --disable-oss"
+	econf 	$(use_enable static) \
 		$(use_enable djbfft) \
 		${myconf} || die
 	emake || die "emake failed"
diff --git a/media-libs/a52dec/a52dec-0.7.4.ebuild b/media-libs/a52dec/a52dec-0.7.4.ebuild
index ef2574903d81..38611651bac8 100644
--- a/media-libs/a52dec/a52dec-0.7.4.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.18 2004/09/28 02:04:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.4.ebuild,v 1.19 2004/10/04 08:37:13 eradicator Exp $
 
 inherit flag-o-matic
 
@@ -20,14 +20,10 @@ src_compile() {
 	append-flags -fPIC
 	filter-flags -fprefetch-loop-arrays
 
-	local myconf
-	use oss \
-		|| myconf="${myconf} --disable-oss"
-	use static \
-		&& myconf="${myconf} --disable-shared --enable-static" \
-		|| myconf="${myconf} --enable-shared --disable-static"
-
-	econf ${myconf} || die
+	local myconf="--enable-shared"
+	use oss || myconf="${myconf} --disable-oss"
+	econf 	$(use_enable static) \
+		${myconf} || die
 	emake || die "emake failed"
 }
 
diff --git a/media-libs/a52dec/files/digest-a52dec-0.7.4-r1 b/media-libs/a52dec/files/digest-a52dec-0.7.4-r1
deleted file mode 100644
index 51a373ceb950..000000000000
--- a/media-libs/a52dec/files/digest-a52dec-0.7.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz 241507