| 1 |
hawking 08/06/20 15:13:49 |
| 2 |
|
| 3 |
Modified: ChangeLog python-2.5.2-r4.ebuild |
| 4 |
Log: |
| 5 |
Fix bsddb dependency, bug 223133. Cosmetics |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r1 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.324 dev-lang/python/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.324&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.324&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?r1=1.323&r2=1.324 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v |
| 18 |
retrieving revision 1.323 |
| 19 |
retrieving revision 1.324 |
| 20 |
diff -u -r1.323 -r1.324 |
| 21 |
--- ChangeLog 29 May 2008 21:29:02 -0000 1.323 |
| 22 |
+++ ChangeLog 20 Jun 2008 15:13:49 -0000 1.324 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for dev-lang/python |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.323 2008/05/29 21:29:02 hawking Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.324 2008/06/20 15:13:49 hawking Exp $ |
| 28 |
+ |
| 29 |
+ 20 Jun 2008; Ali Polatel <hawking@g.o> python-2.5.2-r4.ebuild: |
| 30 |
+ Fix bsddb dependency, bug 223133. Cosmetics |
| 31 |
|
| 32 |
29 May 2008; Ali Polatel <hawking@g.o> python-2.3.5-r2.ebuild, |
| 33 |
python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r3.ebuild, |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.5 dev-lang/python/python-2.5.2-r4.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.2-r4.ebuild?rev=1.5&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.2-r4.ebuild?rev=1.5&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.2-r4.ebuild?r1=1.4&r2=1.5 |
| 42 |
|
| 43 |
Index: python-2.5.2-r4.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r4.ebuild,v |
| 46 |
retrieving revision 1.4 |
| 47 |
retrieving revision 1.5 |
| 48 |
diff -u -r1.4 -r1.5 |
| 49 |
--- python-2.5.2-r4.ebuild 29 May 2008 21:29:02 -0000 1.4 |
| 50 |
+++ python-2.5.2-r4.ebuild 20 Jun 2008 15:13:49 -0000 1.5 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2008 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r4.ebuild,v 1.4 2008/05/29 21:29:02 hawking Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r4.ebuild,v 1.5 2008/06/20 15:13:49 hawking Exp $ |
| 56 |
|
| 57 |
# NOTE about python-portage interactions : |
| 58 |
# - Do not add a pkg_setup() check for a certain version of portage |
| 59 |
@@ -38,7 +38,8 @@ |
| 60 |
tk? ( >=dev-lang/tk-8.0 ) |
| 61 |
ncurses? ( >=sys-libs/ncurses-5.2 |
| 62 |
readline? ( >=sys-libs/readline-4.1 ) ) |
| 63 |
- berkdb? ( >=sys-libs/db-3.1 ) |
| 64 |
+ berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 |
| 65 |
+ sys-libs/db:4.2 ) ) |
| 66 |
gdbm? ( sys-libs/gdbm ) |
| 67 |
ssl? ( dev-libs/openssl ) |
| 68 |
doc? ( dev-python/python-docs:2.5 ) |
| 69 |
@@ -91,27 +92,20 @@ |
| 70 |
export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter _sqlite3" |
| 71 |
export PYTHON_DISABLE_SSL=1 |
| 72 |
else |
| 73 |
- # dbm module can link to berkdb or gdbm -- defaults to gdbm when |
| 74 |
- # both are enabled, see #204343 |
| 75 |
- use berkdb || use gdbm \ |
| 76 |
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm" |
| 77 |
- use gdbm \ |
| 78 |
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm" |
| 79 |
- use berkdb \ |
| 80 |
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} bsddb" |
| 81 |
- use readline \ |
| 82 |
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline" |
| 83 |
- use tk \ |
| 84 |
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter" |
| 85 |
- use ncurses \ |
| 86 |
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel" |
| 87 |
- use sqlite \ |
| 88 |
- || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _sqlite3" |
| 89 |
- use ssl \ |
| 90 |
- || export PYTHON_DISABLE_SSL=1 |
| 91 |
- export PYTHON_DISABLE_MODULES |
| 92 |
- echo $PYTHON_DISABLE_MODULES |
| 93 |
+ # dbm module can link to berkdb or gdbm |
| 94 |
+ # defaults to gdbm when both are enabled, #204343 |
| 95 |
+ local disable |
| 96 |
+ use berkdb || use gdbm || disable="${disable} dbm" |
| 97 |
+ use berkdb || disable="${disable} bsddb" |
| 98 |
+ use gdbm || disable="${disable} gdbm" |
| 99 |
+ use ncurses || disable="${disable} _curses _curses_panel" |
| 100 |
+ use readline || disable="${disable} readline" |
| 101 |
+ use sqlite || disable="${disable} sqlite3" |
| 102 |
+ use ssl || export PYTHON_DISABLE_SSL=1 |
| 103 |
+ use tk || disable="${disable} _tkinter" |
| 104 |
+ export PYTHON_DISABLE_MODULES="${disable}" |
| 105 |
fi |
| 106 |
+ einfo "Disabled modules: $PYTHON_DISABLE_MODULES" |
| 107 |
} |
| 108 |
|
| 109 |
src_compile() { |
| 110 |
|
| 111 |
|
| 112 |
|
| 113 |
-- |
| 114 |
gentoo-commits@l.g.o mailing list |
Archives