| 1 |
vostorga 11/04/01 15:04:52 |
| 2 |
|
| 3 |
Modified: tdb-1.2.1-r1.ebuild ChangeLog tdb-1.2.1.ebuild |
| 4 |
Log: |
| 5 |
Restricting working python version to 2.x bug #360033 . Adding double blocker to previous tdb version #314611 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.42/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 sys-libs/tdb/tdb-1.2.1-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/tdb/tdb-1.2.1-r1.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/tdb/tdb-1.2.1-r1.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/tdb/tdb-1.2.1-r1.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: tdb-1.2.1-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.1-r1.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- tdb-1.2.1-r1.ebuild 29 Dec 2010 21:36:14 -0000 1.4 |
| 23 |
+++ tdb-1.2.1-r1.ebuild 1 Apr 2011 15:04:52 -0000 1.5 |
| 24 |
@@ -1,9 +1,9 @@ |
| 25 |
-# Copyright 1999-2010 Gentoo Foundation |
| 26 |
+# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI="2" |
| 32 |
-PYTHON_DEPEND="python? 2" |
| 33 |
+PYTHON_DEPEND="python? 2:2.6" |
| 34 |
|
| 35 |
inherit autotools python |
| 36 |
|
| 37 |
@@ -22,6 +22,7 @@ |
| 38 |
|
| 39 |
pkg_setup() { |
| 40 |
if use python; then |
| 41 |
+ # Make sure the build system will use the right python bug #360033 |
| 42 |
python_set_active_version 2 |
| 43 |
python_pkg_setup |
| 44 |
fi |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.29 sys-libs/tdb/ChangeLog |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/tdb/ChangeLog?rev=1.29&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/tdb/ChangeLog?rev=1.29&content-type=text/plain |
| 52 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/tdb/ChangeLog?r1=1.28&r2=1.29 |
| 53 |
|
| 54 |
Index: ChangeLog |
| 55 |
=================================================================== |
| 56 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v |
| 57 |
retrieving revision 1.28 |
| 58 |
retrieving revision 1.29 |
| 59 |
diff -u -r1.28 -r1.29 |
| 60 |
--- ChangeLog 18 Jan 2011 21:16:58 -0000 1.28 |
| 61 |
+++ ChangeLog 1 Apr 2011 15:04:52 -0000 1.29 |
| 62 |
@@ -1,6 +1,11 @@ |
| 63 |
# ChangeLog for sys-libs/tdb |
| 64 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 65 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.28 2011/01/18 21:16:58 vostorga Exp $ |
| 66 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.29 2011/04/01 15:04:52 vostorga Exp $ |
| 67 |
+ |
| 68 |
+ 01 Apr 2011; Víctor Ostorga <vostorga@g.o> tdb-1.2.1.ebuild, |
| 69 |
+ tdb-1.2.1-r1.ebuild: |
| 70 |
+ Restricting working python version to 2.x bug #360033 . Adding double |
| 71 |
+ blocker to previous tdb version #314611 |
| 72 |
|
| 73 |
*tdb-1.2.7-r1 (18 Jan 2011) |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.9 sys-libs/tdb/tdb-1.2.1.ebuild |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/tdb/tdb-1.2.1.ebuild?rev=1.9&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/tdb/tdb-1.2.1.ebuild?rev=1.9&content-type=text/plain |
| 82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/tdb/tdb-1.2.1.ebuild?r1=1.8&r2=1.9 |
| 83 |
|
| 84 |
Index: tdb-1.2.1.ebuild |
| 85 |
=================================================================== |
| 86 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.1.ebuild,v |
| 87 |
retrieving revision 1.8 |
| 88 |
retrieving revision 1.9 |
| 89 |
diff -u -r1.8 -r1.9 |
| 90 |
--- tdb-1.2.1.ebuild 12 Aug 2010 01:14:43 -0000 1.8 |
| 91 |
+++ tdb-1.2.1.ebuild 1 Apr 2011 15:04:52 -0000 1.9 |
| 92 |
@@ -1,9 +1,9 @@ |
| 93 |
-# Copyright 1999-2010 Gentoo Foundation |
| 94 |
+# Copyright 1999-2011 Gentoo Foundation |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.1.ebuild,v 1.8 2010/08/12 01:14:43 josejx Exp $ |
| 97 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.1.ebuild,v 1.9 2011/04/01 15:04:52 vostorga Exp $ |
| 98 |
|
| 99 |
EAPI="2" |
| 100 |
- |
| 101 |
+PYTHON_DEPEND="python? 2:2.6" |
| 102 |
inherit autotools python |
| 103 |
|
| 104 |
DESCRIPTION="Samba tdb" |
| 105 |
@@ -14,13 +14,21 @@ |
| 106 |
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" |
| 107 |
IUSE="python static-libs tools tdbtest" |
| 108 |
|
| 109 |
-RDEPEND="" |
| 110 |
+RDEPEND="!!<sys-libs/tdb-1.2.1" |
| 111 |
DEPEND="python? ( dev-lang/python ) |
| 112 |
!<net-fs/samba-libs-3.4 |
| 113 |
!<net-fs/samba-3.3 |
| 114 |
app-text/docbook-xsl-stylesheets |
| 115 |
dev-libs/libxslt" |
| 116 |
|
| 117 |
+pkg_setup() { |
| 118 |
+ if use python; then |
| 119 |
+ # Make sure the build system will use the right python bug #360033 |
| 120 |
+ python_set_active_version 2 |
| 121 |
+ python_pkg_setup |
| 122 |
+ fi |
| 123 |
+} |
| 124 |
+ |
| 125 |
src_prepare() { |
| 126 |
eautoconf -Ilibreplace |
| 127 |
sed -i \ |
Archives