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

1 files changed, 18 insertions, 14 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,