Block revision of emul-linux-x86-baselibs that dropped the colliding files.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 27 insertions, 11 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 4deef928a97f..68c04ef2f58b 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.57 2013/08/07 20:18:37 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.58 2013/08/08 12:54:37 ssuominen Exp $
+
+  08 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> eudev-1.2-r1.ebuild,
+  eudev-9999.ebuild:
+  Block revision of emul-linux-x86-baselibs that dropped the colliding files.
 
   07 Aug 2013; Ian Stakenvicius <axs@gentoo.org> eudev-9999.ebuild:
   Initial multilib-minimal.eclass conversion (to build libudev.so.1)
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 5f61edc8e111..68d51aeea83e 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -9,15 +9,19 @@ AUX udev-postmount 1207 SHA256 0220e949b1f31832a205021c0a8615e77b27b73b7c9b16ef4
 DIST eudev-1.1.tar.gz 1706277 SHA256 462659ef77802f244f55cee58fcd6b2a0cf6c24716f64fbb0c6d88a580f398a8 SHA512 e7b54eaa49e21b350341c39848712458d85cd2d3a69233e11fa7e57e93cb7db2382d1138ebd9eebf971650af85b2aebeff2b71a8396c78c444b6759523e69730 WHIRLPOOL 57782df80ef923f9507e0edf31ead8528c764e0b653f69b9ed4c42925e88d5d26a7953d21083dece84e0bcd5521b6ef81e3ffb97215de934c9b631f8dc5ecb52
 DIST eudev-1.2.tar.gz 1677976 SHA256 f9f78c2154eb174a6aab08afde9f5705a9072fc4069031a9f686cabc20beaa22 SHA512 673cd53339d62b23db615e1f67def71ed8d313dcf18edda37498db5fd507a2556073c798f81d16525594b0176fa5f0c9567bea6e4715cc0732b7651d24af4be5 WHIRLPOOL 3329ed127f0fa9696ce4fec406a2e6ff8e9d616ee4fbc6fac0a14a8b80909b6def983dd16c40e7c6abdc93f4da96805fbbb855460daddb1b1352815077b2e009
 EBUILD eudev-1.1.ebuild 6393 SHA256 8ee517dc78dc456231cb6a6e016a62ffa3a66fb147f088037aed3fb9ce32f75c SHA512 5667e17439c3b01b32dad2c36f1665b048321d446490f418656e4f854f9619610b6515d020fab32abbcf03eb5607ac0735111b8770d0800a2b194c98dfce4a16 WHIRLPOOL 3802065d5e812abbbe1f641cc8a157905ae1d2fc32c02b8baf6f3e2dd632423eff0b99744eaa6e90d2df4792f528bf32bd19c09b8dd1ed04ace52c72ccb4ad40
-EBUILD eudev-1.2-r1.ebuild 6871 SHA256 e32a3fcfa1d8d34691f647dbea7de544b2e7c19d2d9e47a18ebc7968db8b1a77 SHA512 d0d8bf34e6f1a2fd3c4f36aa9d44077c3004b8bacd30607acfa6530e9f4ae137bc2ba9e5ddda1eb5093b83dc9becb1d64338a215885bd26d19365fa73e37f39f WHIRLPOOL a3ddb17b0c76f76017738113ffe555ce03ffbc23d6881daa841f3b506c61b1a4d39ca1546bdc6797c72530ee9759908f8c161b38dd04faed69c3359a7620aab3
+EBUILD eudev-1.2-r1.ebuild 7007 SHA256 9292262cc19249a89a80844b246d85807ed787e8348b6cf407fae34e75749040 SHA512 b19af79502a33db066022fbd0cf71d001b6278b6a636665776f1af8d4b5d9acb1ad08edf89ff3a5a5eb3c11ce9ba5a6f884f5ac8988d17ede7de818169b890cd WHIRLPOOL 4a9318b9f51ba32f583d53cfd0f6c30a35331dea155584454ff8d9319287c690426e1bfd77127064562da7288a39f20957a1659f186b71ed5b48e77cd9c32177
 EBUILD eudev-1.2.ebuild 6365 SHA256 9e805cd06a282932e5d39ba64631ee7f65cb69d3d7efb47d274a79de627e9190 SHA512 57443926f019395036e1eb7ebb7b5cb68a54c06d57c1cf15ba4465775cf638d339c3826387bd8bc60f59bdd1303c2c4c78b79483f83285c2caf4330a43b82d39 WHIRLPOOL b3951ed9c18a1ae693254d3ad48d0a98827c52022edeffba1591c8e1c8a9c31ea7e8b641397068a2f427426e106b92ce54566841f32126943c4476cd8e17debf
-EBUILD eudev-9999.ebuild 6915 SHA256 92f0829177fd51566340251828cd63f930689775007819006900e9e89c683738 SHA512 28aa2a1ef610cd4e4243978602c165c556ea34bcb8f28ca146394e1986d9032d5629d0af7eb6dd2b7550a3fb5d517b52c3671511539fcbb7477af5b913c93352 WHIRLPOOL 76c75bc1ca957b87213687ebed67d1d087fc2a42d846c4bbc50f76444a5cf55decbbf482d1c9165aa6f81c015d77c3c4aa3c3144db26b001b69a3cdec1091cb3
-MISC ChangeLog 9375 SHA256 93dd810230407f695f38c21e2cadb9787c8f2ee082e847b087c262e476931fe3 SHA512 8469628a55f290a6eb8c6f4e6637693d6f6230c85e0197ec70d1174ea9ce8e4318df33eb6df621a61f63259a6a307a4edfbebb8503fc866fb56c871358cf6848 WHIRLPOOL 6230236f6eefd35b3784f25f691d10ed5f909e262e7b9495f45225cdbc644058be5daa061ee7e4345f4d293367de637ebaa65572e4c50b3655ba9b4781db1431
+EBUILD eudev-9999.ebuild 7051 SHA256 e216b8a57f49de286adf6e2f0a28d87b0d3497a6e35888a44857f9c5e136cd93 SHA512 f7bc923a77795727db14e03845bef790b1fea052306056c77bad44dec8ad8d3250d78414b39d0c537f634377ab7c4976305fd6efb80c0f2999e6bd2e0b28f088 WHIRLPOOL 0b9bad6e8a1370ae331d6aa4013e2af2c5b8e620d212272e68505d14550f606b8d15c517ca46d4132d4af95c1eda783c28eaa539484d16a0a479920b090ebb41
+MISC ChangeLog 9556 SHA256 0d0f5ae341f6bc42339fbc515db022461d4010b4e1850a7649a50f5ffc6bf5b5 SHA512 d4bf2e789d4e298b2b2cbf69a61679a474ae690a7ecd9843bfbaeb72e58db685d9884ca1cc71b55c038856638c32c7ec17c7a6ce1218ddc6fe4d49cd70e48771 WHIRLPOOL f947aa17cd57ed0e12b3cf769e2e344cb054bf3a993e080eec96d0cf0d209441a764cf51a55595bb94ade5658afdba1fd0c86e526b15b9c3551361976e817ce2
 MISC metadata.xml 956 SHA256 2dc374ed7a7236fc2044a93429e8ff9ce68474f5fce8961aff1209914d4bdbcd SHA512 e164394dee8fbd2afb6258fac4899b24607bbde5ec1e1d3cba51059a11768a653e2d841fecad902da0f85cdc579b3e8e2ea64e94d107a448fd1fdcf8362db4d9 WHIRLPOOL c6d492ca4498e509c8e04aead71a89b4481e8294c661968bdc7ca3081bfe116dd486f5676c3dfe08f5c43658a9f37d1fcb815c9378301a8c385852f83ea27544
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlICq68ACgkQ2ugaI38ACPBFPQD9FeWlrPrNTDe8V9ccI44z6C0a
-b2u4j/47O/ScSGKevAIBAIHwsIrSryVB6btKSlPR2ir8Hjdzc0gixWQYmYAuBxMN
-=vEVI
+iQEcBAEBCAAGBQJSA5SYAAoJEEdUh39IaPFNLcUH/0FA6ZhGZ/y8ZNyUxWB9tNWS
+k8Bxf6OoLUH7558p11epSd6qcOy7mLM3xJZVCVGcqXVputSDVGCxgE2iEweV8ctx
+HGCnBj7dlPKyhfoRpRHc21qSD13D+WsiXy4EMsEUPkVduYjHXovINtba2FKyjtJP
+PbtVTeIjK4+TaW69kvOp3El1bQfUrmCb02PesAlTRsN6E5Ote8cMNqs/eGj6hcvt
+Ya+PZll1tC8BOCb7PeCQ8VyR57Pv9aRhCbKJ6BFlAURgL5jnXgLbTC5vqvVY1WlE
+P17LTIfjnx8c4PQAK0ARZxvUPuNsGEWuy2WAiVwzaBOqBWUIm3qp2yvlpE07VME=
+=j0r8
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.2-r1.ebuild b/sys-fs/eudev/eudev-1.2-r1.ebuild
index 19bc91026d78..3fa7e165033e 100644
--- a/sys-fs/eudev/eudev-1.2-r1.ebuild
+++ b/sys-fs/eudev/eudev-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.2-r1.ebuild,v 1.1 2013/08/07 20:11:25 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.2-r1.ebuild,v 1.2 2013/08/08 12:54:37 ssuominen Exp $
 
 EAPI="5"
 
@@ -29,7 +29,11 @@ COMMON_DEPEND="gudev? ( dev-libs/glib:2 )
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 	selinux? ( sys-libs/libselinux )
 	>=sys-apps/util-linux-2.20
-	!<sys-libs/glibc-2.11"
+	!<sys-libs/glibc-2.11
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 
 DEPEND="${COMMON_DEPEND}
 	keymap? ( dev-util/gperf )
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index e1e0aa14e7f2..38dbf6c5b652 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.35 2013/08/07 20:18:37 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.36 2013/08/08 12:54:37 ssuominen Exp $
 
 EAPI="5"
 
@@ -29,7 +29,11 @@ COMMON_DEPEND="gudev? ( dev-libs/glib:2 )
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 	selinux? ( sys-libs/libselinux )
 	>=sys-apps/util-linux-2.20
-	!<sys-libs/glibc-2.11"
+	!<sys-libs/glibc-2.11
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 
 DEPEND="${COMMON_DEPEND}
 	keymap? ( dev-util/gperf )