From 954026bd0a61558936e59ff95687f3bfd74e14de Mon Sep 17 00:00:00 2001 From: "Gregory M. Tuner" Date: Mon, 7 Jul 2014 02:29:23 -0700 Subject: dev-lang/python-2.7.7-r1: version bump/merge Signed-off-by: Gregory M. Tuner --- dev-lang/python/ChangeLog | 159 ++++++++- dev-lang/python/Manifest | 9 +- dev-lang/python/files/python-2.5-tcl86.patch | 11 - dev-lang/python/python-2.7.6-r2.ebuild | 462 --------------------------- dev-lang/python/python-2.7.7-r1.ebuild | 458 ++++++++++++++++++++++++++ 5 files changed, 619 insertions(+), 480 deletions(-) delete mode 100644 dev-lang/python/files/python-2.5-tcl86.patch delete mode 100644 dev-lang/python/python-2.7.6-r2.ebuild create mode 100644 dev-lang/python/python-2.7.7-r1.ebuild diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 0997153..3a8f205 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,161 @@ # ChangeLog for dev-lang/python -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.721 2013/12/15 08:53:43 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.763 2014/07/06 11:49:54 mgorny Exp $ + + 06 Jul 2014; Michał Górny -files/CVE-2013-4238_py26.patch, + -files/python-2.5-tcl86.patch, -python-2.6.8-r3.ebuild, -python-2.6.9.ebuild: + Remove python:2.6 and relevant patches. + +*python-2.7.7 (28 Jun 2014) +*python-3.4.1 (28 Jun 2014) + + 28 Jun 2014; Mike Gilbert +python-2.7.7.ebuild, + +python-3.4.1.ebuild: + Version bumps. + + 15 Jun 2014; Akinori Hattori python-2.7.6.ebuild: + ia64 stable wrt bug #504742 + + 14 Jun 2014; Pawel Hajdan jr python-2.7.6.ebuild: + x86 stable wrt bug #504742 + + 24 May 2014; Markos Chandras python-2.7.6.ebuild: + Stable on amd64 wrt bug #504742 + +*python-3.2.5-r4 (10 May 2014) + + 10 May 2014; Mike Gilbert +python-3.2.5-r4.ebuild, + python-2.7.6-r1.ebuild, python-3.3.5.ebuild, python-3.4.0.ebuild: + Add optional dependency on dev-tcltk/tix, bug 413393 by John Keeping. + +*python-2.7.6-r1 (25 Apr 2014) + + 25 Apr 2014; Patrick McLean +python-2.7.6-r1.ebuild, + +files/python-2.7.6-recvfrom_into_buffer_overflow.patch: + Revision bump, add patch for CVE-2014-1912 (bug #500518) + + 06 Apr 2014; Mike Frysinger python-2.7.6.ebuild: + Mark arm64/m68k/s390/sh stable. + + 01 Apr 2014; Markus Meier python-2.7.6.ebuild: + arm stable, bug #504742 + + 30 Mar 2014; Mike Gilbert python-3.4.0.ebuild: + Update postinst message; python.eclass does not support 3.4. + + 28 Mar 2014; Mike Gilbert python-3.2.5-r3.ebuild: + Backport readline-6.3 fixes to python-3.2.5, bug 505416. + +*python-3.4.0 (28 Mar 2014) + + 28 Mar 2014; Mike Gilbert +python-3.4.0.ebuild: + Version bump. Permanently drop the 'doc' use flag. + +*python-3.3.5 (28 Mar 2014) + + 28 Mar 2014; Mike Gilbert +python-3.3.5.ebuild: + Version bump. + + 20 Mar 2014; Jeroen Roovers python-2.7.6.ebuild: + Stable for HPPA (bug #504742). + + 18 Mar 2014; Agostino Sarubbo python-3.3.3.ebuild: + Stable for ia64, wrt bug #497758 + + 16 Mar 2014; Mike Gilbert python-2.6.9.ebuild: + Backport fix for bug 503180. + +*python-3.4.0_rc3 (15 Mar 2014) + + 15 Mar 2014; Mike Gilbert +python-3.4.0_rc3.ebuild: + Bump. + + 15 Mar 2014; Mike Gilbert python-2.7.6.ebuild: + Backport upstream fixes for bug 503180. + + 01 Mar 2014; Mike Gilbert python-3.4.0_rc1.ebuild: + Disable ensurepip. + +*python-3.4.0_rc1 (17 Feb 2014) + + 17 Feb 2014; Mike Gilbert +python-3.4.0_rc1.ebuild: + Version bump for testing. Thanks to Arfrever for the patches. + +*python-3.3.4 (17 Feb 2014) + + 17 Feb 2014; Mike Gilbert +python-3.3.4.ebuild: + Version bump. Thanks to Arfrever for maintaining the patchset. + + 08 Feb 2014; Mike Gilbert python-3.3.3.ebuild: + Add workaround for race condition when generating Python-ast.c and Python- + ast.h. Thanks to Arfrever. + + 05 Feb 2014; Mike Frysinger python-3.3.3.ebuild: + Mark arm64/m68k/s390/sh stable. + + 26 Jan 2014; Agostino Sarubbo python-3.3.3.ebuild: + Stable for sparc, wrt bug #497758 + + 26 Jan 2014; Agostino Sarubbo python-3.3.3.ebuild: + Stable for x86, wrt bug #497758 + + 20 Jan 2014; Agostino Sarubbo python-3.3.3.ebuild: + Stable for ppc, wrt bug #497758 + + 19 Jan 2014; Markus Meier python-3.3.3.ebuild: + arm stable, bug #497758 + + 19 Jan 2014; Agostino Sarubbo python-3.3.3.ebuild: + Stable for ppc64, wrt bug #497758 + + 18 Jan 2014; Agostino Sarubbo python-3.3.3.ebuild: + Stable for alpha, wrt bug #497758 + + 18 Jan 2014; Pacho Ramos python-3.3.3.ebuild: + amd64 stable, bug #497758 + + 18 Jan 2014; Mike Frysinger python-2.7.6.ebuild: + Fix cross-compiling tests that try to read /dev/ paths. + + 18 Jan 2014; Mike Frysinger python-2.7.5-r3.ebuild, + python-2.7.5-r4.ebuild, python-2.7.6.ebuild, python-3.3.2-r2.ebuild, + python-3.3.3.ebuild: + Add arm64 love. + + 16 Jan 2014; Mike Frysinger python-3.3.2-r2.ebuild: + Mark m68k/s390/sh stable. + + 15 Jan 2014; Agostino Sarubbo python-3.3.2-r2.ebuild: + Stable for ia64, wrt bug #474128 + + 11 Jan 2014; Jeroen Roovers python-3.3.3.ebuild: + Stable for HPPA (bug #497758). + + 05 Jan 2014; Agostino Sarubbo python-3.3.2-r2.ebuild: + Stable for ppc64, wrt bug #474128 + + 05 Jan 2014; Agostino Sarubbo python-3.3.2-r2.ebuild: + Stable for ppc, wrt bug #474128 + + 30 Dec 2013; Mike Gilbert python-2.6.8-r3.ebuild, + python-2.6.9.ebuild, python-2.7.5-r3.ebuild, python-2.7.5-r4.ebuild, + python-2.7.6.ebuild, python-3.2.5-r3.ebuild, python-3.3.2-r2.ebuild, + python-3.3.3.ebuild: + Don't die on broken sem_open if threads flag is disabled. + + 30 Dec 2013; Mike Gilbert python-2.6.8-r3.ebuild, + python-2.6.9.ebuild, python-2.7.5-r3.ebuild, python-2.7.5-r4.ebuild, + python-2.7.6.ebuild, python-3.2.5-r3.ebuild, python-3.3.2-r2.ebuild, + python-3.3.3.ebuild: + Die if sem_open is detected as broken, bug 496328. + + 26 Dec 2013; Markus Meier python-3.3.2-r2.ebuild: + arm stable, bug #474128 + +*python-2.6.9 (25 Dec 2013) + + 25 Dec 2013; Mike Gilbert +python-2.6.9.ebuild: + Bump for security bug 495224. 15 Dec 2013; Agostino Sarubbo python-3.3.2-r2.ebuild: Stable for sparc, wrt bug #474128 diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 56d6f1c..b639832 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -3,7 +3,6 @@ AUX CVE-2013-4238_py27.patch 11591 SHA256 050cc2d4b9d588f2587010a30819591e02130f AUX CVE-2013-4238_py33.patch 11437 SHA256 e4f78490fc247df9d1133dc9f2deec47b1c582c4af1c8e93bd503d889c9eb716 SHA512 d1f1b64c46056f178b89abfe61c7c653afc0ed67cf9a8ef8c981d1cf6a1c389cb20bd354cac3a30c1241e6fe24a49e165527571276c1f8afb55989f5f069ba00 WHIRLPOOL e5889b6be0a2db7ec45ff8cbe9fa8481c6c69b25091b62635d2ff595ef5d0b1136485f7adb04f4c0c97402edfd9d915d4fd05e2b6bf1942497d81de1b1cefdce AUX pydoc.conf 279 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8 SHA512 2d552b6262fa4c7cd75f45d93b8a2657eb9154decbc08f9b73d2e67e1d84367b498f8556fbba20f7b57414281cfd673fff607da3c688c1d6bb9842e92cf0c32a WHIRLPOOL 1ba44797765939d7c0bcbecb08cb6201eeff9b134d4d3caef9339729dcad9f258e20b16db5f369f49b378df3c91e530115dbce5ce3595d71cd325a48793ac814 AUX pydoc.init 741 SHA256 913be80dea585dd161d2fd439f56a358f148853d8305cb0dbf113c91eb1643f5 SHA512 9806c6ecf55f51b74b7cf4088c22043838cee8e8192b0bd33289c80ca86f96469bcef7ad110f654505109aa325fcfcc4e54e9494c8dccef13447d12c89f00152 WHIRLPOOL 73d5e45039bc054ed5217503b0ef3d96fc8701e2c0a69342118c0e5a89949a5afb2228827e97a654868f916620578a4a8fd2fba2dc60c6850c3f61affc0dfa28 -AUX python-2.5-tcl86.patch 615 SHA256 cc649fbd471c7e348fc64f3844d9f4e1aab604cb3a028c9fb2cc58ba816b7bda SHA512 dca5eaff3ba981d699805c310dba0a7412ab2b856256ef25e41eb49e1441c382f868406ddce04a1e9768ccfacab1fb39e5e7a320f4ca6884a51583ca61a77dc8 WHIRLPOOL 515f1a5a163d4b34adff2b8e10e43c83f9575f185391440cf89155076b0399d3c5249e5a8741894d94092af4c5271c125b032bbc76c9e4e6f6d94f26133e5672 AUX python-2.7-issue16248.patch 735 SHA256 ed137a0ab513e6d9c910e37f637aef2d58fb730070e447572f39d46d9cc99568 SHA512 da00f8571741d4cfb529b9db875b5d831d5d8e43fdc464bc43adee046f208165ab6b13d671bc90be988b1099afeac4fc0e7ba7fa473ff74a9ec7731da89e11a9 WHIRLPOOL ad770b848666efb5cc3b8c07a530f2a9aaca683f4b447c2d835e39be59a5dde35a28ab8cdb278ecf456e15e57b7401ff83fb04ac71bd8d80abc19d45beb84d62 AUX python-2.7-issue18851.patch 11805 SHA256 4ecff8db20cdc4d9b0692a126859c318a9ba20bf1eff6e633c964871b2410d66 SHA512 b1eeec1451d011f37c65676819bf8391b9657d93a0b9f03d0db09956ef052fa3f2d922d1d5fc3c69567f549aa86f65a06670dcf3ead8300c0ac97651f9a503cd WHIRLPOOL b4b51d590175959df1f8373ff86343618b4474ea9afc2ef9360c680c986f30fa8f432eeb076de676cb87052cc6453a2b613dfaab51ab1ec5945a7c7c496a4f9f AUX python-2.7.5-library-path.patch 991 SHA256 ff7a4a1846ebcadc2dbf979ea619072caac22e47909fe188fc4b6becce6ea2eb SHA512 74916d541eb38c526dc1243fe5e5a9de3a7875f02c53e5f49e60182ba042de2f15514364e7fbd821146dcf92db2bba88d8a9f46d4c71237b73fd39cbabf93d85 WHIRLPOOL 62bb1c85941ccaac7ca6f6fb2d93dc27f206cf9f815b90ef1f89748dfdd1d38deda9f6bf7eb2ce9fd8635d1a77576819192e8049ec5de52fdeb9f981dfb32f9f @@ -15,8 +14,8 @@ AUX python-3.2-CVE-2013-2099.patch 2102 SHA256 76a89951e7efcf14d37e30e0104446429 AUX python-3.2-issue16248.patch 738 SHA256 b5e94ead2622f355d733232dcfdac4dab53889aab12980fa1e4496c296191e77 SHA512 6fcf3d4cf05e41758a6d51ad9cc25ce9fcd1d33854f096b599811a07ef6b7f0cc4f178c4db6b15c5c9ee86eb53fcc736fede0dfb4eae81ca429d0fad62d84db9 WHIRLPOOL dd620bdce394a74910f4deed50b8bcd2b5d6b61af1e2e225a7c36fe4f293560fe1237a2111a4a4a334dfd1272fa4b7faf6289b2a018864c4f154c8a8a8b85c5c AUX python-3.3-CVE-2013-2099.patch 2102 SHA256 d5ccc8de43a176d9d16c3a7be58d32dcf3c952147d8866f84dffcd8fa66f6396 SHA512 a8e2c8fd3d3c3924acb856e89b6dc6965c887688e4c7d078c27abacfaf6b33b12484d86942b75643f28e4a14a465e2ec6a30fe53acf2ab036ae667fb7f76d737 WHIRLPOOL c02bd815d5143b6a916a91f40bb7971f1be188e836ab6095a5befd6410545acba0d44b4b0a75a5f7e7d84105018c0ef27887eefdcd883c73e68f872bb4138e35 AUX python-config-2.4-r1 1624 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f SHA512 f8a0e12bed93385b3dddfa64a416ff4a560ec1b12c6c4a0dd715a2c804a43b6a292f0fe13e28d7828d4c4d620cde9dd7eab6a3423216786917ea6f51856ff53c WHIRLPOOL f2fe759b05ac0eb3b8dd196b0c68b8b8e0145ab79659eb4a45adee1bf7ae7260f457ae6192b9792990babd59cb98cceec05a8d93a50a3203517fe49ec30f5e0e -DIST Python-2.7.6.tar.xz 10431288 SHA256 1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 SHA512 e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238 WHIRLPOOL 3b83106e89c96d2227573595bd96c868e6ece7fb04fda0aa22c8d3249af99cedebcd224ec8ae788eabe8a091a55d12af9ed093ee1eedb7c72b66732c62d5e1b3 -DIST python-gentoo-patches-2.7.6-1.tar.xz 14572 SHA256 cb0fca8f006ee7b8501cfbed063c987ad6793f61072144ded2122bca6dc608ed SHA512 e6bc3de2053b1dbc5845effe86cc7d19acbcf10b52b2a1ce3d45988492a2430dd8f6ea3e547beaf57bdf176b06a07f267aa6afac82cde61ed730fe3f4b2ab238 WHIRLPOOL ecf800bc895609bbdf5ec5c53031142b56002b20930d9dd1c34610fb6628d0d5fa6874a1111fa691474bde6ae1e18a03da795bb298cde4a6f649e45637ea4da0 -EBUILD python-2.7.6-r2.ebuild 14003 SHA256 79354af671983ae31fd940aaf46adcd0f086accd0a2e79d74c23f0dde523816a SHA512 a9ca3466d6868eb513782cfc987095873e2152e2727f9738d46c800539cfb7d0d181b5cd99e2f9e47dc760af75be6e40dfe22963224d54a6fa40eca862d0fd6e WHIRLPOOL fdccc9bfe3f605709fcd57903430987d9c20a5357b139653d06a120b571cc22c0285af3a5992a5b3194373c0f49800ae5599022667763cd7a21111aec55a0c03 -MISC ChangeLog 27576 SHA256 d9b6928b2234df665a3ce1868f4452b24d2cc7e012e6ac08c116d8b786ab4859 SHA512 c54030c7f02a0663eea1c2a0fb5b9d0377b9245bb1de7330e85d341a05c7c3c6db117df20ac121fa1e549da3e76470714c9e4b723499716f00ee8ae6d4a64d50 WHIRLPOOL 8a878d2be539d36d6fd4102df9d493c63b528cd46a7ee3b0c89429a2370bdab90c50925e73adaf4c5920cef23efd54993d5b0e0d2cd5d946648a97b2bbbb7405 +DIST Python-2.7.7.tar.xz 10496500 SHA256 2983e3cd089b30c50e2b2234f07c2ac4fb8a5df230ab8f2e1133a1d8b208da78 SHA512 ea2101feeb41da953b078b93977bd320a937f4047d074fbed568c7c73b1dfe433a66f7f14009ad7160862694a1b378e61f688831b655dcab8a8825e0d1a9acff WHIRLPOOL c3e8862ca2e66a18755adecca98cf59a56d667238671b10810e056cc27fcc099f94126064c93bf30e9941dbf5cdde67114cead527111b8c73244cd707b5cadd3 +DIST python-gentoo-patches-2.7.7-0.tar.xz 13664 SHA256 80e683fc95b709beca1fda13d72851696d158e97f30cfa692f513eba73876d26 SHA512 66cb9937c64a605f6280fee62ebc4c18b7089905b2d2382f310725ce74c446a2d7b1a783c20ad36b02f8e740ac177064f59fd887f1ede428d46d90491e946c2f WHIRLPOOL 0a7615309bd94012cc28d68ee8dfa75bd1e96d67ffe93194e4c9ff7ed4239d5b17078f961c35d4220ea8ff46ebb28db34af19079712f680e8e69ffeb097db165 +EBUILD python-2.7.7-r1.ebuild 13827 SHA256 c896dd3755836c47a1caccdb104a88bb3b6ee1c1ede31aea1a476ffe7ae8cea5 SHA512 38275f016b5a9a4b345b4bd09e6da34a4db6c646f6218f9ad2ae73734a40505377e1506df60e14a273c42e5555f8c640bdaabecd61ea1c4439901f0286ff1d3b WHIRLPOOL af07efbada9f24ade01811b2be066f16cda60531c7c9cb7a27655fe074f5f76c8de73c6bbb4ed66cad05e6da8974fb3beadcc7567d7f4a124116ed30070d5807 +MISC ChangeLog 33141 SHA256 10319ced983c880825707444621ae570a77e130c1729a218605ff45063f53462 SHA512 3d1a499885ba72af80d15bf3f50ec4a86c96e3113ff1852bce5f9db01716c7b0b0cb10e96c415e3a9338b9e75e17b95261741f9a53a6db29698e5639a3015f0a WHIRLPOOL d034a31b022c267e29b350d1942786ada95f9ee68f26e8a1a023cd0fdcf5f04f327e729c653d9479cd647f1eed89dc1de0d6ee39a1c0e0d1ac68f486059d800c MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e diff --git a/dev-lang/python/files/python-2.5-tcl86.patch b/dev-lang/python/files/python-2.5-tcl86.patch deleted file mode 100644 index 2362e98..0000000 --- a/dev-lang/python/files/python-2.5-tcl86.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -1518,7 +1518,7 @@ - # The versions with dots are used on Unix, and the versions without - # dots on Windows, for detection by cygwin. - tcllib = tklib = tcl_includes = tk_includes = None -- for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2', -+ for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83', '8.2', - '82', '8.1', '81', '8.0', '80']: - tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version) - tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version) diff --git a/dev-lang/python/python-2.7.6-r2.ebuild b/dev-lang/python/python-2.7.6-r2.ebuild deleted file mode 100644 index b541b3b..0000000 --- a/dev-lang/python/python-2.7.6-r2.ebuild +++ /dev/null @@ -1,462 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -WANT_AUTOMAKE="none" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-multilib-utils-r1 toolchain-funcs multiprocessing multilib-minimal - -MY_P="Python-${PV}" -PATCHSET_REVISION="1" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="~amd64" -IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.1.3[${MULTILIB_USEDEP}] - virtual/libffi[${MULTILIB_USEDEP}] - virtual/libintl[${MULTILIB_USEDEP}] - !build? ( - berkdb? ( || ( - sys-libs/db:5.3[${MULTILIB_USEDEP}] - sys-libs/db:5.2[${MULTILIB_USEDEP}] - sys-libs/db:5.1[${MULTILIB_USEDEP}] - sys-libs/db:5.0[${MULTILIB_USEDEP}] - sys-libs/db:4.8[${MULTILIB_USEDEP}] - sys-libs/db:4.7[${MULTILIB_USEDEP}] - sys-libs/db:4.6[${MULTILIB_USEDEP}] - sys-libs/db:4.5[${MULTILIB_USEDEP}] - sys-libs/db:4.4[${MULTILIB_USEDEP}] - sys-libs/db:4.3[${MULTILIB_USEDEP}] - sys-libs/db:4.2[${MULTILIB_USEDEP}] - ) ) - gdbm? ( sys-libs/gdbm[berkdb,${MULTILIB_USEDEP}] ) - ncurses? ( - >=sys-libs/ncurses-5.2[${MULTILIB_USEDEP}] - readline? ( >=sys-libs/readline-4.1[${MULTILIB_USEDEP}] ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3[${MULTILIB_USEDEP}] ) - ssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) - tk? ( - >=dev-lang/tk-8.0[${MULTILIB_USEDEP}] - dev-tcltk/blt[${MULTILIB_USEDEP}] - dev-tcltk/tix[${MULTILIB_USEDEP}] - ) - xml? ( >=dev-libs/expat-2.1[${MULTILIB_USEDEP}] ) - ) - !! /dev/null || die - - ECONF_SOURCE="${S}" OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-dbmliborder="${dbmliborder}" \ - --with-libc="" \ - --enable-loadable-sqlite-extensions \ - --with-system-expat \ - --with-system-ffi - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi - popd > /dev/null || die -} - -multilib_src_compile() { - local S="${BUILD_DIR}" - local ABI="${ABI:-default}" - local BUILD_DIR="${WORKDIR}/${CHOST}-${ABI}" - - # Avoid invoking pgen for cross-compiles. - touch Include/graminit.h Python/graminit.c - - pushd "${BUILD_DIR}" > /dev/null || die - emake - - # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E python - else - pax-mark m python - fi - popd > /dev/null || die -} - -multilib_src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - local S="${BUILD_DIR}" - local ABI="${ABI:-default}" - local BUILD_DIR="${WORKDIR}/${CHOST}-${ABI}" - pushd "${BUILD_DIR}" > /dev/null || die - - # Skip failing tests. - local skipped_tests="distutils gdb" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}/test_${test}-${ABI}.py" - done - - # Rerun failed tests in verbose mode (regrtest -w). - emake test EXTRATESTOPTS="-w" < /dev/tty - local result="$?" - - for test in ${skipped_tests}; do - mv "${T}/test_${test}-${ABI}.py" "${S}/Lib/test/test_${test}.py" - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ "${result}" -ne 0 ]]; then - die "emake test failed" - fi - popd > /dev/null || die -} - -multilib_src_install() { - local S="${BUILD_DIR}" - local ABI="${ABI:-default}" - local BUILD_DIR="${WORKDIR}/${CHOST}-${ABI}" - pushd "${BUILD_DIR}" > /dev/null || die - - emake DESTDIR="${D}" altinstall - - local libdir=${ED}usr/$(get_libdir)/python${SLOT} - sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed" - - # 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}" - rm -f "${ED}usr/bin/smtpd.py" - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test} - else - use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die - use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die - use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die - use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test} - fi - - use threads || rm -r "${libdir}/multiprocessing" || die - use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die - - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ - emake --no-print-directory -s -f - 2>/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - # for python-exec - local EPYTHON PYTHON PYTHON_SITEDIR - - python_export python${SLOT}-${ABI} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py - - popd > /dev/null || die -} - -multilib_src_install_all() { - # Backwards compat with Gentoo divergence - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r "${S}"/Tools - fi - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - - declare -a abis=( $(multilib_get_enabled_abis) ) - local bestabi=${abis[$(( ${#abis[@]} - 1))]} abi file abifile - - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" \ - || die "sed failed" - - # if more than one multilib abi is enabled we have some extra work. - if [[ ${#abis[@]} -gt 1 ]] ; then - # for each abi ... - for abi in "${abis[@]}" ; do - # Backwards compat with Gentoo divergence - dosym python${SLOT}-config-${abi} /usr/bin/python${SLOT}-${abi}-config - - # ... fix multilib scripts with build-generated no-multilib-shebangs. - for file in "${MULTILIB_WRAPPED_EXECUTABLES[@]#@}" ; do - [[ ${file} == /usr/bin/python${SLOT} ]] && continue # not a script - - abifile="${ED}${file#/}-${abi}" - if [[ -f ${abifile} ]] ; then - # keep native ABI suffix unmangled by using EPYTHON export rather than argument - EPYTHON="python${SLOT}-${abi}" python_rewrite_shebang_multilib "${abifile}" - else - die "Couldn't find \"${abifile}\"" - fi - done - - # Skip the remaining steps for the native abi. For non-native abis, ... - [[ ${abi} == ${bestabi} ]] && continue - - # ... install initscript templates, ... - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}-${abi} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}-${abi} - - # ... and instantiate them. - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_${abi/-/_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}-${abi}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}-${abi}" "${ED}etc/init.d/pydoc-${SLOT}-${abi}" \ - || die "sed failed" - done - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7[${MULTILIB_USEDEP}]"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python 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 - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn "You should switch active version of Python ${PV%%.*} and run" - ewarn "'python-updater [options]' to rebuild Python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-2.7.7-r1.ebuild b/dev-lang/python/python-2.7.7-r1.ebuild new file mode 100644 index 0000000..4c57662 --- /dev/null +++ b/dev-lang/python/python-2.7.7-r1.ebuild @@ -0,0 +1,458 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +WANT_AUTOMAKE="none" +WANT_LIBTOOL="none" + +inherit autotools eutils flag-o-matic multilib pax-utils python-multilib-utils-r1 toolchain-funcs multiprocessing multilib-minimal + +MY_P="Python-${PV}" +PATCHSET_VERSION="2.7.7-0" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="http://www.python.org/" +SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" + +LICENSE="PSF-2" +SLOT="2.7" +KEYWORDS="~amd64" +IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.1.3[${MULTILIB_USEDEP}] + virtual/libffi[${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] + !build? ( + berkdb? ( || ( + sys-libs/db:5.3[${MULTILIB_USEDEP}] + sys-libs/db:5.2[${MULTILIB_USEDEP}] + sys-libs/db:5.1[${MULTILIB_USEDEP}] + sys-libs/db:5.0[${MULTILIB_USEDEP}] + sys-libs/db:4.8[${MULTILIB_USEDEP}] + sys-libs/db:4.7[${MULTILIB_USEDEP}] + sys-libs/db:4.6[${MULTILIB_USEDEP}] + sys-libs/db:4.5[${MULTILIB_USEDEP}] + sys-libs/db:4.4[${MULTILIB_USEDEP}] + sys-libs/db:4.3[${MULTILIB_USEDEP}] + sys-libs/db:4.2[${MULTILIB_USEDEP}] + ) ) + gdbm? ( sys-libs/gdbm[berkdb,${MULTILIB_USEDEP}] ) + ncurses? ( + >=sys-libs/ncurses-5.2[${MULTILIB_USEDEP}] + readline? ( >=sys-libs/readline-4.1[${MULTILIB_USEDEP}] ) + ) + sqlite? ( >=dev-db/sqlite-3.3.8:3[${MULTILIB_USEDEP}] ) + ssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) + tk? ( + >=dev-lang/tk-8.0[${MULTILIB_USEDEP}] + dev-tcltk/blt[${MULTILIB_USEDEP}] + dev-tcltk/tix[${MULTILIB_USEDEP}] + ) + xml? ( >=dev-libs/expat-2.1[${MULTILIB_USEDEP}] ) + ) + !! /dev/null || die + + ECONF_SOURCE="${S}" OPT="" \ + econf \ + --with-fpectl \ + --enable-shared \ + $(use_enable ipv6) \ + $(use_with threads) \ + $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ + --infodir='${prefix}/share/info' \ + --mandir='${prefix}/share/man' \ + --with-dbmliborder="${dbmliborder}" \ + --with-libc="" \ + --enable-loadable-sqlite-extensions \ + --with-system-expat \ + --with-system-ffi + + if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi + popd > /dev/null || die +} + +multilib_src_compile() { + local S="${BUILD_DIR}" + local ABI="${ABI:-default}" + local BUILD_DIR="${WORKDIR}/${CHOST}-${ABI}" + + # Avoid invoking pgen for cross-compiles. + touch Include/graminit.h Python/graminit.c + + pushd "${BUILD_DIR}" > /dev/null || die + emake + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi + popd > /dev/null || die +} + +multilib_src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + local S="${BUILD_DIR}" + local ABI="${ABI:-default}" + local BUILD_DIR="${WORKDIR}/${CHOST}-${ABI}" + pushd "${BUILD_DIR}" > /dev/null || die + + # Skip failing tests. + local skipped_tests="distutils gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}/test_${test}-${ABI}.py" + done + + # Rerun failed tests in verbose mode (regrtest -w). + emake test EXTRATESTOPTS="-w" < /dev/tty + local result="$?" + + for test in ${skipped_tests}; do + mv "${T}/test_${test}-${ABI}.py" "${S}/Lib/test/test_${test}.py" + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" + elog "and run the tests separately." + + if [[ "${result}" -ne 0 ]]; then + die "emake test failed" + fi + popd > /dev/null || die +} + +multilib_src_install() { + local S="${BUILD_DIR}" + local ABI="${ABI:-default}" + local BUILD_DIR="${WORKDIR}/${CHOST}-${ABI}" + pushd "${BUILD_DIR}" > /dev/null || die + + emake DESTDIR="${D}" altinstall + + local libdir=${ED}usr/$(get_libdir)/python${SLOT} + sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed" + + # 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}" + rm -f "${ED}usr/bin/smtpd.py" + + if use build; then + rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test} + else + use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die + use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test} + fi + + use threads || rm -r "${libdir}/multiprocessing" || die + use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die + + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + # for python-exec + local EPYTHON PYTHON PYTHON_SITEDIR + + python_export python${SLOT}-${ABI} EPYTHON PYTHON PYTHON_SITEDIR + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py + python_domodule epython.py + + popd > /dev/null || die +} + +multilib_src_install_all() { + # Backwards compat with Gentoo divergence + dosym python${SLOT}-config /usr/bin/python-config-${SLOT} + + dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r "${S}"/Tools + fi + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} + + declare -a abis=( $(multilib_get_enabled_abis) ) + local bestabi=${abis[$(( ${#abis[@]} - 1))]} abi file abifile + + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${SLOT}:" \ + -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" \ + || die "sed failed" + + # if more than one multilib abi is enabled we have some extra work. + if [[ ${#abis[@]} -gt 1 ]] ; then + # for each abi ... + for abi in "${abis[@]}" ; do + # Backwards compat with Gentoo divergence + dosym python${SLOT}-config-${abi} /usr/bin/python${SLOT}-${abi}-config + + # ... fix multilib scripts with build-generated no-multilib-shebangs. + for file in "${MULTILIB_WRAPPED_EXECUTABLES[@]#@}" ; do + [[ ${file} == /usr/bin/python${SLOT} ]] && continue # not a script + + abifile="${ED}${file#/}-${abi}" + if [[ -f ${abifile} ]] ; then + # keep native ABI suffix unmangled by using EPYTHON export rather than argument + EPYTHON="python${SLOT}-${abi}" python_rewrite_shebang_multilib "${abifile}" + else + die "Couldn't find \"${abifile}\"" + fi + done + + # Skip the remaining steps for the native abi. For non-native abis, ... + [[ ${abi} == ${bestabi} ]] && continue + + # ... install initscript templates, ... + newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}-${abi} + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}-${abi} + + # ... and instantiate them. + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_${abi/-/_}_PORT:" \ + -e "s:@PYDOC@:pydoc${SLOT}-${abi}:" \ + -i "${ED}etc/conf.d/pydoc-${SLOT}-${abi}" "${ED}etc/init.d/pydoc-${SLOT}-${abi}" \ + || die "sed failed" + done + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7[${MULTILIB_USEDEP}]"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python 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 + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn "You should switch active version of Python ${PV%%.*} and run" + ewarn "'python-updater [options]' to rebuild Python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} -- cgit v1.2.3-65-gdbad