Restricting working python version to 2.x bug #360033 . Adding double blocker to previous tdb version #314611

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 25 insertions, 11 deletions

diff --git a/sys-libs/tdb/ChangeLog b/sys-libs/tdb/ChangeLog
index 9eea81b9ebf6..30fd726f9375 100644
--- a/sys-libs/tdb/ChangeLog
+++ b/sys-libs/tdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/tdb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.28 2011/01/18 21:16:58 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.29 2011/04/01 15:04:52 vostorga Exp $
+
+  01 Apr 2011; Víctor Ostorga <vostorga@gentoo.org> tdb-1.2.1.ebuild,
+  tdb-1.2.1-r1.ebuild:
+  Restricting working python version to 2.x bug #360033 . Adding double
+  blocker to previous tdb version #314611
 
 *tdb-1.2.7-r1 (18 Jan 2011)
 
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 41bafd16fa4b..d35e7b37b0bc 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,8 +1,8 @@
 DIST tdb-1.2.1.tar.gz 268142 RMD160 f24882257bb462edc10c8ef0da39d82ce847546c SHA1 9a3b2b87efb7b7b146b11ccd7d480239a19a30d2 SHA256 ef423b934c5ddfeddaa3d3b1567072b0d6f7243bbae5fd363a1b090b0573cdfa
 DIST tdb-1.2.7-patches.tar.gz 5559 RMD160 11426ae72f56fe13beb926612af7d17df2edf471 SHA1 c98cbc8c4d8918aa8c3a5a9377ee8bc29fd7ac20 SHA256 b57dc25ae52c460f15c2acd2e41e6c91c38d9a7b4d9b101001a16f49ffa409d1
 DIST tdb-1.2.7.tar.gz 447718 RMD160 3b42a1131d9c35214344f06369d43c1954585b41 SHA1 67fcc19961e6772d9fb9f8261b7cfcdc5b6a0504 SHA256 602f171ee900182ddfaae152b3f9db15e920e28f9dddbd61fce0c4678a91c10b
-EBUILD tdb-1.2.1-r1.ebuild 2164 RMD160 70ddec3d441a301d7de40a8fcf5f7e40a43d5443 SHA1 f23f5eb5c8e086a1e6c9e34953b0b5df200b0cda SHA256 c206df3a347bb0956ef74bd8fa452ea2492693d4c7e15727a2a63c94542ab7dd
-EBUILD tdb-1.2.1.ebuild 1871 RMD160 8f78b3f10419d34bac08738d38f88c98ab95ce18 SHA1 a21c9d85ece56d1a59398de7c94f104ad60d5ef9 SHA256 ceb23d55d0c57f2db9034af95c8593ddb8463147ccffec9c50cd5913f9a3419f
+EBUILD tdb-1.2.1-r1.ebuild 2237 RMD160 87496a2c07ef243649342c61187f255e82b4f4ef SHA1 e77dfb06e64385daea5df09ba3b52a5433c15337 SHA256 ad73471d2cc6ab87b6c68aec734ce58369965d57a6c9f56636390b85545c2bf4
+EBUILD tdb-1.2.1.ebuild 2089 RMD160 6c163b2e9f1b29c42e8b0e15d1f23b0f4455e744 SHA1 06f8ae6637a63c0d9c138ea70ad5ee53b62a34f6 SHA256 25a0612a763405e80da77314ad90962bfafb8e0c5cf57a089c8badb3129adc17
 EBUILD tdb-1.2.7-r1.ebuild 2348 RMD160 b37f683a27c59c0b2b10895d77129c96d79157ce SHA1 2f5730689be3b4ddbf73de562d5b527aed6a82f2 SHA256 14573c6294d8acea0b0bf88af2e727df796d3ca7e2d1dde7c672e5b31d6145c8
-MISC ChangeLog 3645 RMD160 52d9f9076d01bcad74c44b70a282553b86301bb8 SHA1 15cf941334b4049f8960328e579ca7d49c5d44fb SHA256 9bc268c22e0acefa6b8316a1a1941ceda13bd298b7f66c25d0d4f2f7324a4fb8
+MISC ChangeLog 3854 RMD160 c4d7c4ea6764853c62b2131623a373df33cdd55c SHA1 6674960b5d224f8b0ba80ca782cafe835b7e5ead SHA256 5aaa1df8552f8028f7834c695ab130056de20aa8caafcd93989b2f0134db372f
 MISC metadata.xml 362 RMD160 75a97802cc496bf98325a692bc1fc60212b042b3 SHA1 8302e25e34804c9b5c0b91e547cdd10ee62e156f SHA256 9488379e63418d03eb8f1dd6838c281d8a95413f11685a5427302ec9ad0c5cb5
diff --git a/sys-libs/tdb/tdb-1.2.1-r1.ebuild b/sys-libs/tdb/tdb-1.2.1-r1.ebuild
index d1421bad2881..4c81f1aa6c89 100644
--- a/sys-libs/tdb/tdb-1.2.1-r1.ebuild
+++ b/sys-libs/tdb/tdb-1.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.1-r1.ebuild,v 1.4 2010/12/29 21:36:14 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.1-r1.ebuild,v 1.5 2011/04/01 15:04:52 vostorga Exp $
 
 EAPI="2"
-PYTHON_DEPEND="python? 2"
+PYTHON_DEPEND="python? 2:2.6"
 
 inherit autotools python
 
@@ -22,6 +22,7 @@ DEPEND="!<net-fs/samba-3.3
 
 pkg_setup() {
 	if use python; then
+		# Make sure the build system will use the right python bug #360033
 		python_set_active_version 2
 		python_pkg_setup
 	fi
diff --git a/sys-libs/tdb/tdb-1.2.1.ebuild b/sys-libs/tdb/tdb-1.2.1.ebuild
index bd84627abb42..e8b81cdb9a0d 100644
--- a/sys-libs/tdb/tdb-1.2.1.ebuild
+++ b/sys-libs/tdb/tdb-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.1.ebuild,v 1.8 2010/08/12 01:14:43 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.1.ebuild,v 1.9 2011/04/01 15:04:52 vostorga Exp $
 
 EAPI="2"
-
+PYTHON_DEPEND="python? 2:2.6"
 inherit autotools python
 
 DESCRIPTION="Samba tdb"
@@ -14,13 +14,21 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="python static-libs tools tdbtest"
 
-RDEPEND=""
+RDEPEND="!!<sys-libs/tdb-1.2.1"
 DEPEND="python? ( dev-lang/python )
 	!<net-fs/samba-libs-3.4
 	!<net-fs/samba-3.3
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt"
 
+pkg_setup() {
+	if use python; then
+		# Make sure the build system will use the right python bug #360033
+	    python_set_active_version 2
+	    python_pkg_setup
+	fi
+}
+
 src_prepare() {
 	eautoconf -Ilibreplace
 	sed -i \