Add x11-libs/cairo.

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

4 files changed, 176 insertions, 6 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 520deaad0e4c..c5c02eb41ec5 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.114 2013/11/22 19:30:48 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.115 2014/02/28 21:24:02 mgorny Exp $
+
+*emul-linux-x86-gtklibs-20131008-r2 (28 Feb 2014)
+
+  28 Feb 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-gtklibs-20131008-r2.ebuild, +files/remove-native-20131008-r2:
+  Add x11-libs/cairo.
 
   22 Nov 2013; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-gtklibs-20131008.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 78d9a2aad690..08dd92200cdf 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -2,17 +2,31 @@
 Hash: SHA256
 
 AUX remove-native 116 SHA256 0740732bc23aaf0e11b26630351a6966a82c5f56f0ca2d4d035050aacc47d428 SHA512 3f931a00db509286c9eef6c7ab58061045968bc5069f077199f3f6ccfe1cd883217412f7f1aa721dfbf322407efc7ff6ade747f0649d9561a76d912585e116d1 WHIRLPOOL fd6406877f80439f112e2ace78da303425769c88fee2c3834b6c41f84c1a49ae25e378e02ae170c1d42910bab7aad4df89f50958104dd754e2d3e1de89cd726d
+AUX remove-native-20131008-r2 1247 SHA256 4f6afa9165cd816e71c513047da1cbb88fba84eaf1fd4adbc62f59fd7d2fea11 SHA512 ade6a489d0a1b9933b575eda968d5a047ac8bb4832c18236524ddc9323f4057df37ac425dd62ec53d37acea84a3e674ae297d789f224535d645c0ac1c136cfea WHIRLPOOL 7cdd661eac66050d2e70f2ba81987030c9d0d8508a30d2ae5476760fb4eb8fa28b57b5ee7859e193a0ce226a02fd188db194d3ae50e7502007feb80712f117fb
 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-r2.ebuild 3332 SHA256 e5bb5a75bd5ec5dd89b997dd28b6420f876bc9b7c94e9390eb38dd96d89f8a15 SHA512 b2b7a308777c9853b58687bea20a1c2666aac193a7a8a7bc4792b1f5f3e867bf5a1bfcfa98e238b773d9087a1f180b09573e29b437fa19f90d3be3e158895c73 WHIRLPOOL 652f220a9eca7175bae096cae153e4c6a4b55108076f088deb0e11c7e5913f9ba1a1fb3cfec3f69aa7a9e6a768be2a13c3a8c80e1f147bb3ba335cfb93f2e408
 EBUILD emul-linux-x86-gtklibs-20131008.ebuild 3107 SHA256 1888f4c4eed43eba477dac52f7e60ece28d188946214dfdf7a57a45306418d33 SHA512 5deef9176a32ffeac2f8e370040a063dba5ed0d7307671318de8179586f2fdd5017a2f73581e8827481f61cf83fb66081f6d111052f6c9d0d67e782ce1aaea0c WHIRLPOOL 63cb7264f0bc8927cd1edf2dfa050f0bf51ff345f16ab06f5f6f330661a7e7450a14291d0000f5be0bebb7a9bd62a8bd15cd3229c47bfc84ed03dfed9f9bf3ee
-MISC ChangeLog 20039 SHA256 70eff400280a57d29f76a960861093f17d63b9ce302cb69a36adb2ed5c70ff29 SHA512 8b19f60fd0cdeb22a78089ed8b73c006460ce7326e09c17df527796c53cce50de97da7079b8bb4d49cc2e78b2cf1aed19d998b792e3b5b44a0e8a096f2257a9c WHIRLPOOL 51aef7f938ae16eab58e89c10219fb9c642129ac6fb72930f3f4e88ed76e5f51e9c9faef9f97dd4f2c3157680ee16d232634301671f82e9d0a995f15d6ef619f
+MISC ChangeLog 20244 SHA256 743b331d22deec6f8cb072cd241a4e2b03a4dc45097dce69f9b0adf2438cc7e8 SHA512 bc5d520c0da4db149929d9be0e72919b4bfabb8bbad41522c328abbb3de08891bb4006f12d8fcfcce8832ad52fb9dec8fa51de9323a2836dbc665b8b152340aa WHIRLPOOL 4b146ad96be188758a837a135d82300b63ae95bdababd76c02382657308dd94b39d5a8800378253e07ca1d576db5fa10419c0bb7c0c77409b9c9de4b5931a2e8
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKPsOoACgkQCaWpQKGI+9ToFACdFRndtOEAhasLyzqxpyfNGS/s
-e+8An22KPploATQnbhXU1FSpzytT1G1R
-=Orc4
+iQJ8BAEBCABmBQJTEP50XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOy5QQAODQnn8b9oZeB1Ao0xWj3Hw8
+L/LDnBHwPB45kDCm4v911J1VsPdmlIY0BfPtum1kplX1QWEA6kmvQvERRd3KAgBR
+gIn6nTcO9/o23EvNLLd6u7niMVN9t9vGrl2hHGklzCsqEiCB5bOANZsTjaLo2FN7
+VT6DK4cfetR1LsZ0i+/dbXxCwgdcdZVQfCCpOEG/kqOlicZaOM3sjDF5xoRlMTR4
+HiiQqFK1qNVHUd9qV8CK8Z8iYSC7T8yB1z9eJbPDhXxkCg1/Bq714FnsitVC8WKp
+GmnUcp0An6vVvNmmevGEDXcyL5/058hb0HbG0BdBIw87qTZLqbtfUQqpbUj/wplM
+q7HSVWchuxmqDqZKa2bD1gBPJEx1srSnsA2r+ySW+8R8F0mGjBbEvryl+Il8wffg
+PS9NYc8dzxbdp80kqRon+jJYr4JCY//aDToRWDBebcbwZWhu8pd7t+2ijQ5WqMW2
+H+HpLQMDbePftfsOSnXogPlBcjpy+vFPb1gbSkynedoHSR7A7misDQAmD24WSFAh
+pBu+FwL1QgNy0HDXTyPCvI1iknN3DuNuJisLMEUMeJUdodk+rKEnwpChue9DfKq2
+HR6SAVWWZZkhoyXjQKdTdT7cW5+/4/L3cuZ7/jtPplWnvK18bPTe2fLJLxC18ORa
+sIrUMqQFssx0uJQ6emX+
+=RowE
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r2.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r2.ebuild
new file mode 100644
index 000000000000..8a259e1ca5c8
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 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-r2.ebuild,v 1.1 2014/02/28 21:24:02 mgorny 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(-)]
+		>=x11-libs/cairo-1.12.16-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-${PVR}")
+}
+
+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-20131008-r2 b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r2
new file mode 100644
index 000000000000..f266bc23228c
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r2
@@ -0,0 +1,37 @@
+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
+usr/lib32/cairo/cairo-fdr.so
+usr/lib32/cairo/cairo-fdr.so.0
+usr/lib32/cairo/cairo-fdr.so.0.0.0
+usr/lib32/cairo/cairo-sphinx.so
+usr/lib32/cairo/cairo-sphinx.so.0
+usr/lib32/cairo/cairo-sphinx.so.0.0.0
+usr/lib32/cairo/libcairo-trace.so
+usr/lib32/cairo/libcairo-trace.so.0
+usr/lib32/cairo/libcairo-trace.so.0.0.0
+usr/lib32/libcairo-gobject.so
+usr/lib32/libcairo-gobject.so.2
+usr/lib32/libcairo-gobject.so.2.11200.14
+usr/lib32/libcairo-script-interpreter.so
+usr/lib32/libcairo-script-interpreter.so.2
+usr/lib32/libcairo-script-interpreter.so.2.11200.14
+usr/lib32/libcairo.so
+usr/lib32/libcairo.so.2
+usr/lib32/libcairo.so.2.11200.14
+usr/lib32/pkgconfig/cairo-egl.pc
+usr/lib32/pkgconfig/cairo-fc.pc
+usr/lib32/pkgconfig/cairo-ft.pc
+usr/lib32/pkgconfig/cairo-gl.pc
+usr/lib32/pkgconfig/cairo-glx.pc
+usr/lib32/pkgconfig/cairo-gobject.pc
+usr/lib32/pkgconfig/cairo-pdf.pc
+usr/lib32/pkgconfig/cairo-png.pc
+usr/lib32/pkgconfig/cairo-ps.pc
+usr/lib32/pkgconfig/cairo-script.pc
+usr/lib32/pkgconfig/cairo-svg.pc
+usr/lib32/pkgconfig/cairo-tee.pc
+usr/lib32/pkgconfig/cairo-xlib-xrender.pc
+usr/lib32/pkgconfig/cairo-xlib.pc
+usr/lib32/pkgconfig/cairo.pc