commit: 1c107237c1c1451c149e7e345032e973737b32e2
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 5 10:58:59 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 11:00:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c107237
app-editors/emacs: Remove pre-2011 workaround for Info dir
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-editors/emacs/emacs-18.59-r15.ebuild | 14 +++-----------
app-editors/emacs/emacs-25.3-r16.ebuild | 17 ++++-------------
app-editors/emacs/emacs-26.3-r13.ebuild | 16 ++++------------
app-editors/emacs/emacs-27.2-r11.ebuild | 16 ++++------------
app-editors/emacs/emacs-28.2-r6.ebuild | 16 ++++------------
app-editors/emacs/emacs-28.3_rc1.ebuild | 16 ++++------------
app-editors/emacs/emacs-29.0.9999-r1.ebuild | 16 ++++------------
app-editors/emacs/emacs-30.0.9999.ebuild | 16 ++++------------
8 files changed, 31 insertions(+), 96 deletions(-)
diff --git a/app-editors/emacs/emacs-18.59-r15.ebuild
b/app-editors/emacs/emacs-18.59-r15.ebuild
index 2c48395d4314..7844e27bcb93 100644
--- a/app-editors/emacs/emacs-18.59-r15.ebuild
+++ b/app-editors/emacs/emacs-18.59-r15.ebuild
@@ -134,8 +134,7 @@ src_install() {
dosym -r /usr/share/info/emacs-${SLOT} ${basedir}/info
docompress -x /usr/share/info
- # move Info dir to avoid collisions with the dir file generated by
portage
- mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
dodir /var/lib/emacs
@@ -146,16 +145,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
+ # verify that the PM hasn't removed our Info directory index #257260
local infodir="${ED}/usr/share/info/emacs-${SLOT}"
- if [[ -f ${infodir}/dir.orig ]]; then
- mv "${infodir}"/dir{.orig,} || die
- elif [[ -d ${infodir} ]]; then
- # this can happen when preinst is run twice, e.g. when
- # installing a binpkg that was created with quickpkg #899648
- ewarn "Unexpected \"dir\" file in ${infodir} - preinst run
twice?"
- [[ ${MERGE_TYPE} == binary && -f ${infodir}/dir ]] || die
- fi
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-25.3-r16.ebuild
b/app-editors/emacs/emacs-25.3-r16.ebuild
index 723f51cc2df7..c30c446b5c38 100644
--- a/app-editors/emacs/emacs-25.3-r16.ebuild
+++ b/app-editors/emacs/emacs-25.3-r16.ebuild
@@ -240,11 +240,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|| die "moving emacs man page failed"
- # move info dir to avoid collisions with the dir file generated by
portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
- || die "moving info dir failed"
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
@@ -330,16 +328,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
+ # verify that the PM hasn't removed our Info directory index #257260
local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
- if [[ -f ${infodir}/dir.orig ]]; then
- mv "${infodir}"/dir{.orig,} || die
- elif [[ -d ${infodir} ]]; then
- # this can happen when preinst is run twice, e.g. when
- # installing a binpkg that was created with quickpkg #899648
- ewarn "Unexpected \"dir\" file in ${infodir} - preinst run
twice?"
- [[ ${MERGE_TYPE} == binary && -f ${infodir}/dir ]] || die
- fi
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-26.3-r13.ebuild
b/app-editors/emacs/emacs-26.3-r13.ebuild
index 40ac01cbd10b..908d736cf0d5 100644
--- a/app-editors/emacs/emacs-26.3-r13.ebuild
+++ b/app-editors/emacs/emacs-26.3-r13.ebuild
@@ -249,10 +249,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml ||
die
- # move info dir to avoid collisions with the dir file generated by
portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -350,16 +349,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
+ # verify that the PM hasn't removed our Info directory index #257260
local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
- if [[ -f ${infodir}/dir.orig ]]; then
- mv "${infodir}"/dir{.orig,} || die
- elif [[ -d ${infodir} ]]; then
- # this can happen when preinst is run twice, e.g. when
- # installing a binpkg that was created with quickpkg #899648
- ewarn "Unexpected \"dir\" file in ${infodir} - preinst run
twice?"
- [[ ${MERGE_TYPE} == binary && -f ${infodir}/dir ]] || die
- fi
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-27.2-r11.ebuild
b/app-editors/emacs/emacs-27.2-r11.ebuild
index b11a6adb956f..314d7da47ad8 100644
--- a/app-editors/emacs/emacs-27.2-r11.ebuild
+++ b/app-editors/emacs/emacs-27.2-r11.ebuild
@@ -307,10 +307,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml ||
die
- # move info dir to avoid collisions with the dir file generated by
portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -413,16 +412,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
+ # verify that the PM hasn't removed our Info directory index #257260
local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
- if [[ -f ${infodir}/dir.orig ]]; then
- mv "${infodir}"/dir{.orig,} || die
- elif [[ -d ${infodir} ]]; then
- # this can happen when preinst is run twice, e.g. when
- # installing a binpkg that was created with quickpkg #899648
- ewarn "Unexpected \"dir\" file in ${infodir} - preinst run
twice?"
- [[ ${MERGE_TYPE} == binary && -f ${infodir}/dir ]] || die
- fi
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-28.2-r6.ebuild
b/app-editors/emacs/emacs-28.2-r6.ebuild
index 8d359a6ae141..a86b866e289c 100644
--- a/app-editors/emacs/emacs-28.2-r6.ebuild
+++ b/app-editors/emacs/emacs-28.2-r6.ebuild
@@ -386,10 +386,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml ||
die
- # move info dir to avoid collisions with the dir file generated by
portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -492,16 +491,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
+ # verify that the PM hasn't removed our Info directory index #257260
local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
- if [[ -f ${infodir}/dir.orig ]]; then
- mv "${infodir}"/dir{.orig,} || die
- elif [[ -d ${infodir} ]]; then
- # this can happen when preinst is run twice, e.g. when
- # installing a binpkg that was created with quickpkg #899648
- ewarn "Unexpected \"dir\" file in ${infodir} - preinst run
twice?"
- [[ ${MERGE_TYPE} == binary && -f ${infodir}/dir ]] || die
- fi
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-28.3_rc1.ebuild
b/app-editors/emacs/emacs-28.3_rc1.ebuild
index d38c159725f9..f27c55f138e8 100644
--- a/app-editors/emacs/emacs-28.3_rc1.ebuild
+++ b/app-editors/emacs/emacs-28.3_rc1.ebuild
@@ -403,10 +403,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml ||
die
- # move info dir to avoid collisions with the dir file generated by
portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -509,16 +508,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
+ # verify that the PM hasn't removed our Info directory index #257260
local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
- if [[ -f ${infodir}/dir.orig ]]; then
- mv "${infodir}"/dir{.orig,} || die
- elif [[ -d ${infodir} ]]; then
- # this can happen when preinst is run twice, e.g. when
- # installing a binpkg that was created with quickpkg #899648
- ewarn "Unexpected \"dir\" file in ${infodir} - preinst run
twice?"
- [[ ${MERGE_TYPE} == binary && -f ${infodir}/dir ]] || die
- fi
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild
b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
index 198c02ddd567..16e932a02739 100644
--- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
@@ -433,10 +433,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml ||
die
- # move info dir to avoid collisions with the dir file generated by
portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -539,16 +538,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
+ # verify that the PM hasn't removed our Info directory index #257260
local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
- if [[ -f ${infodir}/dir.orig ]]; then
- mv "${infodir}"/dir{.orig,} || die
- elif [[ -d ${infodir} ]]; then
- # this can happen when preinst is run twice, e.g. when
- # installing a binpkg that was created with quickpkg #899648
- ewarn "Unexpected \"dir\" file in ${infodir} - preinst run
twice?"
- [[ ${MERGE_TYPE} == binary && -f ${infodir}/dir ]] || die
- fi
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild
b/app-editors/emacs/emacs-30.0.9999.ebuild
index a1fdc765f4c4..257e0e3e5c92 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -433,10 +433,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml ||
die
- # move info dir to avoid collisions with the dir file generated by
portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -539,16 +538,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
+ # verify that the PM hasn't removed our Info directory index #257260
local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
- if [[ -f ${infodir}/dir.orig ]]; then
- mv "${infodir}"/dir{.orig,} || die
- elif [[ -d ${infodir} ]]; then
- # this can happen when preinst is run twice, e.g. when
- # installing a binpkg that was created with quickpkg #899648
- ewarn "Unexpected \"dir\" file in ${infodir} - preinst run
twice?"
- [[ ${MERGE_TYPE} == binary && -f ${infodir}/dir ]] || die
- fi
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
