add multilib support wrt #496548, patch by Michael Mair-Keimberger

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 133 insertions, 10 deletions

diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog
index 1d5c2a4075f9..4b5246021e29 100644
--- a/media-libs/giflib/ChangeLog
+++ b/media-libs/giflib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/giflib
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.72 2013/11/10 04:14:36 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.73 2014/04/18 13:37:22 hasufell Exp $
+
+*giflib-5.0.5-r1 (18 Apr 2014)
+*giflib-4.2.3-r1 (18 Apr 2014)
+
+  18 Apr 2014; Julian Ospald <hasufell@gentoo.org> +giflib-4.2.3-r1.ebuild,
+  +giflib-5.0.5-r1.ebuild:
+  add multilib support wrt #496548, patch by Michael Mair-Keimberger
 
 *giflib-5.0.5 (10 Nov 2013)
 
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index be6957423622..3e536934d472 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -8,19 +8,29 @@ DIST giflib-4.2.3.tar.bz2 560968 SHA256 0ac8d56726f77c8bc9648c93bbb4d6185d32b15b
 DIST giflib-5.0.4.tar.bz2 629190 SHA256 7c78b2834256fcb7ff703d0d2153f965dc296f8e059de1fc635aba1042b00bba SHA512 057c7754a7169a8690d03b39e084626355e907dcc0644473da1ebe6c6f36c7d991a477c0b22d258bdbceafe473bab585bca57fa9bf4d9c0c4d7ebbe920bea83f WHIRLPOOL 91aad640c43581b9ff0daef2e8e909414419451590bbc372943275558724513cd3b1f081dc202498670c7d18cb22b48e067c79a157da6f597c8c56c737e07231
 DIST giflib-5.0.5.tar.bz2 651559 SHA256 606d8a366b1c625ab60d62faeca807a799a2b9e88cbdf2a02bfcdf4429bf8609 SHA512 3b8a5e3bd3ecd324073a635f76fbea218392644d11ca13918631a82339b3ef4567c57666ef777f684e3e81f39f04d8741e0973a538352f5bd17f5f15535a45c2 WHIRLPOOL 9fabcdbbee9dc08e17da7da6dabc61ca965ab631754f6f20c54953bb3b0f7763f6d0dc572c649e6ae9834bbcc03955aedee0ef6f2e0e09ec4e5bc46e223727ef
 EBUILD giflib-4.1.6-r2.ebuild 1492 SHA256 dac47abcf0ef7cedc9d5f6a84d6a003d502c0d0ea9945d6e4cabe345936c422a SHA512 419d642faac07ee65d21f4761123a25333f8c34f8ff4aaba15cddd9a74154142fb333e474b137d88c0f70ae27b3a5a689d2d9b527421011d91aed631dc9079fc WHIRLPOOL cc7c9bb2a4941ccf41794cc2349f9fb8221261fbae3abd3fd94725b0883ebd3078f754c2c105221976d373c26c32f24a2881f5ecceaa4bec9bb8dabded6722a4
+EBUILD giflib-4.2.3-r1.ebuild 1584 SHA256 4b002bf8df2f9594e31ec4fb1f7c1b56d0146108a4524b17d3c98434358f5c4e SHA512 7a51379bf6cf6476fe5b47302d7bdd91e351a3636aa19a4f9abae6e6b21113560b2772f005d0d23614566eebd01f7899deab6dd90df8f07f908dc41cf05ee60a WHIRLPOOL f7ed7dd26a250591a5e6c6139760f0cc0949acc9e82ddec5418539edea4fcfc98f1bbb02eb7b3afa54b925160ec8d09e66b1d573fa009a1926e6d2bccb7aa094
 EBUILD giflib-4.2.3.ebuild 1371 SHA256 344ef5c60520dd59ac4ae21f6c56d7c9ce32c849e719c10112cb0027fc221cbc SHA512 2839b46ec698ee18fa3d3ef20a06a5dd8ad3f4914c67d1b5f4b9a2882c5fcc72cc1a38a6ff85bc285972fee0714348460b92ca6477ad8e68b96d73336ce29e5c WHIRLPOOL 927d99a618d778a2a66b47e304ddea84f1d33884dbbac024f10b595819f1588eaef334ed62b5b8b8c5d224e8bdfbb546468c5c9ce0d13b51582f03e3d2c23c60
 EBUILD giflib-5.0.4.ebuild 991 SHA256 1ffbcda536f411ebf1058fa10175958f257980e0ae47b580b1295990bcd9893f SHA512 10491dc9d7a76632e97e1cdcdf0d9e85a95e3389c86548a2491bfefd017c610ea69d923db37ddb0d523a202a83eaec787ef03db3b83072387305483545ebd920 WHIRLPOOL 07576ef87feb1d6983ef9736b3870fa21de3d73a5355085dd7d207840a74119b7236846a6751c05cc4bf1baaba50ea0ebd52830de0f887934fba8f0a82c35d66
+EBUILD giflib-5.0.5-r1.ebuild 1327 SHA256 d74765a3e4699beb7b4e44093b203e1404c07b30a789a0998eeeb865d398e14d SHA512 f184c5d98d51d49b106e331064e27834f9543a1d74e3da0ffb1719e91de47a345504350778c1f9ba5c3fa8f3d246c5026caf06742745cbe060344700c92638f6 WHIRLPOOL 2b675bb7e058934e1b94f2fc9043d0a7cc7ab4e7eaeb819e45d388d5f1acbbc995a2a9deab46678c25c3bc5a2f8862d8c5051566a0829bd6e1234c52d4237998
 EBUILD giflib-5.0.5.ebuild 994 SHA256 d07701ab7b70f916be47281298288bb36d65912a34efcb47f7876207e2d4816c SHA512 148c9bf838f35012f3b45944ac716025700d11ac6251cda71f81ea2b0fb8f0fc934b78addd6e5ff3fb7c5c90bbe8d41d57bc08c93c884083b39886249726ab5f WHIRLPOOL 83274aaa6f6bb724423b48f41803552bf2c594aad5cc363dcbf7be5c6beafe0ca01e8945d40a5706c7c1d4b66c604e0841f781bd5712d10b2fcc22f9122ce74c
-MISC ChangeLog 8960 SHA256 03f09c0704f79b111305164127b6d48e5543c35c8c5f6655a5dccdca29cdc97d SHA512 e3b7ba80a1135bf338b941351c4e3f69b6b74143ca066b778d5d99f5e27b6eb156b084bf3fe38639c0643bae94fbba20faf2012c0ec573700e5d729ede6fcd85 WHIRLPOOL 46cea28d4bcdf4768d54167f8a2c5c566d1a541e5fb51ea755253d305147609d8a834fec8e5007b013075828441fac154a3877073281e45324fcc6d6df375635
+MISC ChangeLog 9195 SHA256 1202e08278c1990ece5bcd7624b73265493523a66df77610e50eb9e02a919b54 SHA512 57f921b8456bbb36f2cafb801e10ed2b764ee8da6eb5efd61212a613eb825d384905fb4231a7298a135aca4cb8dfb7ef0a4522be16da3c136d7623228648f068 WHIRLPOOL 6cb67c32a067fa21927bb35bd06a9ae6051d3ffc2e51db1248e12465d54eb5fa3da3835945f27dcb58d92b6ce9675312ebd6bd79e44811454c098779afcc454f
 MISC metadata.xml 262 SHA256 37a2fa1d7fe15de221a57c2528b6073d06fd6c9da64819e6bb9267b51dde0f2d SHA512 5dd2e307fa1b22920fa9c2aafa105a3a7fe190ff4d2af4da47c400c7e84d820d3ea6108230f763a802e928379083ef2ed854de71978718f3fda39dd43cfddf0c WHIRLPOOL c7f717f63b135da337899c79efef09c11175b7135ac8c482ca44f93a17a8221832e4d569a61f76a159ca4ad9cd3a0b774fa071dfee583df678c7d0847cc42a50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSfwgtAAoJEEqz6FtPBkyjyGQIAJ9Dm2Wwo4QjIfYJIYYK47XB
-ncs26pCux5JKU1AX+pVUPItG6yPQGX5eV88v3YK7Heyz8w1u0z29whHLRXqfn7PK
-UbbgqEDpq/iV0pW8g8YLOIjnsmdR7KUgu+tCk2ZGlPrkplnak3tsLDmkzzROekhb
-Y0ySD+/oBEKcK+FeS970yZaQAuuMUnz2QpiVxWBpGJI5c5RRhYFmPLXS5m8J/0yI
-2GFYWXBZIvW4Ry3GHil5ju80ZLhAzLyZyVq/KaAp20oE9+IpGyawh2QiVg+twOct
-dZm0T2JxvfKsU6326maULSWMFJ0HdOpifeU8lCYBpSFM85Vk4ZGLcI3UnvXEE+U=
-=d2tv
+iQJ8BAEBCABmBQJTUSqVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg/BwP/RPzj92egM524k0pB4M8Bk6K
+5Yz34S70E2hKWAvCYg5pbmGHLEximHikiAWlMCN0ack3jDvs7rDbnR783jDynIqe
+cYoAk73Tb5rMDfCIMJWXXy7v84nb73aTB/v5EZ3n+/Ut5n/aBaquy3PTKYOsThC5
+X96DRFGMZSbCjYTnXGF1IkSNVXt4Zo65qzC4Mj1UDLGJajM3uaxuKp51X7EI9Ix4
+mXJ2FG+3tNzDMVHkUlww5nAJR4oBjq/zJMTmvnDJsRcV3w1uHUYYDUPs2KQgHLGm
+eEd/JAGxNzrkDl54EUtSEOgdN68hZ2DDLpMhWaMqFrFQXfCHwLiqd4IfV41ND/2i
+x98qf3D1Inn+Eilq3khyofllgz+4IJIfmKjGGnON8jcldsjFFhEcVVnDluDxEkew
+kKg4PzotBzBPPQXLtPcONFGaYKfEs2HXitNG+ZI7xAAiab0n1kHaq2QwJtoXdvrP
+iAEuVXcRrtXtVCNOsy4hbGeOYpqdFOhoEpjoJos5JumwgbJj3IQujAh0KW2wPnAB
+W55KE2rNmnXri1AZMQg/p2K9jDV6fud9YDyCmAQsfpIty4IV9on24op81boQn1fS
+ZNykfkm3DgfGcZ1WmcQG04FQYgZUo9q8DKIQPVqY9Zy6w0lWwReF0aZZ1q6WamNI
+FzOy6LbAgPjodcd0r5gF
+=B4e9
 -----END PGP SIGNATURE-----
diff --git a/media-libs/giflib/giflib-4.2.3-r1.ebuild b/media-libs/giflib/giflib-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..d0d19956e206
--- /dev/null
+++ b/media-libs/giflib/giflib-4.2.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.2.3-r1.ebuild,v 1.1 2014/04/18 13:37:22 hasufell Exp $
+
+EAPI=5
+
+inherit autotools-multilib eutils
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="http://sourceforge.net/projects/giflib/"
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs X"
+
+RDEPEND="X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# don't generate html docs
+	sed -i '/^SUBDIRS/s/doc//' Makefile.am || die
+
+	epatch "${FILESDIR}"/${PN}-4.1.6-giffix-null-Extension-fix.patch
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:${X_PRE_LIBS}::' \
+		configure.ac || die #486542,#483258
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable X x11)
+		)
+	autotools-multilib_src_configure
+}
+
+src_test() {
+	autotools-multilib_src_test -C tests
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	# for static libs the .la file is required if built with +X
+	use static-libs || prune_libtool_files --all
+
+	doman doc/*.1
+	dodoc doc/*.txt
+}
diff --git a/media-libs/giflib/giflib-5.0.5-r1.ebuild b/media-libs/giflib/giflib-5.0.5-r1.ebuild
new file mode 100644
index 000000000000..9dabe1f0b276
--- /dev/null
+++ b/media-libs/giflib/giflib-5.0.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-5.0.5-r1.ebuild,v 1.1 2014/04/18 13:37:22 hasufell Exp $
+
+EAPI=5
+
+inherit eutils libtool autotools-multilib
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="http://sourceforge.net/projects/giflib/"
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+# Needs testing first.
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	local myconfargs=(
+		$(use_enable static-libs static)
+		)
+	# No need for xmlto as they ship generated files.
+	ac_cv_prog_have_xmlto=no \
+		autotools-multilib_src_configure
+
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	# for static libs the .la file is required if built with +X
+	use static-libs || prune_libtool_files --all
+
+	doman doc/*.1
+	dodoc doc/*.txt
+	dohtml -r doc
+}