Version bump, drop old

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

8 files changed, 41 insertions, 456 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 4c4e6d86b238..62fd000ddd99 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,17 @@
 # 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.123 2014/05/04 12:22:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.124 2014/05/06 20:52:20 pacho Exp $
+
+*emul-linux-x86-gtklibs-20140506 (06 May 2014)
+
+  06 May 2014; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-gtklibs-20140506.ebuild, +files/remove-native-20140506,
+  -emul-linux-x86-gtklibs-20131008-r1.ebuild,
+  -emul-linux-x86-gtklibs-20131008-r2.ebuild,
+  -emul-linux-x86-gtklibs-20131008-r3.ebuild,
+  -emul-linux-x86-gtklibs-20131008-r4.ebuild, -files/remove-native-20131008-r2,
+  -files/remove-native-20131008-r3, -files/remove-native-20131008-r4:
+  Version bump, drop old
 
   04 May 2014; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-gtklibs-20140406.ebuild:
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
deleted file mode 100644
index c5bd60332a14..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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/emul-linux-x86-gtklibs-20131008-r2.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r2.ebuild
deleted file mode 100644
index 8a259e1ca5c8..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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/emul-linux-x86-gtklibs-20131008-r3.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r3.ebuild
deleted file mode 100644
index 7dfccddc3574..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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-r3.ebuild,v 1.1 2014/03/01 10:20:27 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(-)]
-		>=x11-libs/gdk-pixbuf-2.30.5-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
-	if ! use abi_x86_32; then
-		my_gdk_pixbuf_query_loaders
-	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/emul-linux-x86-gtklibs-20131008-r4.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140506.ebuild
index ed253d0d7426..09d40baf0a3f 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r4.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140506.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.2 2014/03/04 03:25:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140506.ebuild,v 1.1 2014/05/06 20:52:20 pacho Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -13,12 +13,19 @@ 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(-)]
 	)"
 # RDEPEND on opengl stuff needed due cairo, bug #410213
 
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
deleted file mode 100644
index f266bc23228c..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r2
+++ /dev/null
@@ -1,37 +0,0 @@
-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
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r3 b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r3
deleted file mode 100644
index 974b7777bbb4..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r3
+++ /dev/null
@@ -1,62 +0,0 @@
-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
-usr/bin/gdk-pixbuf-query-loaders32
-usr/lib32/libgdk_pixbuf_xlib-2.0.so.0.2600.4
-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.2600.4
-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
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r4 b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140506
index 1198cda8862d..f9e72e40c966 100644
--- a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r4
+++ b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140506
@@ -1,6 +1,6 @@
 usr/lib32/libpixman-1.so
 usr/lib32/libpixman-1.so.0
-usr/lib32/libpixman-1.so.0.30.2
+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
@@ -72,24 +72,31 @@ usr/lib32/libpangoft2-1.0.so.0
 usr/lib32/libpangoft2-1.0.so.0.3000.1
 usr/lib32/libpangox-1.0.so
 usr/lib32/libpangox-1.0.so.0
-usr/lib32/libpangox-1.0.so.0.3000.1
+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.3000.1
-usr/lib32/pango/1.6.0/modules/pango-arabic-fc.so
-usr/lib32/pango/1.6.0/modules/pango-arabic-lang.so
-usr/lib32/pango/1.6.0/modules/pango-basic-fc.so
-usr/lib32/pango/1.6.0/modules/pango-basic-x.so
-usr/lib32/pango/1.6.0/modules/pango-hangul-fc.so
-usr/lib32/pango/1.6.0/modules/pango-hebrew-fc.so
-usr/lib32/pango/1.6.0/modules/pango-indic-fc.so
-usr/lib32/pango/1.6.0/modules/pango-indic-lang.so
-usr/lib32/pango/1.6.0/modules/pango-khmer-fc.so
-usr/lib32/pango/1.6.0/modules/pango-syriac-fc.so
-usr/lib32/pango/1.6.0/modules/pango-thai-fc.so
-usr/lib32/pango/1.6.0/modules/pango-tibetan-fc.so
+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