summaryrefslogtreecommitdiff
path: root/app-editors/emacs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-03-05 23:52:45 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-03-05 23:52:45 +0000
commit1c33e521c460dc40899ce7bc919602b842ce27e2 (patch)
tree580eefad4cce1e883e7504b93352a9029b53036d /app-editors/emacs
parent65e4244e411c4f65f55f2aa91f39e228f4c0680b (diff)
gentoo auto-resync : 05:03:2023 - 23:52:45
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/Manifest16
-rw-r--r--app-editors/emacs/emacs-18.59-r15.ebuild12
-rw-r--r--app-editors/emacs/emacs-25.3-r16.ebuild13
-rw-r--r--app-editors/emacs/emacs-26.3-r13.ebuild12
-rw-r--r--app-editors/emacs/emacs-27.2-r11.ebuild12
-rw-r--r--app-editors/emacs/emacs-28.2-r6.ebuild12
-rw-r--r--app-editors/emacs/emacs-28.3_rc1.ebuild12
-rw-r--r--app-editors/emacs/emacs-29.0.9999-r1.ebuild12
-rw-r--r--app-editors/emacs/emacs-30.0.9999.ebuild12
9 files changed, 48 insertions, 65 deletions
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c7cd05f5c8b3..39ad43589342 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -14,16 +14,16 @@ DIST emacs-28.2-patches-2.tar.xz 3760 BLAKE2B 73a78b4fa05aec86ed29315acdad821995
DIST emacs-28.2-patches-3.tar.xz 5416 BLAKE2B c361fdebf375427cf25c4ac206161b5b55d8d6de88752de35491c778ba90eedf277159a8c317ccda7aaf5e000035d6e33d8e70282436d6e03fa311c4576abe03 SHA512 acae15b577af831bc94e102323836f3fa5b0d51ec1096b84063c81c58f1087b67487507c05d93ba5ddacfce0fea4f3e755906a9ec582b061b65095ee7d693eac
DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
DIST emacs-28.3-rc1.tar.xz 47896700 BLAKE2B 2d7da4a72cc1256c7b9d1157cd379a5373b6b55c01d94254d6aee25887991a8da694f3239a7f443adef0debbc300043ad4595b5934b6aa383daed10257bcbae0 SHA512 2cd4c5174a5ade6f928de3ff6aa1728fe0f18bd5b985d87b62f38aa083da14d9ae3db6372638548d33ef7bbb632823eabb051307d8fca6c78296bff3c79b2d2f
-EBUILD emacs-18.59-r15.ebuild 4392 BLAKE2B a2d1b7dba97a50ebeb7e70f8112aa6e9b67ea0f49e2ea03351aac0d73e57d8750f40d76dccbe37c85c47911a1c0c11d7405760df26ad49113e345f838d0e4d9f SHA512 27ae9452912e9d7f5e21b9ad3fbb79d4b40d92eaad0f952ac7500423b2ebf907eb1654218ce760b93a31f18fa17d216f5fb7757a03fb2dcc65f4b8682b6300cc
+EBUILD emacs-18.59-r15.ebuild 4342 BLAKE2B 08852c5c45cc4330fb7684be880272a3d2ebe71ad736226f6fb3300ea3a5ad615509ddec3f3f49cc9a563e12e37d3bce4c227f8778634a02a8e632c539877d13 SHA512 85e85041bdc5f509d874602602c7bf5a7ce220a8fbdb7af571570e50e37fba89ec07cfd312b555386aa82a87fa010737787cd829689a83506cc61f4eb84a3839
EBUILD emacs-25.3-r15.ebuild 11093 BLAKE2B 4bae8f9ddf46a9300076808f8ee365da379633950cc3b159a837dfd7bbee39731d66ddae316f79c2b94a29aa53e7612fab1761f87f6c2c38fd16fe1b415d82b8 SHA512 28a0736dcb4ba69ab19a723a978f176d907d878c35899236359aa61c9305223e28315c0500b78f9cc76115f6740dd89f52022370a5bd5741bde723dbd4026104
-EBUILD emacs-25.3-r16.ebuild 11098 BLAKE2B b57c2e554e0b992de30a3b20b707ee62d754a8600c28a9c27846d18230a2c33b230efc6bc961d95d9373b62161fe053802a220017b837f05ec54cd046c5c1359 SHA512 222ca59e223403834c3bfec7824b82ab4831325413aa2e84692097945484cfb794a96a9346a8d3f7a652d937543a0e967967780ed1ce2e61ba209738b2e39929
+EBUILD emacs-25.3-r16.ebuild 11011 BLAKE2B fd5a8324ad44c24471f0d29d4e2475dc084c5db5e7a5f9bfa62e25c24408c2f90bcac6ccbbcef196a1d32f36325ae4a4af2ac0ee2110c68a40c7f69818d69eb3 SHA512 fc087ab8138ed7067afea0bb30ce8656b7145f2da17eaef07c9c8e47af64fe3949c7b71b7d00e5deb14dd771cb03f2f24030f70619a7bf180a8ec24d6410e96a
EBUILD emacs-26.3-r11.ebuild 11782 BLAKE2B df6298cd44cd0b542df107d1de249a1cebe25b5c4312722bc0736818cb1f345322b0c7e01de261cd5622bdd966cb8c9204e6a7976503c35cf320ce41c4737f6f SHA512 fc19f754dcb120e6a73249622358b6b02d08679132472ddb5e59ab3556293724bc4c132e88f41de4f9a6f0a00dc37c9dbb5694085c3456de71e76187f57d6308
-EBUILD emacs-26.3-r13.ebuild 11798 BLAKE2B 5c3b97e526a311e24213d8db6aa54bf74f6ffd8969f3a734ca76a8c8404e3fb47d8649d01cb7e2ad26900fbd3413fae733fcebc113464667f9fc4414daeac308 SHA512 5bfde7d7c94b300f30efe17723d58da01562aa4034b2c45efa4f94bcf2a457b8373ae11d50d98b23bcd9320c80469c177a010ea15def31310f65042b840920d5
-EBUILD emacs-27.2-r11.ebuild 14318 BLAKE2B 1a511a177273fff5d840406fc5aa9b3e1be169890271fddb5733e3833053d8fc7b744b39416b035bb13a38c5ff645d7d9d08f7d45474bc17ca1e86e17bcb5d6c SHA512 8a9c35642c0d29048c359699918de6a0f09f23ba41b366b9a7b325044fc1ba6a7281df2e49524eaa0f82c6480e1d1057616faea76cfae746e8c9e11eb501536f
+EBUILD emacs-26.3-r13.ebuild 11740 BLAKE2B 352b94899d28136a5c4239790489843fed526a3e25b0130e22ba7bf628697754308b0d3af50e315c0bb4d62df249a72db8d37268d4998c1dabbf22f025cb9c74 SHA512 394ae65e7a9fbd180b6ad54bb2f4e5ba88ff712dcf11943e806c7914e35ff8645cccde67ba218a2c8bef331179da7cc9cd18a1e5a1ef475341a04f7b67104565
+EBUILD emacs-27.2-r11.ebuild 14260 BLAKE2B f9ae761d12052f2908bbcdd86dfbe0c023854dcef3ad2779a1fa70bdcf4a6dcf142d66b96a8515ea9407feedd42173f8be747fecc8120c69054b7cbec59e29a0 SHA512 d96f6548f7ced934876e84757e7729216a4a50a0846a882001406ae1d538537090b983957b32c7c4a3320ef104de0d41c9ca0f7da13c90403bb2bd2cac256c47
EBUILD emacs-27.2-r9.ebuild 14313 BLAKE2B 9e5d108ecf03da117123995e8542d92e461d845df19eb0b0276dcfe6aedac2142d07298096c2aafeaefbfd58cc8db9ed589077129dc06f80fbc14a65589f7205 SHA512 6dfe590ca8cce4f0ed03646935875eed42376870732a46ee906971383ddf7e3fd521858d1ab08b0d104da8657f0a4c9411afd16945d0f04171bb0a8fc5a3009e
EBUILD emacs-28.2-r4.ebuild 16758 BLAKE2B a9d8e7a0f010698e530d0dfa502036ca36bcd112c31c94c5540957adf41eb244a76cb5d97c8ea8dbaf1f336deb50197e9888c677125894880520af8d224be330 SHA512 7a9e3cbcaac1bf5e273489b87a2bc6d3919af7223f36b317201f9e2c748aa7e6ad935ef8290c7699aef5fb187dde42f2d028a8c78ac4341f7f9928c8b01558ec
-EBUILD emacs-28.2-r6.ebuild 16765 BLAKE2B c08a2079ee7ed7905ca2640beaf78acb40601c7a03cd027f5568b83c4d1a97999ff2ad002f98507554e4184d4aa73931143916ad41e26f13ace76bd3b8d79edd SHA512 9a349f6f8d3755f0ff3bad7a635d8115dfbeae1a2e76b1892b7350de6fe07c567c5d2b3d918ac6b1b3f684b11158d50c21a7bebaecb0c605ac2147ff36b7a0a0
-EBUILD emacs-28.3_rc1.ebuild 17256 BLAKE2B 9c0d6f83f5451e3e1ccdcfb9334782b3f64884f41534c95d2edfa0f0fe00765dc70282c2ccc424b5eb33d4126c75cae344863653c15eaf74ab5f8eb31d79f77e SHA512 16acc38562a16fca4ee16372e1ed620202682b190d292c69ab1573f1b59c4ede0ada71d312eab17bb4516a586c39bc71a58fe3f7701d75eb7681d4c04e6c9ba9
-EBUILD emacs-29.0.9999-r1.ebuild 18196 BLAKE2B 376255711f13ff7e629491990a84e07ff51d04371dda9b11e0488cd441b6f99d807315425ebb4d16ad5242c8ccc7ea225645faa9fba2a92588dda14941fbbd87 SHA512 c5e0cce0a79b3f93f58fb515a3a4c4dd6ae5a2a50ee9dda8ad4bd8934a311db5f0148ac5846ffb265ab126363d509b2ba603ddce5d8c5d2993748849b23bae1e
-EBUILD emacs-30.0.9999.ebuild 18194 BLAKE2B a198f5125839960b8d3bf45be132f4b35ad4137c02c7c660f00fedfe1c4cafb9248a334be2346cad25bfbd012f8d9e7f207e84a762b3115a4e2646dc9cf84ab8 SHA512 f042a997db7a555fe05c12c5b09edc2c44a2833e6ea0dd1d04245fc86bc0c5a9f9a1ce39fa87e28ae18655ddb28f9667dba88cf471149f16f8e5eec5b6c0cd63
+EBUILD emacs-28.2-r6.ebuild 16707 BLAKE2B ec647f539b1006f9945bc7ff91d60cedc23f5dad95f0f53cc56589d314fdf188f464f209a27dfa5de47a4407b83af8ba78e70bdb0df9f1a896f9990277a41d09 SHA512 6e55c00fe665acb9c69da018ea6080c42327832083f232c99b4223628d401a3a48384c3499a63f5793d76f283d929f52088dab679e39e87f1ab512fc8aff8f63
+EBUILD emacs-28.3_rc1.ebuild 17198 BLAKE2B 6e86b94cd8c6cbf9e46914027746a9c52b5d5a512a101f4f45c1d129cce2587b1aca13d1b4e3e4beed9d544d8aad64c1636a95a5667423b10352e7f571a03586 SHA512 71bcc63ca873b2c144a3987436a59be0f695cd1e0bfab15419330ab092d6deb35a100e7ce895dc98f6887bf077e3ca8094df3d0537babbd7eff0abeb319a201a
+EBUILD emacs-29.0.9999-r1.ebuild 18138 BLAKE2B b1876d79dbbcc0b23c991ee8e503b0da0d542224fd878cd9dc941b80c53b7865f6730d7831613a4232951ec1c8cce9a324189ab077357868e0931a7fb0857636 SHA512 14e13297734239f4d4c769f365591bc754fd00bafb2430af5f9709250c3ba02e4fa5ffa87d777bd47269d5dd75b12d31beee764025fca288322806e010bfcc76
+EBUILD emacs-30.0.9999.ebuild 18136 BLAKE2B 5aa17458480dc84a8c182281a67262ef5d0993211e623c86c47c09c812dba3bd213d930da0ab57f727c32c9df73db9a16151ec3b51db128b3c3a41e87b061484 SHA512 fd0659852845e8eb07ce05d57e231ecd06362beed199a2bdd3d11484c6eb6cc2477b1f30b49b011ab04d6669679dfffc2140a931097f01768b831afa7c7ea667
MISC metadata.xml 3265 BLAKE2B e4f61b7e8859672fe9798ebaae20d8fb490d4677db7be8a856f313f4dfd5f02b38623250ddc45cdab1f0d0b64b941b4874b95252c796e893d5a28e5a318277bc SHA512 4b79a448076ddee7de95dc2f1a999fb86295d04a20d016a9bb2fe8a038ee5424517ca8f1991a884a08ca52847191c83becb06fb7cb8d4bb2a609cf4b2e25d020
diff --git a/app-editors/emacs/emacs-18.59-r15.ebuild b/app-editors/emacs/emacs-18.59-r15.ebuild
index 6822620a67f8..7844e27bcb93 100644
--- a/app-editors/emacs/emacs-18.59-r15.ebuild
+++ b/app-editors/emacs/emacs-18.59-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -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,10 +145,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d "${D}"/usr/share/info ]]; then
- mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/emacs-${SLOT}"
+ [[ -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 1e7a6cd64d8b..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,10 +328,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -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 10482650084c..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,10 +349,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -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 bbe0dd17f23d..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,10 +412,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -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 31ef2328e4a8..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,10 +491,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -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 0a3be1463dbd..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,10 +508,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -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 b06274d3a565..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,10 +538,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -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 0a03ca0c6d54..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,10 +538,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 23:35:35 +0000