diff options
| -rw-r--r-- | dev-lang/python/python-2.7.18-r5.ebuild | 22 | ||||
| -rw-r--r-- | dev-lang/python/python-3.10.0_alpha3.ebuild | 1 | ||||
| -rw-r--r-- | dev-lang/python/python-3.6.12-r1.ebuild | 34 | ||||
| -rw-r--r-- | dev-lang/python/python-3.7.9-r1.ebuild | 34 | ||||
| -rw-r--r-- | dev-lang/python/python-3.8.6-r1.ebuild | 34 | ||||
| -rw-r--r-- | dev-lang/python/python-3.8.7.ebuild | 36 | ||||
| -rw-r--r-- | dev-lang/python/python-3.9.0-r1.ebuild | 1 | ||||
| -rw-r--r-- | dev-lang/python/python-3.9.1.ebuild | 3 |
8 files changed, 2 insertions, 163 deletions
diff --git a/dev-lang/python/python-2.7.18-r5.ebuild b/dev-lang/python/python-2.7.18-r5.ebuild index 022e586961cc..66d18c69df18 100644 --- a/dev-lang/python/python-2.7.18-r5.ebuild +++ b/dev-lang/python/python-2.7.18-r5.ebuild @@ -65,7 +65,6 @@ DEPEND="${RDEPEND} RDEPEND+=" !build? ( app-misc/mime-types ) !<=dev-lang/python-exec-2.4.6-r1" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" pkg_setup() { if use berkdb; then @@ -346,24 +345,3 @@ src_install() { dosym "python${PYVER}" "/usr/bin/python${pymajor}" dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config" } - -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 -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.10.0_alpha3.ebuild b/dev-lang/python/python-3.10.0_alpha3.ebuild index c26b80ae4526..4f63d5703d89 100644 --- a/dev-lang/python/python-3.10.0_alpha3.ebuild +++ b/dev-lang/python/python-3.10.0_alpha3.ebuild @@ -60,7 +60,6 @@ BDEPEND=" virtual/pkgconfig !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-3.6.12-r1.ebuild b/dev-lang/python/python-3.6.12-r1.ebuild index 1695164047aa..d7dc0ddc2f32 100644 --- a/dev-lang/python/python-3.6.12-r1.ebuild +++ b/dev-lang/python/python-3.6.12-r1.ebuild @@ -56,7 +56,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. @@ -330,36 +329,3 @@ src_install() { "${scriptdir}/idle" || die fi } - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; 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 - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.7.9-r1.ebuild b/dev-lang/python/python-3.7.9-r1.ebuild index efee2dc75560..c9f05e0a8bb6 100644 --- a/dev-lang/python/python-3.7.9-r1.ebuild +++ b/dev-lang/python/python-3.7.9-r1.ebuild @@ -57,7 +57,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. @@ -316,36 +315,3 @@ src_install() { "${scriptdir}/idle" || die fi } - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; 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 - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.8.6-r1.ebuild b/dev-lang/python/python-3.8.6-r1.ebuild index 3a63d125d358..a995778caf34 100644 --- a/dev-lang/python/python-3.8.6-r1.ebuild +++ b/dev-lang/python/python-3.8.6-r1.ebuild @@ -57,7 +57,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. @@ -320,36 +319,3 @@ src_install() { "${scriptdir}/idle" || die fi } - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; 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 - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.8.7.ebuild b/dev-lang/python/python-3.8.7.ebuild index eaee9eaef9c5..6d3bedd9a7f4 100644 --- a/dev-lang/python/python-3.8.7.ebuild +++ b/dev-lang/python/python-3.8.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -57,7 +57,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. @@ -320,36 +319,3 @@ src_install() { "${scriptdir}/idle" || die fi } - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; 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 - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.9.0-r1.ebuild b/dev-lang/python/python-3.9.0-r1.ebuild index 1135d77cd400..9a4416b1da3b 100644 --- a/dev-lang/python/python-3.9.0-r1.ebuild +++ b/dev-lang/python/python-3.9.0-r1.ebuild @@ -57,7 +57,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M diff --git a/dev-lang/python/python-3.9.1.ebuild b/dev-lang/python/python-3.9.1.ebuild index 9f6b2edbb3a1..dfb20a04f215 100644 --- a/dev-lang/python/python-3.9.1.ebuild +++ b/dev-lang/python/python-3.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -57,7 +57,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M |