| 1 |
arfrever 09/08/25 01:27:00 |
| 2 |
|
| 3 |
Modified: python-2.6.2-r1.ebuild ChangeLog |
| 4 |
python-3.1.1.ebuild |
| 5 |
Log: |
| 6 |
Fix building of Python 2.6.2-r1 with USE=-threads (bug #282518). Fix building with USE=build or USE=-xml (bug #282259). Small updates. |
| 7 |
(Portage version: 14154-svn/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 dev-lang/python/python-2.6.2-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r1.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r1.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.2-r1.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: python-2.6.2-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r1.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- python-2.6.2-r1.ebuild 21 Aug 2009 01:53:28 -0000 1.7 |
| 23 |
+++ python-2.6.2-r1.ebuild 25 Aug 2009 01:26:59 -0000 1.8 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2009 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r1.ebuild,v 1.7 2009/08/21 01:53:28 arfrever Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r1.ebuild,v 1.8 2009/08/25 01:26:59 arfrever Exp $ |
| 29 |
|
| 30 |
# NOTE about python-portage interactions : |
| 31 |
# - Do not add a pkg_setup() check for a certain version of portage |
| 32 |
@@ -19,7 +19,7 @@ |
| 33 |
MY_P="Python-${PV}" |
| 34 |
S="${WORKDIR}/${MY_P}" |
| 35 |
|
| 36 |
-PATCHSET_REVISION="2" |
| 37 |
+PATCHSET_REVISION="3" |
| 38 |
|
| 39 |
DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." |
| 40 |
HOMEPAGE="http://www.python.org/" |
| 41 |
@@ -94,7 +94,7 @@ |
| 42 |
src_configure() { |
| 43 |
# Disable extraneous modules with extra dependencies. |
| 44 |
if use build; then |
| 45 |
- export PYTHON_DISABLE_MODULES="dbm bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter pyexpat" |
| 46 |
+ export PYTHON_DISABLE_MODULES="dbm bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" |
| 47 |
export PYTHON_DISABLE_SSL="1" |
| 48 |
else |
| 49 |
# dbm module can be linked against berkdb or gdbm. |
| 50 |
@@ -108,7 +108,7 @@ |
| 51 |
use sqlite || disable+=" _sqlite3" |
| 52 |
use ssl || export PYTHON_DISABLE_SSL="1" |
| 53 |
use tk || disable+=" _tkinter" |
| 54 |
- use xml || disable+=" pyexpat" |
| 55 |
+ use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. |
| 56 |
export PYTHON_DISABLE_MODULES="${disable}" |
| 57 |
|
| 58 |
if ! use xml; then |
| 59 |
@@ -235,14 +235,15 @@ |
| 60 |
sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile" |
| 61 |
|
| 62 |
if use build; then |
| 63 |
- rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb/test,email,encodings,lib-tk,test} |
| 64 |
+ rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,email,encodings,lib-tk,sqlite3,test} |
| 65 |
else |
| 66 |
use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb/test,test} |
| 67 |
- use berkdb || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/bsddb" |
| 68 |
+ use berkdb || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,test/test_bsddb*} |
| 69 |
+ use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite*} |
| 70 |
use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/lib-tk" |
| 71 |
fi |
| 72 |
|
| 73 |
- use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite.py*} |
| 74 |
+ use threads || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/multiprocessing" |
| 75 |
|
| 76 |
prep_ml_includes usr/include/python${PYVER} |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.405 dev-lang/python/ChangeLog |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.405&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.405&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?r1=1.404&r2=1.405 |
| 86 |
|
| 87 |
Index: ChangeLog |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v |
| 90 |
retrieving revision 1.404 |
| 91 |
retrieving revision 1.405 |
| 92 |
diff -u -r1.404 -r1.405 |
| 93 |
--- ChangeLog 21 Aug 2009 01:53:28 -0000 1.404 |
| 94 |
+++ ChangeLog 25 Aug 2009 01:26:59 -0000 1.405 |
| 95 |
@@ -1,6 +1,11 @@ |
| 96 |
# ChangeLog for dev-lang/python |
| 97 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.404 2009/08/21 01:53:28 arfrever Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.405 2009/08/25 01:26:59 arfrever Exp $ |
| 100 |
+ |
| 101 |
+ 25 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 102 |
+ python-2.6.2-r1.ebuild, python-3.1.1.ebuild: |
| 103 |
+ Fix building of Python 2.6.2-r1 with USE=-threads (bug #282518). Fix |
| 104 |
+ building with USE=build or USE=-xml (bug #282259). Small updates. |
| 105 |
|
| 106 |
21 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 107 |
python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild, python-3.1.1.ebuild: |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
1.4 dev-lang/python/python-3.1.1.ebuild |
| 112 |
|
| 113 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1.ebuild?rev=1.4&view=markup |
| 114 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1.ebuild?rev=1.4&content-type=text/plain |
| 115 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-3.1.1.ebuild?r1=1.3&r2=1.4 |
| 116 |
|
| 117 |
Index: python-3.1.1.ebuild |
| 118 |
=================================================================== |
| 119 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1.ebuild,v |
| 120 |
retrieving revision 1.3 |
| 121 |
retrieving revision 1.4 |
| 122 |
diff -u -r1.3 -r1.4 |
| 123 |
--- python-3.1.1.ebuild 21 Aug 2009 01:53:29 -0000 1.3 |
| 124 |
+++ python-3.1.1.ebuild 25 Aug 2009 01:27:00 -0000 1.4 |
| 125 |
@@ -1,6 +1,6 @@ |
| 126 |
# Copyright 1999-2009 Gentoo Foundation |
| 127 |
# Distributed under the terms of the GNU General Public License v2 |
| 128 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1.ebuild,v 1.3 2009/08/21 01:53:29 arfrever Exp $ |
| 129 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1.ebuild,v 1.4 2009/08/25 01:27:00 arfrever Exp $ |
| 130 |
|
| 131 |
EAPI="2" |
| 132 |
|
| 133 |
@@ -81,7 +81,7 @@ |
| 134 |
src_configure() { |
| 135 |
# Disable extraneous modules with extra dependencies. |
| 136 |
if use build; then |
| 137 |
- export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter pyexpat" |
| 138 |
+ export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" |
| 139 |
export PYTHON_DISABLE_SSL="1" |
| 140 |
else |
| 141 |
local disable |
| 142 |
@@ -91,7 +91,7 @@ |
| 143 |
use sqlite || disable+=" _sqlite3" |
| 144 |
use ssl || export PYTHON_DISABLE_SSL="1" |
| 145 |
use tk || disable+=" _tkinter" |
| 146 |
- use xml || disable+=" pyexpat" |
| 147 |
+ use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. |
| 148 |
export PYTHON_DISABLE_MODULES="${disable}" |
| 149 |
|
| 150 |
if ! use xml; then |
| 151 |
@@ -219,13 +219,14 @@ |
| 152 |
sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile" |
| 153 |
|
| 154 |
if use build; then |
| 155 |
- rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{email,encodings,test,tkinter} |
| 156 |
+ rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{email,encodings,sqlite3,test,tkinter} |
| 157 |
else |
| 158 |
use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/test" |
| 159 |
- use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{tkinter,test/test_tk.py*} |
| 160 |
+ use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite*} |
| 161 |
+ use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{tkinter,test/test_tk*} |
| 162 |
fi |
| 163 |
|
| 164 |
- use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite.py*} |
| 165 |
+ use threads || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/multiprocessing" |
| 166 |
|
| 167 |
prep_ml_includes usr/include/python${PYVER} |
Archives