Revision bump featuring pixman multilib conversion.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 130 insertions, 6 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 8c9dae32cce8..b6135ba55bfa 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.112 2013/10/08 20:59:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.113 2013/10/26 08:58:24 aballier Exp $
+
+*emul-linux-x86-gtklibs-20131008-r1 (26 Oct 2013)
+
+  26 Oct 2013; Alexis Ballier <aballier@gentoo.org>
+  +emul-linux-x86-gtklibs-20131008-r1.ebuild, +files/remove-native:
+  Revision bump featuring pixman multilib conversion.
 
 *emul-linux-x86-gtklibs-20131008 (08 Oct 2013)
 
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 8fcfa3098107..432f97726c63 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX remove-native 116 SHA256 0740732bc23aaf0e11b26630351a6966a82c5f56f0ca2d4d035050aacc47d428 SHA512 3f931a00db509286c9eef6c7ab58061045968bc5069f077199f3f6ccfe1cd883217412f7f1aa721dfbf322407efc7ff6ade747f0649d9561a76d912585e116d1 WHIRLPOOL fd6406877f80439f112e2ace78da303425769c88fee2c3834b6c41f84c1a49ae25e378e02ae170c1d42910bab7aad4df89f50958104dd754e2d3e1de89cd726d
 DIST emul-linux-x86-gtklibs-20130224.tar.xz 6174404 SHA256 a0e0205d2f6dcee0aa019805923242b1c85c2c070ef45884e3e13c6ff49d714f SHA512 78fd89d48cd260ff240686297494468890e22b07d9c750423638d595d8006fe3e93680069ca5902f605591f1a86000d1b645cc8fb29fd4c9baf6c223dcfe4ecf WHIRLPOOL e5f006a7a245b3f52ba6f6d6e16e178852df677177bc97f69ecc8ba64460875e2b33397efb657f241462d280435016b18679044b0443337384e25c84c1e1f0fd
 DIST emul-linux-x86-gtklibs-20131008.tar.xz 7164380 SHA256 4a61e9b0345e276062b108eea25a43e30b0ebac77a6f523fcd8d92ece6678121 SHA512 c4a0242752f2f9f72868deb56cd44386d0902d9d42f9dc60555ba01b3922bbd2580b3c299dd41c407aec33e955f52b5173cb203799598efbe8f5aed7c1dbe27d WHIRLPOOL 1d2f8246616a71403b930bee5d95ccdecd2b30b2e2a8e2a553b25891c744a933915333116b6c85c5a53449ce1599494a2af49b436bb38cd104801e03a058c1f9
 EBUILD emul-linux-x86-gtklibs-20130224.ebuild 3107 SHA256 5c9bb325223e579f51cf02b4fdde1861c8bc1fc577ef433353fab90e679aae0a SHA512 5ea01eb53ffc9be9fb7d167574a8518ea35eda33116cb568c3dba1e7b31dd6cf56a88b5df36492a715db2579c7801ddc31c2e3e42bcdc4816e0aaf4016555bc2 WHIRLPOOL cdfdc9fccb07bc6acb1d37af58d92c8b83537fd916babd47e459020233aa17a412d864047e1ceec82d114ef1e71807f07cd0e0b38e05e79aea35412a20e7628d
+EBUILD emul-linux-x86-gtklibs-20131008-r1.ebuild 3282 SHA256 c9d8e74e701f3a09ffbb746df3a420271e57e064a5cf20f9df8e754c77a2efb0 SHA512 337dcb2fd5fede1557d3bd03c2763acfece662f56724fa53d490e6a27b324d413bae7a42c0aff80e1a263fea0fd32cd18960fb7ea9ceb328552f940b0790f22c WHIRLPOOL c27021f3084707585fd790531bb1d48d74541b5088ff6f7ab35dacb6784459592ec9f162f764048415a347319a07c4a7f0d8aee816c6a23ca770c28de835a04a
 EBUILD emul-linux-x86-gtklibs-20131008.ebuild 3108 SHA256 3b6db513552f3adb3500706b8457729d8d693f1341dd7f4e94bbe0ce07f5e80d SHA512 6577be5778686ebcb6d2f4717d664f1b37fa64c514ab72880ccdf45bd5ab06f76f901a52d45f327a5f77b647796e5086e088676210137181aa33401328dafb0a WHIRLPOOL 299293110cd918ed34222bf162ac814fb337626283396c78fc886294f9ca0ea4b20d4f3cbc1772b6d518c29b856a8decbb1ff56a665ee02a186de4182d8e22ad
-MISC ChangeLog 19696 SHA256 1ee5c9e74634bb077db307ee880c10f999e59f23d69c32129d6a0f6b68391591 SHA512 d9380f9d684084544b51d13f9833bf5d1e7f05efdbf7c087f6ea2f095a8ca25e50f9cf40600348e6c104033276951e3ebe5199ed550a8c6e17affe0e09551d66 WHIRLPOOL 364e7f63e4e7e8e940b9ad1475facebd8a5cccff7bfaddbe95234eee3b7d4de2942674ad1382cfd80de0e93b7679ccb69bb0432fd01807aacb0da9ba99bb8450
+MISC ChangeLog 19925 SHA256 876505f80bff333a65da83d759712f52fa89f2c406f5db56c254cc5aed71107d SHA512 2568a29c6ed1333d785025a681c7279e1df3173259254425f802bf55e39da1c08e79d3667fa0183cf9caaf506c861a4ee14296e2c8901862dc0ea5aad2636d89 WHIRLPOOL 10d0998ad6ae3e8239d6ca21c58db2fe6315ff300f6bd3e27ff9d01744eac8dd8adbd811b30d26df53e9d7ff6b4d177b3f5424f326cae7bf6f553c567d0aca5f
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJUcj8ACgkQCaWpQKGI+9Tu4wCZAXwCHrNGDbJMmP2E92bviKTA
-Gg4AniePzOrVVQaH+IwFrzHCK79TZR52
-=DjKE
+iEYEAREIAAYFAlJrhDEACgkQvFcC4BYPU0pi1QCgjODGSQvbh7QrUP2D64H31vY3
+hOIAoLVMvRWGlUKA2cxG07kpgJyGNNNQ
+=j9HO
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild
new file mode 100644
index 000000000000..c5bd60332a14
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild,v 1.1 2013/10/26 08:58:24 aballier Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
+KEYWORDS="-* ~amd64"
+IUSE="abi_x86_32"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-xlibs-${PV}
+	~app-emulation/emul-linux-x86-opengl-${PV}
+	abi_x86_32? (
+		>=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
+	)"
+# RDEPEND on opengl stuff needed due cairo, bug #410213
+
+my_gdk_pixbuf_query_loaders() {
+	# causes segfault if set
+	unset __GL_NO_DSO_FINALIZER
+
+	local tmp_file=$(mktemp --suffix=tmp.XXXXXXXXXXgdk_pixbuf_queryloaders)
+	if [ -z "${tmp_file}" ]; then
+		ewarn "Cannot create temporary file"
+		return 1
+	fi
+
+	if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
+		cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	else
+		ewarn "Warning, gdk-pixbuf-query-loaders32 failed."
+	fi
+	rm "${tmp_file}"
+}
+
+my_pango_querymodules() {
+	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
+	einfo "Generating pango modules listing..."
+
+	mkdir -p "${PANGO_CONFDIR}"
+	local pango_conf="${PANGO_CONFDIR}/pango.modules"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
+	if [ -z "${tmp_file}" ]; then
+		ewarn "Cannot create temporary file"
+		return 1
+	fi
+
+	if pango-querymodules32 > "${tmp_file}"; then
+		cat "${tmp_file}" > "${pango_conf}"
+	else
+		ewarn "Cannot update pango.modules, file generation failed"
+	fi
+	rm "${tmp_file}"
+}
+
+my_gtk_query_immodules() {
+	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
+	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
+
+	mkdir -p "${GTK2_CONFDIR}"
+	local gtk_conf="${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
+	if [ -z "${tmp_file}" ]; then
+		ewarn "Cannot create temporary file"
+		return 1
+	fi
+
+	if gtk-query-immodules-2.0-32 > "${tmp_file}"; then
+		cat "${tmp_file}" > "${gtk_conf}"
+	else
+		ewarn "Cannot update gtk.immodules, file generation failed"
+	fi
+	rm "${tmp_file}"
+}
+
+src_prepare() {
+	query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
+	ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
+	emul-linux-x86_src_prepare
+
+	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
+	mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
+	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
+	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
+
+	# Remove migrated stuff.
+	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
+}
+
+pkg_preinst() {
+	#bug 169058
+	for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
+		[[ -L ${l} ]] && rm -f ${l}
+	done
+}
+
+pkg_postinst() {
+	my_pango_querymodules
+	my_gtk_query_immodules
+	my_gdk_pixbuf_query_loaders
+
+	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
+	if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then
+		ewarn
+		ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
+		ewarn "multilib systems, please remove it by hand."
+		ewarn
+	fi
+}
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/remove-native b/app-emulation/emul-linux-x86-gtklibs/files/remove-native
new file mode 100644
index 000000000000..e99efe8bcbd1
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/files/remove-native
@@ -0,0 +1,4 @@
+usr/lib32/libpixman-1.so
+usr/lib32/libpixman-1.so.0
+usr/lib32/libpixman-1.so.0.30.2
+usr/lib32/pkgconfig/pixman-1.pc