From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1N3pyu-0006rq-Co for garchives@archives.gentoo.org; Fri, 30 Oct 2009 11:49:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58D4BE0A5F; Fri, 30 Oct 2009 11:49:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E4DBEE0A5F for ; Fri, 30 Oct 2009 11:49:22 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 7ECE66775B for ; Fri, 30 Oct 2009 11:49:22 +0000 (UTC) Received: from arfrever by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1N3pyr-0002lv-Pk for gentoo-commits@lists.gentoo.org; Fri, 30 Oct 2009 11:49:21 +0000 From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, arfrever@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/python: python-2.6.4.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: python-2.6.4.ebuild ChangeLog X-VCS-Directories: dev-lang/python X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis Content-Type: text/plain; charset=utf8 Message-Id: Sender: Arfrever Frehtes Taifersar Arahesis Date: Fri, 30 Oct 2009 11:49:21 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 15f89501-fdfd-4152-9f09-b151734104ed X-Archives-Hash: 652d962b2714fe3c3cd5e841c63a207d arfrever 09/10/30 11:49:21 Modified: ChangeLog Added: python-2.6.4.ebuild Log: Version bump. (Portage version: 14746-svn/cvs/Linux x86_64) Revision Changes Path 1.430 dev-lang/python/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/Ch= angeLog?rev=3D1.430&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/Ch= angeLog?rev=3D1.430&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/Ch= angeLog?r1=3D1.429&r2=3D1.430 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v retrieving revision 1.429 retrieving revision 1.430 diff -u -r1.429 -r1.430 --- ChangeLog 24 Oct 2009 14:35:31 -0000 1.429 +++ ChangeLog 30 Oct 2009 11:49:20 -0000 1.430 @@ -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.429 200= 9/10/24 14:35:31 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.430 200= 9/10/30 11:49:20 arfrever Exp $ + +*python-2.6.4 (30 Oct 2009) + + 30 Oct 2009; Arfrever Frehtes Taifersar Arahesis + +python-2.6.4.ebuild: + Version bump. =20 24 Oct 2009; Alexey Shvetsov python-2.6.3.ebuild, python-3.1.1-r1.ebuild: 1.1 dev-lang/python/python-2.6.4.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/py= thon-2.6.4.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/py= thon-2.6.4.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: python-2.6.4.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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.6.4.ebuild,v = 1.1 2009/10/30 11:49:20 arfrever Exp $ EAPI=3D"2" inherit autotools eutils flag-o-matic multilib pax-utils python toolchain= -funcs versionator # We need this so that we don't depend on python.eclass. PYVER_MAJOR=3D"$(get_major_version)" PYVER_MINOR=3D"$(get_version_component_range 2)" PYVER=3D"${PYVER_MAJOR}.${PYVER_MINOR}" MY_P=3D"Python-${PV}" S=3D"${WORKDIR}/${MY_P}" PATCHSET_REVISION=3D"0" DESCRIPTION=3D"Python is an interpreted, interactive, object-oriented pro= gramming language." HOMEPAGE=3D"http://www.python.org/" SRC_URI=3D"http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2 mirror://gentoo/python-gentoo-patches-${PV}$([[ "${PATCHSET_REVISION}" != =3D "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2" LICENSE=3D"PSF-2.2" SLOT=3D"2.6" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~s= parc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE=3D"-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readl= ine sqlite ssl +threads tk ucs2 wininst +xml" # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes} # do not conflict with the ones in python proper. - liquidx RDEPEND=3D">=3Dapp-admin/eselect-python-20090606 >=3Dsys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) doc? ( dev-python/python-docs:${SLOT} ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=3Dsys-libs/ncurses-5.2 readline? ( >=3Dsys-libs/readline-4.1 ) ) sqlite? ( >=3Ddev-db/sqlite-3 ) ssl? ( dev-libs/openssl ) tk? ( >=3Ddev-lang/tk-8.0 ) xml? ( >=3Ddev-libs/expat-2 ) )" DEPEND=3D"${RDEPEND} dev-util/pkgconfig" RDEPEND+=3D" !build? ( app-misc/mime-types )" PDEPEND=3D"app-admin/python-updater" PROVIDE=3D"virtual/python" pkg_setup() { if use berkdb; then ewarn "\"bsddb\" module is out-of-date and no longer maintained inside = dev-lang/python. It has" ewarn "been additionally removed in Python 3. You should use external, = still maintained \"bsddb3\"" ewarn "module provided by dev-python/bsddb3 which supports both Python = 2 and Python 3." fi if ! has_version "=3Ddev-lang/python-3*"; then elog "It is highly recommended to additionally install Python 3, but wi= thout configuring Python wrapper to use Python 3." fi } src_prepare() { # Ensure that internal copies of expat and libffi aren't used. rm -fr Modules/expat rm -fr Modules/_ctypes/libffi* if tc-is-cross-compiler; then epatch "${FILESDIR}/python-2.5-cross-printf.patch" epatch "${FILESDIR}/python-2.6-chflags-cross.patch" epatch "${FILESDIR}/python-2.6-test-cross.patch" else rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch fi EPATCH_SUFFIX=3D"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 repo= rted as working - gmsoft (22 May 04) # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!! [[ "${ARCH}" =3D=3D "hppa" ]] && sed -e "s/utimes //" -i "${S}/configure= " if ! use wininst; then # Remove Microsoft Windows executables. rm Lib/distutils/command/wininst-*.exe fi # Fix OtherFileTests.testStdin() not to assume # that stdin is a tty for bug #248081. sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_fi= le.py || die "sed failed" eautoreconf } src_configure() { # Disable extraneous modules with extra dependencies. if use build; then export PYTHON_DISABLE_MODULES=3D"dbm _bsddb gdbm _curses _curses_panel = readline _sqlite3 _tkinter _elementtree pyexpat" export PYTHON_DISABLE_SSL=3D"1" else # dbm module can be linked against berkdb or gdbm. # Defaults to gdbm when both are enabled, #204343. local disable use berkdb || use gdbm || disable+=3D" dbm" use berkdb || disable+=3D" _bsddb" use gdbm || disable+=3D" gdbm" use ncurses || disable+=3D" _curses _curses_panel" use readline || disable+=3D" readline" use sqlite || disable+=3D" _sqlite3" use ssl || export PYTHON_DISABLE_SSL=3D"1" use tk || disable+=3D" _tkinter" use xml || disable+=3D" _elementtree pyexpat" # _elementtree uses = pyexpat. export PYTHON_DISABLE_MODULES=3D"${disable}" 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 fi if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" fi export OPT=3D"${CFLAGS}" filter-flags -malign-double [[ "${ARCH}" =3D=3D "alpha" ]] && append-flags -fPIC # https://bugs.gentoo.org/show_bug.cgi?id=3D50309 if is-flag -O3; then is-flag -fstack-protector-all && replace-flags -O3 -O2 use hardened && replace-flags -O3 -O2 fi if tc-is-cross-compiler; then OPT=3D"-O1" CFLAGS=3D"" LDFLAGS=3D"" CC=3D"" \ ./configure --{build,host}=3D${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:=3D.*:=3D./hostpython:" \ -e "/^HOSTPGEN/s:=3D.*:=3D./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 LDFLAGS so we link modules with -lpython2.6 correctly. # Needed on FreeBSD unless Python 2.6 is already installed. # Please query BSD team before removing this! append-ldflags "-L." econf \ --with-fpectl \ --enable-shared \ $(use_enable ipv6) \ $(use_with threads) \ $(use ucs2 && echo "--enable-unicode=3Ducs2" || echo "--enable-unicode=3D= ucs4") \ --infodir=3D'${prefix}'/share/info \ --mandir=3D'${prefix}'/share/man \ --with-libc=3D'' \ --with-system-ffi } src_test() { # Tests won't work when cross compiling. if tc-is-cross-compiler; then elog "Disabling tests due to crosscompiling." return fi # Byte compiling should be enabled here. # Otherwise test_import fails. python_enable_pyc # Skip all tests that fail during emerge but pass without emerge: # (See bug #67970) local skip_tests=3D"distutils minidom pyexpat sax tcl" # test_ctypes fails with PAX kernel (bug #234498). host-is-pax && skip_tests+=3D" ctypes" for test in ${skip_tests}; do mv "${S}/Lib/test/test_${test}.py" "${T}" done # Rerun failed tests in verbose mode (regrtest -w). EXTRATESTOPTS=3D"-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 "The following tests have been skipped:" for test in ${skip_tests}; do elog "test_${test}.py" done elog "If you'd like to run them, you may:" elog "cd /usr/$(get_libdir)/python${PYVER}/test" elog "and run the tests separately." } src_install() { emake DESTDIR=3D"${D}" altinstall maninstall || die "emake altinstall ma= ninstall failed" mv "${D}usr/bin/python${PYVER}-config" "${D}usr/bin/python-config-${PYVE= R}" # Fix collisions between different slots of Python. mv "${D}usr/bin/2to3" "${D}usr/bin/2to3-${PYVER}" 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${PYV= ER}.1" rm -f "${D}usr/bin/smtpd.py" # Fix the OPT variable so that it doesn't have any flags listed in it. # Prevents the problem with compiling things with conflicting flags late= r. sed -e "s:^OPT=3D.*:OPT=3D-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${P= YVER}/config/Makefile" if use build; then rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,email,lib-tk,sqlit= e3,test} else use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsdd= b/test,test} use berkdb || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{bsddb,test= /test_bsddb*} use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,te= st/test_sqlite*} use tk || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/lib-tk" fi use threads || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/multiprocess= ing" prep_ml_includes usr/include/python${PYVER} 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} # Installs empty directory. rmdir "${D}usr/$(get_libdir)/${PN}${PYVER}/lib-old" } pkg_preinst() { if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=3D${CATE= GORY}/${PN}-${SLOT}_alpha"; then python_updater_warning=3D"1" fi } eselect_python_update() { local ignored_python_slots_options=3D [[ "$(eselect python show)" =3D=3D "python2."* ]] && ignored_python_slot= s_options=3D"--ignore 3.0 --ignore 3.1 --ignore 3.2" # Create python2 symlink. eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null eselect python update ${ignored_python_slots_options} } pkg_postinst() { eselect_python_update python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python$= {PYVER} if [[ "${python_updater_warning}" =3D=3D "1" ]]; then ewarn ewarn "\e[1;31m********************************************************= ****************\e[0m" ewarn ewarn "You have just upgraded from an older version of Python." ewarn "You should run 'python-updater \${options}' to rebuild Python mo= dules." ewarn ewarn "\e[1;31m********************************************************= ****************\e[0m" ewarn ebeep 12 fi } pkg_postrm() { eselect_python_update python_mod_cleanup /usr/$(get_libdir)/python${PYVER} }