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 1R4fJe-0007sJ-4n for garchives@archives.gentoo.org; Fri, 16 Sep 2011 20:47:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 677D721C18B; Fri, 16 Sep 2011 20:47:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 00BE521C18B for ; Fri, 16 Sep 2011 20:47:08 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0674C1B4007 for ; Fri, 16 Sep 2011 20:47:08 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2256) id BBF2F2004C; Fri, 16 Sep 2011 20:47:06 +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: python-3.2.2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: python-3.2.2.ebuild ChangeLog X-VCS-Directories: dev-lang/python X-VCS-Committer: djc X-VCS-Committer-Name: Dirkjan Ochtman Content-Type: text/plain; charset=utf8 Message-Id: <20110916204706.BBF2F2004C@flycatcher.gentoo.org> Date: Fri, 16 Sep 2011 20:47:06 +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: X-Archives-Hash: 3d16e88d54b0a33cfa69004d5bdfcc48 djc 11/09/16 20:47:06 Modified: ChangeLog Added: python-3.2.2.ebuild Log: Version bump python to 3.2.2. =20 (Portage version: 2.1.10.15/cvs/Linux x86_64) Revision Changes Path 1.547 dev-lang/python/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/Ch= angeLog?rev=3D1.547&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/Ch= angeLog?rev=3D1.547&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/Ch= angeLog?r1=3D1.546&r2=3D1.547 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.546 retrieving revision 1.547 diff -u -r1.546 -r1.547 --- ChangeLog 16 Sep 2011 13:34:12 -0000 1.546 +++ ChangeLog 16 Sep 2011 20:47:06 -0000 1.547 @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/python # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.546 201= 1/09/16 13:34:12 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.547 201= 1/09/16 20:47:06 djc Exp $ + +*python-3.2.2 (16 Sep 2011) + + 16 Sep 2011; Dirkjan Ochtman +python-3.2.2.ebuild: + Version bump to 3.2.2 (fixes bug 375051). =20 *python-3.1.4-r3 (16 Sep 2011) *python-2.7.2-r3 (16 Sep 2011) 1.1 dev-lang/python/python-3.2.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/py= thon-3.2.2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/py= thon-3.2.2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: python-3.2.2.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-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.2.ebuild,v = 1.1 2011/09/16 20:47:06 djc Exp $ EAPI=3D"3" WANT_AUTOMAKE=3D"none" inherit autotools eutils flag-o-matic multilib python toolchain-funcs if [[ "${PV}" =3D=3D *_pre* ]]; then inherit subversion ESVN_PROJECT=3D"python" ESVN_REPO_URI=3D"http://svn.python.org/projects/python/branches/release3= 2-maint" ESVN_REVISION=3D"" else MY_PV=3D"${PV%_p*}" MY_P=3D"Python-${MY_PV}" fi PATCHSET_REVISION=3D"0" DESCRIPTION=3D"Python is an interpreted, interactive, object-oriented pro= gramming language." HOMEPAGE=3D"http://www.python.org/" if [[ "${PV}" =3D=3D *_pre* ]]; then SRC_URI=3D"" else SRC_URI=3D"http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION= }" !=3D "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2" fi LICENSE=3D"PSF-2" SLOT=3D"3.2" 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"build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqli= te +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? ( gdbm? ( sys-libs/gdbm ) ncurses? ( >=3Dsys-libs/ncurses-5.2 readline? ( >=3Dsys-libs/readline-4.1 ) ) sqlite? ( >=3Ddev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=3Ddev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=3Ddev-libs/expat-2 ) )" DEPEND=3D">=3Dsys-devel/autoconf-2.65 ${RDEPEND} $([[ "${PV}" =3D=3D *_pre* ]] && echo "=3D${CATEGORY}/${PN}-${PV%%.*}*"= ) $([[ "${PV}" !=3D *_pre* ]] && echo "app-arch/xz-utils") dev-util/pkgconfig $([[ "${PV}" =3D~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] && echo "doc? ( de= v-python/sphinx )") !sys-devel/gcc[libffi]" RDEPEND+=3D" !build? ( app-misc/mime-types ) $([[ "${PV}" =3D~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( de= v-python/python-docs:${SLOT} )")" PDEPEND=3D"app-admin/python-updater" if [[ "${PV}" !=3D *_pre* ]]; then S=3D"${WORKDIR}/${MY_P}" fi pkg_setup() { python_pkg_setup } 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 [[ "${PV}" =3D~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; the= n if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL= ' Include/patchlevel.h; then # Update micro version, release level and version string. local micro_version=3D"${PV%_pre*}" micro_version=3D"${micro_version##*.}" local version_string=3D"${PV%.*}.$((${micro_version} - 1))+" sed \ -e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${mic= ro_version}/" \ -e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RE= LEASE_LEVEL_ALPHA/" \ -e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_= string}\2/" \ -i Include/patchlevel.h || die "sed failed" fi fi local excluded_patches if ! tc-is-cross-compiler; then excluded_patches=3D"*_all_crosscompile.patch" fi local patchset_dir if [[ "${PV}" =3D=3D *_pre* ]]; then patchset_dir=3D"${FILESDIR}/${SLOT}-${PATCHSET_REVISION}" else patchset_dir=3D"${WORKDIR}/${MY_PV}" fi EPATCH_EXCLUDE=3D"${excluded_patches}" EPATCH_SUFFIX=3D"patch" epatch "$= {patchset_dir}" #Linux-3 compat. Bug #374579 (upstream issue12571) if use kernel_linux; then cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die "copy plat-l= inux failed" fi sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ Lib/distutils/command/install.py \ Lib/distutils/sysconfig.py \ Lib/site.py \ Lib/sysconfig.py \ Lib/test/test_site.py \ Makefile.pre.in \ Modules/Setup.dist \ Modules/getpath.c \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" if ! use wininst; then # Remove Microsoft Windows executables. rm Lib/distutils/command/wininst-*.exe fi # Support versions of Autoconf other than 2.65. sed -e "/version_required(2\.65)/d" -i configure.in || die "sed failed" # Disable ABI flags. sed -e "s/ABIFLAGS=3D\"\${ABIFLAGS}.*\"/:/" -i configure.in || die "sed = failed" if [[ "${PV}" =3D=3D *_pre* ]]; then sed -e "s/\(-DSVNVERSION=3D\).*\( -o\)/\1\\\\\"${ESVN_REVISION}\\\\\"\2= /" -i Makefile.pre.in || die "sed failed" fi eautoreconf } src_configure() { if use build; then # Disable extraneous modules with extra dependencies. export PYTHON_DISABLE_MODULES=3D"gdbm _curses _curses_panel readline _s= qlite3 _tkinter _elementtree pyexpat" export PYTHON_DISABLE_SSL=3D"1" else local disable 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/python3.X/config/Makefile. tc-export CXX # Set LDFLAGS so we link modules with -lpython3.2 correctly. # Needed on FreeBSD unless Python 3.2 is already installed. # Please query BSD team before removing this! append-ldflags "-L." local dbmliborder if use gdbm; then dbmliborder+=3D"${dbmliborder:+:}gdbm" fi OPT=3D"" econf \ --with-fpectl \ --enable-shared \ $(use_enable ipv6) \ $(use_with threads) \ $(use_with wide-unicode) \ --infodir=3D'${prefix}/share/info' \ --mandir=3D'${prefix}/share/man' \ --with-computed-gotos \ --with-dbmliborder=3D"${dbmliborder}" \ --with-libc=3D"" \ --enable-loadable-sqlite-extensions \ --with-system-expat \ --with-system-ffi } src_compile() { emake EPYTHON=3D"python${PV%%.*}" CPPFLAGS=3D"" CFLAGS=3D"" LDFLAGS=3D""= || die "emake failed" } 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 gdb" for test in ${skip_tests}; do mv "${S}/Lib/test/test_${test}.py" "${T}" done # Rerun failed tests in verbose mode (regrtest -w). emake test EXTRATESTOPTS=3D"-w" CPPFLAGS=3D"" CFLAGS=3D"" LDFLAGS=3D"" <= /dev/tty 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() { emake DESTDIR=3D"${D}" altinstall || die "emake altinstall failed" python_clean_installation_image -q sed \ -e "s/\(CONFIGURE_LDFLAGS=3D\).*/\1/" \ -e "s/\(PY_LDFLAGS=3D\).*/\1/" \ -i "${ED}$(python_get_libdir)/config-${SLOT}/Makefile" || die "sed fail= ed" mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLO= T}" if use build; then rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,= sqlite3,test,tkinter} else use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/test" 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,tkinter,test/test_tk*} fi use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing" 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 newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" if use kernel_linux; then if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then cp -r "${ED}$(python_get_libdir)/plat-linux2" \ "${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux faile= d" else cp -r "${ED}$(python_get_libdir)/plat-linux3" \ "${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux faile= d" fi fi sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || d= ie "sed failed" } 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() { if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect pyt= hon show)" ]]; then eselect python update fi if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr= /bin/$(eselect python show --python${PV%%.*})" ]]; then eselect python update --python${PV%%.*} fi } 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 local n for ((n =3D 0; n < 12; n++)); do echo -ne "\a" sleep 1 done fi } pkg_postrm() { eselect_python_update python_mod_cleanup $(python_get_libdir) }