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

[Victor Ostorga (vostorga)]

vostorga    14/02/01 20:50:03

  Modified:             ChangeLog talloc-2.1.0.ebuild
  Log:
  Adding multilib support, bug #491222 , patch thanks to Kenneth Graunke <kenneth@×××××××××.org>
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xE25EE336)

Revision  Changes    Path
1.62                 sys-libs/talloc/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog	11 Dec 2013 02:03:57 -0000	1.61
+++ ChangeLog	1 Feb 2014 20:50:03 -0000	1.62
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/talloc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.61 2013/12/11 02:03:57 jmbsvicetto Exp $
+# 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 $
+
+  01 Feb 2014; Victor Ostorga talloc-2.1.0.ebuild:
+  Adding multilib support, bug #491222 , patch thanks to Kenneth Graunke
+  <kenneth@×××××××××.org>
 
   11 Dec 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
   talloc-2.0.8.ebuild, talloc-2.1.0.ebuild:



1.3                  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.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild?r1=1.2&r2=1.3

Index: talloc-2.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- talloc-2.1.0.ebuild	11 Dec 2013 02:03:57 -0000	1.2
+++ talloc-2.1.0.ebuild	1 Feb 2014 20:50:03 -0000	1.3
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.2 2013/12/11 02:03:57 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v 1.3 2014/02/01 20:50:03 vostorga Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
 
-inherit waf-utils python-single-r1 multilib
+inherit waf-utils python-single-r1 multilib multilib-minimal
 
 DESCRIPTION="Samba talloc library"
 HOMEPAGE="http://talloc.samba.org/"
@@ -21,6 +21,7 @@
 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
@@ -28,7 +29,11 @@
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
-src_configure() {
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
 	local extra_opts=""
 
 	use compat && extra_opts+=" --enable-talloc-compat1"
@@ -37,7 +42,7 @@
 		${extra_opts}
 }
 
-src_install() {
+multilib_src_install() {
 	waf-utils_src_install
 
 	# waf is stupid, and no, we can't fix the build-system, since it's provided