| 1 |
commit: 5d88d9b3360378c6149143cadc5a72e0daaeb585 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 18 12:09:05 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 18 12:09:21 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d88d9b3 |
| 7 |
|
| 8 |
app-editors/emacs-vcs: Remove compatibility code in pkg_preinst. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 11 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild | 14 ++------------ |
| 14 |
.../emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild | 15 ++------------- |
| 15 |
app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 14 ++------------ |
| 16 |
3 files changed, 6 insertions(+), 37 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild |
| 19 |
index 1b73de9ab19..5d69c80a079 100644 |
| 20 |
--- a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild |
| 21 |
+++ b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild |
| 22 |
@@ -379,18 +379,8 @@ src_install () { |
| 23 |
|
| 24 |
pkg_preinst() { |
| 25 |
# move Info dir file to correct name |
| 26 |
- local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 27 |
- if [[ -f ${ED}${infodir}/dir.orig ]]; then |
| 28 |
- mv "${ED}"${infodir}/dir{.orig,} || die |
| 29 |
- elif [[ -d "${ED}"${infodir} ]]; then |
| 30 |
- # this should not happen in EAPI 4 |
| 31 |
- ewarn "Regenerating Info directory index in ${infodir} ..." |
| 32 |
- rm -f "${ED}"${infodir}/dir{,.*} |
| 33 |
- for f in "${ED}"${infodir}/*; do |
| 34 |
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
| 35 |
- install-info --info-dir="${ED}"${infodir} "${f}" || die |
| 36 |
- fi |
| 37 |
- done |
| 38 |
+ if [[ -d ${ED}/usr/share/info ]]; then |
| 39 |
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die |
| 40 |
fi |
| 41 |
} |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild |
| 45 |
index e4a2a2cd716..9880970c3fc 100644 |
| 46 |
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild |
| 47 |
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild |
| 48 |
@@ -377,19 +377,8 @@ src_install () { |
| 49 |
|
| 50 |
pkg_preinst() { |
| 51 |
# move Info dir file to correct name |
| 52 |
- local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 53 |
- if [[ -f ${ED}${infodir}/dir.orig ]]; then |
| 54 |
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" |
| 55 |
- elif [[ -d "${ED}"${infodir} ]]; then |
| 56 |
- # this should not happen in EAPI 4 |
| 57 |
- ewarn "Regenerating Info directory index in ${infodir} ..." |
| 58 |
- rm -f "${ED}"${infodir}/dir{,.*} |
| 59 |
- for f in "${ED}"${infodir}/*; do |
| 60 |
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
| 61 |
- install-info --info-dir="${ED}"${infodir} "${f}" \ |
| 62 |
- || die "install-info failed" |
| 63 |
- fi |
| 64 |
- done |
| 65 |
+ if [[ -d ${ED}/usr/share/info ]]; then |
| 66 |
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die |
| 67 |
fi |
| 68 |
} |
| 69 |
|
| 70 |
|
| 71 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild |
| 72 |
index dc1e3f47c0a..832d7156dc3 100644 |
| 73 |
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild |
| 74 |
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild |
| 75 |
@@ -386,18 +386,8 @@ src_install () { |
| 76 |
|
| 77 |
pkg_preinst() { |
| 78 |
# move Info dir file to correct name |
| 79 |
- local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 80 |
- if [[ -f ${ED}${infodir}/dir.orig ]]; then |
| 81 |
- mv "${ED}"${infodir}/dir{.orig,} || die |
| 82 |
- elif [[ -d "${ED}"${infodir} ]]; then |
| 83 |
- # this should not happen in EAPI 4 |
| 84 |
- ewarn "Regenerating Info directory index in ${infodir} ..." |
| 85 |
- rm -f "${ED}"${infodir}/dir{,.*} |
| 86 |
- for f in "${ED}"${infodir}/*; do |
| 87 |
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
| 88 |
- install-info --info-dir="${ED}"${infodir} "${f}" || die |
| 89 |
- fi |
| 90 |
- done |
| 91 |
+ if [[ -d ${ED}/usr/share/info ]]; then |
| 92 |
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die |
| 93 |
fi |
| 94 |
} |
Archives