Fix file collision with emul-linux-x86-gtklibs

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

3 files changed, 31 insertions, 22 deletions

diff --git a/x11-themes/gtk-engines-xfce/ChangeLog b/x11-themes/gtk-engines-xfce/ChangeLog
index 4239ebae46c9..be694c76363d 100644
--- a/x11-themes/gtk-engines-xfce/ChangeLog
+++ b/x11-themes/gtk-engines-xfce/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/gtk-engines-xfce
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog,v 1.168 2014/12/23 16:14:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog,v 1.169 2014/12/26 16:13:10 tetromino Exp $
+
+  26 Dec 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtk-engines-xfce-3.0.1-r301.ebuild:
+  Fix file collision with emul-linux-x86-gtklibs
 
 *gtk-engines-xfce-3.0.1-r301 (23 Dec 2014)
 
diff --git a/x11-themes/gtk-engines-xfce/Manifest b/x11-themes/gtk-engines-xfce/Manifest
index 44108647c67c..6aabab50da96 100644
--- a/x11-themes/gtk-engines-xfce/Manifest
+++ b/x11-themes/gtk-engines-xfce/Manifest
@@ -5,25 +5,25 @@ DIST gtk-xfce-engine-3.0.1.tar.bz2 369040 SHA256 eb03cf81da1a91e426a2141c092ed7a
 EBUILD gtk-engines-xfce-3.0.1-r200.ebuild 878 SHA256 601ea8f4a760731a7f26401c4e7f3c107af7ef0a4892a3e1d91de7acd0a3cee9 SHA512 5e30aa1f2f47a9d22b99a376b788f0630d0170ac3cf2b5598b993cbe310add97b9589eaebb9c18fe7a9364dae4a8d77a12a16644978a807c0da05497b6cb21c2 WHIRLPOOL d46ce5ebeee04501ce30543525b0f3efa3ac2edc4812cbc07e1b278fd9a5b9c05f24a8d5f75a197d5c5034572b60c4e457380dfed4ed3fd64b252d6936ccfd4a
 EBUILD gtk-engines-xfce-3.0.1-r201.ebuild 1238 SHA256 09a26e76944d058baec7c6dcac96f60d97effb3f6cd1c5b9527507c454fd8d45 SHA512 8ae8e5ac6b0ec1da810a78797e884d2f7f5dc71986e866135f26b52b5fd5ce8f50b9d3a9aca99c26b5474c14506cf436872acd4213aa0c48512e02d95e6c8b0c WHIRLPOOL 913c9c2d56e622ce34bc1bc10ab070406a4a0a976ee79abc23e5115bebc583af3b0d8deacac50b8ed8fc0fd051eb6c4e7a567ee97bcf1802f7216df0585d2666
 EBUILD gtk-engines-xfce-3.0.1-r300.ebuild 877 SHA256 311e68c2ca19c625eea77925c10622283f0428a24b1d410f48927de816d7ecee SHA512 95f082cba324ac31407ba6b1e4f5825f957c060d2d714ba47f7963c2e7af14096e4f36bab90be36ec52485c6d6efa07054b18c0e6ee692d05cc56662aabefcfd WHIRLPOOL 6d50f51a3dee9e7bba4f8c0ae7e0220a1de3b02c750f6fabeef8b404dd4c4d5d8aba46020aad777c20fc440480e3be1f138fb4bbf7cd7b4cb9ea1291d35e277f
-EBUILD gtk-engines-xfce-3.0.1-r301.ebuild 1107 SHA256 6d6b726b0588861b486b2de25cd3cb045165274b178eb42ebf49bef0b7401e11 SHA512 fc7de9ced4e8471bfd829c63c34598c437139a19967a08c2f59ac61b91d05cfc6ed878aff09617d59a7bc63a948e086a2d5202181b6fa09525354d2143892cd6 WHIRLPOOL 7fe44c2be0265c034fadc747dd28e35baf317278bc48faa6104b779d73d2a1e28dfdb3d7d32c5eedd73585f16442f05c6476b97ea5c6aea5a1e1f250c5f322a9
-MISC ChangeLog 22598 SHA256 cda25719c692f7350cf205525cc9bc68bd44bbc54aa9867684cb9259b8ee8fd0 SHA512 56b10c71417e9b2bc29cc9d19d57473d1ac6a7ea129a1c9725cdf8a014b4adb98510a14e4de0ee1380ea2d701a17f3a14fcf802181d998bb94f773f5e7ed5664 WHIRLPOOL 8b09af5798d4be1387fe6aa8b91b057ac948ec5116f491cfa428995c4f10a0b3535f83c6f76dc1b1f0e995d0fffbbf8cba482b60fa10d8e57b07113a2f2ea27b
+EBUILD gtk-engines-xfce-3.0.1-r301.ebuild 1277 SHA256 a1dfe985a031f081dfb735d75e7023fa6ebd9eb6ffc2e4994ed8483df86c4695 SHA512 d7f154c716c90d57ed69912b78b9e0c8fc1541e5243147f19578b5f894463ff5f146bdfbdb14e5c3059bf32cc9343e1821c3964685fa868e6bc75ff035cb65e9 WHIRLPOOL ccf4c363cf84dddcaec6b13ea5e36bb4c425fc1a4a989c941ff6f64c62f4525c29e88384afe91947977ea3d8493abebe4132db4b1b95b727a8445430d1e02504
+MISC ChangeLog 22748 SHA256 e50ab1b82a61b3d519382d5cd86e123229d3692dddd2c4fcc55c3a9c3a99c1fd SHA512 3580b85d8567c46c2e0a68106a9a7d66506ab7c98b09701d7f3e088716440c804e3b3e3a389dbf83eeb426ffa01759025f4d1e69a07407b57b9815eadac8e2c0 WHIRLPOOL 61adcbb06a2a0563f1867b9df1285fb046d77c50a93ecb9e6e9363aa80302657495153bf1d4e58afad413c44d11e1915bd3120a754f59047063b469baa407ff5
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUmZTzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHNoP/0kcgI3LzXXtydHzp8Qsszg9
-t3GJIL1cWa274M6DPPAHmAFUwJ/wctoQ4KeOoNLH2C3vSu+c6/PNdESa4ymHvXty
-xdIqcDiyuuJOc3k5QyTzndijonQzpa3a+GfYZZjfsTbqoFjcJl/7BDdv14I4nb3B
-MKNUW5IzUrvtIfmvNXiHj2be/Evkt9X18yHJ/xh+K5w0TaI+1Nb9RrV1yzjrKYqn
-x/Pdpfshm3TPhnoQma3oMz9LdMA3heYIpSZHJ1f41JXPHkbQ1M2vxoB/Q1R/d0kI
-dC+LDkxpT19O6tK3iJXUpfcdYPkwMbkTao05kaTyA4Ijp2ZVByoMHoH7J4aG8M5n
-meVWWAXiSO9HMcssBqZbm7ef/jOZbU+FXpQAOcdz6oqEanCZz91y4QdA0c/JXvRq
-oqTBKi5pOxYGhUjgvMo4S2LQZjS5yzRA1+lReXx4UajB+Q5l8h577R5Itr4m69UM
-TrUTd5vFXxGDHunPGQhCj2wmmq3kFimcvh2HBadcie60f6gzsP8UrL15Tf1y0K3N
-iHNh0zC+hU/AB67MmOnTU2AQP9zA/xzZy5E9RN5lssaCngnoFT7ZtxHrhxTmZEo5
-Ncs3dBn+14FkvCLpSpYsQ0NiFeDQmshhpinqpFXoA7ZJztCI0OuSCQdOKt2otslL
-zP0Km8aHdIadQ6+aOgPX
-=QFKb
+iQJ8BAEBCABmBQJUnYkXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNjskP/1hMemur2IklcBsZ4HoS49ym
+tv1M1nsL2MX4y+zI3rfDajFsfPRbefufIjFICYNGT4TzFMrm0/lbS7ZFDOKHXSyj
+DJPVXSXVUFQ0MZWL17MiYv3b/wVT3F9d1/kyNIhb80y6LPbImdhgKSEOLHwbvU/i
+HD0Je49QNbMH/i2gdHvu3ARWW6MgQuQLaO5QyCE1IOzVtEiJNqN4bDrv702Oydvd
+95FyCugtPK+z4IBnlrDQybmwWbb9LaKInVvsXf8O8kTpbwwV2wxw+DpR7vtdK7kl
+SPHK/d85zD7CxU1BWEQuNodKjcMT+PAXj3x2STszx069aGuF/CY1zZQcV9v1rDcc
+y5WEILkAYz2iCTvw8p6aIqVEs4Hs+nK+x8ldiYlMEZu1do0ytQhct9Lo8Ssq1+4z
++qdwmTct/x07vZH73TSJCX4xc4hFTviMf00yEbfHeUnx5EmbD0BLHVCEzvXOTCs1
+E5UrMiHcuQb1IkXP8jLMPv46hUvOtwzCVZhaPmOl3ZOMJsUC+IUPvnkk3Xo/rH3w
+mDxy2Dz18UssXAL4LhKrySk2TSDm0GMcS+5KH/jE77/mB6ylTGWDlinZAQI4h9H1
+WT3lXjC72tz2FO3U/EYCg8POylBQIXpObeK7cOph3RXeWHd6saUPxx/MeAOp28md
+h3ZOXpInToOqV19SkUwm
+=7eSt
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild
index 9f7c4ce7b210..a7a75e4cab8c 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.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/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild,v 1.1 2014/12/23 16:14:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild,v 1.2 2014/12/26 16:13:10 tetromino Exp $
 
 EAPI=5
 MY_PN=gtk-xfce-engine
@@ -15,9 +15,14 @@ SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
-RDEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}]
+COMMON_DEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r5
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)"
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
 
 S=${WORKDIR}/${MY_PN}-${PV}