Avoid file collision with emul-linux-x86-gtklibs.

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

3 files changed, 32 insertions, 22 deletions

diff --git a/app-accessibility/at-spi2-core/ChangeLog b/app-accessibility/at-spi2-core/ChangeLog
index dcdf87c6bd4f..2e99fcd9f05c 100644
--- a/app-accessibility/at-spi2-core/ChangeLog
+++ b/app-accessibility/at-spi2-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/at-spi2-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.74 2014/11/22 20:01:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.75 2014/11/24 01:40:34 tetromino Exp $
+
+  24 Nov 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  at-spi2-core-2.12.0-r1.ebuild:
+  Avoid file collision with emul-linux-x86-gtklibs.
 
 *at-spi2-core-2.12.0-r1 (22 Nov 2014)
 
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 943bccb9d7f9..f94b4ae9f5a0 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -5,26 +5,26 @@ AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 SHA256 5834cf4115437900
 DIST at-spi2-core-2.10.2.tar.xz 446272 SHA256 d3da58f84f4c8e4d5fe940ecb52fb27b4d9ea2b4dcdb3e1fae0f46b5eaa2dde1 SHA512 51b3ec2f77933622ad3aa52e2bd91cab3a7ffbc396e1ec01a52ea277e5cbc972ab0998d3a54deeaf18fc67c5767c1958d4a0ff6bdc77768ca3a51b567013d5da WHIRLPOOL 480ab9c3c037e53f220abc42be9f09ea179a19de62b640efe0697ced1c04122d387eff8fc3fe7e359ea853de4415a3eddc42aa3fa18a00ddb57a1fa426a030e6
 DIST at-spi2-core-2.12.0.tar.xz 454668 SHA256 db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89 SHA512 955249568e28441201d0a079e26bd703e21716b9189e372bfa20cda70e1079bbb51f62246cdeb1b914953f448e0432b749d402d723710247f2a1b8b343b37ccc WHIRLPOOL 67870b40b3c0e343b3119bae93b23540f8ab2c71137d033c9b4ee000d28a4c66353dae8a72d815367ac8b291471dd3c21d985a0cdd4c6812e43f95ca1931010a
 EBUILD at-spi2-core-2.10.2.ebuild 1394 SHA256 cf6598f74f4dfc4549b6640f27aa4429c016f0d9f32ac9d156a94ca36d97f9f8 SHA512 12b7c6ae3e7a40c4205831c43fba74cc5406ee51363e6ede452f7e8cf87f65f23cb53525e50a8ad0b76ca5331776d4347effe28a07e0f2b51f9e2e5bb48a0e19 WHIRLPOOL 962ebf9a50ad8eb12c68c29ccf37b530fc509bbf834f5d062d4f591550381d6a3016a988412fd7f04102bde646e92890715c073c0879fe7220dffd8c8edeb833
-EBUILD at-spi2-core-2.12.0-r1.ebuild 1861 SHA256 b5020c083530c7142270c214448bf531668da94fca27d5212d3b34bb095241c0 SHA512 747b99f5a63a559d315dca58438cc0e601effad2a086b31c2825683d7d72f1016664ad97945d801bd11ea7697096def3be9949ab47948a38558f80a7c6182118 WHIRLPOOL 2f8ef8d964c2f6aa420745a5f012498f86b12aca8eda21eb03e2d7e5620fe6ca66657f1377cbb49b04b7dcfcaab3e893e4ae2e60dfeac9d63fab96d7a7709da6
+EBUILD at-spi2-core-2.12.0-r1.ebuild 2032 SHA256 3cbe43fb417fcb5f796c69337c34b899c767106fec984c21cac94beeb683a0a8 SHA512 13a6e98ed3a34c9f014eff40f9b840d5c4d44e7acd31ae63df7114f15819da0a8f272abe30fb84dc395a8d24fefe62f69f50ea363a726b136e9ce9f62873fbc5 WHIRLPOOL e874484c7c8cc5b58cc29dbbcdc36cb9a60ec54c5989b0c824f9f688f9d868437c20fa6540e45052846489e997485d313c2585d1868ae5301f9dc6dd00bbcc60
 EBUILD at-spi2-core-2.12.0.ebuild 1408 SHA256 b61c53c0717f5a3a981f0de018623dbc905b2fcecb68024731ef47dcae6dfded SHA512 3321994755703d822251182f2f805f65b405441d5a24e0d8112a7f5f713fadf79b41ba69b3afcebb2bae72942d7ffaf6b7718dfe23cd30f8c3b95daf254cf956 WHIRLPOOL f631782426efc35288612232b110ad540fc5bb1967ba9b27e2cb594e1e4f19a2f5568332f7e1d6084e395808edf3f506ea165b0b0102c68d361aec007b80836c
-MISC ChangeLog 10752 SHA256 c0f35cff0771bcac743c61a4f4486544119df1b63402d677064fc33735f96cab SHA512 b2bd94081fe6340798cde55adf084df92a81e1dccf6833989f690082441004ecdbacdadd493afebf47f2220e48646ee734e4794d2d921bf09404a790d93c4b2c WHIRLPOOL 086652a68b8965e8e9482037da210ee3078c7df9bd2c20463de31638d26118f79ab53af5a4d900e896bd6cab52b1f2ae73a797d6d4ff8ec4fc4414a04addfdbe
+MISC ChangeLog 10900 SHA256 280dc350a68e9394df503a7055eb960fdc3d185481b1c46099ad7700cdbba4e6 SHA512 ecf500bdeed440af67fd89b8fac34793b2d897f0abbd2918ee467b7d5d44d1654a1e9aa0da0e19345e077982e79d7a7716674aeb57815fff915ca6db5acf9cf0 WHIRLPOOL 917df84b6056c3663a5fa51f5cabb5448eb79220a0784fe55dfe5ab2738f99d32f396c141c75abaf42fd2e01ba63f3db6b1f89992023be934e91041e6adcf745
 MISC metadata.xml 174 SHA256 c0255e6a66375ac0e7f11c3712c6b47b7746432df4cf518e10c230674a6bc4f0 SHA512 b704bc8a6cbe98854b84a2ddedb7a2bc00309e3290e568dffed0bafc0acfcc81d6edb73dfacb95c56eef85982c2131f108e96abf55018ce45eda886f47bba1fb WHIRLPOOL 0e5a13b34c4e1ecf2888082f0c45255a63411981fbecbf4b8766de0f77993c2e6293f2ecb441adf901b20a48a56195a434cbb56c585d7e33693da12733ccb693
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUcOunXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLV8P/AjnubNSMU/A63v1g40c2I0o
-JGmmFOe3m3Eg+KIDsEfBK6YMJNy66msROQ+hLJTxKJGoIPWfM+qfD7cAIYjdWtT1
-YFN0Wfn2/wzs1WrJZ0bWJRqN1EfhFCgzJTFhGSk7Q+AhLU08Kq1AtLNUQGGdEweV
-mRU2opcUDPcDhozv4yxql8Wd9zdAwEiwltH8GOmZaSjLTlIo31EbIj1dD/OjIVZI
-uqZk4T2wtUcNOxxVGWPXBmJD2ek3Yw25ZZiXSh25rIJQ4uGxDU38Ey5F2pzCB61q
-lXHxog0G+sBvHwaqxxqIzJsPeIGlCzCbPioeVZWNRwlIYF1VKV4Zq02j/fijIzLo
-UPoX0b/umz2VnCjr022CTWhPP9aEhjiZ9xN2zqgh5PsvS/+1dQ6hIMiegOdlVh9x
-ygGV8Qw5y9mJGoA+itHASqB8q12mmWtoUViWHAT16C4605ry3OQvP6RIbiEv0kTJ
-AcL8BenJIwrmqM/dPKcAl7p4q3F/M8jpNU7GHGZe4WLSVDK427noK8PAUGbPGcWo
-YXA7e6Sw2Qn2s4Z+feLokI3d1cUNOvf7E+b8s6cYmytrVdGl7A1cUKSFlO79DFum
-33I3dvKTVc5YNTau/AltJBDYZaKcH23GMTt5d+Nxdk4qiyjijWOF7M4jef7r8UQQ
-To3ANH++x++AKjDY4GKd
-=YVPf
+iQJ8BAEBCABmBQJUcoyTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNIe0P/00WggukpkPZTs9FmYlW8VkE
+d/NVEOQqS5yQfCd1cEFgxEvDc/ybbb3WGxUaEQ3qLS1LkUu318d4Wibginrt2Nf7
+DviHrwhGaH4SHLaZ52LSFlpjda7DjhEpLGZEb4iGe0kekIQCNaWQXCvwh+AyqzVT
+ZrbpTKKqb0ijTdsukzqEe9Lq7k/ZNuloTj0HHd5eSTELhyGQgfuuZwPJcsqdLPhH
+8ushA82jdG5Pxhh0btMt75B72UAsTvRZ7Q5LBsg33kJCVc4NI2rAT9yI/HPDoNEd
+n+HoI/TalpnhrwDR76tGsQ4VEmzgmv+APyzzu5FBswyfFuv02dIZMzsy3goBE8cf
+dnbUjL4kyeQn6gbSjfy7CyONJWkWkGHFunuM1TUz8rRfSVBVx0jRjzZ3UVJx6dJg
+w7XVJAuc9I1KiXlAu3VNVYE89oiiKIHC4ujcqaIpTYWTR20G7VlC1XZUFCZTn/UY
+ex4oz9S3Boarkqyhs7wa2yeH7qZzBR476y9Emn7qULg9MBdm2qmu3wczORhI8Iqu
+cl19rAKrD4/OSmjiMiIShKNmXbTCBSzNb3+5oEJcaoIwjZCbcdwmfo0qt2bUxqC7
+lQKTJZdwjqEkgz+cb7k6zB/MUarw3KRmMSIXM3a2f9FkaibDZZVQ9eJmO/QFm+MX
+1m8ndq2Qf2ndWicVHqUo
+=+ngH
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild
index 546eb3279d4f..55eb49d15f69 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.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-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild,v 1.1 2014/11/22 20:01:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.12.0-r1.ebuild,v 1.2 2014/11/24 01:40:34 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fb
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
 # Only libX11 is optional right now
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
 	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
 	x11-libs/libSM[${MULTILIB_USEDEP}]
@@ -28,7 +28,13 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig[${MULTILIB_USEDEP}]