diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-24 02:51:55 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-24 02:51:55 +0000 |
commit | ed32ca7a3b3ac35a2a8a8a9d242456b9f3c60ce4 (patch) | |
tree | f92473da2d63bfe662e73a966ee8a67c36277dd7 | |
parent | stable amd64, bug 270826 (diff) | |
download | historical-ed32ca7a3b3ac35a2a8a8a9d242456b9f3c60ce4.tar.gz historical-ed32ca7a3b3ac35a2a8a8a9d242456b9f3c60ce4.tar.bz2 historical-ed32ca7a3b3ac35a2a8a8a9d242456b9f3c60ce4.zip |
Version bump (bug #252317).
Package-Manager: portage-13625-svn/cvs/Linux x86_64
-rw-r--r-- | dev-lang/python/ChangeLog | 8 | ||||
-rw-r--r-- | dev-lang/python/Manifest | 5 | ||||
-rw-r--r-- | dev-lang/python/python-2.4.6.ebuild | 311 |
3 files changed, 322 insertions, 2 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 9adfec9cbdea..521ec1508d55 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/python # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.377 2009/04/24 14:17:23 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.378 2009/05/24 02:51:55 arfrever Exp $ + +*python-2.4.6 (24 May 2009) + + 24 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + +python-2.4.6.ebuild: + Version bump (bug #252317). 24 Apr 2009; Raúl Porcel <armin76@gentoo.org> python-2.5.4-r2.ebuild: arm/ia64/m68k/s390/sh/sparc stable wrt #265790 diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index afeacf20a9ac..11a6b98e15ab 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -16,6 +16,7 @@ AUX python-config-2.4-r1 1624 RMD160 e4e6893c9e8414289c0c70c0f4be58835911e376 SH AUX python-updater 8777 RMD160 f177c5ae1f1d5dabffd9c52da10704999284af0c SHA1 91719ec53bd5e128042fedaed68d40fcb4abd65b SHA256 25d24778518f33e24e735e2319b1f6aa6a94137afe30b55cfeb974a74cf3873a AUX python-updater-r1 8785 RMD160 a395283fc17565fc9bc68e59928c74aafe3f19e5 SHA1 6d6f2d44bf20a528693d017b99f45541ae535bf5 SHA256 850bce6c25b33fbc05da98387bf7bd8652d4d6af4c8a7c11b4956e26a84a86b6 DIST Python-2.4.4.tar.bz2 8158073 RMD160 4c7b5b70178fe69881b62201ef0bab55037d8708 SHA1 9e0971f93df8acbd947378d0d16a32fcc8897ba2 SHA256 325fdc7351a08bd8d811e7fb53c41bff11764648ab1a671abd910afec946b38a +DIST Python-2.4.6.tar.bz2 8154677 RMD160 0687989193dec2ac108142759281be7ddcf7f31e SHA1 cb1972a554a458f6a26d3e047b359251865d7c96 SHA256 da104139ad3f4534482942ac02cf8f8ed9badd370ffa14f06b07c44914423e08 DIST Python-2.5.2.tar.bz2 9807597 RMD160 b23b02739833e6730799c5866e2b77aae884b63f SHA1 4755d212f50af704c20224a6966e23acc5aea60f SHA256 f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e DIST Python-2.5.4.tar.bz2 9821313 RMD160 3a76c83464c3b1c38a60351ab054e33ac7195663 SHA1 0f2e819d6381f72f26c734e00a6780b3933ea404 SHA256 bc8d896a2bfe5523ba93b8d89b71017b74e8e6cb21dc676a0ccff668c8780110 DIST Python-2.6.1.tar.bz2 10960385 RMD160 497dafaca9c150fca611b0175eeb13c2fc4d3e2d SHA1 419f0cb29e9713ea861dde8c43d107c51329e57b SHA256 cf153f10ba6312a8303ceb01bed834a2786d28aa89c7d73dba64714f691628f6 @@ -25,6 +26,7 @@ DIST python-gentoo-patches-2.4.4-r11.tar.bz2 22397 RMD160 d805a16f1e719c06f0d9b8 DIST python-gentoo-patches-2.4.4-r12.tar.bz2 22595 RMD160 ec9a60d0ddaa1ad5e971d6d57d672f61e41611ca SHA1 b27188459902e055c79a59f16aea9803fb5e5a8c SHA256 267bebdcdb9446b4943c6a745cf437ff585ca8fac0c2706ab16ef8175029cc23 DIST python-gentoo-patches-2.4.4-r3.tar.bz2 8348 RMD160 e9b59a7cd1469668d43a41d396d7a275bef78270 SHA1 16373b922895d1c14ccfa9d6b39079f2d5a2bcb6 SHA256 1c81397312136625fc220db660f701d4eccbde75e74bb40a0d77015b4d5d4f9f DIST python-gentoo-patches-2.4.4-r4.tar.bz2 9569 RMD160 2e618e2bf8d0d9d1e722f60b6b781af8906b1750 SHA1 f2253df5b52350fdfbd06054597814d705c088c5 SHA256 a5e9783a4ad57c60f91e3f943f4ff60dcb9b2eb64aa9226598bff9658473781e +DIST python-gentoo-patches-2.4.6.tar.bz2 10983 RMD160 c06dc76edec86d708a0c0e37126ae50f49f61bd3 SHA1 bbc04083fe74cff8c723c5c3cab70b1b814c987f SHA256 0508a66408f218c655823303833599344d2edeec1ffc683c6ada3fc33731590d DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d142a3f3454de46bc55 SHA1 b64fc90f331e42ea2c364fd61d13b515300fdcbf SHA256 8afff4ed12c3c5ca4418da657617317a8c646a69ae341a3d494747659825355f DIST python-gentoo-patches-2.5.2-r8.tar.bz2 28376 RMD160 c4e02a5ed947b253781ec11fd9f5f26498e41c81 SHA1 92e359402e7b6751b28671e19ad7ea0736b62614 SHA256 c008abb01c40057facf3d7fa8ad3a31e792f1b7d41bba96e0084e7476e05a0e3 DIST python-gentoo-patches-2.5.4.tar.bz2 19474 RMD160 00bb0918414db251b11b7f19a9f8a112c9e49fbd SHA1 fd4955f7da3049abecc4df0e203e783a90390cf8 SHA256 6e050dd8e8a90655bf935af99ad1ae6456bc072f075ddb9bcd532201bbb37274 @@ -34,11 +36,12 @@ EBUILD python-2.4.4-r14.ebuild 10746 RMD160 4c5e1215ad1756eeab64bbe52ef88ffdcb04 EBUILD python-2.4.4-r15.ebuild 10743 RMD160 1df6ba576dfd3b0a5eb25b5b29a0dbedf53c483e SHA1 8c43ac03cdbbf6e91b7a9e7eec766cbf4f2f59ae SHA256 1a4515d15197601c56f27a0f9b4d206dff67ed8a02472b5c046dd04e6977a24a EBUILD python-2.4.4-r5.ebuild 10577 RMD160 9beeae06b88a2fb12d55a8a3e40e0444b4d7c382 SHA1 91c46a25e45ef7d87c69426cfeee1f4b4ac28287 SHA256 cf164d816a56fdc6ebd9f4482a03cc574e1c7429f4cab4a2002796d678576899 EBUILD python-2.4.4-r6.ebuild 10578 RMD160 1ae5c7e5c2130c5822de6923211c0507605d2d0b SHA1 b74df8d15b3ae97a38e961abb59720e5bb492795 SHA256 f3f0c49db7b629fa16b4cf27b7ab999e049209ff9b71df8982586dce76530b3b +EBUILD python-2.4.6.ebuild 9926 RMD160 a2c4787388c5496d4699e9b3e3323846e850cf0f SHA1 97dbcf513f411c1f381da1cd5714e4eadbc212bf SHA256 7fc80f51940c8c82c1b6d21f8b5f0b0c285d1adf50a85c09bf8c8bdfd8551c42 EBUILD python-2.5.2-r7.ebuild 10669 RMD160 b155d1db61f9bbf21195358d4bf924a77847e2d9 SHA1 49d5a793399e3e1164a23ca391332badd9dcc7ab SHA256 8218d47daf2414fc210063c15e32fb3c0e007f9532dfdb1f2c1cb186fe1e0411 EBUILD python-2.5.2-r8.ebuild 10797 RMD160 8f30ee723f9371f4fe228a188248d6aa8140ab5c SHA1 b29df521b889c292f8eebcab767997f452252c7e SHA256 4949ecd970eee3531969e0d13c3c8eb2b2dfbf73e9a8e86bd7d1449ea83b99c7 EBUILD python-2.5.4-r2.ebuild 10691 RMD160 01893e25086cbbcbac9d5aecf2fab2d887a42b2b SHA1 3a99dfdacf14dd215d3415d5174e85a82b14f1c0 SHA256 6c220c17509b37b3651000ef05e2c4513b5f0ffd78080d9963c7255c696a35df EBUILD python-2.6-r5.ebuild 8673 RMD160 a31253b0e9d63b26efddca049735d4f6c397e278 SHA1 7eacac6e7bddec1cd006a7325786017b2f96c055 SHA256 f0af14b61269f6e107b8ace0d4bc6e4a45a9d11db7ad1ffb23b0e939c9e2621f EBUILD python-2.6.1-r1.ebuild 8892 RMD160 2bcba3f34cd70c0c437b1aab1a9467460e5fcbd6 SHA1 b0eb25add1739c64fc8ccee9336d5b57648a54d7 SHA256 ec9be9ecf92198948ab745af808da55af1dee935d7e79813a7d73004f1ae6a3d EBUILD python-2.6.2.ebuild 8434 RMD160 5316ce9620302704cbe61059a192d22e1f2ad7c5 SHA1 7be851d906745eea0c9b3dc5f86767151aea2b1a SHA256 221d09d6a988ce01158aa53d7d04ff37462f1341b8dfe0d7ad39f1a1bc64ecc5 -MISC ChangeLog 66983 RMD160 f6d771574a711ab6e0aec059372975027ca47801 SHA1 575b3f24653e0294ff55472cc56b7bce918aa340 SHA256 165ca18fb247eb998bb59daace26e84380bdeb04908cb5fa1d08b18cbfc49448 +MISC ChangeLog 67141 RMD160 5127cbef76be446cd660c83e7bef8278c43a14b4 SHA1 f94a321bbd8b6b8c10c1a4ce230b0afe18a301e0 SHA256 869367098877879a1779ded25fdd6030c1066e39333e5cdb4ca6ad46fe28ae1c MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild new file mode 100644 index 000000000000..7c589fa065f9 --- /dev/null +++ b/dev-lang/python/python-2.4.6.ebuild @@ -0,0 +1,311 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.1 2009/05/24 02:51:55 arfrever Exp $ + +# NOTE about python-portage interactions : +# - Do not add a pkg_setup() check for a certain version of portage +# in dev-lang/python. It _WILL_ stop people installing from +# Gentoo 1.4 images. + +EAPI=1 + +inherit autotools eutils flag-o-matic multilib python toolchain-funcs versionator + +# we need this so that we don't depends on python.eclass +PYVER_MAJOR=$(get_major_version) +PYVER_MINOR=$(get_version_component_range 2) +PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" + +MY_P="Python-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." +HOMEPAGE="http://www.python.org/" +SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2 + mirror://gentoo/python-gentoo-patches-${PV}.tar.bz2" + +LICENSE="PSF-2.2" +SLOT="2.4" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="berkdb bootstrap build +cxx doc elibc_uclibc examples gdbm ipv6 ncurses readline ssl +threads tk ucs2 wininst +xml" + +# Can't be compiled against db-4.5 Bug #179377 +DEPEND=">=app-admin/eselect-python-20080925 + >=sys-libs/zlib-1.1.3 + !dev-python/cjkcodecs + !build? ( + tk? ( >=dev-lang/tk-8.0 ) + ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) + berkdb? ( || ( sys-libs/db:4.4 sys-libs/db:4.3 ) ) + gdbm? ( sys-libs/gdbm ) + ssl? ( dev-libs/openssl ) + doc? ( dev-python/python-docs:2.4 ) + xml? ( dev-libs/expat ) + )" + +# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri +# NOTE: added blocker to enforce correct merge order for bug 88777. - zmedico + +RDEPEND="${DEPEND} build? ( !dev-python/pycrypto )" +PDEPEND="${DEPEND} app-admin/python-updater" + +PROVIDE="virtual/python" + +src_unpack() { + unpack ${A} + cd "${S}" + + if tc-is-cross-compiler ; then + epatch "${FILESDIR}"/python-2.4.4-test-cross.patch + else + rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch + fi + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}" + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Makefile.pre.in \ + Modules/Setup.dist \ + Modules/getpath.c \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + # fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04) + # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!! + [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i "${S}"/configure + + if ! use wininst; then + # remove microsoft windows executables + rm Lib/distutils/command/wininst-*.exe + fi + + eautoreconf +} + +src_configure() { + # disable extraneous modules with extra dependencies + if use build; then + export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter" + export PYTHON_DISABLE_SSL=1 + else + # dbm module can link to berkdb or gdbm -- defaults to gdbm when + # both are enabled, see #204343 + use berkdb || use gdbm \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm" + use gdbm \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm" + use berkdb \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} bsddb" + use readline \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline" + use tk \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter" + use ncurses \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel" + use ssl \ + || export PYTHON_DISABLE_SSL=1 + use xml \ + || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} pyexpat" + + export PYTHON_DISABLE_MODULES + + if use !xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + einfo "Disabled modules: $PYTHON_DISABLE_MODULES" + fi +} + +src_compile() { + filter-flags -malign-double + + [ "${ARCH}" = "alpha" ] && append-flags -fPIC + + # http://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flag -O3; then + is-flag -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + export OPT="${CFLAGS}" + + local myconf + #if we are creating a new build image, we remove the dependency on g++ + if use build && ! use bootstrap || ! use cxx ; then + myconf="--with-cxx=no" + fi + + # super-secret switch. don't use this unless you know what you're + # doing. enabling UCS2 support will break your existing python + # modules + use ucs2 \ + && myconf="${myconf} --enable-unicode=ucs2" \ + || myconf="${myconf} --enable-unicode=ucs4" + + src_configure + + if tc-is-cross-compiler ; then + OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \ + ./configure --with-cxx=no --{build,host}=${CBUILD} || die "cross-configure failed" + emake python Parser/pgen || die "cross-make failed" + mv python hostpython + mv Parser/pgen Parser/hostpgen + make distclean + sed -i \ + -e '/^HOSTPYTHON/s:=.*:=./hostpython:' \ + -e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \ + Makefile.pre.in || die "sed failed" + fi + + # export CXX so it ends up in /usr/lib/python2.x/config/Makefile + tc-export CXX + # set LINKCC to prevent python from being linked to libstdc++.so + export LINKCC="\$(PURIFY) \$(CC)" + econf \ + --with-fpectl \ + --enable-shared \ + $(use_enable ipv6) \ + $(use_with threads) \ + --infodir='${prefix}'/share/info \ + --mandir='${prefix}'/share/man \ + --with-libc='' \ + ${myconf} + emake || die "Parallel make failed" +} + +src_install() { + dodir /usr + emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed" + + # install our own custom python-config + exeinto /usr/bin + newexe "${FILESDIR}"/python-config-${PYVER}-r1 python-config-${PYVER} + + # Use correct libdir in python-config + dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config-${PYVER} + + if use build ; then + rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test} + else + use elibc_uclibc && rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test} + use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/bsddb + use tk || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/lib-tk + fi + + # Fix slotted collisions + mv "${D}"/usr/bin/pydoc "${D}"/usr/bin/pydoc${PYVER} + mv "${D}"/usr/bin/idle "${D}"/usr/bin/idle${PYVER} + mv "${D}"/usr/share/man/man1/python.1 \ + "${D}"/usr/share/man/man1/python${PYVER}.1 + rm -f "${D}"/usr/bin/smtpd.py + + prep_ml_includes usr/include/python${PYVER} + + # The stuff below this line extends from 2.1, and should be deprecated + # in 2.3, or possibly can wait till 2.4 + + # seems like the build do not install Makefile.pre.in anymore + # it probably shouldn't - use DistUtils, people! + insinto /usr/$(get_libdir)/python${PYVER}/config + doins "${S}"/Makefile.pre.in + + # While we're working on the config stuff... Let's fix the OPT var + # so that it doesn't have any opts listed in it. Prevents the problem + # with compiling things with conflicting opts later. + dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \ + /usr/$(get_libdir)/python${PYVER}/config/Makefile + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins -r "${S}"/Tools || die "doins failed" + fi + + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} + newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} +} + +pkg_postrm() { + eselect python update --ignore 3.0 + python_mod_cleanup /usr/lib/python${PYVER} + [[ "$(get_libdir)" == "lib" ]] || \ + python_mod_cleanup /usr/$(get_libdir)/python${PYVER} +} + +pkg_postinst() { + eselect python update --ignore 3.0 + python_mod_optimize + python_mod_optimize -x "(site-packages|test)" \ + /usr/lib/python${PYVER} + [[ "$(get_libdir)" == "lib" ]] || \ + python_mod_optimize -x "(site-packages|test)" \ + /usr/$(get_libdir)/python${PYVER} + + # workaround possible python-upgrade-breaks-portage situation + if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then + if [ -f ${myroot}/usr/lib/python2.3/site-packages/portage.py ]; then + einfo "Working around possible python-portage upgrade breakage" + mkdir -p ${myroot}/usr/lib/portage/pym + cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym + python_mod_optimize /usr/lib/portage/pym + fi + fi + + echo + ewarn + ewarn "If you have just upgraded from an older version of python you" + ewarn "will need to run:" + ewarn + ewarn "/usr/sbin/python-updater" + ewarn + ewarn "This will automatically rebuild all the python dependent modules" + ewarn "to run with python-${PYVER}." + ewarn + ewarn "Your original Python is still installed and can be accessed via" + ewarn "/usr/bin/python2.x." + ewarn + ebeep 5 +} + +src_test() { + # Tests won't work when cross compiling + if tc-is-cross-compiler ; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Disabling byte compiling breaks test_import + python_enable_pyc + + #skip all tests that fail during emerge but pass without emerge: + #(See bug# 67970) + local skip_tests="cookielib distutils global hotshot mimetools minidom mmap posix sax strptime subprocess syntax tcl time urllib urllib2" + + # test_pow fails on alpha. + # http://bugs.python.org/issue756093 + [[ ${ARCH} == "alpha" ]] && skip_tests="${skip_tests} pow" + + for test in ${skip_tests} ; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # rerun failed tests in verbose mode (regrtest -w) + EXTRATESTOPTS="-w" make test || die "make test failed" + + for test in ${skip_tests} ; do + mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py + done + + elog "Portage skipped the following tests which aren't able to run from emerge:" + for test in ${skip_tests} ; do + elog "test_${test}.py" + done + + elog "If you'd like to run them, you may:" + elog "cd /usr/lib/python${PYVER}/test" + elog "and run the tests separately." +} |