Add multilib atk & gtk+. Also remove files for gtk-engines but do not pull them implicitly.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 285 insertions, 1 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 3b140d272b9f..9402e754ea45 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.126 2014/05/09 07:11:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.127 2014/05/14 13:37:33 mgorny Exp $
+
+*emul-linux-x86-gtklibs-20140508-r1 (14 May 2014)
+
+  14 May 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-gtklibs-20140508-r1.ebuild, +files/remove-native-20140508-r1:
+  Add multilib atk & gtk+. Also remove files for gtk-engines but do not pull
+  them implicitly.
 
   09 May 2014; Michał Górny <mgorny@gentoo.org> files/remove-native-20140508:
   Update remove-native wrt library name changes.
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r1.ebuild
new file mode 100644
index 000000000000..81622c97ae85
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r1.ebuild
@@ -0,0 +1,127 @@
+# 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-20140508-r1.ebuild,v 1.1 2014/05/14 13:37:33 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? (
+		!>=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)]
+		!>=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)]
+	)
+	abi_x86_32? (
+		>=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
+		>=x11-libs/cairo-1.12.16-r1[abi_x86_32(-)]
+		>=x11-libs/gdk-pixbuf-2.30.5-r1[abi_x86_32(-)]
+		>=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)]
+		>=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)]
+		>=x11-libs/pango-1.36.2-r1[abi_x86_32(-)]
+		>=x11-libs/pangox-compat-0.0.2-r1[abi_x86_32(-)]
+		>=media-libs/imlib-1.9.15-r4[abi_x86_32(-)]
+		>=dev-libs/atk-2.10.0-r1[abi_x86_32(-)]
+		>=x11-libs/gtk+-2.24.23-r1:2[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/i686-pc-linux-gnu-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() {
+	if ! use abi_x86_32; then
+		my_pango_querymodules
+		my_gdk_pixbuf_query_loaders
+		my_gtk_query_immodules
+	fi
+
+	# 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-20140508-r1 b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140508-r1
new file mode 100644
index 000000000000..e55f60f298ab
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140508-r1
@@ -0,0 +1,150 @@
+usr/lib32/libpixman-1.so
+usr/lib32/libpixman-1.so.0
+usr/lib32/libpixman-1.so.0.32.4
+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.16
+usr/lib32/libcairo-script-interpreter.so
+usr/lib32/libcairo-script-interpreter.so.2
+usr/lib32/libcairo-script-interpreter.so.2.11200.16
+usr/lib32/libcairo.so
+usr/lib32/libcairo.so.2
+usr/lib32/libcairo.so.2.11200.16
+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
+usr/bin/gdk-pixbuf-query-loaders32
+usr/lib32/libgdk_pixbuf_xlib-2.0.so.0.3000.7
+usr/lib32/libgdk_pixbuf-2.0.so
+usr/lib32/libgdk_pixbuf_xlib-2.0.so
+usr/lib32/pkgconfig/gdk-pixbuf-2.0.pc
+usr/lib32/pkgconfig/gdk-pixbuf-xlib-2.0.pc
+usr/lib32/libgdk_pixbuf-2.0.so.0.3000.7
+usr/lib32/libgdk_pixbuf_xlib-2.0.so.0
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so
+usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so
+usr/lib32/libgdk_pixbuf-2.0.so.0
+usr/bin/pango-querymodules32
+usr/lib32/libpango-1.0.so
+usr/lib32/libpango-1.0.so.0
+usr/lib32/libpango-1.0.so.0.3600.3
+usr/lib32/libpangocairo-1.0.so
+usr/lib32/libpangocairo-1.0.so.0
+usr/lib32/libpangocairo-1.0.so.0.3600.3
+usr/lib32/libpangoft2-1.0.so
+usr/lib32/libpangoft2-1.0.so.0
+usr/lib32/libpangoft2-1.0.so.0.3600.3
+usr/lib32/libpangox-1.0.so
+usr/lib32/libpangox-1.0.so.0
+usr/lib32/libpangox-1.0.so.0.0.0
+usr/lib32/libpangoxft-1.0.so
+usr/lib32/libpangoxft-1.0.so.0
+usr/lib32/libpangoxft-1.0.so.0.3600.3
+usr/lib32/pango/1.8.0/modules/pango-arabic-lang.so
+usr/lib32/pango/1.8.0/modules/pango-indic-lang.so
+usr/lib32/pango/1.8.0/modules/pango-basic-fc.so
+usr/lib32/pkgconfig/pango.pc
+usr/lib32/pkgconfig/pangocairo.pc
+usr/lib32/pkgconfig/pangoft2.pc
+usr/lib32/pkgconfig/pangox.pc
+usr/lib32/pkgconfig/pangoxft.pc
+usr/lib32/libgraphite2.so
+usr/lib32/libgraphite2.so.3
+usr/lib32/libgraphite2.so.3.0.1
+usr/lib32/pkgconfig/graphite2.pc
+usr/lib32/libharfbuzz-gobject.so
+usr/lib32/libharfbuzz-gobject.so.0
+usr/lib32/libharfbuzz-gobject.so.0.923.0
+usr/lib32/libharfbuzz.so
+usr/lib32/libharfbuzz.so.0
+usr/lib32/libharfbuzz.so.0.923.0
+usr/lib32/pkgconfig/harfbuzz-gobject.pc
+usr/lib32/pkgconfig/harfbuzz.pc
+usr/lib32/libImlib.so
+usr/lib32/libImlib.so.1
+usr/lib32/libImlib.so.1.9.15
+usr/lib32/pkgconfig/imlib.pc
+usr/lib32/libatk-1.0.so
+usr/lib32/libatk-1.0.so.0
+usr/lib32/libatk-1.0.so.0.21009.1
+usr/lib32/pkgconfig/atk.pc
+usr/lib32/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so
+usr/lib32/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
+usr/lib32/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so
+usr/lib32/gtk-2.0/2.10.0/engines/libpixmap.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-am-et.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-inuktitut.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-cedilla.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-viqr.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-thai.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-ipa.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-ti-et.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-ti-er.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-multipress.so
+usr/lib32/gtk-2.0/2.10.0/immodules/im-xim.so
+usr/lib32/gtk-2.0/include/gdkconfig.h
+usr/lib32/gtk-2.0/modules/libgail.so
+usr/lib32/gtk-2.0/modules/libferret.so
+usr/lib32/libgailutil.so
+usr/lib32/libgailutil.so.18
+usr/lib32/libgailutil.so.18.0.1
+usr/lib32/libgdk-x11-2.0.so
+usr/lib32/libgdk-x11-2.0.so.0
+usr/lib32/libgdk-x11-2.0.so.0.2400.23
+usr/lib32/libgtk-x11-2.0.so
+usr/lib32/libgtk-x11-2.0.so.0
+usr/lib32/libgtk-x11-2.0.so.0.2400.23
+usr/lib32/pkgconfig/gail.pc
+usr/lib32/pkgconfig/gdk-2.0.pc
+usr/lib32/pkgconfig/gdk-x11-2.0.pc
+usr/lib32/pkgconfig/gtk+-2.0.pc
+usr/lib32/pkgconfig/gtk+-unix-print-2.0.pc
+usr/lib32/pkgconfig/gtk+-x11-2.0.pc
+usr/lib32/gtk-2.0/2.10.0/engines/libmurrine.so
+usr/lib32/gtk-2.0/2.10.0/engines/libmist.so
+usr/lib32/gtk-2.0/2.10.0/engines/libthinice.so
+usr/lib32/gtk-2.0/2.10.0/engines/libglide.so
+usr/lib32/gtk-2.0/2.10.0/engines/libhcengine.so
+usr/lib32/gtk-2.0/2.10.0/engines/libclearlooks.so
+usr/lib32/gtk-2.0/2.10.0/engines/libxfce.so
+usr/lib32/gtk-2.0/2.10.0/engines/libindustrial.so
+usr/lib32/gtk-2.0/2.10.0/engines/libredmond95.so
+usr/lib32/gtk-2.0/2.10.0/engines/libcrux-engine.so
+usr/lib32/pkgconfig/gtk-engines-2.pc