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

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

4 files changed, 42 insertions, 21 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/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 595684c698c2..ebece2e080de 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -5,7 +5,7 @@ AUX remove-native 116 SHA256 0740732bc23aaf0e11b26630351a6966a82c5f56f0ca2d4d035
 AUX remove-native-20131008-r2 1247 SHA256 4f6afa9165cd816e71c513047da1cbb88fba84eaf1fd4adbc62f59fd7d2fea11 SHA512 ade6a489d0a1b9933b575eda968d5a047ac8bb4832c18236524ddc9323f4057df37ac425dd62ec53d37acea84a3e674ae297d789f224535d645c0ac1c136cfea WHIRLPOOL 7cdd661eac66050d2e70f2ba81987030c9d0d8508a30d2ae5476760fb4eb8fa28b57b5ee7859e193a0ce226a02fd188db194d3ae50e7502007feb80712f117fb
 AUX remove-native-20131008-r3 2599 SHA256 3c5ffb266bc1a3d9080cce24869ea984c742060f1dbe47aa9c8a07716c368cee SHA512 3ef1364608c9f063160b9ebdaaac10e5f66b9f6ed14d8a2d1bb3209cfb16a1e804a65be39058571202ddaa7fc222e4a7e45621332091a454bb30912b0ac5a0ea WHIRLPOOL 69cfcf4e53b5903e33ac44936a7af142967d5d9fc8529ced7ebad955b5145ad1e8e17d05c69fcecb0daf21b07bba2030ed60f21b21a0bd43288c56b99c6ae5a4
 AUX remove-native-20131008-r4 3851 SHA256 921d818b9296a1f3d9f1a7f3db06046bad01a65810ac100e0994b5d27fce0c23 SHA512 626737ce0757dc1e019288126c123538c367c89752a988c425a1fa03d0dbbc647014506a2f261789420302971bf749343094755a05b988fe94adaf9b075a182f WHIRLPOOL 9d1f3aefe74b82c02114ed28b4ae86095218246c08d4b33692838095957e389986b7218279b06eb03b2042416b96179d3ee016fa9084f5addef98a968c9f1a6f
-AUX remove-native-20140406 3935 SHA256 095ad4b37979d3a66d84ffca5fa36ff68b776f38679d3ca53b78b2a05ae92760 SHA512 70eff60d3036932f9b065e014a8c1a0a2af67689d3aae4bf4220c959ef9e1ae0803b6998ae1e84042cc5148189fa783033090535419efa4f36b4b38aa2bef2a9 WHIRLPOOL a717b63b64ef3a106864e6a037d84712bcc6b88c18fee1f7b64cf20fa237b337747417ad26ff16a01b941e2d91c521b4e3cb7d9cd14632eafdce9827bb142a03
+AUX remove-native-20140406 3797 SHA256 0fc1b226a47b16c8fbfd27cac1af7c0c87b16400ffd4dae6dfb88a1a4f747d46 SHA512 be13d6fbdc2bb94c4d55cdc92a256a057cffd4df42cc88efc77cd5e0d9236379d44a8ce344f06771cb688485cd2bd13d8fc5e0bb82fd992d495d7a571ccff9a8 WHIRLPOOL 3919e4467cf971a1bcd5e268efeea6c416f0e9f2b2c0b4d117ee3ac6e5ee732fcde16f7a47766c7338db9e2ff534660ea6ee70e91a1d1250af251187fd5385fa
 DIST emul-linux-x86-gtklibs-20131008.tar.xz 7164380 SHA256 4a61e9b0345e276062b108eea25a43e30b0ebac77a6f523fcd8d92ece6678121 SHA512 c4a0242752f2f9f72868deb56cd44386d0902d9d42f9dc60555ba01b3922bbd2580b3c299dd41c407aec33e955f52b5173cb203799598efbe8f5aed7c1dbe27d WHIRLPOOL 1d2f8246616a71403b930bee5d95ccdecd2b30b2e2a8e2a553b25891c744a933915333116b6c85c5a53449ce1599494a2af49b436bb38cd104801e03a058c1f9
 DIST emul-linux-x86-gtklibs-20140406.tar.xz 7395632 SHA256 a6d30621c984d968fd5f15709da4aca9aae855c48a181c562d834a8154ee0bf6 SHA512 acc07b51269c2581931c2b3e488a8d425e5c6390e1d78be343b64e3f403da8bd32f0605d4a7cd3b2f59fa13a17afce4cf11cbca53bf278d6e2f198cba4830812 WHIRLPOOL 8acad99cc57d89163f3784c074fd42a510341679d48567e7fbb8bb5be3c3849189e42cbca0ea87319190b3f82b10e837ff591add4b4b53217775238d20adcbe9
 EBUILD emul-linux-x86-gtklibs-20131008-r1.ebuild 3282 SHA256 c9d8e74e701f3a09ffbb746df3a420271e57e064a5cf20f9df8e754c77a2efb0 SHA512 337dcb2fd5fede1557d3bd03c2763acfece662f56724fa53d490e6a27b324d413bae7a42c0aff80e1a263fea0fd32cd18960fb7ea9ceb328552f940b0790f22c WHIRLPOOL c27021f3084707585fd790531bb1d48d74541b5088ff6f7ab35dacb6784459592ec9f162f764048415a347319a07c4a7f0d8aee816c6a23ca770c28de835a04a
@@ -13,13 +13,25 @@ EBUILD emul-linux-x86-gtklibs-20131008-r2.ebuild 3332 SHA256 e5bb5a75bd5ec5dd89b
 EBUILD emul-linux-x86-gtklibs-20131008-r3.ebuild 3413 SHA256 9a4586c5cc6cef171fe46c5146ed9e149ba0dbe16477ece6a8f3ab26bcf5dfe6 SHA512 82f195c8022d293f1a696a228f26d9a1dcd10baea36b97cd99850fcdb889772e438ccf37450bd00b9859c0e6e02f2e650c3ffd92f0767ddcc2908b765738d101 WHIRLPOOL 6f32d4f1d9cd8440166f4a1c158e9d176a4f72938ec5fa618ce34082b046ba40b6d16f80464d181cf514394342f283b28bef5acd808fad0d9e857a18ccfacc88
 EBUILD emul-linux-x86-gtklibs-20131008-r4.ebuild 3512 SHA256 97e17af8b959d4b798c89a6c4e00f9b87ebf0e76a99494d5329ab436b5d25ea2 SHA512 b32f180a26aa2e4e34df042c44bda90cd33e3151b945ef82e9a9b5b49fe7fb7257e6ffe164058b27bf039edd564c9143c9572f02d2471a619c0e238783a8eb63 WHIRLPOOL a43110846bfdeaff1685b3ef5f21a439f49ef74d3dc0e9faf2c60dd0d06b28583eab5da80f66b24aa0f5f1702f5bb69ffe1d072eae77444737405ba33c4bdb6a
 EBUILD emul-linux-x86-gtklibs-20131008.ebuild 3107 SHA256 1888f4c4eed43eba477dac52f7e60ece28d188946214dfdf7a57a45306418d33 SHA512 5deef9176a32ffeac2f8e370040a063dba5ed0d7307671318de8179586f2fdd5017a2f73581e8827481f61cf83fb66081f6d111052f6c9d0d67e782ce1aaea0c WHIRLPOOL 63cb7264f0bc8927cd1edf2dfa050f0bf51ff345f16ab06f5f6f330661a7e7450a14291d0000f5be0bebb7a9bd62a8bd15cd3229c47bfc84ed03dfed9f9bf3ee
-EBUILD emul-linux-x86-gtklibs-20140406.ebuild 3505 SHA256 a45d3a50db2e5a112e99461c64dfd4750fc6ea235acfc582a72a485c63b9ba1b SHA512 6d4dced2b9c36e5c5b2f6be326b9e13607472d1779bcab45256d644b8a4c59e4e4274158e09eca34b7d939356be7325c048e2f2841fff4a858a4cf253a51e365 WHIRLPOOL b900953a52589c959da3d5b20b2b0c1250f2dca8a780d657691623c75d6c8435c0c5c40f8c33bdb9de82b6c0dc809ff8f17db2c33109bd8d320aa5d082eff6f9
-MISC ChangeLog 21230 SHA256 a473f98ffd92a033676dedbc9ad5806153098a5130a9ec268e6e48c31418db72 SHA512 86a877f2bf5c3e7de4a0e48413fad348ad8ea6397dd623497766e6d9914f7942262599dd3119dd3d84be0277c14d4c8e3974597e9f6e1a1ec05145b90d1f7c71 WHIRLPOOL 0e9abfd5c2bbf285f985082cfbce38a2da1ef9dbc0a128a8b29a8bd9d21952599e19b1c33aba6a8022066315b8fa958740d59aeca17003044d7c081c9428c3f7
+EBUILD emul-linux-x86-gtklibs-20140406.ebuild 3721 SHA256 ffc131e630fb19c540cbf93c8c213c9671571cbcffec40a817ebecbbbaef7842 SHA512 05240b42b3fc539b05f16a72ee14b8ccbca8c62b6264dd9fceaa678c02dbdce72158f61cd1dcb2f032e278f976247fcd863e66ea4ffd3f649a793d83c02d0528 WHIRLPOOL 293b115fb8c0a88147ed035bc0dfbb6ec6999b9ba77422f221cc017eb571560bf9d7b71d0ae92a15a001a1279121ee74f5550d3c5f60130f0f3676d9d7808064
+MISC ChangeLog 21415 SHA256 8ff00d6a010e1c64555a453fa80f1eab4610efd13650005302ccda1e886980b5 SHA512 e517adc69faf20b2cd5d141e1c160dff8670c3c0ebc1bcb5cc6a65b52fb063855504de8864c269c49ded6f3d985fa090a089ff6b2b7de904c5214ea6b846cd0d WHIRLPOOL bf374a9e81a78956b1b8c78d3333c5c139e729a9d44a51e02baad346b72a74c55db63259db4d00d0e8c80af0f5bbb0ff29e67d7c7d017ffedfe71d039b19ec6f
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNNoiEACgkQCaWpQKGI+9TlhwCfWNK5kTVHHYC1B0oSEW5/HBNX
-624AnAxee2gW1mF71ESUsHdi3jQp9c05
-=IAm0
+iQJ8BAEBCABmBQJTUZv/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMLwQANV0Hp7zJvO3E3Ov3cP2+hZx
+3956TWNizEO4FLIRq5wBzmTeUQVtVtTlABnrycUecbq+VGBOI/sMAvTX/kiUNBhg
+qKmbJe2Ly6BZ6qlpSKCBKRFYVFkqnkfFa/VAyduL871E9iggBd94R26FpLIdKKLT
+cnUyhKoMzKHHbAMdAxtp41FsXGBdoINp74yfoMYMgQcbQ3XYl5mjcIV3MjZqLIKH
+UQl/SgCWoXVwGgJW3uGUvag7O8/lpRpx15ngtgncba/56dDe12/tmZ0W6Sr7OlvQ
+qLWLI4Px0uNPFirmINNLF/L8xo/Nms2jfiUjUIc/wiPYnkxl7e5v2OybIRurB5VD
+ziaXiHkYsJX9wdwV2t6p3NIdsNVFwK+4c78GaubaeHFQHxr9U9ItKl4Cajck07FK
+clw0DOevkMimG/I0schDtDOqUbZ1MmR/8OcDGCjvba53nfIpd6geLfjKM4k7th30
+IZM4Dk3Iw93xiMdSVA3n/jeH+hu+g2GvbOb9EEKFAopsjRf63nknmlRqmnpfiuuT
+d7rxxONu104Ybcc8PTmY3oh7/bzUlIr9GozW8q+MQ4ohs0tWOjLOr6w/gTY1aJA5
+EB8uIND0RPVnCvFiVwM9BhIHzHQaKREzijvPzHIlGQUrHo88p4aVT/feRCebkw73
+0xENOpBVAAEM1XdTFniw
+=fFcm
 -----END PGP SIGNATURE-----
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