x11-libs/gdk-pixbuf-2.30.5-r1: multilib-utize

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

2 files changed, 26 insertions, 18 deletions

diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 31d767c..a8b3486 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -2,6 +2,6 @@ AUX gdk-pixbuf-2.28.0-string_h.patch 748 SHA256 3077d260fe15c0b9888ca31e47461d35
 DIST gdk-pixbuf-2.28.2.tar.xz 1192936 SHA256 183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617 SHA512 2082e6f44aa8e986586da8f5797b7e9aae23c60021c5183ed6e1e2e99cef338ec1b20cf2baef19a337ac557eb585399377e92534d2f90222a68943b914d86656 WHIRLPOOL 7060b0b591d47b1eec43b01a29cde5903ee78f458a4623a66d66d6b0d83f32d08ae2c5aa9da9dfc328990168c477a879b501c34d6f24b3d93f38cd7cdb4b8a66
 DIST gdk-pixbuf-2.30.5.tar.xz 1330776 SHA256 43e71d50c4511d7d72fa75b1ac7ad3e8e04bdc97908d003449e78171683bb136 SHA512 b43072bbfe459382e713446aac77fba5b9e40876d866152942ae3d74d432071543e42ad3303c5536101713bd24046bf687298bbc6b6650d8548b593d4f20423c WHIRLPOOL 45332066d9e9320cca060e0a07fd788818487610931e2ce1378532ed603d38b14c0919d5628d96953bceb25efe5125a910cf5982849a3ba739f2efd54f50789b
 EBUILD gdk-pixbuf-2.28.2-r1.ebuild 2808 SHA256 b51b2499e7bd4c40e1d30dd1d70a45bb795c0a8c719402c1a0262fd8b7c8f93f SHA512 e664af27478eee898030ce41daa0f9d3a8d841c749748d6fb52668325f7da2af5026babe1b294c7de21823daac8255cbfd437ad51226c5f11ee41751ecc3d5bb WHIRLPOOL 66c1400dacf36678197a11709d90d8344263383c5d8c359e0043f6452c74945f06cebf001cf3f5710f5ed8808e39686b0702038153f8da7f167aff1dda952313
-EBUILD gdk-pixbuf-2.30.5-r1.ebuild 3018 SHA256 6f6f7ad44cbe633c517e6c95f96ebd5c309fe69f4de16c59c47e5c5c565cfd62 SHA512 08124cc710bcb2b3021adfdfad65d1290660d78f22b53e35213d6e35e124703bb622d717b06409c195253b82e54d76358dca31f3ed632d422592bbf41f86b8c0 WHIRLPOOL 291702596bbcfe15ea9d2ff406f8cbd73f5a9144078bde0be445d905c67847f6869905c99d8440b9cd85732b974cacd8abd63158c9a527bca614597030c627b0
+EBUILD gdk-pixbuf-2.30.5-r1.ebuild 3152 SHA256 9dee016108ddc3ee6e706c2043b926ba4aa35218adfb41099644bacfb00eae6d SHA512 ba51c065e08a8540bb3ac86c3b6535f1c1693662ce69d38c79c85a094a41f1c3487609f35fc452f69659594fadb28cfe234484aca549acc235527d9fa2ebfde2 WHIRLPOOL 5a62e37c6fd5926992b9b362d4c8d8537dc06bb0a13f431be575902f3b3e28cf368ea57ea6c7bd736e73f696f5f9b3ccac6553db9e324ca49509931f1321e514
 MISC ChangeLog 14620 SHA256 0f3d2aa643f360797efe6f4eac0a88dea906fe301d06fa52a3815b0b9062e23c SHA512 c376198fbcbcd8b8762dcc6876e4325c26d259f81b638c2905cbd3bcfc03a4c37c2f7e76fd93a4b222c2f107c6b235a36ebae978a825782cad7e978f49eae7b5 WHIRLPOOL 6191d4fc3bbf07634530f89b9b810b0ff0651f1758c5269fec099d73c2dff55ef43ac3c873142ec86d638bd6e1f5a934e3fb2862eed1b6b5c184aaba76d8f2ae
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
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
index 95325a1..96d2a5a 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.5-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.5-r1.ebuild
@@ -4,28 +4,28 @@
 
 EAPI="5"
 
-inherit gnome.org gnome2-utils multilib libtool
+inherit gtk-doc gnome.org gnome2-multilib libtool
 
 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"
+KEYWORDS="~amd64"
 IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.37.6:2
-	>=media-libs/libpng-1.4:0=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper:= )
-	tiff? ( >=media-libs/tiff-3.9.2:0= )
-	X? ( x11-libs/libX11 )
+	>=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[${MULTILIB_USEDEP}] )
+	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
+	>=sys-devel/gettext-0.17[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
 "
 # librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
@@ -36,6 +36,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<x11-libs/gtk+-2.90.4:3
 "
 
+MULTILIB_WRAPPED_EXECUTABLES=( /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
@@ -44,13 +46,12 @@ src_prepare() {
 	# 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 #???
+	gnome2-multilib_src_prepare
 }
 
 src_configure() {
 	# png always on to display icons
-	econf \
+	gnome2-multilib_src_configure \
 		$(usex debug --enable-debug=yes "") \
 		$(use_with jpeg libjpeg) \
 		$(use_with jpeg2k libjasper) \
@@ -62,13 +63,16 @@ src_configure() {
 
 src_install() {
 	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
-	MAKEOPTS="${MAKEOPTS} -j1" default
-	prune_libtool_files --modules
+	GNOME2_LA_PUNT=yes gnome2-multilib_src_install -j1
 }
 
 pkg_preinst() {
 	gnome2_gdk_pixbuf_savelist
 
+	multilib_foreach_abi my_per_abi_pkg_preinst
+}
+
+my_per_abi_pkg_preinst() {
 	# Make sure loaders.cache belongs to gdk-pixbuf alone
 	local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
 
@@ -83,7 +87,7 @@ pkg_postinst() {
 	# causes segfault if set, see bug 375615
 	unset __GL_NO_DSO_FINALIZER
 
-	gnome2_gdk_pixbuf_update
+	gnome2-multilib_gdk_pixbuf_update
 
 	# Migration snippet for when this was handled by gtk+
 	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
@@ -95,6 +99,10 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache
+		multilib_foreach_abi my_per_abi_pkg_postrm
 	fi
 }
+
+my_per_abi_pkg_postrm() {
+	rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache
+}