| 1 |
arfrever 10/05/02 16:41:20 |
| 2 |
|
| 3 |
Modified: python-2.4.6.ebuild python-2.5.4-r4.ebuild |
| 4 |
python-2.6.5-r2.ebuild |
| 5 |
Log: |
| 6 |
Synchronize ebuilds. |
| 7 |
(Portage version: HEAD/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.33 dev-lang/python/python-2.4.6.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.33&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.33&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?r1=1.32&r2=1.33 |
| 15 |
|
| 16 |
Index: python-2.4.6.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v |
| 19 |
retrieving revision 1.32 |
| 20 |
retrieving revision 1.33 |
| 21 |
diff -u -r1.32 -r1.33 |
| 22 |
--- python-2.4.6.ebuild 20 Mar 2010 20:33:28 -0000 1.32 |
| 23 |
+++ python-2.4.6.ebuild 2 May 2010 16:41:19 -0000 1.33 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 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.4.6.ebuild,v 1.32 2010/03/20 20:33:28 arfrever Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.33 2010/05/02 16:41:19 arfrever Exp $ |
| 29 |
|
| 30 |
EAPI="1" |
| 31 |
|
| 32 |
@@ -59,6 +59,9 @@ |
| 33 |
unpack ${A} |
| 34 |
cd "${S}" |
| 35 |
|
| 36 |
+ # Ensure that internal copy of expat is not used. |
| 37 |
+ rm -fr Modules/expat |
| 38 |
+ |
| 39 |
if tc-is-cross-compiler; then |
| 40 |
epatch "${FILESDIR}/python-2.4.4-test-cross.patch" |
| 41 |
else |
| 42 |
@@ -175,7 +178,7 @@ |
| 43 |
} |
| 44 |
|
| 45 |
src_test() { |
| 46 |
- # Tests won't work when cross compiling. |
| 47 |
+ # Tests will not work when cross compiling. |
| 48 |
if tc-is-cross-compiler; then |
| 49 |
elog "Disabling tests due to crosscompiling." |
| 50 |
return |
| 51 |
@@ -206,13 +209,15 @@ |
| 52 |
done |
| 53 |
|
| 54 |
elog "If you'd like to run them, you may:" |
| 55 |
- elog "cd $(python_get_libdir)/test" |
| 56 |
+ elog "cd '${EPREFIX}$(python_get_libdir)/test'" |
| 57 |
elog "and run the tests separately." |
| 58 |
|
| 59 |
python_disable_pyc |
| 60 |
} |
| 61 |
|
| 62 |
src_install() { |
| 63 |
+ [[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/" |
| 64 |
+ |
| 65 |
emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed" |
| 66 |
|
| 67 |
# Install our own custom python-config |
| 68 |
@@ -223,33 +228,35 @@ |
| 69 |
dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config-${SLOT} |
| 70 |
|
| 71 |
# Fix collisions between different slots of Python. |
| 72 |
- mv "${D}usr/bin/pydoc" "${D}usr/bin/pydoc${SLOT}" |
| 73 |
- mv "${D}usr/bin/idle" "${D}usr/bin/idle${SLOT}" |
| 74 |
- mv "${D}usr/share/man/man1/python.1" "${D}usr/share/man/man1/python${SLOT}.1" |
| 75 |
- rm -f "${D}usr/bin/smtpd.py" |
| 76 |
+ mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}" |
| 77 |
+ mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" |
| 78 |
+ mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1" |
| 79 |
+ rm -f "${ED}usr/bin/smtpd.py" |
| 80 |
|
| 81 |
# Fix the OPT variable so that it doesn't have any flags listed in it. |
| 82 |
# Prevents the problem with compiling things with conflicting flags later. |
| 83 |
- sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" |
| 84 |
+ sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${ED}$(python_get_libdir)/config/Makefile" |
| 85 |
|
| 86 |
# Python 2.4 partially doesn't respect $(get_libdir). |
| 87 |
if use build; then |
| 88 |
- rm -fr "${D}usr/bin/idle${SLOT}" "${D}"usr/lib*/python${SLOT}/{bsddb,idlelib,lib-tk,test} |
| 89 |
+ rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}"usr/lib*/python${SLOT}/{bsddb,idlelib,lib-tk,test} |
| 90 |
else |
| 91 |
- use elibc_uclibc && rm -fr "${D}"usr/lib*/python${SLOT}/{bsddb/test,test} |
| 92 |
- use berkdb || rm -fr "${D}"usr/lib*/python${SLOT}/{bsddb,test/test_bsddb*} |
| 93 |
- use tk || rm -fr "${D}usr/bin/idle${SLOT}" "${D}"usr/lib*/python${SLOT}/{idlelib,lib-tk} |
| 94 |
+ use elibc_uclibc && rm -fr "${ED}"usr/lib*/python${SLOT}/{bsddb/test,test} |
| 95 |
+ use berkdb || rm -fr "${ED}"usr/lib*/python${SLOT}/{bsddb,test/test_bsddb*} |
| 96 |
+ use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}"usr/lib*/python${SLOT}/{idlelib,lib-tk} |
| 97 |
fi |
| 98 |
|
| 99 |
prep_ml_includes $(python_get_includedir) |
| 100 |
|
| 101 |
+ dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" |
| 102 |
+ |
| 103 |
if use examples; then |
| 104 |
insinto /usr/share/doc/${PF}/examples |
| 105 |
doins -r "${S}/Tools" || die "doins failed" |
| 106 |
fi |
| 107 |
|
| 108 |
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} |
| 109 |
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} |
| 110 |
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" |
| 111 |
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" |
| 112 |
} |
| 113 |
|
| 114 |
pkg_preinst() { |
| 115 |
|
| 116 |
|
| 117 |
|
| 118 |
1.16 dev-lang/python/python-2.5.4-r4.ebuild |
| 119 |
|
| 120 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild?rev=1.16&view=markup |
| 121 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild?rev=1.16&content-type=text/plain |
| 122 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild?r1=1.15&r2=1.16 |
| 123 |
|
| 124 |
Index: python-2.5.4-r4.ebuild |
| 125 |
=================================================================== |
| 126 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v |
| 127 |
retrieving revision 1.15 |
| 128 |
retrieving revision 1.16 |
| 129 |
diff -u -r1.15 -r1.16 |
| 130 |
--- python-2.5.4-r4.ebuild 20 Mar 2010 20:33:28 -0000 1.15 |
| 131 |
+++ python-2.5.4-r4.ebuild 2 May 2010 16:41:19 -0000 1.16 |
| 132 |
@@ -1,6 +1,6 @@ |
| 133 |
# Copyright 1999-2010 Gentoo Foundation |
| 134 |
# Distributed under the terms of the GNU General Public License v2 |
| 135 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.15 2010/03/20 20:33:28 arfrever Exp $ |
| 136 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.16 2010/05/02 16:41:19 arfrever Exp $ |
| 137 |
|
| 138 |
EAPI="1" |
| 139 |
|
| 140 |
@@ -22,7 +22,7 @@ |
| 141 |
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" |
| 142 |
IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" |
| 143 |
|
| 144 |
-# NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes} |
| 145 |
+# NOTE: dev-python/{elementtree,celementtree,pysqlite} |
| 146 |
# do not conflict with the ones in python proper. - liquidx |
| 147 |
|
| 148 |
RDEPEND=">=app-admin/eselect-python-20091230 |
| 149 |
@@ -70,9 +70,10 @@ |
| 150 |
unpack ${A} |
| 151 |
cd "${S}" |
| 152 |
|
| 153 |
- # Ensure that internal copies of expat and libffi aren't used. |
| 154 |
+ # Ensure that internal copies of expat, libffi and zlib are not used. |
| 155 |
rm -fr Modules/expat |
| 156 |
rm -fr Modules/_ctypes/libffi* |
| 157 |
+ rm -fr Modules/zlib |
| 158 |
|
| 159 |
if tc-is-cross-compiler; then |
| 160 |
epatch "${FILESDIR}/python-2.5-cross-printf.patch" |
| 161 |
@@ -189,7 +190,7 @@ |
| 162 |
} |
| 163 |
|
| 164 |
src_test() { |
| 165 |
- # Tests won't work when cross compiling. |
| 166 |
+ # Tests will not work when cross compiling. |
| 167 |
if tc-is-cross-compiler; then |
| 168 |
elog "Disabling tests due to crosscompiling." |
| 169 |
return |
| 170 |
@@ -224,45 +225,49 @@ |
| 171 |
done |
| 172 |
|
| 173 |
elog "If you'd like to run them, you may:" |
| 174 |
- elog "cd $(python_get_libdir)/test" |
| 175 |
+ elog "cd '${EPREFIX}$(python_get_libdir)/test'" |
| 176 |
elog "and run the tests separately." |
| 177 |
|
| 178 |
python_disable_pyc |
| 179 |
} |
| 180 |
|
| 181 |
src_install() { |
| 182 |
+ [[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/" |
| 183 |
+ |
| 184 |
emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed" |
| 185 |
|
| 186 |
- mv "${D}usr/bin/python${SLOT}-config" "${D}usr/bin/python-config-${SLOT}" |
| 187 |
+ mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}" |
| 188 |
|
| 189 |
# Fix collisions between different slots of Python. |
| 190 |
- mv "${D}usr/bin/pydoc" "${D}usr/bin/pydoc${SLOT}" |
| 191 |
- mv "${D}usr/bin/idle" "${D}usr/bin/idle${SLOT}" |
| 192 |
- mv "${D}usr/share/man/man1/python.1" "${D}usr/share/man/man1/python${SLOT}.1" |
| 193 |
- rm -f "${D}usr/bin/smtpd.py" |
| 194 |
+ mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}" |
| 195 |
+ mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" |
| 196 |
+ mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1" |
| 197 |
+ rm -f "${ED}usr/bin/smtpd.py" |
| 198 |
|
| 199 |
# Fix the OPT variable so that it doesn't have any flags listed in it. |
| 200 |
# Prevents the problem with compiling things with conflicting flags later. |
| 201 |
- sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${D}$(python_get_libdir)/config/Makefile" |
| 202 |
+ sed -e "s:^OPT=.*:OPT=\t\t-DNDEBUG:" -i "${ED}$(python_get_libdir)/config/Makefile" |
| 203 |
|
| 204 |
if use build; then |
| 205 |
- rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test} |
| 206 |
+ rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test} |
| 207 |
else |
| 208 |
- use elibc_uclibc && rm -fr "${D}$(python_get_libdir)/"{bsddb/test,test} |
| 209 |
- use berkdb || rm -fr "${D}$(python_get_libdir)/"{bsddb,test/test_bsddb*} |
| 210 |
- use sqlite || rm -fr "${D}$(python_get_libdir)/"{sqlite3,test/test_sqlite*} |
| 211 |
- use tk || rm -fr "${D}usr/bin/idle${SLOT}" "${D}$(python_get_libdir)/"{idlelib,lib-tk} |
| 212 |
+ use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test} |
| 213 |
+ use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,test/test_bsddb*} |
| 214 |
+ use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*} |
| 215 |
+ use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk} |
| 216 |
fi |
| 217 |
|
| 218 |
prep_ml_includes $(python_get_includedir) |
| 219 |
|
| 220 |
+ dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" |
| 221 |
+ |
| 222 |
if use examples; then |
| 223 |
insinto /usr/share/doc/${PF}/examples |
| 224 |
doins -r "${S}/Tools" || die "doins failed" |
| 225 |
fi |
| 226 |
|
| 227 |
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} |
| 228 |
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} |
| 229 |
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" |
| 230 |
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" |
| 231 |
} |
| 232 |
|
| 233 |
pkg_preinst() { |
| 234 |
|
| 235 |
|
| 236 |
|
| 237 |
1.3 dev-lang/python/python-2.6.5-r2.ebuild |
| 238 |
|
| 239 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild?rev=1.3&view=markup |
| 240 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild?rev=1.3&content-type=text/plain |
| 241 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild?r1=1.2&r2=1.3 |
| 242 |
|
| 243 |
Index: python-2.6.5-r2.ebuild |
| 244 |
=================================================================== |
| 245 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v |
| 246 |
retrieving revision 1.2 |
| 247 |
retrieving revision 1.3 |
| 248 |
diff -u -r1.2 -r1.3 |
| 249 |
--- python-2.6.5-r2.ebuild 1 May 2010 22:25:51 -0000 1.2 |
| 250 |
+++ python-2.6.5-r2.ebuild 2 May 2010 16:41:19 -0000 1.3 |
| 251 |
@@ -1,6 +1,6 @@ |
| 252 |
# Copyright 1999-2010 Gentoo Foundation |
| 253 |
# Distributed under the terms of the GNU General Public License v2 |
| 254 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.2 2010/05/01 22:25:51 arfrever Exp $ |
| 255 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.3 2010/05/02 16:41:19 arfrever Exp $ |
| 256 |
|
| 257 |
EAPI="2" |
| 258 |
|
| 259 |
@@ -180,10 +180,6 @@ |
| 260 |
--with-system-ffi |
| 261 |
} |
| 262 |
|
| 263 |
-src_compile() { |
| 264 |
- emake EXTRA_CFLAGS="${CFLAGS}" || die "emake failed" |
| 265 |
-} |
| 266 |
- |
| 267 |
src_test() { |
| 268 |
# Tests will not work when cross compiling. |
| 269 |
if tc-is-cross-compiler; then |
| 270 |
@@ -219,7 +215,7 @@ |
| 271 |
done |
| 272 |
|
| 273 |
elog "If you would like to run them, you may:" |
| 274 |
- elog "cd ${EPREFIX}$(python_get_libdir)/test" |
| 275 |
+ elog "cd '${EPREFIX}$(python_get_libdir)/test'" |
| 276 |
elog "and run the tests separately." |
| 277 |
|
| 278 |
python_disable_pyc |
| 279 |
@@ -252,13 +248,15 @@ |
| 280 |
|
| 281 |
prep_ml_includes $(python_get_includedir) |
| 282 |
|
| 283 |
+ dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" |
| 284 |
+ |
| 285 |
if use examples; then |
| 286 |
insinto /usr/share/doc/${PF}/examples |
| 287 |
doins -r "${S}/Tools" || die "doins failed" |
| 288 |
fi |
| 289 |
|
| 290 |
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} |
| 291 |
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} |
| 292 |
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" |
| 293 |
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" |
| 294 |
|
| 295 |
# Do not install empty directory. |
| 296 |
rmdir "${ED}$(python_get_libdir)/lib-old" |
Archives