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 1P4HHP-0005lS-51 for garchives@archives.gentoo.org; Fri, 08 Oct 2010 18:02:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8873E0B69 for ; Fri, 8 Oct 2010 18:02:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1EA39E099C for ; Fri, 8 Oct 2010 17:17:46 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 71F301B4011 for ; Fri, 8 Oct 2010 17:17:45 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2256) id 0F84820051; Fri, 8 Oct 2010 17:17:44 +0000 (UTC) From: "Dirkjan Ochtman (djc)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, djc@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/python: ChangeLog python-2.6.6.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog python-2.6.6.ebuild X-VCS-Directories: dev-lang/python X-VCS-Committer: djc X-VCS-Committer-Name: Dirkjan Ochtman Content-Type: text/plain; charset=utf8 Message-Id: <20101008171744.0F84820051@flycatcher.gentoo.org> Date: Fri, 8 Oct 2010 17:17:44 +0000 (UTC) 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: f33c2323-846a-4a7e-8f14-43d5650effaf X-Archives-Hash: 14057406b47680119851c1ea4553f994 djc 10/10/08 17:17:44 Modified: ChangeLog Added: python-2.6.6.ebuild Log: Version bump python to 2.6.6 (bug 334425). =20 (Portage version: 2.1.9.13/cvs/Linux x86_64) Revision Changes Path 1.496 dev-lang/python/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/Ch= angeLog?rev=3D1.496&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/Ch= angeLog?rev=3D1.496&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/Ch= angeLog?r1=3D1.495&r2=3D1.496 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.495 retrieving revision 1.496 diff -u -r1.495 -r1.496 --- ChangeLog 15 Aug 2010 23:14:30 -0000 1.495 +++ ChangeLog 8 Oct 2010 17:17:43 -0000 1.496 @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/python # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.495 201= 0/08/15 23:14:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.496 201= 0/10/08 17:17:43 djc Exp $ + +*python-2.6.6 (08 Oct 2010) + + 08 Oct 2010; Dirkjan Ochtman +python-2.6.6.ebuild: + Version bump to 2.6.6 (bug 334425). =20 15 Aug 2010; Jeroen Roovers python-3.1.2-r4.ebuild: Stable for HPPA (bug #325593). 1.1 dev-lang/python/python-2.6.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/py= thon-2.6.6.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/py= thon-2.6.6.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: python-2.6.6.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-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6.ebuild,v = 1.1 2010/10/08 17:17:43 djc Exp $ EAPI=3D"2" inherit autotools eutils flag-o-matic multilib pax-utils python toolchain= -funcs MY_P=3D"Python-${PV}" 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" PYTHON_ABI=3D"${SLOT}" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 = ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE=3D"-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readl= ine sqlite +ssl +threads tk +wide-unicode wininst +xml" RDEPEND=3D">=3Dapp-admin/eselect-python-20091230 >=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 ) ) 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 ) ) doc? ( dev-python/python-docs:${SLOT} )" DEPEND=3D"${RDEPEND} dev-util/pkgconfig !sys-devel/gcc[libffi]" RDEPEND+=3D" !build? ( app-misc/mime-types )" PDEPEND=3D"app-admin/python-updater" PROVIDE=3D"virtual/python" S=3D"${WORKDIR}/${MY_P}" pkg_setup() { 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 } src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. rm -fr Modules/expat rm -fr Modules/_ctypes/libffi* rm -fr Modules/zlib if ! tc-is-cross-compiler; then rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch fi EPATCH_SUFFIX=3D"patch" epatch "${WORKDIR}/${PV}" # Avoid regeneration, which would not change contents of files. touch Include/Python-ast.h Python/Python-ast.c 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 if [[ "$(gcc-major-version)" -ge 4 ]]; then append-flags -fwrapv fi filter-flags -malign-double [[ "${ARCH}" =3D=3D "alpha" ]] && append-flags -fPIC # https://bugs.gentoo.org/show_bug.cgi?id=3D50309 if is-flagq -O3; then is-flagq -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." OPT=3D"" econf \ --with-fpectl \ --enable-shared \ $(use_enable ipv6) \ $(use_with threads) \ $(use wide-unicode && echo "--enable-unicode=3Ducs4" || echo "--enable-= unicode=3Ducs2") \ --infodir=3D'${prefix}/share/info' \ --mandir=3D'${prefix}/share/man' \ --with-libc=3D"" \ --with-system-ffi } src_test() { # Tests will not 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 failing tests. local skip_tests=3D"distutils httpservers 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" emake test local result=3D"$?" 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 would like to run them, you may:" elog "cd '${EPREFIX}$(python_get_libdir)/test'" elog "and run the tests separately." python_disable_pyc if [[ "${result}" -ne 0 ]]; then die "emake test failed" fi } src_install() { [[ -z "${ED}" ]] && ED=3D"${D%/}${EPREFIX}/" emake DESTDIR=3D"${D}" altinstall maninstall || die "emake altinstall ma= ninstall failed" python_clean_installation_image -q mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLO= T}" # Fix collisions between different slots of Python. mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}" mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}" mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${S= LOT}.1" rm -f "${ED}usr/bin/smtpd.py" if use build; then rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,id= lelib,lib-tk,sqlite3,test} else use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test= } use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,test/test_bsddb= *} use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sql= ite*} use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/= "{idlelib,lib-tk} fi use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing" prep_ml_includes $(python_get_includedir) dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" if use examples; then insinto /usr/share/doc/${PF}/examples doins -r "${S}/Tools" || die "doins failed" fi newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" # Do not install empty directory. rmdir "${ED}$(python_get_libdir)/lib-old" } pkg_preinst() { if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY= }/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then python_updater_warning=3D"1" fi } eselect_python_update() { local eselect_python_options [[ "$(eselect python show)" =3D=3D "python2."* ]] && eselect_python_opti= ons=3D"--python2" # Create python2 symlink. eselect python update --python2 > /dev/null eselect python update ${eselect_python_options} } pkg_postinst() { eselect_python_update python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_li= bdir) 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 $(python_get_libdir) }