Reverting commit on talloc-2.1.0 , because emul-linux-x86-baselibs still provides talloc. Check bug #491222 for multilib patch

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE25EE336

3 files changed, 27 insertions, 28 deletions

diff --git a/sys-libs/talloc/ChangeLog b/sys-libs/talloc/ChangeLog
index 796679ec8043..8f00c7d6172e 100644
--- a/sys-libs/talloc/ChangeLog
+++ b/sys-libs/talloc/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for sys-libs/talloc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.62 2014/02/01 20:50:03 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.63 2014/02/02 17:40:57 vostorga Exp $
 
-  01 Feb 2014; Victor Ostorga talloc-2.1.0.ebuild:
+  02 Feb 2014; Victor Ostorga <vostorga@gentoo.org> talloc-2.1.0.ebuild:
+  Reverting commit on talloc-2.1.0 , because emul-linux-x86-baselibs still
+  provides talloc. Check bug #491222 for multilib patch
+
+  01 Feb 2014; Victor Ostorga <vostorga@gentoo.org> talloc-2.1.0.ebuild:
   Adding multilib support, bug #491222 , patch thanks to Kenneth Graunke
   <kenneth@whitecape.org>
 
@@ -119,32 +123,32 @@
   18 Dec 2011; Mike Gilbert <floppym@gentoo.org> +talloc-2.0.1-r2.ebuild:
   Install missing SONAME symlink. Resolves bug 394787.
 
-  18 Oct 2011; Víctor Ostorga <vostorga@gentoo.org> talloc-2.0.7.ebuild:
+  18 Oct 2011; Víctor Ostorga <vostorga@gentoo.org> talloc-2.0.7.ebuild:
   Adding block on <sys-libs/talloc-2.0.5 to DEPEND, bug 387509
 
 *talloc-2.0.7 (27 Sep 2011)
 
-  27 Sep 2011; Víctor Ostorga <vostorga@gentoo.org> +talloc-2.0.7.ebuild:
+  27 Sep 2011; Víctor Ostorga <vostorga@gentoo.org> +talloc-2.0.7.ebuild:
   Version bump to 2.0.7
 
   27 Aug 2011; Fabian Groffen <grobian@gentoo.org> talloc-2.0.5.ebuild:
   Fix install_names on Darwin, working around tremendously broken
   waf-buildsystem, bug #374455, keyworded ~x64-macos
 
-  17 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  17 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   talloc-2.0.5.ebuild:
   keyword ~sparc-solaris
 
   07 Jul 2011; Alexis Ballier <aballier@gentoo.org> talloc-2.0.5.ebuild:
   keyword ~x86-fbsd
 
-  02 Jun 2011; Víctor Ostorga <vostorga@gentoo.org> talloc-2.0.5.ebuild:
+  02 Jun 2011; Víctor Ostorga <vostorga@gentoo.org> talloc-2.0.5.ebuild:
   Adding dependency dev-lang/python[threads] bug 363071
 
   16 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> talloc-2.0.5.ebuild:
   Stop unnecessarily forcing Python 2.6.
 
-  15 Mar 2011; Víctor Ostorga <vostorga@gentoo.org> talloc-2.0.5.ebuild:
+  15 Mar 2011; Víctor Ostorga <vostorga@gentoo.org> talloc-2.0.5.ebuild:
   Fixing collision with /usr/lib/libtalloc.so.2 bug #351608 setting python
   2.6 as runtime python bug #354587 #357269
 
@@ -153,7 +157,7 @@
 
 *talloc-2.0.5 (13 Jan 2011)
 
-  13 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> +talloc-2.0.5.ebuild:
+  13 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> +talloc-2.0.5.ebuild:
   Add new talloc version. NOTE: doc xsl file is fetched from net rather than
   using the system one, this needs to be fixed.
 
@@ -168,7 +172,7 @@
   Respect LDFLAGS. Fixes bug 323497. Thanks Andreis Vinogradovs
   <spamslepnoga@inbox.ru> for report.
 
-  05 Jun 2010; Raúl Porcel <armin76@gentoo.org> talloc-2.0.1-r1.ebuild:
+  05 Jun 2010; Raúl Porcel <armin76@gentoo.org> talloc-2.0.1-r1.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #300158
 
   19 May 2010; Jeroen Roovers <jer@gentoo.org> talloc-2.0.1-r1.ebuild:
@@ -178,12 +182,12 @@
   talloc-2.0.1-r1.ebuild:
   x86 stable wrt bug #300158
 
-  03 May 2010; Olivier Crête <tester@gentoo.org> ChangeLog:
+  03 May 2010; Olivier Crête <tester@gentoo.org> ChangeLog:
   amd64 stable, bug #300158
 
 *talloc-2.0.1-r1 (03 Apr 2010)
 
-  03 Apr 2010; Tiziano Müller <dev-zero@gentoo.org>
+  03 Apr 2010; Tiziano Müller <dev-zero@gentoo.org>
   +talloc-2.0.1-r1.ebuild, metadata.xml:
   Fixed: unnecessary inherit, swig dependency, documentation install,
   static-libs building.
@@ -193,11 +197,11 @@
   26 Jan 2010; Patrick Lauer <patrick@gentoo.org> +talloc-2.0.1.ebuild:
   Bump
 
-  06 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  06 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   talloc-2.0.0-r1.ebuild:
   Block older samba (to force uninstall).
 
-  30 Nov 2009; Raúl Porcel <armin76@gentoo.org> talloc-2.0.0-r1.ebuild:
+  30 Nov 2009; Raúl Porcel <armin76@gentoo.org> talloc-2.0.0-r1.ebuild:
   Add ~arm/~ia64/~s390/~sh/~sparc wrt #285952
 
   29 Nov 2009; Tobias Klausmann <klausman@gentoo.org>
@@ -222,7 +226,7 @@
   Ebuild cleanups thanks to pva, bug #288536, making docs optional #290193,
   thanks to Andrew Church for the patch
 
-  11 Oct 2009; Petteri Räty <betelgeuse@gentoo.org> talloc-2.0.0.ebuild:
+  11 Oct 2009; Petteri Räty <betelgeuse@gentoo.org> talloc-2.0.0.ebuild:
   Block <net-fs/samba-libs-3.4 for bug #288545.
 
   09 Oct 2009; Patrick Lauer <patrick@gentoo.org> talloc-1.3.0.ebuild,
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 52e98bef515e..bd66f7d6a346 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -5,13 +5,13 @@ DIST talloc-2.0.8.tar.gz 433489 SHA256 1ec11e635e0318dbbb014db38ff96e8dba3ce5f61
 DIST talloc-2.1.0.tar.gz 416097 SHA256 0701393882647f823503e3aa075bc67d75c194b376822377dae2d20f9130f08f SHA512 7bdc448c91211299edf16502d263362ac660d5123d8ea7bb2ed58af2231537e4f29da5384b8d5be10254a02b193520890e95a73d697c40eba09728a9b6d56d57 WHIRLPOOL d8593cba27f5d971acb39acacdbea70df5b80ed31288cf440a2ebeaca266e070deeea8322f4ba5682580f66044128f18dd6d76b735aa0670aed46f13f5a4e857
 EBUILD talloc-2.0.8-r1.ebuild 2008 SHA256 36055a03405c512ee0ca00dfac8eda8d6a68c10a92ee974f5533c1c49da95cd1 SHA512 ac9b3b668506f60a8a288bfeafb51ce89765fc92650194ebb2160055d0626473f3a067d598fed90546ff3493c96f83214caeb3e100f9f6fe22281b34e4e945a4 WHIRLPOOL 8e3c4230b373bcf54cab800d25da15acc93d70f00182302135be6184fcc3288f8a6672fc3da4cebcb91f7fe985e2f9d8812cd0901db5278617925f598faf2e01
 EBUILD talloc-2.0.8.ebuild 2072 SHA256 4647ff80009ef0d81e5e29f0dddcedf328757c7498e6ae4df20f82de73a5e87f SHA512 f889a204b1df0eea7e4d0c196b21f48e0584ed74f9dc76078b5cb596b93b8ff9799cfa601cabf3fe4c8bb552abdd2cd3cad6583c6bbd2b6b97357218c26f9532 WHIRLPOOL e8c7bbbb1926f5d09d2962e51da154c9fc65313b98ce41900e127295bc1ea5d307db5a7f05d0b4dba90c3da670b5c3a5be24f3730d5aa885843d73e3ebffe33f
-EBUILD talloc-2.1.0.ebuild 2155 SHA256 685bbcf39dd47adb28913ab67ebbb2a4505dab4fb16f5e279cb2f3764687f041 SHA512 43c5a53424030f9c0bff5a4dd08d6a2156a1a7b3954dc8047d1e4c165714e723d914552272d0f0d50a05b68581cc8d34141c40b531ece6fd7bc6c10d55b016cd WHIRLPOOL 8d353261359427f86232d9f7f1097b6c81b79eff538b6f886608420a580813017153c97047abb3b1dd0d84faadc313caac6f440990526a28d287ac01b9f6ab3a
-MISC ChangeLog 8494 SHA256 fca54597dc4d6e627110b42dee9fa0e1d315d6fe3654c5bca757cf097e1dbdcc SHA512 195d9cd9f25c2092b7ee761c0f35df5f604094f72e0c5845e98ae56a454795a5c878a0c94badbe028fb8200c8c805afb766a5917aadab28ceffa53d9fc34ca05 WHIRLPOOL 70ec4db59d4cdfdf5964652976a6ed75451ac0da18047dd2422caeb3cf6339e862d226fcdbd22d4bb70165cb99b8dc359988c4804954ed958dcaa68ec4afb162
+EBUILD talloc-2.1.0.ebuild 2008 SHA256 ed594868a24eca076e0babdde780e53a89881cda6cbb794cf07a09c2d96f2dee SHA512 4935b9166707bc83e1442f9915e0dd3d38851368679f0cbb9274e244528c0813c9b0e4153443404cb372e9a4e7be01cf85cf7cc08adf3ca5f48370d1ad01c25e WHIRLPOOL e8a329721a16839d314ff323abc46cb11905d5afd8589243b86a75e013835e5e84ea7400f045834e99b590320dd74b988ef49e6f4899c5941b074466ebfcd3fc
+MISC ChangeLog 8752 SHA256 f6f948bb0686096934ea27cc4f4168d5f18fdcac038e311cbfa896d3131cb3f7 SHA512 e8f51bcec0b30a480f166fa1c0bf7c9b9e3a102eb5b74f8744432634acb5f95317eba08254e4baab5a0ef3ce4b1b351cfade14171eb1a3a65e45562ff5f78206 WHIRLPOOL b6e4831d99dcff36d6b6e1713c22f4f5b0a78be4068375ff1def257f72c58310aef273eb0d94cb4a04a06c48d9a34c45ec3ba00632950cc916b410862da5e7d7
 MISC metadata.xml 341 SHA256 f12826bad0472c46c8bd1ee18e7ab0acdc4cf26dd8b1322b1a93ff7c95b14a7e SHA512 dd141022832b17bc47f40cc940c2165c849b5ad786df5cbba7685da4543a8969ed992fb9dda3a136d045418f6de731c83909f3d02fd3ad2dee4d0ab4689b0c44 WHIRLPOOL 1fff0d00542a6e5b3f64edb985e53fe978a9d91dde0b0118cf790dc113a1a3e3fd01632f2f19517af9b47fef51902de579e43c30eaedf3fa298230848cb125a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLtXqsACgkQKQaZ7OJe4zYL5wCgnxHUWGmDXo3S6mpUb+SQfAIs
-yq8AniVhA1sUTOKjNib4gRuCDofNIn68
-=zJ0p
+iEYEAREIAAYFAlLug9QACgkQKQaZ7OJe4zYfVwCfeUSSkffcLS62XPL8JUGllmvm
+QDoAnieN+YsT1AwIESrEJU9S2vEJ1YXO
+=aVUX
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/talloc/talloc-2.1.0.ebuild b/sys-libs/talloc/talloc-2.1.0.ebuild
index d9707129656c..2932ee9f4f48 100644
--- a/sys-libs/talloc/talloc-2.1.0.ebuild
+++ b/sys-libs/talloc/talloc-2.1.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v 1.3 2014/02/01 20:50:03 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v 1.4 2014/02/02 17:40:57 vostorga Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
 
-inherit waf-utils python-single-r1 multilib multilib-minimal
+inherit waf-utils python-single-r1 multilib
 
 DESCRIPTION="Samba talloc library"
 HOMEPAGE="http://talloc.samba.org/"
@@ -21,7 +21,6 @@ IUSE="compat +python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 )
 	!!<sys-libs/talloc-2.0.5"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
@@ -29,11 +28,7 @@ DEPEND="${RDEPEND}
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
+src_configure() {
 	local extra_opts=""
 
 	use compat && extra_opts+=" --enable-talloc-compat1"
@@ -42,7 +37,7 @@ multilib_src_configure() {
 		${extra_opts}
 }
 
-multilib_src_install() {
+src_install() {
 	waf-utils_src_install
 
 	# waf is stupid, and no, we can't fix the build-system, since it's provided