summaryrefslogtreecommitdiff
path: root/app-editors/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/Manifest18
-rw-r--r--app-editors/emacs/emacs-23.4-r20.ebuild16
-rw-r--r--app-editors/emacs/emacs-24.5-r10.ebuild12
-rw-r--r--app-editors/emacs/emacs-25.3-r9.ebuild13
-rw-r--r--app-editors/emacs/emacs-26.3-r4.ebuild14
-rw-r--r--app-editors/emacs/emacs-27.1-r4.ebuild14
-rw-r--r--app-editors/emacs/emacs-27.2.9999.ebuild14
-rw-r--r--app-editors/emacs/emacs-27.2.ebuild14
-rw-r--r--app-editors/emacs/emacs-28.0.9999.ebuild22
-rw-r--r--app-editors/emacs/metadata.xml2
10 files changed, 73 insertions, 66 deletions
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 08b6fb93e033..8d9942e1a384 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,12 +10,12 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee7
DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
-EBUILD emacs-23.4-r20.ebuild 11016 BLAKE2B 75525567d105ecb2c83bcec444600d21bd957074123593d0037e04a2c04e64d080bddcf62b51bb0adb01e0ac77ad46850ac77224806b0666bdf2b8805098d6b6 SHA512 1e028bc69c05f3baeb9eff225051423eb10f3514a4ce159b39592b746d1d4f6dc1d565141cade5abb67bd67742eb55f3402ad781aeff698a0aad824688a6d775
-EBUILD emacs-24.5-r10.ebuild 10781 BLAKE2B 8b7a7566ce2ee7fd9e9c8f58a1474baa814d5cd3591f22f8d64dad4e106ecc0b7a56efd14fba2f06af92cea9051ff736560050c723cc5304b8c5c33c47d0882c SHA512 9c71eedfc4407c23e88ad97a46c3cd057c41e01711efb70992ecb8f010f43b3352971728c14aa310b4a5d7caa5f9d869518eed9c249abe95fa3975f35b2cd740
-EBUILD emacs-25.3-r9.ebuild 11123 BLAKE2B c37b558de89ee524552c0521f09195bf80e1b01899fae53784319c5c0a35ab5f01fe4f98f268ab810fb4ea92b72a08beb124d558559942d6ad3548dd3d158dcd SHA512 e86b375cc44b087b3af65d2201312c418aa7a2c153e54378eab7e489bc809a2f86a198ae0b35b3d8b4018dc6824511a75585b6ab1fd90749cfe3b2fd3c097239
-EBUILD emacs-26.3-r4.ebuild 11766 BLAKE2B c21c37ea3b2d54b66590e3b228946856e7fe04697e3ec8b12026c3a038fde3fc0e0c6a55baf732b08c037faeb10e257c1ef21277a525d92060fb99daddbbd22b SHA512 a840ac0098909830145dcde4171e65c0c2118a375b3025620a14e86b2c16dd71902127540b71c176efcbdd92c86396340401775a6b9105ac3f049636feb10e13
-EBUILD emacs-27.1-r4.ebuild 14297 BLAKE2B 871fb31db52bda22a43727bc11df1adacd2d81ed6a4ceac53e21715ecf0765cf4e5aa90caafafbc47830da2c0a077d78946a5dd618ac3ae1154eba4c32d5526b SHA512 e6372bcb13e27a7fc7a7ef824d342cf9171f3642b58e515106481a011abe7f162e5d8c235cd77c995c6d1ed2cb6e2e893c1f8044b55ec6a6efee438b33bc5316
-EBUILD emacs-27.2.9999.ebuild 14261 BLAKE2B 4a4ed9d6506f13362c269e2f79e68f977a26a679e20ae3cf8c0de8cd9a9fb2660cfa2da3ca5c285f290a92307d6f06c9f4035c1cb441ee775fd6b27880bec3d6 SHA512 8e95b6ca5344a23b2c6c7ea59b2a74204493953ae698e8c10775be7b1ea8c9f0b25340ae963f3f02d22beadc279c7d30cb8613c845df2937b27bb4c7a208aa34
-EBUILD emacs-27.2.ebuild 14262 BLAKE2B 2c35f870febbf283e03481fa0f40bc7773637af45ea85748f406d155db582d7e52ee535ee28e42732d879960f7147157462c3b720c5effd338f452648b5995f6 SHA512 aaf72d43f1861c75230bdff4e8a416d69ee364f1537cbbcc6188d52439de4d4f42994dfc28fa75db876db325f0fe591c5a3a9f8358b74a6a56b24787ed120626
-EBUILD emacs-28.0.9999.ebuild 13844 BLAKE2B 35297dd18513e664e48408f0bd0a9fb027181e665f9aae8ed0a69276b5739c7ee430449628d0e7dad93952fa7094f230b9701158db6a7391d569e4fc2becf52a SHA512 af62749c11ce65beb52f645eed8e87786427c20cdae49b2728bf7b0eea0d61420242c9e12cf015050e444aca9dd71e1589ff88623f05b410882cced34bec1ed9
-MISC metadata.xml 3037 BLAKE2B fea30de2fe3c754253119e21c0f2c1023d4ac9c78ff0586fd5c427a8b44104ca620a16a8560de310afe342fd38e69be58781656ae45d59223d3e48d6510bb980 SHA512 07a5bf84aecac3fde3d6b0a698e875683f8479becc66037ba4d21f0bfef3e7d533331ab072ad1d5911cc36d9b5efdec979a3daafe812a5055139f8171d4ae6ea
+EBUILD emacs-23.4-r20.ebuild 11072 BLAKE2B 560f125213e52175a0dff8437cad8278436e3d36a534b72dfb6031423f0403b1ec3f803a5ea68f96f0d9a7c0cd56fbcdd01afb30e29e8092751b3c7d1888a00d SHA512 c5420af73f2aa01ec6c914a965a1d15169caad80cd949768109b85e0fb925135653eced075990413f03c139f0ead04162e3ed91681b1a17834ec95a7d9630dcd
+EBUILD emacs-24.5-r10.ebuild 10823 BLAKE2B a21968356333216b290d4ad3fc356261a0a924038c9c243a02c1ff286b252f2409344a9b377aa5b1ddad24c373bb81c71392da898f5dbd3e07c1e0749bcf707c SHA512 bc787ceccdb0386b8b233d12ef18be3d14d68e74dd33a07c1e6f41c89dca48ef5c5d0c1c082c28fde172ddf65c439e77da61f30fae6074086641a64a6ebe5a9d
+EBUILD emacs-25.3-r9.ebuild 11134 BLAKE2B 04c984fe3403dcc86a4aad93632f12a9f596dbd44b621c59f79073f90c4ca0740a036280ca3d7f4da15d813ac465915e55d3dfb8619f1fb4cca31d3d07f53b56 SHA512 03842263b26c437355e7ff0582b69daf39ff7ea4d9d56d2f66e255b6a1d6cdf6abf7fa2cca31229cffb1afa3fe3624db96925452ee500d97a72573d8ad270698
+EBUILD emacs-26.3-r4.ebuild 11815 BLAKE2B d47062336ca215fec5657dea95739751405f66b32f864ea2c72db58b81f01392d8f903c32701ac2ac308f77e854cb9d959fe558ad20387c66ddfb22334aa113d SHA512 eb768c3ded1a9a1303666e49868321b7341e152d109a068eea1b465dc344fcd87a2fbeb2e3c2fc244f7a2c9dec74650bb3e272ca1fb43fd1e5a229c5f4c443bc
+EBUILD emacs-27.1-r4.ebuild 14346 BLAKE2B 455210831d874ae10846d7872bafb5606275fb42c42074990f2b904c197b5e2948e98a5659537070b43df7935e357d226f89e75d4ed7bf2f01aab17f1282ec9e SHA512 b8389386ec5b510c044a138a256d44d6b4dc2de79aa490a86ee86039c6fb2b7d811e8d417e7f0b77d89693221721961555b27bb208ca00ce03d800c1c2e7455c
+EBUILD emacs-27.2.9999.ebuild 14310 BLAKE2B 80f0e564e88e59debc29f728776d22ca86f4b26733c6806c918f653da3b114794a7cebdc8d136fc00dfc50d94ebb0c4ad4763af874d52c3ba2322ff531a3b70a SHA512 d3f4b7be206b7dc430f536c9e59681be77adcd70885ce7c914eb96a65209ab6dcf7e338206c1f75c7ac6fc45f74aacf2eac502912b22e0b2592c76ff8d6e897f
+EBUILD emacs-27.2.ebuild 14311 BLAKE2B bb7104a2b5ecf0ed7a19d18d107607bf426f2d065b9895c45a2e20ea55243eb4e8fbfe06ce12848c4ba57a05bb8a30f37d8c7f6ed274980f447a6eb8c0d804c3 SHA512 3a0e3b915b413cd0c4b83bfb6d7a73e3dfebfbf87eae343607d956abaf42658947fe41263fc29ba13471ff60f160dfdace0ac75b5d218957365c501a29275d46
+EBUILD emacs-28.0.9999.ebuild 14196 BLAKE2B a45dd87886e1df006c1cc3e4301f03f3df30debe414fbe5c47fde4ecadb59ec5e4720e8eafee2053527dfca015dd73c526540f12cf666300c44644b2905058c4 SHA512 05ffce7d2b738d300ff9b393e52115b8327f7616bd946e87ed9d132b7fdfa965f8d231df5819a2f11eca6b46b1dea0ea09df6429eff872966568242fa39a30ef
+MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
index 245667931c0c..f46ce1b68c8a 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -255,15 +255,15 @@ src_install() {
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{applications,icons}
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{applications,icons} || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
local cdir
if use source; then
@@ -273,8 +273,8 @@ src_install() {
# C source you might find via find-function
doins src/*.{c,h,m}
doins -r src/{m,s}
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c || die
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README || die
elif has installsources ${FEATURES}; then
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
@@ -303,7 +303,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild
index 3358010308c1..c9d98111c2be 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -244,15 +244,15 @@ src_install() {
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{applications,icons}
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{applications,icons} || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use gzip-el; then
# compress .el files when a corresponding .elc exists
@@ -296,7 +296,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild
index 2ef65527eeee..b7a2c457507d 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -91,7 +91,6 @@ BDEPEND="app-eselect/eselect-emacs
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
- !<app-editors/emacs-vcs-${PV}
app-eselect/eselect-emacs"
EMACS_SUFFIX="emacs-${SLOT}"
@@ -253,15 +252,15 @@ src_install() {
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use gzip-el; then
# compress .el files when a corresponding .elc exists
@@ -305,7 +304,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild
index 34237af4f679..4dc17e9bd912 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -262,16 +262,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -324,7 +324,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild
index f7ad194e0efe..a296afd19d0b 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -325,16 +325,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -387,7 +387,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
index 7f3c223e9ed6..d565c8aad9a9 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -324,16 +324,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -386,7 +386,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild
index c3f5c07c1496..45899a7477ff 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -324,16 +324,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -386,7 +386,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 80e296098e70..e37d8033beab 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
RESTRICT="test"
RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
@@ -52,6 +52,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gmp? ( dev-libs/gmp:0= )
gpm? ( sys-libs/gpm )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+ jit? ( sys-devel/gcc:=[jit(-)] )
json? ( dev-libs/jansson )
kerberos? ( virtual/krb5 )
lcms? ( media-libs/lcms:2 )
@@ -140,6 +141,10 @@ src_prepare() {
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
+ # These files ignore LDFLAGS. We assign the variable here, because
+ # for live ebuilds FULL_VERSION doesn't exist in global scope
+ use jit && QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
eapply_user
# Fix filename reference in redirected man page
@@ -261,6 +266,7 @@ src_configure() {
$(use_with games gameuser ":gamestat") \
$(use_with gmp libgmp) \
$(use_with gpm) \
+ $(use_with jit native-compilation) \
$(use_with json) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with lcms lcms2) \
@@ -308,16 +314,16 @@ src_install() {
fi
# avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}/usr/$(get_libdir)"
- rm -rf "${ED}"/var
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+ rm -rf "${ED}"/var || die
# remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
# remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
if use systemd; then
insinto /usr/lib/systemd/user
@@ -370,7 +376,7 @@ src_install() {
if use gui && use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 626977035455..48f1ffacb83d 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -38,6 +38,8 @@
engine</flag>
<flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
processing</flag>
+ <flag name="jit">Compile with Emacs Lisp native compiler support via
+ libgccjit</flag>
<flag name="json">Compile with native JSON support using
<pkg>dev-libs/jansson</pkg></flag>
<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 17:46:00 +0000