[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/

[Zac Medico]

commit:     90c173fd4761bdb8f15599486e6a06852ccba742
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 22:55:57 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 22:57:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c173fd

app-portage/gentoolkit: make postinst message conditional

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 app-portage/gentoolkit/gentoolkit-0.4.0.ebuild    | 18 +++++++++++++-----
 app-portage/gentoolkit/gentoolkit-0.4.1.ebuild    | 18 +++++++++++++-----
 app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild | 18 +++++++++++++-----
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
index c96bc49af44..47665d99a84 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
@@ -35,16 +35,24 @@ python_install_all() {
        distutils-r1_python_install_all
 }
 
+pkg_preinst() {
+       if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+               SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+       fi
+}
+
 pkg_postinst() {
        # Create cache directory for revdep-rebuild
        mkdir -p -m 0755 "${EROOT%/}"/var/cache
        mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
 
-       elog "Starting with this version, ebump, ekeyword and imlate are now"
-       elog "part of the gentoolkit package."
-       elog "The gentoolkit-dev package is now deprecated in favor of a single"
-       elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-       elog "are now obsolete/unused with the git based tree."
+       if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+               elog "Starting with this version, ebump, ekeyword and imlate 
are now"
+               elog "part of the gentoolkit package."
+               elog "The gentoolkit-dev package is now deprecated in favor of 
a single"
+               elog "gentoolkit package.   The remaining tools from 
gentoolkit-dev"
+               elog "are now obsolete/unused with the git based tree."
+       fi
 
        # Only show the elog information on a new install
        if [[ ! ${REPLACING_VERSIONS} ]]; then

diff --git a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
index 7d5fb8c5f73..6722fbcda23 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
@@ -35,16 +35,24 @@ python_install_all() {
        distutils-r1_python_install_all
 }
 
+pkg_preinst() {
+       if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+               SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+       fi
+}
+
 pkg_postinst() {
        # Create cache directory for revdep-rebuild
        mkdir -p -m 0755 "${EROOT%/}"/var/cache
        mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
 
-       elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-       elog "part of the gentoolkit package."
-       elog "The gentoolkit-dev package is now deprecated in favor of a single"
-       elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-       elog "are now obsolete/unused with the git based tree."
+       if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+               elog "Starting with version 0.4.0, ebump, ekeyword and imlate 
are now"
+               elog "part of the gentoolkit package."
+               elog "The gentoolkit-dev package is now deprecated in favor of 
a single"
+               elog "gentoolkit package.   The remaining tools from 
gentoolkit-dev"
+               elog "are now obsolete/unused with the git based tree."
+       fi
 
        # Only show the elog information on a new install
        if [[ ! ${REPLACING_VERSIONS} ]]; then

diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
index 1670a73c840..3ef6b39ef07 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@@ -39,16 +39,24 @@ python_install_all() {
        distutils-r1_python_install_all
 }
 
+pkg_preinst() {
+       if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+               SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+       fi
+}
+
 pkg_postinst() {
        # Create cache directory for revdep-rebuild
        mkdir -p -m 0755 "${EROOT%/}"/var/cache
        mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
 
-       elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-       elog "part of the gentoolkit package."
-       elog "The gentoolkit-dev package is now deprecated in favor of a single"
-       elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-       elog "are now obsolete/unused with the git based tree."
+       if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+               elog "Starting with version 0.4.0, ebump, ekeyword and imlate 
are now"
+               elog "part of the gentoolkit package."
+               elog "The gentoolkit-dev package is now deprecated in favor of 
a single"
+               elog "gentoolkit package.   The remaining tools from 
gentoolkit-dev"
+               elog "are now obsolete/unused with the git based tree."
+       fi
 
        # Only show the elog information on a new install
        if [[ ! ${REPLACING_VERSIONS} ]]; then