Revision bump to fix fPIC issue bug #68567.

5 files changed, 65 insertions, 18 deletions

diff --git a/media-libs/a52dec/ChangeLog b/media-libs/a52dec/ChangeLog
index 732fd8dd6871..466f2e759380 100644
--- a/media-libs/a52dec/ChangeLog
+++ b/media-libs/a52dec/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2004/10/04 08:37:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/ChangeLog,v 1.22 2004/11/05 09:29:17 eradicator Exp $
+
+*a52dec-0.7.4-r3 (05 Nov 2004)
+
+  05 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/a52dec-0.7.4-build.patch, -a52dec-0.7.4-r2.ebuild,
+  +a52dec-0.7.4-r3.ebuild:
+  Revision bump to fix fPIC issue bug #68567.
 
   04 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -a52dec-0.7.4-r1.ebuild:
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index 95a414cf6f3d..94a18eca3450 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 84a4788e5901b9b5f2a769dfac75993d a52dec-0.7.4-r3.ebuild 1311
 MD5 de290c0400384a59257ecb5b48147c87 a52dec-0.7.4.ebuild 941
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 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-----
+MD5 3bb61e4ec18824ddab0068807ad43de8 files/a52dec-0.7.4-build.patch 1232
+MD5 d98b1ff993cc74290d145feadc2542ff files/digest-a52dec-0.7.4-r3 64
diff --git a/media-libs/a52dec/a52dec-0.7.4-r2.ebuild b/media-libs/a52dec/a52dec-0.7.4-r3.ebuild
index 6f2cf363ab76..542ab7426906 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r2.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r3.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2004/10/04 08:37:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.4-r3.ebuild,v 1.1 2004/11/05 09:29:17 eradicator Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic libtool gnuconfig
 
 DESCRIPTION="library for decoding ATSC A/52 streams used in DVD"
 HOMEPAGE="http://liba52.sourceforge.net/"
@@ -13,12 +13,31 @@ 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
+DEPEND=">=sys-devel/autoconf-2.5
+	>=sys-devel/automake-1.8
 	djbfft? ( dev-libs/djbfft )"
+
 RDEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-build.patch
+	export WANT_AUTOMAKE=1.8
+	export WANT_AUTOCONF=2.5
+
+	libtoolize --force --copy --automake
+
+	autoheader
+	aclocal
+	automake -a -f -c
+	autoconf
+
+	gnuconfig_update
+}
+
 src_compile() {
-	append-flags -fPIC
 	filter-flags -fprefetch-loop-arrays
 
 	local myconf="--enable-shared"
@@ -30,6 +49,6 @@ src_compile() {
 }
 
 src_install() {
-	einstall docdir=${D}/usr/share/doc/${PF}/html || die
+	make DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html install || die
 	dodoc AUTHORS ChangeLog HISTORY NEWS README TODO doc/liba52.txt
 }
diff --git a/media-libs/a52dec/files/a52dec-0.7.4-build.patch b/media-libs/a52dec/files/a52dec-0.7.4-build.patch
new file mode 100644
index 000000000000..bc1aa988f301
--- /dev/null
+++ b/media-libs/a52dec/files/a52dec-0.7.4-build.patch
@@ -0,0 +1,30 @@
+diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
+--- a52dec-0.7.4.orig/liba52/Makefile.am	2002-01-27 20:36:48.000000000 -0800
++++ a52dec-0.7.4/liba52/Makefile.am	2004-11-05 01:10:21.317401872 -0800
+@@ -1,4 +1,4 @@
+-CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
++AM_CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
+ 
+ lib_LTLIBRARIES = liba52.la
+ 
+diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
+--- a52dec-0.7.4.orig/liba52/configure.incl	2002-01-27 20:36:48.000000000 -0800
++++ a52dec-0.7.4/liba52/configure.incl	2004-11-05 01:11:38.172672216 -0800
+@@ -2,7 +2,7 @@
+ AC_SUBST([LIBA52_LIBS])
+ 
+ dnl avoid -fPIC when possible
+-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
++dnl LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
+ 
+ AC_ARG_ENABLE([double],
+     [  --enable-double         use double-precision samples])
+diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
+--- a52dec-0.7.4.orig/src/Makefile.am	2002-06-22 18:51:57.000000000 -0700
++++ a52dec-0.7.4/src/Makefile.am	2004-11-05 01:10:21.320401375 -0800
+@@ -1,4 +1,4 @@
+-CFLAGS = @A52DEC_CFLAGS@
++AM_CFLAGS = @A52DEC_CFLAGS@
+ 
+ bin_PROGRAMS = a52dec extract_a52
+ a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
diff --git a/media-libs/a52dec/files/digest-a52dec-0.7.4-r2 b/media-libs/a52dec/files/digest-a52dec-0.7.4-r3
index 51a373ceb950..51a373ceb950 100644
--- a/media-libs/a52dec/files/digest-a52dec-0.7.4-r2
+++ b/media-libs/a52dec/files/digest-a52dec-0.7.4-r3