Proper libgif unbundling

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 37 insertions, 10 deletions

diff --git a/media-libs/libafterimage/ChangeLog b/media-libs/libafterimage/ChangeLog
index 9782b9e53376..12c4a54475d0 100644
--- a/media-libs/libafterimage/ChangeLog
+++ b/media-libs/libafterimage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libafterimage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.30 2011/02/28 17:47:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.31 2011/03/28 18:07:53 bicatali Exp $
+
+  28 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  libafterimage-1.20.ebuild, +files/libafterimage-gif.patch:
+  Proper libgif unbundling
 
 *libafterimage-1.20 (28 Feb 2011)
 
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index 41bc5bdbb4e7..8e451c07a3c4 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -4,17 +4,18 @@ Hash: SHA1
 AUX libafterimage-1.18-glx.patch 932 RMD160 61f6ddd4f659ffdeff2c4a7abd57ad9d5a97354e SHA1 09183f34a1f4b7737efcc40b36563e2bf84d8964 SHA256 e6fc40d8a0384781d04b82229a7d1a61066cedcf6dbf01427251230a59703b82
 AUX libafterimage-1.18-recmake_bsd.patch 1934 RMD160 cdd484974683aaea096c893d842b3693362e4a39 SHA1 030a4173e798e764dfbca64a60f2640af489236e SHA256 3628b28d09a119133b1235215454a8e7f664bdf9969445c267fa8648497e75a3
 AUX libafterimage-config.patch 369 RMD160 e209d20413373694cd4b4cf16cc1927fbb8437f6 SHA1 030143afcdece5802511b51899c221d48e421ebf SHA256 75a7683211f8d65a6cb1a6ed99b013d7bcc5b3cb3a241e36748a2c0b5ff960c6
+AUX libafterimage-gif.patch 1436 RMD160 8656affb37559f0cee1fd8143e8c29f78ec4dd42 SHA1 a80433320c5c22c9ffb754a3952aada7df6760a9 SHA256 d9e681e5fae08dd6e648ee699e3feb617a924ec5c011fdab81a75d4c3949ea9a
 AUX libafterimage-makefile.in.patch 2168 RMD160 4b6340f3845774de82fb612de0e94f0841ae869a SHA1 f707ad8a850eafacdac780a727f936b8cf8673de SHA256 44b2f80b7e5f9bef3852d179e247592f3d5a0983de105082d1b5d1667eb4ced8
 DIST libAfterImage-1.18.tar.bz2 1050328 RMD160 dcf921660e15bb31908c90fcfe00b58d58754fc3 SHA1 d177c63067f5d0053e02f92879fe59764e421f25 SHA256 f1562240f1dd3a180e07436ee28a993a707654a339d997ad0512692d3fc32312
 DIST libAfterImage-1.20.tar.bz2 1017055 RMD160 b02332fc598a6f141d103c38974e34fc559e1eb4 SHA1 c214ac89a1e61d9c8834ccc9210d0f7952305737 SHA256 6e233253f4d1dd22dfce9f9a245cc036d814fc99ba7f6732f4e345de62cfe458
 EBUILD libafterimage-1.18-r1.ebuild 2057 RMD160 071d40441ef17db71a74137ac9309289c7c74e8d SHA1 bdbff0028d48ff776c416548c6cff1db3c276678 SHA256 3f1c3aad8643465bc4ecf812d73a936490bfc7cbed9e5ef35b48cf4be4e5f9f1
-EBUILD libafterimage-1.20.ebuild 2070 RMD160 f00cfe798c4114de7293aca0aa981929b080ffef SHA1 6b5ea9282b03bf93f408c94f65155fcd6ff6250b SHA256 5b6b2cd424547fd87a693dabde8f2d32dadd895503642407a8dd791de0b78a18
-MISC ChangeLog 4279 RMD160 45f3bee4e32aad93145af297be3b7a6e85c5add1 SHA1 9f425a1447bd1faa6b4d6d0c1aadc40be8ecb6d1 SHA256 8325ae92d037006286f245903aa93806d90994dfd84ebcbb401d60a46f646440
+EBUILD libafterimage-1.20.ebuild 2179 RMD160 ef5dc96fc56ee6ac0f4327d701f38c88505a38ee SHA1 a94e48a7be985f07f253a8c0102deb233d87edf0 SHA256 533740691b06242a997e82cc22cd39a2a06fb9f791890c5437be5a33ef99b350
+MISC ChangeLog 4423 RMD160 de4595ddc0bb8829a5eedf0a93f499fe79443158 SHA1 0130be843f4461f045cacb8cd87c33d9c7e0c92d SHA256 66fc2c11380f77f5fc0f1dc18f403e24a7d0d02a2090fb27921cdb0c71870e6c
 MISC metadata.xml 803 RMD160 5a20a7d1e910ee66f7bb5fd53aad8341a1f0b653 SHA1 bfee50707db93a6a62978caf711b15be6446c67c SHA256 5f1fc597d0da18541c30e568f47ec9d1937f277dc34130101e8e605924a4d444
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1r37IACgkQ1ycZbhPLE2AJ0wCfY3GpQkgHJ5kUa1RkeBZj/mHG
-UdwAn0bWKUoDp+3ZEctxgziqetTbUagx
-=+voG
+iEYEARECAAYFAk2QzpQACgkQ1ycZbhPLE2D7NwCdEvT5O2J0S01XFxR94eSvMAu6
+RmYAnj+zZNA6Hg0apxq3vf/ZWU4cL1HM
+=oiyK
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libafterimage/files/libafterimage-gif.patch b/media-libs/libafterimage/files/libafterimage-gif.patch
new file mode 100644
index 000000000000..8a2ca8e46720
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-gif.patch
@@ -0,0 +1,18 @@
+--- configure.in.orig	2011-03-28 18:55:22.000000000 +0100
++++ configure.in	2011-03-28 18:56:08.000000000 +0100
+@@ -60,12 +60,9 @@
+ dnl# AC_ARG_WITH(xpm_includes,   [  --with-xpm-includes=DIR  use libXpm includes in DIR( when builtin XPM handling is disabled )], xpm_includes="$withval", xpm_includes=no)
+ 
+ dnl# standard libgif/ungif should not be used and considered obsolete!
+-dnl# AC_ARG_WITH(ungif,		    [  --with-ungif             support Uncompressed GIF image format using libungif [no]],with_ungif="$withval",with_ungif=no)
+-dnl# AC_ARG_WITH(gif,		    [  --with-gif               support GIF image format using libgif   [no]],with_gif="$withval",with_gif=no)
+-dnl# AC_ARG_WITH(gif_includes,   [  --with-gif-includes=DIR  use GIF includes in DIR], gif_includes="$withval", gif_includes=no)
+-with_ungif=no
+-with_gif=no
+-with_gif_includes=no
++AC_ARG_WITH(ungif,		    [  --with-ungif             support Uncompressed GIF image format using libungif [no]],with_ungif="$withval",with_ungif=no)
++AC_ARG_WITH(gif,		    [  --with-gif               support GIF image format using libgif   [no]],with_gif="$withval",with_gif=no)
++AC_ARG_WITH(gif_includes,   [  --with-gif-includes=DIR  use GIF includes in DIR], gif_includes="$withval", gif_includes=no)
+ AC_ARG_WITH(builtin_gif,    [  --with-builtin-gif               support Uncompressed GIF image format using builtin libgif [yes]],with_builtin_gif="$withval",with_builtin_gif=yes)
+ 
+ 
diff --git a/media-libs/libafterimage/libafterimage-1.20.ebuild b/media-libs/libafterimage/libafterimage-1.20.ebuild
index 10d84607e22b..f11e57cfa597 100644
--- a/media-libs/libafterimage/libafterimage-1.20.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.1 2011/02/28 17:47:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.2 2011/03/28 18:07:53 bicatali Exp $
 
 EAPI=3
-inherit eutils
+inherit eutils autotools
 
 MY_PN=libAfterImage
 
@@ -37,11 +37,14 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-makefile.in.patch
 	# fix lib paths in afterimage-config
 	epatch "${FILESDIR}"/${PN}-config.patch
+	# fix gif unbundle
+	epatch "${FILESDIR}"/${PN}-gif.patch
 	# remove forced flags
 	sed -i \
 		-e 's/CFLAGS="-O3"//' \
 		-e 's/ -rdynamic//' \
-		configure || die "sed failed"
+		configure.in || die "sed failed"
+	eautoreconf
 }
 
 src_configure() {
@@ -60,7 +63,8 @@ src_configure() {
 		--with-x \
 		--with-xpm \
 		--without-builtin-gif \
-		--without-builtin-ungif \
+		--without-builtin-jpeg \
+		--without-builtin-png \
 		--without-builtin-zlib \
 		--without-afterbase
 }