remove ppc64 hackery which isn't needed and apply bld fix

4 files changed, 16 insertions, 22 deletions

diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog
index 1540b78c0540..af6b43e4f87c 100644
--- a/media-libs/giflib/ChangeLog
+++ b/media-libs/giflib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/giflib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.18 2005/01/30 10:07:11 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.19 2005/02/03 21:21:03 tgall Exp $
+
+  03 Feb 2005; Tom Gall <tgall@gentoo.org> giflib-4.1.0-r3.ebuild,
+  giflib-4.1.3.ebuild
+  removed ppc64 specific bits (we're ok now), add build fix
+  for autoconf
 
   30 Jan 2005; lanius@gentoo.org giflib-4.1.3.ebuild:
   mark amd64
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 39810edd441f..dd6c2c394370 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,5 +1,5 @@
-MD5 ddf7b7543fecef567fae8880ab0a4ed3 giflib-4.1.0-r3.ebuild 2254
-MD5 e29e169d7151f38d889e1788ef4b83a5 ChangeLog 2372
-MD5 7acf14ac309cb06805cffaec26e0af03 giflib-4.1.3.ebuild 1720
-MD5 eff137a49d638c20405a6f8c9c4ad5b5 files/digest-giflib-4.1.3 64
+MD5 a93557d66334a37daa7115b8e640837f ChangeLog 2536
+MD5 24d0af9f4b2f0d8e9f3272bc3a78d0bf giflib-4.1.0-r3.ebuild 2109
+MD5 4aea9ce09906aef58b1076bb18f0cb88 giflib-4.1.3.ebuild 1547
 MD5 93888297538e2f77defcfef93578b8db files/digest-giflib-4.1.0-r3 64
+MD5 eff137a49d638c20405a6f8c9c4ad5b5 files/digest-giflib-4.1.3 64
diff --git a/media-libs/giflib/giflib-4.1.0-r3.ebuild b/media-libs/giflib/giflib-4.1.0-r3.ebuild
index 2bc67cfa46b2..61d6038bc440 100644
--- a/media-libs/giflib/giflib-4.1.0-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.32 2005/01/30 10:07:12 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.33 2005/02/03 21:21:03 tgall Exp $
 
 inherit gnuconfig eutils
 
@@ -14,22 +14,17 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
 IUSE="X gif"
 
-DEPEND="X? ( virtual/x11 )"
+DEPEND="X? ( virtual/x11 )
+		>=sys-devel/autoconf-2.58"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	gnuconfig_update
-	# The library it tries to create is like 12 bytes, which is obviously bogus,
-	# updating libtool/autoconf fixes this!
-	if [ "${ARCH}" = "ppc64" ] ; then
-		libtoolize -c -f
-		aclocal
-		autoconf
-	fi
 }
 
 src_compile() {
+	export WANT_AUTOCONF=2.5
 	econf `use_with X x` || die
 	emake || die "emake failed"
 }
diff --git a/media-libs/giflib/giflib-4.1.3.ebuild b/media-libs/giflib/giflib-4.1.3.ebuild
index 77e1e3065865..1669fe3e90c8 100644
--- a/media-libs/giflib/giflib-4.1.3.ebuild
+++ b/media-libs/giflib/giflib-4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.3.ebuild,v 1.2 2005/01/30 10:07:12 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.3.ebuild,v 1.3 2005/02/03 21:21:03 tgall Exp $
 
 inherit gnuconfig
 
@@ -19,16 +19,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	gnuconfig_update
-	# The library it tries to create is like 12 bytes, which is obviously bogus,
-	# updating libtool/autoconf fixes this!
-	if [ "${ARCH}" = "ppc64" ] ; then
-		libtoolize -c -f
-		aclocal
-		autoconf
-	fi
 }
 
 src_compile() {
+	export WANT_AUTOCONF=2.5
 	econf `use_with X x` || die
 	emake || die "emake failed"
 }