diff options
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/python/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-lang/python/Manifest | 14 | ||||
| -rw-r--r-- | dev-lang/python/python-2.6.6-r1.ebuild | 52 |
3 files changed, 25 insertions, 52 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index ee7642feb958..38ad7849d870 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,13 @@ # 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.513 2010/12/29 16:21:36 hwoarang Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.514 2011/01/01 18:24:05 jmbsvicetto Exp $ + + 01 Jan 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + python-2.6.6-r1.ebuild: + Non-maintainer commit. + Reverting commit that broke stage generation for python-2.6.6-r1 as it wasn't + reverted before - bug 347867. + This commit was accepted by Arfrever. 29 Dec 2010; Markos Chandras <hwoarang@gentoo.org> python-2.6.6-r1.ebuild: Stable on amd64 wrt bug #342927 diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 9cdf5e5af870..beca93e7c845 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1 AUX pydoc.init 666 RMD160 11caf3a78bce4cdaebacaf21eaf26cc1ce30282e SHA1 88c5cb6d5bf737c74e1be93118cf157630af9ad7 SHA256 0d25c71232b74adb87dc709cc7cd8f8b13c452c0fe82fa33808f907f7a96d628 AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6 @@ -27,17 +24,10 @@ DIST python-gentoo-patches-3.1.3.tar.bz2 12778 RMD160 1bdb66b6ed11ba41a0d2e4cfd4 EBUILD python-2.4.6.ebuild 9296 RMD160 dac3e3b4d6dd4210e09218cebb2be683331e616c SHA1 9af11f887248d91e61194c7124969f7492dea4af SHA256 6dc1b9af1a50ef5f3e22ef11321892fb24ab2d24a9e74b7c94fd67e9d4912114 EBUILD python-2.5.4-r4.ebuild 9646 RMD160 62771015f0ff7529aa2a90787f581a3ced40b5f9 SHA1 8d7e256da105bb19c821edcf697de78fa8c8970e SHA256 4dc2644db1e56b1d2484efca9087094303fc9858b1a502357785fce2b6c75c5f EBUILD python-2.6.5-r3.ebuild 9444 RMD160 8d4f99e6a188cfe298845069194cc3976fcb35de SHA1 9931ed1ac9b8ed812b608ad49fb39d753269c246 SHA256 465c428d1be88035ff8b29e5eee0898f723cdcf8e4233523ec185ce05c145f54 -EBUILD python-2.6.6-r1.ebuild 10456 RMD160 1b1dc27fc89e7707d0b576da2baf933d473e5259 SHA1 d286daaa689d30ee3586e90473b3519aa882a3fa SHA256 8a5e4b9378e547580eec6c7e0191e47a7b45d6019c4c4109787c21a09ca4690b +EBUILD python-2.6.6-r1.ebuild 9630 RMD160 9f9d23cda68a5a39b737faa99cf127a52471c122 SHA1 d35a368b2eb2df37999d6b00a744b3266caad2c8 SHA256 a02fb209eef6ee3d9764f8041bcaf622c2a751ab9f7e99487bf3439ebdf9a801 EBUILD python-2.7.1.ebuild 11155 RMD160 ae57e5466d3b2fa08158df1382bbc6db92f494bd SHA1 ca7f2a63e99e1c61d7866fcee2d1a31baa0a678c SHA256 cd114ab8448cf6c9de45ed1f2cd7d992545552d32089c33d3f39df4f9d7dd564 EBUILD python-2.7.ebuild 9744 RMD160 d2da1b16c2e7b172cbcc71d946b23b95a3303096 SHA1 01bf5c021c1990d58e67e9d54404f7c827ebdb92 SHA256 f853409bb30839c2e363f4432e463fd34b3c14e1479ee3a026f4f46696a4c3b1 EBUILD python-3.1.2-r4.ebuild 9530 RMD160 f5c81006e92a82eeecff26b6aebd4634954f82f2 SHA1 249a5bd39a775866b19d18b2b4970011ecaab8f3 SHA256 75a6e7ba58e8b10052eb3ae0fb235c9a1a73b1f8b1ab04b7fdfd1a45b04fc718 EBUILD python-3.1.3.ebuild 10587 RMD160 d62df31bbc98d2d481af6aafaa863b468a9aa335 SHA1 34b850cd44f0cee4bf53d41a200c60c95892fad8 SHA256 55be7f4aa9534ce9a8ad41badbe182c06f868317c7fd2bc5de314303a972402f -MISC ChangeLog 91224 RMD160 5cda3037b11c52cbce18bbb7af863a92245cc564 SHA1 82a60d86aea3f0d1b98aedd1609d0b44dd687c97 SHA256 bbe5e8b03c6cf169e6411840b6fa4c56a62347bfb907408fc13e0ee43bd3b0ea +MISC ChangeLog 91498 RMD160 515fd45cda6aa5129e9c923c3f654aa8d88fa989 SHA1 74130b530a60745cd50c7b9fe85d5747e7ca05ae SHA256 1ae63be7a7eb37cffad54d51326a3f911451d736ceb12e0dc9e1a673bafba71e MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAk0bX88ACgkQ9/cejkQaxBAbVACfQUFnNq5doczUsOdXRoAQstyU -U78AnRZTpTH36ZJlTkj6TuCVgz8zRjs9 -=EBfG ------END PGP SIGNATURE----- diff --git a/dev-lang/python/python-2.6.6-r1.ebuild b/dev-lang/python/python-2.6.6-r1.ebuild index 9793b4452d78..6c4b901e3e1e 100644 --- a/dev-lang/python/python-2.6.6-r1.ebuild +++ b/dev-lang/python/python-2.6.6-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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-2.6.6-r1.ebuild,v 1.11 2010/12/29 16:21:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.12 2011/01/01 18:24:05 jmbsvicetto Exp $ EAPI="2" @@ -272,48 +272,24 @@ src_install() { rmdir "${ED}$(python_get_libdir)/lib-old" } -save_active_python_version() { - active_python_2=$(eselect python show --python2) - active_python_3=$(eselect python show --python3) - active_python_main=$(eselect python show) -} - -restore_active_python_version() { - if [[ -n "${active_python_2}" && - "${active_python_2}" != $(eselect python show --python2) ]] ; then - einfo "Restoring active Python 2.x interpreter: ${active_python_2}" - eselect python set --python2 "${active_python_2}" - fi - if [[ -n "${active_python_3}" && - "${active_python_3}" != $(eselect python show --python3) ]] ; then - einfo "Restoring active Python 3.x interpreter: ${active_python_3}" - eselect python set --python3 "${active_python_3}" - fi - - if [[ -n "${active_python_main}" && - "${active_python_main}" != $(eselect python show) ]] ; then - einfo "Restoring main active Python interpreter: ${active_python_main}" - eselect python set "${active_python_main}" +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then + python_updater_warning="1" fi } -ensure_python_symlink() { - if [[ -z "$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} +eselect_python_update() { + local eselect_python_options + [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2" -pkg_preinst() { - save_active_python_version + # Create python2 symlink. + eselect python update --python2 > /dev/null - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then - python_updater_warning="1" - fi + eselect python update ${eselect_python_options} } pkg_postinst() { - restore_active_python_version - ensure_python_symlink + eselect_python_update python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir) @@ -331,7 +307,7 @@ pkg_postinst() { } pkg_postrm() { - ensure_python_symlink + eselect_python_update python_mod_cleanup $(python_get_libdir) -} +}
\ No newline at end of file |