diff options
Diffstat (limited to 'app-editors/emacs')
-rw-r--r-- | app-editors/emacs/Manifest | 26 | ||||
-rw-r--r-- | app-editors/emacs/emacs-26.3-r18.ebuild | 9 | ||||
-rw-r--r-- | app-editors/emacs/emacs-26.3-r19.ebuild | 9 | ||||
-rw-r--r-- | app-editors/emacs/emacs-27.2-r16.ebuild | 2 | ||||
-rw-r--r-- | app-editors/emacs/emacs-27.2-r17.ebuild | 2 | ||||
-rw-r--r-- | app-editors/emacs/emacs-28.2-r12.ebuild | 2 | ||||
-rw-r--r-- | app-editors/emacs/emacs-28.2-r13.ebuild | 3 | ||||
-rw-r--r-- | app-editors/emacs/emacs-29.3-r2.ebuild | 2 | ||||
-rw-r--r-- | app-editors/emacs/emacs-29.3-r3.ebuild | 2 | ||||
-rw-r--r-- | app-editors/emacs/emacs-29.4.ebuild | 5 | ||||
-rw-r--r-- | app-editors/emacs/emacs-30.0.91.ebuild | 619 | ||||
-rw-r--r-- | app-editors/emacs/emacs-30.0.9999-r1.ebuild | 3 | ||||
-rw-r--r-- | app-editors/emacs/emacs-31.0.9999.ebuild | 3 |
13 files changed, 651 insertions, 36 deletions
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 5a953ab43020..e9ef49bb8879 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -12,18 +12,20 @@ DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd93 DIST emacs-29.3-patches-2.tar.xz 2304 BLAKE2B 1005194bc2ed6d9be0cadcf449f4f82c1bcda178e6126f27f8ea0c359344bcf6a9368226a6eaf9d4b655a0c59ed6beecc3130b4409c84bb3ed19911ba22d9e80 SHA512 67250b08cf0b1d4f8279987cea19da0838f520c98ae91b16200c8bf5b5e2a171ffdb7c06a266c6f220ec8466a9264af55529dc150b002588937597e328a581d2 DIST emacs-29.3-patches-4.tar.xz 3376 BLAKE2B 966aef4036b48d11cbd0e901f78afb5c1d6eb0e12dc88c0b3e18cc093f19d268b15d760d281719f12e106daaa82f61b4bb32e23d4041d9636f0832653b914506 SHA512 22cf97583c659c0bde0a6f9beb9b5ea783eb3cfe777e0c84d0784ae2f1652e7de284d77f240a832902d12f6d73a309e55c34552e0de449595212e59afde39088 DIST emacs-29.3.tar.xz 52203168 BLAKE2B 73651c52e508d5341f66659bbaf98e839040239198cb66f62239f489a961794adf837d9a14e9b605f059b7b612803e0ce5998ec47100ba545db642baacdb55ec SHA512 efaecfc46a0b88f61de477d92c08ee592b8838e6c34724151a3b1502efa7ebd4d4837733c694807e6de1ba4b8d37d2ec382c6bb2ed000b67ad8f0e11c7df2a6b -DIST emacs-29.4-patches-2.tar.xz 2196 BLAKE2B d2e8363209761531a08f9daf6372d2c667a54c4edf9dc809d56f4c1761e2192d1f116d081ad93a2cfd98428d2ace183ad4a282bad7cbe10402026a88f0966aeb SHA512 f0106763cdb52e5c4583ab624cb55bcc7a3761be04de45f1c65e8be2bfe449352d454888bf24f77eef881babc06a92f8202755dd5aed41f115a808edcdb59023 +DIST emacs-29.4-patches-3.tar.xz 2364 BLAKE2B bf0d044ad0b12eeea1b87d76f143f3a542857eff6b29685abb2b37efd0105580cba2f4ca49655b4da6e13d3997e6c26f2966e597f66753b5321f6aa09f8c563d SHA512 4c6321a63a3f917f9644d464c74925fad0942caeb57966b2a5a0ed171eeb8987230b7039b2829f96526d205b4ad97fcc94f991ecdf7296d8dee355eb14d4df36 DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b08883bdd07be6d8acf0039df2aeebd294e679e98f4c64a9dd9bdad93589fc7c176cf3860d4fb823fce23f7f2b3cd SHA512 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80 +DIST emacs-30.0.91.tar.xz 54782188 BLAKE2B 9ef6f6bcca6b33fb9f70530ff1bb2ff8d56d88d201b8a9267d503e75f23efdb6e9707353495d1c504fbdd26a6a260d39cf98077188f41d65118af21e02715069 SHA512 43dd5d21dab16d88c1ca2e430a11dad1e4a7e173f217f5762aea0b6e68b526c6486a9e2856622c1f9aa06553192d2d0fa04454115f1e77e221b14b6b03dc31b6 EBUILD emacs-18.59-r15.ebuild 4452 BLAKE2B 054147542f5dcdb5fb86d07194e231ff00babde084c417a648516753cf276e0e65a4da3f78c0154bf31d3f410c4afcdf9ccbeaa2a1275c29fd01aacc15fd6d70 SHA512 c1c377cd37bec24c0b845123f109d69de113c22ce85eac9a9efd4b063f7c2c2f07666f7dbf93cf2c9c89d1b15290ba63f1e83e446a245e27c2d8a4b6ef15c9e2 -EBUILD emacs-26.3-r18.ebuild 12058 BLAKE2B e3e6e94f87433dfe6383df3b274516e362a7a5c57a37039e6c6fcb48dcaeec259b158dd65f78634456bdfc666a06e4631c041b8cd4bbed4e9f44ac93b9ce593c SHA512 b0b38e72cd26d8a4e55bd01e8024ed00b58f2d53394fc71816ac6bf12862f090b73c7ebcc15932152daf9ce0eed15b07764069cab0b587c988003e96271d68f3 -EBUILD emacs-26.3-r19.ebuild 12062 BLAKE2B 97456a6f387571d30f241f231995b48d46d931dbf72f69a21f001369ce5864f46b2e76800a5aeeb4e4671ea49649b73830efde1a26f619405ea106f4a8a9fb89 SHA512 49bc78929e8e880a51cefb1e5595b74e369526fed90fba6ac27f9996cbe5a4ab32ac1acc9fb5a4c2f25e263414665a8dd9574458e84e1cc59137611f9a568360 -EBUILD emacs-27.2-r16.ebuild 14715 BLAKE2B d1b23b16eb5ad44008e9acb0fd724dd60d99707018438d9180130096864e3cf340a44fce209ed360fc1d126df1d913ce6db97081e1ab2116038346acedc6314b SHA512 b0643ae76f3feadaef083e1c9c1933953b3c43fb0d968a4da11cac4e924dea6c5edd5f5ec948f021a9ce0808d283c00522de776a62a40dca8e1371337433fe03 -EBUILD emacs-27.2-r17.ebuild 14720 BLAKE2B 93db3de2c67c1a16e8f46aa09b3ffb11d4bfa3281a54a7709cbdb7338d6fe7923564bedbc9c6fb8f7d25e05b8dd6a8bf30e4f14d2201c8da11136fb93e2572f1 SHA512 d3661c40f2d354f1f61d0e7858a868f43c79e0dfc819ea09ac44c11eea62399cf2403b1d2b629143121741edb1bf28d07ac963988e670185a86ed2205854efc1 -EBUILD emacs-28.2-r12.ebuild 17669 BLAKE2B 48a6250876577f34dcaee56fc5466aa003922abc7cf36d1c149cb5a9c7bd7d0b4718b7adc963228ed8987779968bd203602622c12c9433bdde3ae89b0a752c6c SHA512 9774289bfe30b4b759b503ff016f953fe28ea6cfba44bfec8af1264ae2471c2a697f5a225c93b06de07e96305340afd7cef5db89a7639c642311b74539f89f83 -EBUILD emacs-28.2-r13.ebuild 17673 BLAKE2B de5df1bca4d38387d360ef76194387de597bc173c5994f98b3a484f83a3a1ebddb4a9f4f3978e1a2a84902a8431858c48cc8322454b589d6f7f3b30d184f2967 SHA512 41de792b60b503af29741e7f97a2bd5ff384b859108583bef3dee858a1385cd33ebc992459477a909288b78c9e15c672039fd5e0b112164af8f1a5d5758fd259 -EBUILD emacs-29.3-r2.ebuild 20499 BLAKE2B 519b8f3e80403f98e2d633ecc00ed876328bfa8544d1b13da0b456d2a1928c4b8d7aca315d18daa9c86d4e98ff9d411a9a77bd30bcb69c27cfb0fb7007fe558f SHA512 7e467e8d4e3256e5e47ad630583d815e78f0ba927ec0396cd5f2aa58219bc8443a81cb2f7e625054f0ec7b84077d0222111e8ad1b88be12618d7c7a8a8cbab36 -EBUILD emacs-29.3-r3.ebuild 20503 BLAKE2B 7e58ced13a33c1d75bf2169866eafb6ba377b482213814a50ef0af87ed212abce1a09fa7e40eee3672ae662b87fdd2268cec5f962925092aaa26ce73cfaf2802 SHA512 12491911675fd3237307bf12caa85b7c40b80ee23d6dc45e1d59f355f0d1d0677c14179d7f22b1ce67c6f9ea9e4c1c8dcbca5c32739b309f4e1667cb68f93b40 -EBUILD emacs-29.4.ebuild 20502 BLAKE2B cb4a87101b750c7bc41f537099d126b758a45ecffa39a71ec2be145b03347793d3626c6a74e7069f49f74adeaf129d42195b0dbdac00eec69526842d91c0dd90 SHA512 71827eaf87624d356b6d29211df060fa913609ff38519fd3932fe3cd75f55c4fc3d30e84a27c80662a63674665847513342315e064336f1be1551a3e96afd529 -EBUILD emacs-30.0.9999-r1.ebuild 20098 BLAKE2B db4eb644a65425ae4a294b22add23014f7d094b7df83788116f248cf083f68b5a03c3b8c630c597e48043e33219f77c15c1e9563a6ee39567fbc85098211f2f6 SHA512 b32bb9841c99dc24cb60b7658eb4e094a08b4ec59fba4f8744f6058628678807c6a480cfd9fe6377e5e421ad065c31713888f9e9caf5752b9bace632df453a63 -EBUILD emacs-31.0.9999.ebuild 20096 BLAKE2B ca5045e7ccca98917d8f264dfe960c18ef6f13417379c60498961220662f0b7e46eb8d09cac92d4f9b46e43b0cd89b4af735ddd76b0e0bac16a1557f97500f79 SHA512 4e2f1379919b2ba36020e1672c1f324966e658711c6dcc58b593b2ac6e8d1c739ee78f414ba4b80ef77aa717f9e80a69c12f35ade2c99fa082bdd8ffca893dff +EBUILD emacs-26.3-r18.ebuild 11982 BLAKE2B cb2879cc7a793cfd3a10612879aad5a9ca4d54d5660270aa9553d3a15ee73f9345e996df5a4a7149ec12fae437b11f6a52edd4c8f297d3ffa38ec667de1b851f SHA512 104b71b8b1e2823355a1fa812f4d8e3b17237b0442a4af56a0bbb676cd1114a71dc68ad63c2394ec3e114e4608a2739d8b2f257acadd6e335fe2af12f8fa1e2f +EBUILD emacs-26.3-r19.ebuild 11986 BLAKE2B 75c24d345f0f58487d834f1501ffe69c2fa3b31b07f1b2ed5f125b580a3994b5a3e3f3707bd194682d53201e9839ddfa7ed82f112becd29a7137681504900491 SHA512 c0cb07ca7ef97a14828b20fce484a0a60a9aaf39a7164f656373264ef33527630c40aad2a365ffbab2535575d57749d56c2aaac1c3a1dc182081bb363e0f39b7 +EBUILD emacs-27.2-r16.ebuild 14709 BLAKE2B d82179dc877f11888a3e364bb10db873928784a58281a0d05bd080f41655f6a21b04e6211e4ea75576e7c327b200e2f9727d9bbfa4d4687a22251544c44ee7a8 SHA512 5742f7f8f51a8d3ac0f15eae33cbe6959556e9489fdf6460377e9e65148186e7fe4872c733dc9471784c1d6486432c42debf6fc06fe9366172e2728785fe8914 +EBUILD emacs-27.2-r17.ebuild 14714 BLAKE2B 7282d3002aabaa091d21370533fec5f29121eeae5c3fb3a339149bcc6065c31e3c0a1386e2ff2160cd2e10a8e74b20d95760dc34539396d07c362a329c7e1acf SHA512 31960790ca2da0444ca5738849e6a9e36e1c07b0f99be8a766773905d86d97bff2fbfd1f44093e0055e632411d64caf7587ef01e27cc840737b87e025ebde9fe +EBUILD emacs-28.2-r12.ebuild 17663 BLAKE2B 9f19612d00b5d9f235250ae67fc442d07ace73b82b9e690d3c859a45c58799d227e48dcfa41bb6bc0872297699b300bdb66107b0762729c48f44b56c84429967 SHA512 718073a5c989c4005f99245cc8ce492410cd474f753c41426206352eb3342f970948bbbe0b05fef2e2e63c67296ee5e2ee875878eab57ed745799d4c7beb74f8 +EBUILD emacs-28.2-r13.ebuild 17681 BLAKE2B c793e8cbc476e38d93c44f637f2a44743c88fdb3002c80d36a79f2b9751275bf34e5c2a242b201d2fb4844df959cf47f92f1e3da8e1d14d88c9e8975776d765f SHA512 a84fa51b374835ad13f917d18f8d744327a8b86f6a61dd80a6442c2eeeb3a5477a39788eac33ffe7d4d40b1f4ad482eac7fa97573ed20d1bfc1967c95b70fe79 +EBUILD emacs-29.3-r2.ebuild 20493 BLAKE2B 350b1480a8b8f5803a8d5f81438b915be414260a3d561d1809ca133034981b7f4365fed6369b29bb51971ad220205379c86a702051a1e807f4b2740b68cf1636 SHA512 50481f67b67b3516cb6869a500647831cab20fdac5e774f9f2113e65c08a3fd979605411ed65c6302807740bb1c260634ca2f3ec32ebf24d6365a543e34450aa +EBUILD emacs-29.3-r3.ebuild 20497 BLAKE2B 4f1d044cc6a39afc1dc91c20e65d996cb2bc1707bdd0a88aaff5dd1ba7539d3c468d9002cf24d3b6debd6a55c158feef002a44682f7f1c16093c1cdb78a4344c SHA512 68e9236657c9ba43814b38eab110d1c8cd5bad203bcc5b13be870d4a815bd6613c4471845b3e648ab41e00da5bebd19d0ff0c5e66f7ca1f5085f628e2e696388 +EBUILD emacs-29.4.ebuild 20510 BLAKE2B 229a0bb3769bd3aa2819cc9915b9ef9ab8f0e7df2098e2fdb6e0cfc73349b8d94d3f091af71fc36fd3e3d5b46192e49a509132d70d3932b65b0795177e254dc8 SHA512 f3941f6cfc4735edd0c16551d1db38858da861dd94eab1cc098e6938bc91fec764a5537900bf990ace8b4e8fd7206b02222530ac3cf8d18a2d62ac36fc51ec1f +EBUILD emacs-30.0.91.ebuild 20106 BLAKE2B 5e96f5bd0de7fb0c7bd66c0f6764ec2455c00dc0de944f7c5e4359540e7eac321d9450a1c37f759bc6dee630089610996766e6b6f51a55dc59763e4dcfbe20b3 SHA512 fc43ba3fcdd33e98e1128a977559af3fdd7fc51826d2c380214b2525646b2efc24db7fedda65e33e9bb68efc18db53241669a460831a49e2c2a8806efde3c0d9 +EBUILD emacs-30.0.9999-r1.ebuild 20106 BLAKE2B 5e96f5bd0de7fb0c7bd66c0f6764ec2455c00dc0de944f7c5e4359540e7eac321d9450a1c37f759bc6dee630089610996766e6b6f51a55dc59763e4dcfbe20b3 SHA512 fc43ba3fcdd33e98e1128a977559af3fdd7fc51826d2c380214b2525646b2efc24db7fedda65e33e9bb68efc18db53241669a460831a49e2c2a8806efde3c0d9 +EBUILD emacs-31.0.9999.ebuild 20104 BLAKE2B 73afed8ba4fc7c8ac70a3da4d0b4536316e75e20c565e0833d9e5d6f57e362a2d4170cd9e5c088d208edcde0cccd1dc5edba7d8c2234e44041f7babda7446a1e SHA512 400f2bfbdd533aaf71f0b909424eec2a5c3f4b0e144603b8d1f4234a85718b081557d68fd3b774e3d8407f7182afdca34c43348acab8609e594dcb80c38d9225 MISC metadata.xml 3265 BLAKE2B e4f61b7e8859672fe9798ebaae20d8fb490d4677db7be8a856f313f4dfd5f02b38623250ddc45cdab1f0d0b64b941b4874b95252c796e893d5a28e5a318277bc SHA512 4b79a448076ddee7de95dc2f1a999fb86295d04a20d016a9bb2fe8a038ee5424517ca8f1991a884a08ca52847191c83becb06fb7cb8d4bb2a609cf4b2e25d020 diff --git a/app-editors/emacs/emacs-26.3-r18.ebuild b/app-editors/emacs/emacs-26.3-r18.ebuild index 4129c9010e8b..a6495367c009 100644 --- a/app-editors/emacs/emacs-26.3-r18.ebuild +++ b/app-editors/emacs/emacs-26.3-r18.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -125,12 +125,7 @@ src_prepare() { src_configure() { strip-flags filter-flags -pie #526948 - - if use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi + replace-flags "-O[3-9]" -O2 # We want floating-point arithmetic to be correct #933380 append-flags -fno-fast-math -ffp-contract=off diff --git a/app-editors/emacs/emacs-26.3-r19.ebuild b/app-editors/emacs/emacs-26.3-r19.ebuild index ac98dee8e90d..1c0632f3fb90 100644 --- a/app-editors/emacs/emacs-26.3-r19.ebuild +++ b/app-editors/emacs/emacs-26.3-r19.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -125,12 +125,7 @@ src_prepare() { src_configure() { strip-flags filter-flags -pie #526948 - - if use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi + replace-flags "-O[3-9]" -O2 # We want floating-point arithmetic to be correct #933380 append-flags -fno-fast-math -ffp-contract=off diff --git a/app-editors/emacs/emacs-27.2-r16.ebuild b/app-editors/emacs/emacs-27.2-r16.ebuild index 8606abac7305..2348c2a77186 100644 --- a/app-editors/emacs/emacs-27.2-r16.ebuild +++ b/app-editors/emacs/emacs-27.2-r16.ebuild @@ -36,7 +36,7 @@ else PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" diff --git a/app-editors/emacs/emacs-27.2-r17.ebuild b/app-editors/emacs/emacs-27.2-r17.ebuild index 73bc955e9d4f..5c993bdaa8dd 100644 --- a/app-editors/emacs/emacs-27.2-r17.ebuild +++ b/app-editors/emacs/emacs-27.2-r17.ebuild @@ -36,7 +36,7 @@ else PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" diff --git a/app-editors/emacs/emacs-28.2-r12.ebuild b/app-editors/emacs/emacs-28.2-r12.ebuild index 81ba9aa1b2a0..232777219287 100644 --- a/app-editors/emacs/emacs-28.2-r12.ebuild +++ b/app-editors/emacs/emacs-28.2-r12.ebuild @@ -36,7 +36,7 @@ else PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" diff --git a/app-editors/emacs/emacs-28.2-r13.ebuild b/app-editors/emacs/emacs-28.2-r13.ebuild index ee81b045c11c..21c74404ab1b 100644 --- a/app-editors/emacs/emacs-28.2-r13.ebuild +++ b/app-editors/emacs/emacs-28.2-r13.ebuild @@ -36,7 +36,7 @@ else PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" @@ -404,6 +404,7 @@ src_test() { emake \ EMACS_TEST_VERBOSE=1 \ EXCLUDE_TESTS="${exclude_tests[*]}" \ + TERM=dumb \ TEST_BACKTRACE_LINE_LENGTH=nil \ check } diff --git a/app-editors/emacs/emacs-29.3-r2.ebuild b/app-editors/emacs/emacs-29.3-r2.ebuild index 01bff7cfa606..58067c63963b 100644 --- a/app-editors/emacs/emacs-29.3-r2.ebuild +++ b/app-editors/emacs/emacs-29.3-r2.ebuild @@ -36,7 +36,7 @@ else PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" diff --git a/app-editors/emacs/emacs-29.3-r3.ebuild b/app-editors/emacs/emacs-29.3-r3.ebuild index ae3d09e240b9..517cd3ebfb7b 100644 --- a/app-editors/emacs/emacs-29.3-r3.ebuild +++ b/app-editors/emacs/emacs-29.3-r3.ebuild @@ -36,7 +36,7 @@ else PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" diff --git a/app-editors/emacs/emacs-29.4.ebuild b/app-editors/emacs/emacs-29.4.ebuild index bfa2f2353259..efc0e74f926c 100644 --- a/app-editors/emacs/emacs-29.4.ebuild +++ b/app-editors/emacs/emacs-29.4.ebuild @@ -32,11 +32,11 @@ else SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" fi # Patchset from proj/emacs-patches.git - SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz" PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" @@ -477,6 +477,7 @@ src_test() { emake \ EMACS_TEST_VERBOSE=1 \ EXCLUDE_TESTS="${exclude_tests[*]}" \ + TERM=dumb \ TEST_BACKTRACE_LINE_LENGTH=nil \ check } diff --git a/app-editors/emacs/emacs-30.0.91.ebuild b/app-editors/emacs/emacs-30.0.91.ebuild new file mode 100644 index 000000000000..7d7e32e39e10 --- /dev/null +++ b/app-editors/emacs/emacs-30.0.91.ebuild @@ -0,0 +1,619 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" + EGIT_BRANCH="emacs-30" + EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" + S="${EGIT_CHECKOUT_DIR}" + SLOT="${PV%%.*}-vcs" +else + # FULL_VERSION keeps the full version number, which is needed in + # order to determine some path information correctly for copy/move + # operations later on + FULL_VERSION="${PV%%_*}" + SRC_URI="mirror://gnu/emacs/${P}.tar.xz" + S="${WORKDIR}/emacs-${FULL_VERSION}" + # PV can be in any of the following formats: + # 27.1 released version (slot 27) + # 27.1_rc1 upstream release candidate (27) + # 27.0.9999 live ebuild (slot 27-vcs) + # 27.0.90 upstream prerelease snapshot (27-vcs) + # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) + if [[ ${PV} == *_pre* ]]; then + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + S="${WORKDIR}/emacs" + elif [[ ${PV//[0-9]} != "." ]]; then + SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" + fi + SLOT="${PV%%.*}" + [[ ${PV} == *.*.* ]] && SLOT+="-vcs" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +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 gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm xwidgets zlib" + +X_DEPEND="x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libxcb + x11-libs/xcb-util + x11-misc/xbitmaps + xpm? ( x11-libs/libXpm ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXrender + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + ) + gtk? ( + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4.1= + x11-libs/libXcomposite + ) + ) + !gtk? ( + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXpm + x11-libs/libXmu + x11-libs/libXt + ) + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt + ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) + )" + +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] + sys-libs/ncurses:0= + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + dbus? ( sys-apps/dbus ) + games? ( acct-group/gamestat ) + gmp? ( dev-libs/gmp:0= ) + gpm? ( sys-libs/gpm ) + !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) + kerberos? ( virtual/krb5 ) + lcms? ( media-libs/lcms:2 ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + mailutils? ( net-mail/mailutils[clients] ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) + selinux? ( sys-libs/libselinux ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( net-libs/gnutls:0= ) + systemd? ( sys-apps/systemd ) + tree-sitter? ( dev-libs/tree-sitter:= ) + valgrind? ( dev-debug/valgrind ) + xattr? ( sys-apps/attr ) + zlib? ( sys-libs/zlib ) + gui? ( + gif? ( media-libs/giflib:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + png? ( >=media-libs/libpng-1.4:0= ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff:= ) + webp? ( media-libs/libwebp:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) + !aqua? ( + gsettings? ( + app-emacs/emacs-common[gsettings(-)] + >=dev-libs/glib-2.28.6 + ) + gtk? ( !X? ( + media-libs/fontconfig + media-libs/freetype + >=x11-libs/cairo-1.12.18 + x11-libs/gtk+:3 + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + xwidgets? ( net-libs/webkit-gtk:4.1= ) + ) ) + !gtk? ( ${X_DEPEND} ) + X? ( ${X_DEPEND} ) + ) + )" + +DEPEND="${RDEPEND} + gui? ( !aqua? ( + !gtk? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) + ) )" + +BDEPEND="sys-apps/texinfo + virtual/pkgconfig + gzip-el? ( app-arch/gzip )" + +IDEPEND="app-eselect/eselect-emacs" + +RDEPEND+=" ${IDEPEND}" + +EMACS_SUFFIX="emacs-${SLOT}" +SITEFILE="20${EMACS_SUFFIX}-gentoo.el" + +# Suppress false positive QA warnings #898304 #925091 +QA_CONFIG_IMPL_DECL_SKIP=( + malloc_set_state malloc_get_state MIN static_assert alignof unreachable + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + +src_prepare() { + if [[ ${PV##*.} = 9999 ]]; then + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ + configure.ac) + [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" + einfo "Emacs branch: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" + einfo "Emacs version number: ${FULL_VERSION}" + [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ + || die "Upstream version number changed to ${FULL_VERSION}" + fi + + default + + if use jit; then + find lisp -type f -name "*.elc" -delete || die + + # These files ignore LDFLAGS. We assign the variable here, because + # for live ebuilds FULL_VERSION doesn't exist in global scope + QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" + + # gccjit doesn't play well with ccache or distcc #801580 + # For now, work around the problem with an explicit LIBRARY_PATH + has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ + && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ + | sed -n '/^libraries:/{s:^[^/]*::;p}') + fi + + # Fix filename reference in redirected man page + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die + + # libseccomp is detected by configure but doesn't appear to have any + # effect on the installed image. Suppress it by supplying pkg-config + # with a wrong library name. + sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die + + # Tests that use bubblewrap don't work in the sandbox: + # "bwrap: setting up uid map: Permission denied" + # So, disrupt the search for the bwrap executable. + sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ + test/lisp/emacs-lisp/bytecomp-tests.el || die + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + # We want floating-point arithmetic to be correct #933380 + replace-flags -Ofast -O3 + append-flags -fno-fast-math -ffp-contract=off + + local myconf + + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + + if use alsa; then + use sound || ewarn \ + "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." + myconf+=" --with-sound=alsa" + else + myconf+=" --with-sound=$(usex sound oss)" + fi + + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + + # Emacs supports these window systems: + # X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa). + # General GUI support is enabled by the "gui" USE flag, then + # the window system is selected as follows: + # "aqua" -> Nextstep + # "gtk -X" -> pure GTK + # otherwise -> X11 + # For X11 there is the further choice of toolkits GTK, Motif, + # Athena (Lucid), or no toolkit. They are enabled (in order of + # preference) with the "gtk", "motif", "Xaw3d", and "athena" flags. + + if ! use gui; then + einfo "Configuring to build without window system support" + myconf+=" --without-x --without-pgtk --without-ns" + elif use aqua; then + einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" + myconf+=" --with-ns --disable-ns-self-contained" + myconf+=" --without-x --without-pgtk" + elif use gtk && ! use X; then + einfo "Configuring to build with pure GTK (without X11) support" + myconf+=" --with-pgtk --without-x --without-ns" + myconf+=" --with-toolkit-scroll-bars" #836392 + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=" $(use_with xwidgets)" + else + # X11 + myconf+=" --with-x --without-pgtk --without-ns" + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with toolkit-scroll-bars)" + myconf+=" $(use_with xpm)" + + if use xft; then + myconf+=" --with-xft" + myconf+=" $(use_with cairo)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + else + myconf+=" --without-xft" + myconf+=" --without-cairo" + myconf+=" --without-libotf --without-m17n-flt" + use cairo && ewarn \ + "USE flag \"cairo\" has no effect if \"xft\" is not set." + use m17n-lib && ewarn \ + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." + fi + + local f line + if use gtk; then + einfo "Configuring to build with GIMP Toolkit (GTK+)" + while read line; do ewarn "${line}"; done <<-EOF + Your version of GTK+ will have problems with closing open + displays. This is no problem if you just use one display, but + if you use more than one and close one of them Emacs may crash. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. + If you intend to use more than one display, then it is strongly + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. + EOF + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + for f in motif Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"gtk\" is set." + done + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf+=" --with-x-toolkit=motif" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"motif\" is set." + done + elif use athena || use Xaw3d; then + einfo "Configuring to build with Athena/Lucid toolkit" + myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" + else + einfo "Configuring to build with no toolkit" + myconf+=" --with-x-toolkit=no" + fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." + fi + + if use gui; then + # Common flags recognised for all GUIs + myconf+=" $(use_with gif)" + myconf+=" $(use_with jpeg)" + myconf+=" $(use_with png)" + myconf+=" $(use_with svg rsvg)" + myconf+=" $(use_with tiff)" + myconf+=" $(use_with webp)" + myconf+=" $(use_with imagemagick)" + fi + + if tc-is-cross-compiler; then + # Configure a CBUILD directory when cross-compiling to make tools + mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die + ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit + popd >/dev/null || die + # Don't try to execute the binary for dumping during the build + myconf+=" --with-dumping=none" + elif use m68k; then + # Workaround for https://debbugs.gnu.org/44531 + myconf+=" --with-dumping=unexec" + else + myconf+=" --with-dumping=pdumper" + fi + + econf \ + --program-suffix="-${EMACS_SUFFIX}" \ + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ + --localstatedir="${EPREFIX}"/var \ + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ + --without-compress-install \ + --without-hesiod \ + --without-pop \ + --with-file-notification=$(usev inotify || usev gfile || echo no) \ + --with-pdumper \ + $(use_enable acl) \ + $(use_enable xattr) \ + $(use_with dbus) \ + $(use_with dynamic-loading modules) \ + $(use_with games gameuser ":gamestat") \ + $(use_with gmp libgmp) \ + $(use_with gpm) \ + $(use_with jit native-compilation aot) \ + $(use_with kerberos) $(use_with kerberos kerberos5) \ + $(use_with lcms lcms2) \ + $(use_with libxml2 xml2) \ + $(use_with mailutils) \ + $(use_with selinux) \ + $(use_with sqlite sqlite3) \ + $(use_with ssl gnutls) \ + $(use_with systemd libsystemd) \ + $(use_with threads) \ + $(use_with tree-sitter) \ + $(use_with wide-int) \ + ${myconf} +} + +src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + append-cppflags -DUSE_VALGRIND=$(usex valgrind) + + if tc-is-cross-compiler; then + # Build native tools for compiling lisp etc. + emake -C "${S}-build" src + emake lib # Cross-compile dependencies first for timestamps + # Save native build tools in the cross-directory + cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die + # Specify the native Emacs to compile lisp + EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) + emake "${EMACS_EMAKE_ARGS[@]}" actual-all + else + EMACS_EMAKE_ARGS=() + emake + fi +} + +src_test() { + # List .el test files with a comment above listing the exact + # subtests which caused failure. Elements should begin with a %. + # e.g. %lisp/gnus/mml-sec-tests.el. + local exclude_tests=( + # Reason: permission denied on /nonexistent + # (vc-*-bzr only fails if breezy is installed, as they + # try to access cache dirs under /nonexistent) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: tries to access network + # internet-is-working + %src/process-tests.el + + # Reason: fails with stable version of tree-sitter-json due to + # ast changes. Bug #922525 + %src/treesit-tests.log + + # Reason: test is not skipped if tree-sitter-tsx is not installed + # Bug #922525 + %lisp/progmodes/typescript-ts-mode-tests.el + ) + use threads || exclude_tests+=( + %lisp/server-tests.el + %lisp/progmodes/eglot-tests.el + %src/emacs-module-tests.el + %src/keyboard-tests.el + ) + use xpm || exclude_tests+=( %src/image-tests.el ) + + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir -p "${T}"/gpg || die + local f + for f in browser extra ssh; do + printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \ + > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die + done + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TERM=dumb \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + +src_install() { + emake \ + "${EMACS_EMAKE_ARGS[@]}" \ + DESTDIR="${D}" \ + NO_BIN_LINK=t \ + BLESSMAIL_TARGET="" \ + install + + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || 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 + + # movemail must be setgid mail + if ! use mailutils; then + fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fi + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die + rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 + 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 || die + + # remove COPYING file (except for etc/COPYING used by describe-copying) + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die + + if use systemd; then + insinto /usr/lib/systemd/user + sed -e "/^##/d" \ + -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \ + -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \ + etc/emacs.service | newins - ${EMACS_SUFFIX}.service + assert + fi + + if use gzip-el; then + # compress .el files when a corresponding .elc exists + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el failed" + fi + + local cdir + if use source; then + cdir="/usr/share/emacs/${FULL_VERSION}/src" + insinto "${cdir}" + # This is not meant to install all the source -- just the + # C source you might find via find-function + doins src/*.{c,h,m} + elif has installsources ${FEATURES}; then + cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" + fi + + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die + X + ;;; ${EMACS_SUFFIX} site-lisp configuration + X + (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + Y (setq find-function-C-source-directory + Y "${EPREFIX}${cdir}") + X (let ((path (getenv "INFOPATH")) + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) + X (and path + X ;; move Emacs Info dir before anything else in /usr/share + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS CONTRIBUTE + + if use gui && use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + mv nextstep/Emacs.app \ + "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + fi + + local DOC_CONTENTS="You can set the version to be started by + /usr/bin/emacs through the Emacs eselect module, which also + redirects man and info pages. Therefore, several Emacs versions can + be installed at the same time. \"man emacs.eselect\" for details. + \\n\\nIf you upgrade from a previous major version of Emacs, then + it is strongly recommended that you use app-admin/emacs-updater + to rebuild all byte-compiled elisp files of the installed Emacs + packages." + if use gui; then + DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. + Installing media-fonts/font-adobe-{75,100}dpi on the X server's + machine would satisfy basic Emacs requirements under X11. + See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs + for how to enable anti-aliased fonts." + use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi + if ! use mailutils; then + DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs' + own e-mail features are going to be used as an e-mail client + (e.g. Rmail), you are strongly encouraged to enable it. If not, + Emacs will use its own implementation of movemail; which has + fewer features and is less secure. For more information see: + https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html" + fi + tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write + a portable dump file due to being cross-compiled. + To create this file at run time, execute the following command: + \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable + \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" + readme.gentoo_create_doc +} + +pkg_preinst() { + # 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() { + elisp-site-regen + readme.gentoo_print_elog + + if use livecd; then + # force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd + eselect emacs update + else + eselect emacs update ifunset + fi +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild index 3270adf173f8..7d7e32e39e10 100644 --- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild @@ -33,7 +33,7 @@ else fi SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" @@ -464,6 +464,7 @@ src_test() { emake \ EMACS_TEST_VERBOSE=1 \ EXCLUDE_TESTS="${exclude_tests[*]}" \ + TERM=dumb \ TEST_BACKTRACE_LINE_LENGTH=nil \ check } diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild index 886e2dbf4f7f..d20867938cb9 100644 --- a/app-editors/emacs/emacs-31.0.9999.ebuild +++ b/app-editors/emacs/emacs-31.0.9999.ebuild @@ -33,7 +33,7 @@ else fi SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" @@ -464,6 +464,7 @@ src_test() { emake \ EMACS_TEST_VERBOSE=1 \ EXCLUDE_TESTS="${exclude_tests[*]}" \ + TERM=dumb \ TEST_BACKTRACE_LINE_LENGTH=nil \ check } |