[gentoo-commits] gentoo-x86 commit in sys-libs/talloc: ChangeLog talloc-2.1.0.ebuild

[Victor Ostorga (vostorga)]

vostorga    14/02/02 17:40:57

  Modified:             ChangeLog talloc-2.1.0.ebuild
  Log:
  Reverting commit on talloc-2.1.0 , because emul-linux-x86-baselibs still provides talloc. Check bug #491222 for multilib patch
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xE25EE336)

Revision  Changes    Path
1.63                 sys-libs/talloc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/talloc/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/talloc/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/talloc/ChangeLog?r1=1.62&r2=1.63

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog	1 Feb 2014 20:50:03 -0000	1.62
+++ ChangeLog	2 Feb 2014 17:40:57 -0000	1.63
@@ -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@g.o> 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@g.o> talloc-2.1.0.ebuild:
   Adding multilib support, bug #491222 , patch thanks to Kenneth Graunke
   <kenneth@×××××××××.org>
 
@@ -119,32 +123,32 @@
   18 Dec 2011; Mike Gilbert <floppym@g.o> +talloc-2.0.1-r2.ebuild:
   Install missing SONAME symlink. Resolves bug 394787.
 
-  18 Oct 2011; Víctor Ostorga <vostorga@g.o> talloc-2.0.7.ebuild:
+  18 Oct 2011; Víctor Ostorga <vostorga@g.o> 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@g.o> +talloc-2.0.7.ebuild:
+  27 Sep 2011; Víctor Ostorga <vostorga@g.o> +talloc-2.0.7.ebuild:
   Version bump to 2.0.7
 
   27 Aug 2011; Fabian Groffen <grobian@g.o> 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@g.o>
+  17 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
   talloc-2.0.5.ebuild:
   keyword ~sparc-solaris
 
   07 Jul 2011; Alexis Ballier <aballier@g.o> talloc-2.0.5.ebuild:
   keyword ~x86-fbsd
 
-  02 Jun 2011; Víctor Ostorga <vostorga@g.o> talloc-2.0.5.ebuild:
+  02 Jun 2011; Víctor Ostorga <vostorga@g.o> talloc-2.0.5.ebuild:
   Adding dependency dev-lang/python[threads] bug 363071
 
   16 Mar 2011; Samuli Suominen <ssuominen@g.o> talloc-2.0.5.ebuild:
   Stop unnecessarily forcing Python 2.6.
 
-  15 Mar 2011; Víctor Ostorga <vostorga@g.o> talloc-2.0.5.ebuild:
+  15 Mar 2011; Víctor Ostorga <vostorga@g.o> 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@g.o> +talloc-2.0.5.ebuild:
+  13 Jan 2011; Tomáš Chvátal <scarabeus@g.o> +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@×××××.ru> for report.
 
-  05 Jun 2010; Raúl Porcel <armin76@g.o> talloc-2.0.1-r1.ebuild:
+  05 Jun 2010; Raúl Porcel <armin76@g.o> talloc-2.0.1-r1.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #300158
 
   19 May 2010; Jeroen Roovers <jer@g.o> 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@g.o> ChangeLog:
+  03 May 2010; Olivier Crête <tester@g.o> ChangeLog:
   amd64 stable, bug #300158
 
 *talloc-2.0.1-r1 (03 Apr 2010)
 
-  03 Apr 2010; Tiziano Müller <dev-zero@g.o>
+  03 Apr 2010; Tiziano Müller <dev-zero@g.o>
   +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@g.o> +talloc-2.0.1.ebuild:
   Bump
 
-  06 Dec 2009; Diego E. Pettenò <flameeyes@g.o>
+  06 Dec 2009; Diego E. Pettenò <flameeyes@g.o>
   talloc-2.0.0-r1.ebuild:
   Block older samba (to force uninstall).
 
-  30 Nov 2009; Raúl Porcel <armin76@g.o> talloc-2.0.0-r1.ebuild:
+  30 Nov 2009; Raúl Porcel <armin76@g.o> talloc-2.0.0-r1.ebuild:
   Add ~arm/~ia64/~s390/~sh/~sparc wrt #285952
 
   29 Nov 2009; Tobias Klausmann <klausman@g.o>
@@ -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@g.o> talloc-2.0.0.ebuild:
+  11 Oct 2009; Petteri Räty <betelgeuse@g.o> talloc-2.0.0.ebuild:
   Block <net-fs/samba-libs-3.4 for bug #288545.
 
   09 Oct 2009; Patrick Lauer <patrick@g.o> talloc-1.3.0.ebuild,



1.4                  sys-libs/talloc/talloc-2.1.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild?r1=1.3&r2=1.4

Index: talloc-2.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- talloc-2.1.0.ebuild	1 Feb 2014 20:50:03 -0000	1.3
+++ talloc-2.1.0.ebuild	2 Feb 2014 17:40:57 -0000	1.4
@@ -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 @@
 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 @@
 
 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 @@
 		${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