dev-lang/python: Remove remnants of python-updater

Remove the remaining dependencies on deprecated python-updater,
and update the postinst messages appropriately. For Python 2.7,
the message has been removed altogether since it is the oldest version
supported by PYTHON_TARGETS. For the remaining versions, just inform
about potential PYTHON_TARGETS changes necessary.

The modified versions are not revision-bumped to avoid unnecessary
rebuilds due to a minor change. The versions that are still
newest-visible (i.e. not replaced by another version or revision bump)
will be bumped when python-updater is lastrited.

diff --git a/dev-lang/python/python-2.7.10-r1.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild
index 5715577a33622e64f513904a5c733cd8446e8d63..aaf1b143e04ecd56aea2d8bfcaea0075e5dca231 100644 (file)
--- a/dev-lang/python/python-2.7.10-r1.ebuild
+++ b/dev-lang/python/python-2.7.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -64,8 +64,7 @@ DEPEND="${RDEPEND}
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )
        doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-       app-admin/python-updater"
+PDEPEND="app-eselect/eselect-python"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -329,12 +328,6 @@ src_install() {
        python_domodule epython.py
 }
 
-pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; 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
@@ -347,12 +340,6 @@ eselect_python_update() {
 
 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() {

diff --git a/dev-lang/python/python-2.7.11-r2.ebuild b/dev-lang/python/python-2.7.11-r2.ebuild
index 50bc7a255dbbfda2322a5b95288d79d8da4cbc82..9eeab0c3fe8cb532153104a2bac278186c20047a 100644 (file)
--- a/dev-lang/python/python-2.7.11-r2.ebuild
+++ b/dev-lang/python/python-2.7.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -66,8 +66,7 @@ DEPEND="${RDEPEND}
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )
        doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1
-       app-admin/python-updater"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -343,12 +342,6 @@ src_install() {
        fi
 }
 
-pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; 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
@@ -357,12 +350,6 @@ eselect_python_update() {
 
 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() {

diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild
index 15f7436a60ec4bddd212fd5ecb66e438951db009..992882b2ebd32a424f2334680a8d125ca8650773 100644 (file)
--- a/dev-lang/python/python-2.7.12.ebuild
+++ b/dev-lang/python/python-2.7.12.ebuild
@@ -66,8 +66,7 @@ DEPEND="${RDEPEND}
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )
        doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1
-       app-admin/python-updater"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -343,12 +342,6 @@ src_install() {
        fi
 }
 
-pkg_preinst() {
-       if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; 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
@@ -357,12 +350,6 @@ eselect_python_update() {
 
 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() {

diff --git a/dev-lang/python/python-3.3.5-r3.ebuild b/dev-lang/python/python-3.3.5-r3.ebuild
index 6ff606d7d48da306d220be5ab7c2e6a96a10d1cf..42477ed50fc658c26802b7a7528f8c8e1df3ffe2 100644 (file)
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -54,8 +54,7 @@ DEPEND="${RDEPEND}
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )
        doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-       app-admin/python-updater"
+PDEPEND="app-eselect/eselect-python"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -319,8 +318,6 @@ pkg_postinst() {
                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."
-               ewarn
-               ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules."
        fi
 }
 

diff --git a/dev-lang/python/python-3.3.5-r8.ebuild b/dev-lang/python/python-3.3.5-r8.ebuild
index 99604498825944f5f37b7f74d0a44bd222d189a9..e7f91bd72fb47555469de416bc4095abf9199f98 100644 (file)
--- a/dev-lang/python/python-3.3.5-r8.ebuild
+++ b/dev-lang/python/python-3.3.5-r8.ebuild
@@ -60,8 +60,7 @@ DEPEND="${RDEPEND}
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )
        doc? ( dev-python/python-docs:${PYVER} )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1
-       app-admin/python-updater"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -363,8 +362,6 @@ pkg_postinst() {
                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."
-               ewarn
-               ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules."
        fi
 }
 

diff --git a/dev-lang/python/python-3.4.3-r1.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild
index 0f32b9467bb00fb8d66bc1c175b8617a006feaca..d7dab168b3cba3b63ab589e96c6e34684623c977 100644 (file)
--- a/dev-lang/python/python-3.4.3-r1.ebuild
+++ b/dev-lang/python/python-3.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -51,8 +51,7 @@ DEPEND="${RDEPEND}
        >=sys-devel/autoconf-2.65
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-       app-admin/python-updater"
+PDEPEND="app-eselect/eselect-python"
 
 S="${WORKDIR}/${MY_P}"
 

diff --git a/dev-lang/python/python-3.4.3-r7.ebuild b/dev-lang/python/python-3.4.3-r7.ebuild
index 38e922817b316835cc497a958253004071372fac..51a14dbb6eb61956efb1c42eedcc63a67991ef91 100644 (file)
--- a/dev-lang/python/python-3.4.3-r7.ebuild
+++ b/dev-lang/python/python-3.4.3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -53,8 +53,7 @@ DEPEND="${RDEPEND}
        >=sys-devel/autoconf-2.65
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1
-       app-admin/python-updater"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 S="${WORKDIR}/${MY_P}"
 

diff --git a/dev-lang/python/python-3.4.4.ebuild b/dev-lang/python/python-3.4.4.ebuild
index e1e7af2f93e74640da23f104c194e13862e4844b..a5ef671d7e85b3d62129fdcd583b7a6464a5adec 100644 (file)
--- a/dev-lang/python/python-3.4.4.ebuild
+++ b/dev-lang/python/python-3.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -53,8 +53,7 @@ DEPEND="${RDEPEND}
        >=sys-devel/autoconf-2.65
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1
-       app-admin/python-updater"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 S="${WORKDIR}/${MY_P}"
 

diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild
index 9491f2da175d486c095477dbabee60517f5a9eab..433a3a373da849e08951690acc4101e550ddea6e 100644 (file)
--- a/dev-lang/python/python-3.4.5.ebuild
+++ b/dev-lang/python/python-3.4.5.ebuild
@@ -53,8 +53,7 @@ DEPEND="${RDEPEND}
        >=sys-devel/autoconf-2.65
        !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1
-       app-admin/python-updater"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 S="${WORKDIR}/${MY_P}"