Introduce multilib support, bug #488998.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 142 insertions, 5 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index d56cb34c3a3d..b1f0b1e2e392 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gdk-pixbuf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.100 2014/02/22 22:42:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.101 2014/03/01 10:20:14 mgorny Exp $
+
+*gdk-pixbuf-2.30.5-r1 (01 Mar 2014)
+
+  01 Mar 2014; Michał Górny <mgorny@gentoo.org> +gdk-pixbuf-2.30.5-r1.ebuild:
+  Introduce multilib support, bug #488998.
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gdk-pixbuf-2.30.5.ebuild:
   Fix wrong commit, bug 502160
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 5a773019d059..81a3d86ab207 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -11,13 +11,26 @@ EBUILD gdk-pixbuf-2.26.4.ebuild 2610 SHA256 ee12fe249e0578741f439dab431f07a506a5
 EBUILD gdk-pixbuf-2.26.5.ebuild 2626 SHA256 405d00abacb8df5b8d0ef923c14d4e2a41a57525d2dbff21d3dd3af7fb1d6502 SHA512 b746538050f15fb3992c9eea30d421e10b29267034f83a4c65e9c29246afeb08b8d749de73e27248ccc89c5b95640445a4dc0c5dc51ee5452455b7a84e8e053a WHIRLPOOL 62131e77bc28013ab0f9a480fa6da1cc10d670275e59fd0b48c9cab7deb9d94a32ad3bc94028278e927609c5669b5b2a51451539bafe22c5fd0c5c186f87fcff
 EBUILD gdk-pixbuf-2.28.2.ebuild 2861 SHA256 4ba700059cf8c48e2f4c23690d48ddfcafcea0d2517a2697ec035269438ad378 SHA512 86ac174fe18e9c8be0041f674d4275bc219676feea84ce44e87100223f836204fb49a49fb8b6992a315100d4e5df7014334341fa49fc1a1f53aed2b4b338c195 WHIRLPOOL feb16403a6ade060117157f45b726d58945ded87aae7da5af092c5b85c37cd41cbc00a92f4cb44e1366fff5a12a4158ebe07df655b0d40c477549596237033a7
 EBUILD gdk-pixbuf-2.30.4.ebuild 3111 SHA256 d6241a1b606f95d9a96aebb7097de43ecb902f0a32fde9a656b3ec23ce14e44f SHA512 5751a6d34a6988f32404d221e124474b05a00001febd907627ab0b20e7303e08f0d6471b54ef8b49d118b9fdc4503013757591fe1aad5c4c896176462d74762d WHIRLPOOL cf3b65ec323884657d12a9fa0bbe3c4c9340021ed2bcb7b7529ebfe1693da2ee0f760c27fa3a4afd29ab952f0843b169d2f24f0ad8866be86d20693148838369
+EBUILD gdk-pixbuf-2.30.5-r1.ebuild 3706 SHA256 c45507d8ad2fe440c4597f20899e217423e202da36db44002b09a2862fbc5961 SHA512 48e25e31857fbd7fae83f4866720b1d3c3bb790d8a8386e77b58ac4424cbe27e13227a9074cef0c38e3689b52c75c931c3f1f3604df1a37d5d48ea7492cb8cab WHIRLPOOL d1a2f7653d6160e0b275436bb6dc67854445b31915fa39733a6e95a15e4fdb16f1f333bddc9dce1f07c9ca125140764e71f4c8c0d27f432ed2db72973ebddc02
 EBUILD gdk-pixbuf-2.30.5.ebuild 3123 SHA256 903efe2801857b15929133dfce14b00d5a6e4caa1bae8cb3c08f6706aa01e126 SHA512 d26d6cfe741fbf13352f77d002d9b77e0a47de32c59f3b7de44ac6c4cf6d544ff7cb4f9a3503a616ee0335ee3ed75bb88450e926326fb33fd4854c46dc78072c WHIRLPOOL 2da21c4d5b053f0f8b34ca49f1e5a395ed71d9846f093232b79b0c700700948b05e8f4aa24f60dbdccfe212bfe8f02684e438969fd1be0dc9b070a9017f98e7f
-MISC ChangeLog 15117 SHA256 880f1cdba68b5dc8783d4c82f25edc9387c3248babc97e9c97d34429da2921a4 SHA512 bcef02475da2bff9e3dcc813221d1880e7e0e4125b8e8150457549d3bb819956979be20b3af00b243259b368bc646cd26258902dc33cd1016674245b2f7df796 WHIRLPOOL 69e0b7f2ab8872784a1c0157761dec26314157eeb7f1b810a7f27e2f78a0d4336ec4360fe108dedcb445c6e8bd23e1f705280d676772fe9de7df7a185c9ebf17
+MISC ChangeLog 15279 SHA256 24f9ae0d69695c9fd4efc92436a7b5a95ec240de571396b492466ba57e23a487 SHA512 b0dd17e23def0b22cc1cf1a1ca6aac88a924a47bcc75a1e0b9951d342f716066ba93e3bb78aed7ab84b836eba81aab711689aa1e800413867503448dd1f919fc WHIRLPOOL 556c0615a9aa71320990d44d8ebb5c88a99cbf1b33f349949ef16ef4223895cdc9e3e1d5f0ea709c92feb5a8fa43ae33c153be48d8eab4de313bc34882450508
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJJ8QACgkQCaWpQKGI+9TU4wCeM0Gv3vBRrugOtX92D9QNxfox
-7QYAnjqirGPGFTH4ev5MDqwgiP0pmqn5
-=lZuG
+iQJ8BAEBCABmBQJTEbRfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBacP/jG29BOXPd2JOrpOP04AfWZ/
+7rY/xKtnAIrQS/wtjS8LzazOCm8wc4idnjrV1N4o2lyeAPQI5afATTAnKmJ6YWtf
+dSnT2hAq6vdR1DIoj1oSjxtlOL9AdiQmxR7Tip7oIVqetQiFkHIxOVHlTwOf3cLs
+2mbUioTtdPvjjeRCFjU/HC7qw8L04FGBDT1YV6tmQ6PwR2raZfyfGaa4MSXN+DmO
+MYhSFYSS1luXU8PwXoEsnVT2SKEuIzTH+g5FvtUyjTLkIA1PwukhJ1dri7YI0yD6
+HnZzFIBfvnSHaCEsmyEOfzNI8Yccb2H8mRa4K4oSh1UUmSx6IR7UAYCfCXwlFhTz
+vGFYQUg0taplyU/Gz7CWcrIW/AlAGp5omHaWuY9bAllsbMujFgOnDwyzmjTCVnpG
++7coIXoXn0hO9X8LoCRgEDdQgjzFVKjgfEMKUvVZ72pG5Z1E372/fnj7WgxN5jAh
+A1UD5Tt+nd+/EpZolERhtnEQm0TqXckl4unrfoSjcqCme80I/cc8FhIhgVI6Zr+s
+0wUtaFXOZkRYDRpBSF/K4aXrkdwgSqZ5Sxjddx6I2d9UZ7tK0mMHxBmwm86FByyv
+GvIt9dm3elgY4Ubt6hmBoQQJF8snnI5FzNzt9EMcmL4Sk86cBI7KI6ymOkeVp4XK
+hcXQOykm5uE60yz+Efdy
+=hUES
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.5-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.5-r1.ebuild
new file mode 100644
index 000000000000..4ff1a61426c4
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.5-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.5-r1.ebuild,v 1.1 2014/03/01 10:20:14 mgorny Exp $
+
+EAPI="5"
+
+inherit eutils gnome.org gnome2-utils multilib libtool multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders
+)
+
+src_prepare() {
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
+	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+	default
+	elibtoolize # for Darwin modules, bug #???
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_build_binaries \
+			&& use_enable introspection \
+			|| echo --disable-introspection) \
+		$(use_with X x11) \
+		--with-libpng
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	emake -j1 DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
+
+pkg_preinst() {
+	gnome2_gdk_pixbuf_savelist
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}