fix bug 179377, with a dependency adjustment to proper slots of sys-libs/db, provided...
authorChristian Faulhammer <fauli@gentoo.org>
Sat, 16 Feb 2008 16:27:22 +0000 (16:27 +0000)
committerChristian Faulhammer <fauli@gentoo.org>
Sat, 16 Feb 2008 16:27:22 +0000 (16:27 +0000)
Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

dev-lang/python/ChangeLog
dev-lang/python/Manifest
dev-lang/python/python-2.4.4-r9.ebuild [new file with mode: 0644]

index a42edbbe7144a2357d33cfa4f9efcf9617c65646..a21960228be85014b23dfcc83a13fbc51f333e9b 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.299 2008/01/25 20:05:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.300 2008/02/16 16:27:22 opfer Exp $
+
+*python-2.4.4-r9 (16 Feb 2008)
+
+  16 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  +python-2.4.4-r9.ebuild:
+  fix bug 179377, with a dependency adjustment to proper slots of sys-libs/db,
+  provided by Petr Pisar <petr DOT pisar AT atlas DOT cz>
 
   25 Jan 2008; Markus Rothe <corsair@gentoo.org> python-2.3.6-r4.ebuild:
   Stable on ppc64; bug #198373
index 050ec1327fb9e4cb5c4ac15db17ff7e5cdeec3e3..472e5dc71de932298cf5c93d1a048ae8b6295fc6 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 AUX depreorder.py 2235 RMD160 a6da5f336bdf8c370861c7922a5fa79ce4ab89cb SHA1 3b8590d7fbece2367088c646a792a9618d786dec SHA256 93920120e596f34e4222e8686e6283b03cdd517f89f2dba3eda90d79fa016aba
 AUX python-2.4.2-gentoo_obsd-r1.patch 1630 RMD160 77c7c13be17f7dcf1abccab2a0fb5818f4f7c261 SHA1 ba795d0aeba9986ed6077217848fd8ba1eb0d39c SHA256 b96f687a18cdfd75090a7401298568ee5819046a54eb58c1527126dd36596d47
@@ -37,9 +40,17 @@ EBUILD python-2.4.4-r5.ebuild 10332 RMD160 b0a00a167b1385aa4b9472e6fa8245aee01a5
 EBUILD python-2.4.4-r6.ebuild 10379 RMD160 23414e397b35039af912849f6a366c16ed092390 SHA1 b1ba0c7cf6d9e2533865b9ee610b324bafbe2aed SHA256 027565f6f2fbf90d38fdc5dc240ebae8e7cba8f44d8307df8c05c0f1b4f70d36
 EBUILD python-2.4.4-r7.ebuild 10471 RMD160 ddb7e39a115126d1679dff5766032f66b4e2e596 SHA1 5d3b1de3f1f2428643361c6890a3c250b0a49c1d SHA256 f88229dbde6d128f8ac4fd7c44aa48157c141ee8b014c096b52d564e9aedb7d8
 EBUILD python-2.4.4-r8.ebuild 10656 RMD160 c8ba17c06ea8053902a3be590951a3da0404e47f SHA1 9c4e3f7d05998f26414e2bc04a4652eda7bdff8c SHA256 c9990f1babde1186d4dca56a1b994739909b411daa237169dbd943b9211c7dac
+EBUILD python-2.4.4-r9.ebuild 10731 RMD160 24825340067c0d3b39d3fe70d48b56578b737014 SHA1 f1dd21bac1acc5b7281f8814bca4a948747e2db7 SHA256 ef30f043c2267a47cf3d65cb1c089daa05df5bd6b5a17b9b02832042de5e95fe
 EBUILD python-2.5.1-r2.ebuild 10346 RMD160 e04f22c557c3fcb8e79955d39dda26a25e03f73b SHA1 bf59ae8a2b2fa07ce8713ca6c17b3915884f8760 SHA256 cde4a7ed6543798b727283e302653e2d8594d6b7491d52a3581b410ba40ba8bf
 EBUILD python-2.5.1-r3.ebuild 10348 RMD160 b312c9bbd10510721543d51cb9281dc2033845e7 SHA1 569b85a020bade1e35b849802aeeada337c63eee SHA256 6d281ff6cc64c1ccc861be3b6fae6be94c300a23827d7d4e30d91b71fc23dd11
 EBUILD python-2.5.1-r4.ebuild 10476 RMD160 1d74c53b21eb8242659bcf9d528e35401c303ed3 SHA1 a85d737e73d0bd177f69d6871c6d31d276584bc0 SHA256 dedc062353e2c359a3024410f1f86643f405a66bb27da626149bafdd1742c06a
 EBUILD python-2.5.1-r5.ebuild 10661 RMD160 c3171b93576aec797f00aa2927c39cf93660c9cd SHA1 00ec9f340ed64557321b03227ce95d480e57f660 SHA256 cdea8026c100726360e77684a551562e1575a8a1a193ba4d0bb9e40b7f90d962
-MISC ChangeLog 51285 RMD160 abef5c79d0c7ded93f1384da37867d5635e81cfe SHA1 4e8de8ca8ed116ce0cc096b318d3a45df69f0cb0 SHA256 1cf9f1b1ef43d85cab2a9689e722605c3e545b568fd0700dc959653616131e61
+MISC ChangeLog 51535 RMD160 4edbf45566545802f75970e1082427f034dd1290 SHA1 6f96f7e3b841202438f78d6ed1a2c7ad0b205d69 SHA256 1ba52f25737259275f9a6e05b8ecf37df7ca4fdc8df465c626905a2f388f6863
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHtw9MNQqtfCuFneMRAorxAJwOsW/lNEgzZka9YgDd601eFSKj5QCfQc+g
+h2rzzpk+ZuHkbMYl8MdUNvQ=
+=rE2j
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.4.4-r9.ebuild b/dev-lang/python/python-2.4.4-r9.ebuild
new file mode 100644 (file)
index 0000000..378ca66
--- /dev/null
@@ -0,0 +1,324 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r9.ebuild,v 1.1 2008/02/16 16:27:22 opfer 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 python multilib versionator toolchain-funcs alternatives
+
+# 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}-r5.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="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx nothreads examples elibc_uclibc"
+
+# Can't be compiled against db-4.5 Bug #179377
+DEPEND=">=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-${PV}* )
+               dev-libs/expat
+       )"
+
+# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python
+#       provides the functionality expected from previous pythons.
+
+# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
+#       it to compile python. We just need to ensure that when we install
+#       python, we definitely have fchksum support. - liquidx
+
+# 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/python-fchksum !dev-python/pycrypto )"
+PDEPEND="${DEPEND} !build? ( dev-python/python-fchksum ) app-admin/python-updater"
+
+PROVIDE="virtual/python"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       if tc-is-cross-compiler ; then
+               [[ $(python -V 2>&1) != "Python ${PV}" ]] && \
+                       die "Crosscompiling requires the same host and build versions."
+               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
+
+       # 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
+
+       # remove microsoft windows executables
+       rm Lib/distutils/command/wininst-*.exe
+
+       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
+               export PYTHON_DISABLE_MODULES
+               echo $PYTHON_DISABLE_MODULES
+       fi
+}
+
+src_compile() {
+       filter-flags -malign-double
+
+       # Seems to no longer be necessary
+       #[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+       [ "${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 nocxx ; 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"
+
+       use nothreads \
+               && myconf="${myconf} --without-threads" \
+               || myconf="${myconf} --with-threads"
+
+       src_configure
+
+       if tc-is-cross-compiler ; then
+               OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+                       ./configure --with-cxx=no || 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
+       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` \
+               --infodir='${prefix}'/share/info \
+               --mandir='${prefix}'/share/man \
+               --with-libc='' \
+               ${myconf} || die
+       emake || die "Parallel make failed"
+}
+
+src_install() {
+       dodir /usr
+       src_configure
+       make DESTDIR="${D}" altinstall maninstall || die
+
+       # 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
+               mkdir -p "${D}"/usr/share/doc/${P}/examples
+               cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
+       fi
+}
+
+pkg_postrm() {
+       local mansuffix=$(ecompress --suffix)
+       python_makesym
+       alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
+       alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"
+       alternatives_auto_makesym "/usr/bin/python-config" \
+                                                               "python-config-[0-9].[0-9]"
+       alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
+                                                               "python[0-9].[0-9].1${mansuffix}"
+
+       python_mod_cleanup /usr/lib/python${PYVER}
+       [[ "$(get_libdir)" == "lib" ]] || \
+               python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+}
+
+pkg_postinst() {
+       local myroot
+       myroot=$(echo $ROOT | sed 's:/$::')
+       local mansuffix=$(ecompress --suffix)
+
+       python_makesym
+       alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
+       alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]"
+       alternatives_auto_makesym "/usr/bin/python-config" \
+                                                               "python-config-[0-9].[0-9]"
+       alternatives_auto_makesym "/usr/share/man/man1/python.1${mansuffix}" \
+                                                               "python[0-9].[0-9].1${mansuffix}"
+
+       python_mod_optimize
+       python_mod_optimize -x site-packages \
+                                               -x test ${myroot}/usr/lib/python${PYVER}
+       [[ "$(get_libdir)" == "lib" ]] || \
+               python_mod_optimize -x site-packages \
+                                                       -x test ${myroot}/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 ${myroot}/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
+
+       # PYTHON_DONTCOMPILE=1 breaks test_import
+       unset PYTHON_DONTCOMPILE
+
+       #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"
+
+       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."
+}