Fix remove-native and dependencies for new emul-linux set.

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

3 files changed, 24 insertions, 15 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 6f45b4d16639..4d4ead293556 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.120 2014/04/15 21:18:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.121 2014/04/18 21:41:18 mgorny Exp $
+
+  18 Apr 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-gtklibs-20140406.ebuild, files/remove-native-20140406:
+  Fix remove-native and dependencies for new emul-linux set.
 
   15 Apr 2014; Pacho Ramos <pacho@gentoo.org> +files/remove-native-20140406:
   Update remove-native file, bug #507292#c12 by Sven Eden
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild
index 659619c01ea2..93fda87bd00a 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.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-20140406.ebuild,v 1.1 2014/04/06 09:07:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild,v 1.2 2014/04/18 21:41:18 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -13,10 +13,16 @@ 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(-)]
 	)"
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140406 b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140406
index a472ce5503a8..fa61e0622ff6 100644
--- a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140406
+++ b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140406
@@ -76,18 +76,9 @@ 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
@@ -96,4 +87,12 @@ 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