From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Sun, 26 Dec 2004 22:23:12 +0000 (+0000)
Subject: Run autotools.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3daa5b3dc23d732ce1d5c662b03c768b6d3922c8;p=gentoo.git

Run autotools.
---

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index d01f2922916d..6b983d944717 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.168 2004/12/26 21:05:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.169 2004/12/26 22:23:12 eradicator Exp $
+
+  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xine-lib-1_rc8-r1.ebuild:
+  Run autotools.
 
   26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xine-lib-1_rc8-r1.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 43aa33c9b44f..5d0ae805a3c8 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -4,8 +4,8 @@ Hash: SHA1
 MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
 MD5 d2d62f59048715eaf85d88a90842729d xine-lib-1_rc7.ebuild 5327
 MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380
-MD5 b2df7cec54f3697240428c8e4c6a0508 xine-lib-1_rc8-r1.ebuild 6122
-MD5 6a7bc1bac46755176dd49d409bf3e9e0 ChangeLog 28470
+MD5 7b14f0e8c5222de8df9e0dac4c5d10c4 xine-lib-1_rc8-r1.ebuild 6265
+MD5 7217a5907cd4d614a9151c8ce335e3dc ChangeLog 28573
 MD5 b25152bddc933afdf390149b07f2ff43 xine-lib-1_rc5-r3.ebuild 5473
 MD5 a53b6f55661ef41e343932ceb7108cc3 xine-lib-1_rc6.ebuild 5358
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
@@ -44,7 +44,7 @@ MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBzyeVArHZZzCEUG0RAqaVAJ46z1R8aXcS15H1qG4mRli/YeCBZQCfYejW
-6oMhPjJVcBwrLuurluOMDmo=
-=XGmH
+iD8DBQFBzzngArHZZzCEUG0RAmVTAJoCT35WRAUCeGjdoz2HVhBkrPYMYQCfWmud
++9W8zmPug1l+4Qxir0fSVRk=
+=sGDx
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
index 5ca99dd2f190..651922605f0e 100644
--- a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc8-r1.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/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.9 2004/12/26 21:05:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.10 2004/12/26 22:23:12 eradicator Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -34,6 +34,8 @@ RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	theora? ( media-libs/libtheora )
 	speex? ( media-libs/speex )"
 DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.59
 	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
@@ -55,28 +57,32 @@ src_unpack() {
 	# plasmaroo: Kernel 2.6 headers patch
 	epatch ${FILESDIR}/${PN}-1_rc7-2.6.patch
 
-	# force 32 bit userland
-	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/xine-lib-1_rc7-configure-sparc.patch
-
 	# fixes #74475 security bug
 	epatch ${FILESDIR}/djb_demux_aiff.patch
 
 	# fixes bad X11 directories
 	epatch ${FILESDIR}/${PN}-x11.patch
 
-	# Bad version included... may drop .so
-	#libtoolize --copy --force
-
-	# bug #40317
-	elibtoolize
-
 	# Fix building on amd64, #49569
 	#use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
 
 	use pic && epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
 
 	# Fix detection of hppa2.0 and hppa1.1 CHOST
-	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
+	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure.ac
+
+	# Fix detection of sparc64 systems
+	use sparc && epatch ${FILESDIR}/xine-lib-1_rc7-configure-sparc.patch
+
+	# Makefile.ams and configure.ac get patched, so we need to rerun
+	# autotools
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.7
+	aclocal -I m4
+	libtoolize --copy --force
+	autoheader
+	automake -a -f -c
+	autoconf
 }
 
 src_compile() {
@@ -165,7 +171,6 @@ src_compile() {
 		$(use_enable sdl sdltest) \
 		$(use_enable ipv6) \
 		$(use_enable directfb) \
-		$(use_enable xv shared-xv) \
 		${myconf} || die "Configure failed"
 
 	emake -j1 || die "Parallel make failed"