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

["Victor Ostorga (vostorga)" <vostorga@gentoo.org>]

vostorga    11/03/15 20:46:11

  Modified:             ChangeLog talloc-2.0.5.ebuild
  Log:
  Fixing collision with /usr/lib/libtalloc.so.2 bug #351608 setting python 2.6 as runtime python bug #354587 #357269
  
  (Portage version: 2.1.9.25/cvs/Linux i686)

Revision  Changes    Path
1.22                 sys-libs/talloc/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog	1 Mar 2011 23:03:58 -0000	1.21
+++ ChangeLog	15 Mar 2011 20:46:10 -0000	1.22
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/talloc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.21 2011/03/01 23:03:58 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.22 2011/03/15 20:46:10 vostorga Exp $
+
+  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
 
   01 Mar 2011; Jonathan Callen <abcd@gentoo.org> talloc-2.0.5.ebuild:
   Add ~amd64-linux/~x86-linux keywords



1.3                  sys-libs/talloc/talloc-2.0.5.ebuild

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

Index: talloc-2.0.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.5.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- talloc-2.0.5.ebuild	1 Mar 2011 23:03:58 -0000	1.2
+++ talloc-2.0.5.ebuild	15 Mar 2011 20:46:10 -0000	1.3
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.5.ebuild,v 1.2 2011/03/01 23:03:58 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.5.ebuild,v 1.3 2011/03/15 20:46:10 vostorga Exp $
 
 EAPI=3
-
-inherit waf-utils
+PYTHON_DEPEND="2::2.6"
+inherit waf-utils python
 
 DESCRIPTION="Samba talloc library"
 HOMEPAGE="http://talloc.samba.org/"
@@ -15,12 +15,17 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="compat python"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-libs/libxslt"
+RDEPEND="!!<sys-libs/talloc-2.0.5"
+DEPEND="dev-libs/libxslt"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
+pkg_setup() {
+	# Make sure the build system will use the right python
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_configure() {
 	local extra_opts=""