commit:     79230d7997e8f3960cc6c95223eddeb92aa12590
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 11:59:14 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 11:59:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79230d79

app-editors/emacs: Remove compatibility code in pkg_postinst

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/emacs-23.4-r20.ebuild  | 3 ---
 app-editors/emacs/emacs-24.5-r10.ebuild  | 3 ---
 app-editors/emacs/emacs-25.3-r9.ebuild   | 3 ---
 app-editors/emacs/emacs-26.3-r4.ebuild   | 3 ---
 app-editors/emacs/emacs-27.1-r4.ebuild   | 3 ---
 app-editors/emacs/emacs-27.2.9999.ebuild | 3 ---
 app-editors/emacs/emacs-27.2.ebuild      | 3 ---
 app-editors/emacs/emacs-28.0.9999.ebuild | 3 ---
 8 files changed, 24 deletions(-)

diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild 
b/app-editors/emacs/emacs-23.4-r20.ebuild
index 0d973f9bfa6..245667931c0 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -344,9 +344,6 @@ pkg_postinst() {
                # force an update of the emacs symlink for the livecd/dvd,
                # because some microemacs packages set it with USE=livecd
                eselect emacs update
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
        else
                eselect emacs update ifunset
        fi

diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild 
b/app-editors/emacs/emacs-24.5-r10.ebuild
index 29a79f9eda9..3358010308c 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -336,9 +336,6 @@ pkg_postinst() {
                # force an update of the emacs symlink for the livecd/dvd,
                # because some microemacs packages set it with USE=livecd
                eselect emacs update
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
        else
                eselect emacs update ifunset
        fi

diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild 
b/app-editors/emacs/emacs-25.3-r9.ebuild
index 046d2d03a3a..2ef65527eee 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -346,9 +346,6 @@ pkg_postinst() {
                # force an update of the emacs symlink for the livecd/dvd,
                # because some microemacs packages set it with USE=livecd
                eselect emacs update
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
        else
                eselect emacs update ifunset
        fi

diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild 
b/app-editors/emacs/emacs-26.3-r4.ebuild
index f8e6373953e..34237af4f67 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -365,9 +365,6 @@ pkg_postinst() {
                # force an update of the emacs symlink for the livecd/dvd,
                # because some microemacs packages set it with USE=livecd
                eselect emacs update
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
        else
                eselect emacs update ifunset
        fi

diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild 
b/app-editors/emacs/emacs-27.1-r4.ebuild
index 84733a91bbc..f7ad194e0ef 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -433,9 +433,6 @@ pkg_postinst() {
                # force an update of the emacs symlink for the livecd/dvd,
                # because some microemacs packages set it with USE=livecd
                eselect emacs update
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
        else
                eselect emacs update ifunset
        fi

diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild 
b/app-editors/emacs/emacs-27.2.9999.ebuild
index cf4fb3cdad1..7f3c223e9ed 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -432,9 +432,6 @@ pkg_postinst() {
                # force an update of the emacs symlink for the livecd/dvd,
                # because some microemacs packages set it with USE=livecd
                eselect emacs update
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
        else
                eselect emacs update ifunset
        fi

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
index d7bfdd69550..c3f5c07c149 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -432,9 +432,6 @@ pkg_postinst() {
                # force an update of the emacs symlink for the livecd/dvd,
                # because some microemacs packages set it with USE=livecd
                eselect emacs update
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
        else
                eselect emacs update ifunset
        fi

diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild 
b/app-editors/emacs/emacs-28.0.9999.ebuild
index f29bffb7c8c..80e296098e7 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -416,9 +416,6 @@ pkg_postinst() {
                # force an update of the emacs symlink for the livecd/dvd,
                # because some microemacs packages set it with USE=livecd
                eselect emacs update
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
        else
                eselect emacs update ifunset
        fi

Reply via email to