diff options
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/Manifest.gz | bin | 14109 -> 14112 bytes | |||
-rw-r--r-- | app-editors/emacs/Manifest | 16 | ||||
-rw-r--r-- | app-editors/emacs/emacs-26.3-r21.ebuild | 118 | ||||
-rw-r--r-- | app-editors/emacs/emacs-27.2-r19.ebuild | 132 | ||||
-rw-r--r-- | app-editors/emacs/emacs-28.2-r15.ebuild | 138 | ||||
-rw-r--r-- | app-editors/emacs/emacs-29.4-r1.ebuild | 164 | ||||
-rw-r--r-- | app-editors/emacs/emacs-30.0.91.ebuild | 164 | ||||
-rw-r--r-- | app-editors/emacs/emacs-30.0.92.ebuild | 164 | ||||
-rw-r--r-- | app-editors/emacs/emacs-30.0.9999-r1.ebuild | 164 | ||||
-rw-r--r-- | app-editors/emacs/emacs-31.0.9999.ebuild | 164 | ||||
-rw-r--r-- | app-editors/retext/Manifest | 8 | ||||
-rw-r--r-- | app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch | 15 | ||||
-rw-r--r-- | app-editors/retext/retext-7.2.3.ebuild | 74 | ||||
-rw-r--r-- | app-editors/retext/retext-8.0.0.ebuild | 71 | ||||
-rw-r--r-- | app-editors/retext/retext-8.0.1-r1.ebuild | 85 | ||||
-rw-r--r-- | app-editors/retext/retext-8.0.1.ebuild | 78 |
16 files changed, 662 insertions, 893 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 59f954de2c5f..2ee25da19509 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index ee1eb22a183e..97a5ecbb539c 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -15,15 +15,15 @@ DIST emacs-30.0.91.tar.xz 54782188 BLAKE2B 9ef6f6bcca6b33fb9f70530ff1bb2ff8d56d8 DIST emacs-30.0.92.tar.xz 54813380 BLAKE2B adb5eb9e9b8f6eb059688d28730276db07ac82878bc56c98f68c790053d7d7803c16e7898dc2497464d2394c6778e917104df7f0ca869c48decc5c4e41feac1a SHA512 d5cf786733986d8233379859eb15d382c69e71737b790a8732d66818361e1632c9137c26a14534ad14baa4f38bfdc5e4e3e0d94017cfe54586693067e5ff7d05 EBUILD emacs-18.59-r15.ebuild 4463 BLAKE2B 3267a4c5911926609cde01416dcc7cb21f50f3c2faaa7a9ee946d1547fecad96f0b7e41036d1ec661571a67565ce477c66d321be100a6d29e18066f939e0e9c3 SHA512 0f027571450d78913531cd91af1cb0091543fd35df3ab86a07b981d5cf7deaffe705279abfd59b59dafade81758b867f7365411ce1276bcd2c142e2daabb1bde EBUILD emacs-26.3-r19.ebuild 11823 BLAKE2B 0ddb554f48e9f62d06cd6df2a840436d516b2ed1301cd639ce19584ea9350d7ec765cf249fcfa7a1e7ff139f135bcd96aaacd2e20d450aee126d0d7c02915ec1 SHA512 10475df4b0c9685f0f3f491ecc625524146af1e850e60425ebdad46c288f2f7be57f0c98e899086cb7ee3a405f25c3c79b03f0dc4deee9b24e560690e6426354 -EBUILD emacs-26.3-r21.ebuild 11812 BLAKE2B 61162c30a1be148b81b4fd1cc8329e6efab0fde20f8c4c1896f2ae4a1694d0567789509a9d4445859ead2e81dbe215e1c7d0a5bb7543cf8d9ce864578de792a1 SHA512 3f44f01ddb72b987e7d88705dada66d2486a012128d012e1f9a21d26cf9f2777841b8cd0101a3d475f8b90d735dc5c0ef0bedaa7d7d1e8c7173e1ef7cc739e0b +EBUILD emacs-26.3-r21.ebuild 11653 BLAKE2B fdf46c23b7b4fbd2ce993e2ba17d74b3c5b376b78b6f430fc233e3285b0c630e3dce217aa86d617aed87824aa4e3307dc9835feb3ef1f48d37292b554a8059c0 SHA512 8f642b5cf1305ba028842e5dd880e47452cf812595ef938badac96b85a05657e410b1f8760fcb66ae7114f73a08c3b88fa5fb0cd2e89285520f821802b22fe05 EBUILD emacs-27.2-r17.ebuild 14555 BLAKE2B ec5198f984a704f270f95c574405b9621d5a7d8028b56a41ed0f8871ca1980a32079d944f79648ac40713cefbf7efc233e972a386f48fd77c8f3af12d0500e72 SHA512 a3b046c085fb41bc3d7979992d67b92c4f9124e23a6f98f3417a179029b05311a4ce3a7d718009bbb76e121e533793988f8c6f567c24f0ba2b52fc9f932a2224 -EBUILD emacs-27.2-r19.ebuild 14543 BLAKE2B 12428ddedc93efbb747ef77260c062d7c7494ed6dcc0f362cb2c74488b995bd811895aae0a08e5ca967e37a571ec8c2c38b58f35d3ea8101792ba06eec08fce5 SHA512 917b47f5326034fcb033181c1e9faba712b9aa0553ee2677682eec2f7ef8dd57ccf1775b99305a768aea61b6b2714659afa1e6393a51f3b7abf535d6bfea924e +EBUILD emacs-27.2-r19.ebuild 14371 BLAKE2B 8ba83eef7faff060303cd98b6d32400c7833895bd42fd0d7e04183e826b0a991610ac17ce62ab4c92744610eba94d330ad600db60609e7ce5b4ae022a0427534 SHA512 8b129bd716025b274f379a8cb496533df7490207e73fc3f2ef3977b876be530ee04b0856851fb8be3bba8b18f6d2662edca778eb4b093fd592913acbeca8e5ae EBUILD emacs-28.2-r13.ebuild 17522 BLAKE2B df13974f748f4b0b9c59e857c40b00625b21a2e541814ed4de745bae9dbd7213fdc25bbea690ca70b57fd2a35a0f884b282ea7c1707c6e6fbd672f8e8845f239 SHA512 97a04f0c3e505c85471825f97f0955dbaa01b8702e40b9a15e83c276ea9ad90865c804b86f766a0bd393ea892e0b11e57b151e8ff8cdc79539954cbe3262c2d1 -EBUILD emacs-28.2-r15.ebuild 17510 BLAKE2B 2a1c77c820d7b2f49457f036d50d3f680460d5d9b129a1ab89e9bf43bdc2069d58a1297241ec71a15e4d64046c1997a034cd1ada75a799e994567d596b21e1c0 SHA512 6158fce05396eba07e8f9f688d38553f70cacfdd80a813f8f3186172d398b5af38fd5101f733bd1b1b82abdc0aa3d563a364090a963caa25c7278067b1487e65 -EBUILD emacs-29.4-r1.ebuild 20301 BLAKE2B d6719d2a5914e01b8ac04bb6ee2e33ec43341b1c7ea5cf40f57909d7a49ddfc6ef6df521d54e7eb35c5292f06cb90fbe6378a6b843d9680d063fbea6aedfccc5 SHA512 3ace46b503fc4216130bc1f7d540a12f0b6bf891898e1e793f018b32040f75b3d06db0aafd63feca9c4e3add68a9673a10eb87642de586598a207e63f3c560cf +EBUILD emacs-28.2-r15.ebuild 17340 BLAKE2B c35a76d8694c11eee61edbecb4101a137ae8d101c89aac79b60fdc2ef2dc7a192af0c3746cfe6550a2bc0a28b0473f593b6a9685e843748464589268f03edc17 SHA512 3355cce8375717a4fe412599d4dd9fb80be02680d9a0072c0b6dffa465c0ece933c73bf725a6301f6ecfff26ff3036dd5044ba94ee800cafe9fda45356e21ed4 +EBUILD emacs-29.4-r1.ebuild 20069 BLAKE2B 47a13294e4fb6e935a15e642aa820c689be0c9d20932faf0c0458b054ce354f6cc079c2ccabfb0522a6ed7c3410ec274b831461a43e49af33fd3c595e600393c SHA512 1c3a8909b40eb1c737b42c0521dfd149984a1bce2164342e6a4997134e23e78c371713239f991434907db268369634281150b2647619913160aec241b38f4566 EBUILD emacs-29.4.ebuild 20313 BLAKE2B 1bed634eb42caf03b67df68474bf7d8b02b0f2086e8bbe820dd82096b81630af01fa184201fbc6c7b3797ff125ccf45b5dd465eae64443854781e9588acbd4d3 SHA512 d0ba494964d39737ed536e7e00a33212f215820971a449401ca6b60d7dc51715ae39f7fe6910e5673d7eba62683a1cc7d7dc20ef50e5dc5bb71c334f70387261 -EBUILD emacs-30.0.91.ebuild 19892 BLAKE2B d59ab355a228cfaff91fd28a31231676a0f476c4df2918f746360c4e69c38c2d424ba13d7ab4555992bdd710a2b891a7590b14d6581b20eb7689cff21b2dc228 SHA512 6ed79226d999922bc00ad1a3f7d562f0fbd76b9f93d664eb1aa2724e2b5dbeaafa433bdfdeb6bb4e23151d8eb4053145b540d6a455f3640e0ab7e1703012601d -EBUILD emacs-30.0.92.ebuild 19892 BLAKE2B d59ab355a228cfaff91fd28a31231676a0f476c4df2918f746360c4e69c38c2d424ba13d7ab4555992bdd710a2b891a7590b14d6581b20eb7689cff21b2dc228 SHA512 6ed79226d999922bc00ad1a3f7d562f0fbd76b9f93d664eb1aa2724e2b5dbeaafa433bdfdeb6bb4e23151d8eb4053145b540d6a455f3640e0ab7e1703012601d -EBUILD emacs-30.0.9999-r1.ebuild 19892 BLAKE2B d59ab355a228cfaff91fd28a31231676a0f476c4df2918f746360c4e69c38c2d424ba13d7ab4555992bdd710a2b891a7590b14d6581b20eb7689cff21b2dc228 SHA512 6ed79226d999922bc00ad1a3f7d562f0fbd76b9f93d664eb1aa2724e2b5dbeaafa433bdfdeb6bb4e23151d8eb4053145b540d6a455f3640e0ab7e1703012601d -EBUILD emacs-31.0.9999.ebuild 19890 BLAKE2B 9df237ff137e4e1d6b42b206f8b10abd9a4ae6fbae6548e9df7ef8402fc1870d7d2f3cf154d16e9dc43e1391da4f17537979e4448b59e025e6658382c5192226 SHA512 a1ab7e8ac5443e0b04c727c7f0472317236ffc9e310a4498372ce25588b2d7fa3457ba94c87ca42662a81132e03e4005cc4edc8caf001738bcd5493d872f0d74 +EBUILD emacs-30.0.91.ebuild 19660 BLAKE2B 0925378f5769f6ece2345d98d77d89e6d5950da7c38ac7fb0f9f443392988fc102c8b61e913db4436ef8c174aa66c32d27d6c7e8de71834ae92fb1a8a31b29ac SHA512 e21fd088b85911827c9d7bfffda29acff107e5428a452084d8637eb0a93eb052e5742fe0a9b7a77e1a057e7e5e7b782c0e7ab36b6ad5f12a6766055485f8b555 +EBUILD emacs-30.0.92.ebuild 19660 BLAKE2B 0925378f5769f6ece2345d98d77d89e6d5950da7c38ac7fb0f9f443392988fc102c8b61e913db4436ef8c174aa66c32d27d6c7e8de71834ae92fb1a8a31b29ac SHA512 e21fd088b85911827c9d7bfffda29acff107e5428a452084d8637eb0a93eb052e5742fe0a9b7a77e1a057e7e5e7b782c0e7ab36b6ad5f12a6766055485f8b555 +EBUILD emacs-30.0.9999-r1.ebuild 19660 BLAKE2B 0925378f5769f6ece2345d98d77d89e6d5950da7c38ac7fb0f9f443392988fc102c8b61e913db4436ef8c174aa66c32d27d6c7e8de71834ae92fb1a8a31b29ac SHA512 e21fd088b85911827c9d7bfffda29acff107e5428a452084d8637eb0a93eb052e5742fe0a9b7a77e1a057e7e5e7b782c0e7ab36b6ad5f12a6766055485f8b555 +EBUILD emacs-31.0.9999.ebuild 19658 BLAKE2B d32ffa615eba1a88dbb34304b88fc0525029b05988b20c8c3542bc2d57908ecf26a3e30eb17b3c9e13821229f63ff58105c3fc3e5163bdc25cdeb6a95b28502c SHA512 6d4f5063a8cae559e9e46b81f5f9a410462a27be8d2933b669eb3b86bbdc6ec54fbfdf2f3c1552d0d31b2ec25b916c3c28ab8727f7c2db333e8a06bf9c5fbe20 MISC metadata.xml 3434 BLAKE2B aaeef31ce265ae3b3c67ddfe01b3b41724b6fed7353e83f3efa1fe401944707391f3160d7cfea423802c67e78830387e210966f5fdc03a5a0a20b0e38f493b6d SHA512 2ad8128bfe05cbef0cdf19840e809918331c5e98976fb1af14127e0cb7adfba597ff83457a45079d1facd571953210c1650eb11b87d9bce2352e9ca865ebcc38 diff --git a/app-editors/emacs/emacs-26.3-r21.ebuild b/app-editors/emacs/emacs-26.3-r21.ebuild index a0ed4c9895fa..082ee958b14b 100644 --- a/app-editors/emacs/emacs-26.3-r21.ebuild +++ b/app-editors/emacs/emacs-26.3-r21.ebuild @@ -125,45 +125,80 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf + local myconf=( + --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) + $(use_enable acl) + $(use_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gpm) + $(use_with kerberos) $(use_with kerberos kerberos5) + $(use_with lcms lcms2) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with wide-int) + $(use_with zlib) + ) if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-ns" + myconf+=( + --without-x --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" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x + ) else - myconf+=" --with-x --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" + myconf+=( + --with-x --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with xpm) + $(use_with imagemagick) + ) if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -183,53 +218,28 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-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" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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) \ - $(use_enable acl) \ - $(use_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with games gameuser ":gamestat") \ - $(use_with gpm) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-27.2-r19.ebuild b/app-editors/emacs/emacs-27.2-r19.ebuild index 7b92be2c5fa7..9057ada871ab 100644 --- a/app-editors/emacs/emacs-27.2-r19.ebuild +++ b/app-editors/emacs/emacs-27.2-r19.ebuild @@ -166,46 +166,84 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf + local myconf=( + --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_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gmp libgmp) + $(use_with gpm) + $(use_with json) + $(use_with kerberos) $(use_with kerberos kerberos5) + $(use_with lcms lcms2) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with wide-int) + $(use_with zlib) + ) if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-ns" + myconf+=( + --without-x --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" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x + ) else - myconf+=" --with-x --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" + myconf+=( + --with-x --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with xpm) + $(use_with imagemagick) + ) 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)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -225,24 +263,24 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-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" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi fi @@ -252,43 +290,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with games gameuser ":gamestat") \ - $(use_with gmp libgmp) \ - $(use_with gpm) \ - $(use_with json) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-28.2-r15.ebuild b/app-editors/emacs/emacs-28.2-r15.ebuild index 55534cd81160..7b5d0c431e99 100644 --- a/app-editors/emacs/emacs-28.2-r15.ebuild +++ b/app-editors/emacs/emacs-28.2-r15.ebuild @@ -190,57 +190,95 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --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_with dbus) + $(use_with dynamic-loading modules) + $(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) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with wide-int) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-ns" + myconf+=( + --without-x --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" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x + ) else - myconf+=" --with-x --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" + myconf+=( + --with-x --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with xpm) + $(use_with imagemagick) + ) 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)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -260,24 +298,24 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-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" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi fi @@ -287,43 +325,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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_with dbus) \ - $(use_with dynamic-loading modules) \ - $(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) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with wide-int) \ - ${myconf} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-29.4-r1.ebuild b/app-editors/emacs/emacs-29.4-r1.ebuild index 2ff9989a9764..13447ae2ea93 100644 --- a/app-editors/emacs/emacs-29.4-r1.ebuild +++ b/app-editors/emacs/emacs-29.4-r1.ebuild @@ -222,25 +222,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --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_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 json) + $(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) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -256,39 +286,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --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+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) 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)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(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)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -308,36 +350,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-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" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -346,45 +390,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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_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 json) \ - $(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} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-30.0.91.ebuild b/app-editors/emacs/emacs-30.0.91.ebuild index 7058569f30e2..0cd4d0582c91 100644 --- a/app-editors/emacs/emacs-30.0.91.ebuild +++ b/app-editors/emacs/emacs-30.0.91.ebuild @@ -219,25 +219,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --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) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -253,39 +283,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --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+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) 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)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(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)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -305,36 +347,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-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" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -343,45 +387,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-30.0.92.ebuild b/app-editors/emacs/emacs-30.0.92.ebuild index 7058569f30e2..0cd4d0582c91 100644 --- a/app-editors/emacs/emacs-30.0.92.ebuild +++ b/app-editors/emacs/emacs-30.0.92.ebuild @@ -219,25 +219,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --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) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -253,39 +283,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --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+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) 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)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(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)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -305,36 +347,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-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" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -343,45 +387,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild index 7058569f30e2..0cd4d0582c91 100644 --- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild @@ -219,25 +219,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --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) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -253,39 +283,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --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+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) 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)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(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)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -305,36 +347,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-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" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -343,45 +387,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild index 22cbd35f4139..d1f3581d8ccd 100644 --- a/app-editors/emacs/emacs-31.0.9999.ebuild +++ b/app-editors/emacs/emacs-31.0.9999.ebuild @@ -219,25 +219,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --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) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -253,39 +283,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --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+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) 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)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(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)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -305,36 +347,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-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" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -343,45 +387,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest index 764718db6f49..8c6bfc4cb53c 100644 --- a/app-editors/retext/Manifest +++ b/app-editors/retext/Manifest @@ -1,12 +1,4 @@ -AUX retext-8.0.1-fix-set-desktop-entry.patch 517 BLAKE2B e9f6c821e8925f912916604db5d2afac99b9ad58481a2518b755bbbabbf0ac3daaad4360b3b61cf184663ab933aca59a86ed009e850123593f5ede1634ff6fa8 SHA512 77d0eb4c286b20ddbd6a117e9872d132e7def06b524db8419d2929daee5bdde58c1d49eeef3570ca6bd9492f9498f0fdb951e34140112b82d807cc87fb40b6ac -DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da -DIST ReText-8.0.0.tar.gz 492823 BLAKE2B ba80f01f1a40981220c0b3e16dd04bf551319a35c1a5c7f6d5e70135404537e74fa4625fe4c05c7ee54202de9ae16d181c110fcae9b9172761ca5ecf6400f7de SHA512 0f2480bcc8569cf60ebfe55847a2a068d1e5dd262a4ff212873bf58660ec31e9c37d9b21bdc66229d681c065a0d96b6ff11652e8d9a7c77841ea551480d1154c -DIST ReText-8.0.1.tar.gz 538968 BLAKE2B 6ee18b4becf47ed3edae9e1d3ea8167a5db2685ae55b206be1ffca78bb765a559f53575da8aa105eae5d1b1fb87419723cdfd02cfff2eb422de9722589a0b97a SHA512 a2a03a821ac06e0408cd036189e9fce18f4b693085aaa15e0d95f2a80157f6ab09b0bcecd9574673ce57fc9cde937457e8d62971f1553cbc26c681039401178a DIST ReText-8.0.2.tar.gz 546236 BLAKE2B 3ef28366e5884234d77b2155c3f01d7881206383aa19ccb010255eb40ea14aa2ab298fe212d2b4d0e7d65246075b426c93a8ae518b8fb5f0887f1694064e309a SHA512 c7b543d91290c007c820751f39c009c1e5fb86eb59590d0c13610c9c7f13b6023ffee3d6aebc4665addacbefad0d17937a29e8201d08457cc1641a6d5c0019b0 -EBUILD retext-7.2.3.ebuild 1979 BLAKE2B b8ccc3727988d63f148b7dcfa038369f8bcdc5f2cca2b6abf8c9b36982df14450dfd3292ca44d00a4c6bfdebb33ee7ae222ae9d0a5db4430c90b8072870d7431 SHA512 29ed4dab0f2b8e60e176c8cff3665d1a9766cb2588e7cbf327e870605b1984ad252115b65ac9ffa16bdc6404a07e4a901a2ac74715a4489e3a5e2389ec30f377 -EBUILD retext-8.0.0.ebuild 1932 BLAKE2B d7fa1a762f7c1e94ba1e38c28928c42e04eb88d28d0b55aaf84651a95c30f2c9f9e98e3c7aced950e6a0760040f0993be294222ff17ca5ed662c6f65b14ccece SHA512 99bca57c19cf3a132cb2286c59e4a0d87f2e45a11f063cd72984f802dfd1c51afd5468973211b538ecdd296deed3c585c614446910e4e4c348a83e2730ed9d2c -EBUILD retext-8.0.1-r1.ebuild 2060 BLAKE2B af12d081ff875ba261374e6cf89a51e32b5c6c29351dc214c5ad02c860113c6681abcc1878680e6640620553c2a75bfee7138ad56de721dedd53d2f7072f9c3f SHA512 60865f2d7a84c0a1a4f6115ef6a3d0e9ef7e941615cc04ee9a00a4dcd4b1dc1a8abf8e44611f58c6ebf6a5146cd4296579641247556b02203cedd902ff67329f -EBUILD retext-8.0.1.ebuild 1854 BLAKE2B 481cf63856428e3e7f0c992a3526d44c0b210a697fa280a3841c40f59265a951ed64f20a64f7a58a756bd2a07b0e9313a6d644c545da02d6dc97a51ea9a33b41 SHA512 81d627e957056464069b4c3b9254bcb0e26b4ac9e199982336e42946251d90c947e66b1457729abbc1742c042da18d36ae0c5b83d29d90d71014c6bb509ed908 EBUILD retext-8.0.2.ebuild 1635 BLAKE2B e71831b212176a0506096f670e02d97d2ff9de75a5499421872594fe661a4e9512b791d242443860a7f4e971c84d2b7c76e91778f6c910accc684d059e27990f SHA512 69b06c0712b58aa0267ef67f8e2a341329447be1c89ae4f96fae1c7c91d566d717b53a4063b39f77fc83667fdc372e48840979a532f6a816aa99aec0c1b89577 EBUILD retext-9999.ebuild 1624 BLAKE2B 8fa44eb057243b8c671c40a18d54f2712723fcdb3c3380f492cb7851efa59d202f0af1879ea648fc08ce8a30dff1a63699b3f8b13315c2f8ce081f6f9b462202 SHA512 43f3b78c29f86d6c7ceb827df2f577ad3ce46d93a5347430931eab12603a94331feece8467a49e70b8812afb37f3cde272c30f65b64a03273ef65a51f67d6652 MISC metadata.xml 535 BLAKE2B 94fbf92941c956601e9ec037a78919fcbddb572baa20f74c0daae31e438e44d214b57926cfa6d31eb176b8be72d2078e44686bada4a4794e130956c7d91b5865 SHA512 5ed97d1ed19c618b1246375d02860f96ce7f58aa759c467ae69e35d6b003cdac44f5c59f166ae6970e9a082e783550381b34540ad1ba03d661a3f3fde7d26dec diff --git a/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch b/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch deleted file mode 100644 index 0ff685b89152..000000000000 --- a/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch +++ /dev/null @@ -1,15 +0,0 @@ -# Set desktop file name to correspond to the one installed by -# the ebuild ("retext.desktop"). -# Bug: https://bugs.gentoo.org/925726 - ---- a/ReText/__main__.py -+++ b/ReText/__main__.py -@@ -65,7 +65,7 @@ def main(): - app.setApplicationDisplayName("ReText") - app.setApplicationVersion(app_version) - app.setOrganizationDomain('mitya57.me') -- app.setDesktopFileName('me.mitya57.ReText.desktop') -+ app.setDesktopFileName('retext') - QNetworkProxyFactory.setUseSystemConfiguration(True) - - RtTranslator = QTranslator() diff --git a/app-editors/retext/retext-7.2.3.ebuild b/app-editors/retext/retext-7.2.3.ebuild deleted file mode 100644 index 4db42681b7e3..000000000000 --- a/app-editors/retext/retext-7.2.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please don't add pypy support before testing if it's actually supported. The -# old compat matrix is no longer accessible as of 2021-02-13 but stated back -# in 2020-07-05 that PyQt5 was explicitly not supported. -PYTHON_COMPAT=( python3_10 ) -PYPI_NO_NORMALIZE=1 -PYPI_PN="ReText" - -inherit distutils-r1 optfeature qmake-utils virtualx xdg - -MY_PN="ReText" -MY_P="${MY_PN}-${PV/_/~}" - -DESCRIPTION="Simple editor for Markdown and reStructuredText" -HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/retext-project/retext.git" -else - inherit pypi - KEYWORDS="amd64 ~riscv ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - >=dev-python/markups-3.1.1[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/python-markdown-math[${PYTHON_USEDEP}] - dev-python/pyqt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools - test? ( dev-python/pyqt5[testlib,${PYTHON_USEDEP}] ) -" - -distutils_enable_tests unittest - -pkg_setup() { - # Needed for lrelease - export PATH="$(qt5_get_bindir):${PATH}" -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - eunittest || die -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "dictionary support" dev-python/pyenchant - # See https://bugs.gentoo.org/772197. - optfeature "rendering with webengine" dev-python/pyqtwebengine - - einfo "Starting with retext-7.0.4 the markdown-math plugin is installed." - einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math." - einfo "For more details take a look at:" - einfo "https://github.com/mitya57/python-markdown-math#math-delimiters" -} diff --git a/app-editors/retext/retext-8.0.0.ebuild b/app-editors/retext/retext-8.0.0.ebuild deleted file mode 100644 index e9eb056b9e56..000000000000 --- a/app-editors/retext/retext-8.0.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please don't add pypy support before testing if it's actually supported. The -# old compat matrix is no longer accessible as of 2021-02-13 but stated back -# in 2020-07-05 that PyQt5 was explicitly not supported. -PYTHON_COMPAT=( python3_{10..11} ) -PYPI_NO_NORMALIZE=1 -PYPI_PN="ReText" - -inherit distutils-r1 optfeature qmake-utils virtualx xdg - -DESCRIPTION="Simple editor for Markdown and reStructuredText" -HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/retext-project/retext.git" -else - inherit pypi - KEYWORDS="amd64" -fi - -LICENSE="GPL-2+" -SLOT="0" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - >=dev-python/markups-3.1.1[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/python-markdown-math[${PYTHON_USEDEP}] - dev-python/pyqt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools - test? ( dev-python/pyqt6[testlib,${PYTHON_USEDEP}] ) -" - -distutils_enable_tests unittest - -pkg_setup() { - # Needed for lrelease - export PATH="$(qt5_get_bindir):${PATH}" -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - virtx eunittest -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "dictionary support" dev-python/pyenchant - # See https://bugs.gentoo.org/772197. - optfeature "rendering with webengine" dev-python/pyqt6-webengine - - einfo "Starting with retext-7.0.4 the markdown-math plugin is installed." - einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math." - einfo "For more details take a look at:" - einfo "https://github.com/mitya57/python-markdown-math#math-delimiters" -} diff --git a/app-editors/retext/retext-8.0.1-r1.ebuild b/app-editors/retext/retext-8.0.1-r1.ebuild deleted file mode 100644 index ae105ae1c961..000000000000 --- a/app-editors/retext/retext-8.0.1-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{10..11} ) -PYPI_NO_NORMALIZE=1 -PYPI_PN="ReText" - -inherit desktop distutils-r1 optfeature qmake-utils virtualx xdg - -DESCRIPTION="Simple editor for Markdown and reStructuredText" -HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/retext-project/retext.git" -else - inherit pypi - KEYWORDS="~amd64" -fi - -LICENSE="GPL-2+" -SLOT="0" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - >=dev-python/markups-3.1.1[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/python-markdown-math[${PYTHON_USEDEP}] - dev-python/pyqt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools - test? ( dev-python/pyqt6[testlib,${PYTHON_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}"/${P}-fix-set-desktop-entry.patch -) - -distutils_enable_tests unittest - -pkg_setup() { - # Needed for lrelease - export PATH="$(qt5_get_bindir):${PATH}" -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - virtx eunittest -} - -src_install() { - distutils-r1_src_install - - newicon data/retext-kde5.png retext.png - - # Fixme: The application actually provides a desktop file which theoretically - # could be used. So far though I could not make it install properly. - make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor" -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "dictionary support" dev-python/pyenchant - - einfo "Starting with retext-7.0.4 the markdown-math plugin is installed." - einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math." - einfo "For more details take a look at:" - einfo "https://github.com/mitya57/python-markdown-math#math-delimiters" -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-editors/retext/retext-8.0.1.ebuild b/app-editors/retext/retext-8.0.1.ebuild deleted file mode 100644 index 61f1d402961f..000000000000 --- a/app-editors/retext/retext-8.0.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{10..11} ) -PYPI_NO_NORMALIZE=1 -PYPI_PN="ReText" - -inherit desktop distutils-r1 optfeature qmake-utils virtualx xdg - -DESCRIPTION="Simple editor for Markdown and reStructuredText" -HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/retext-project/retext.git" -else - inherit pypi - KEYWORDS="amd64" -fi - -LICENSE="GPL-2+" -SLOT="0" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - >=dev-python/markups-3.1.1[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/python-markdown-math[${PYTHON_USEDEP}] - dev-python/pyqt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools - test? ( dev-python/pyqt6[testlib,${PYTHON_USEDEP}] ) -" - -distutils_enable_tests unittest - -pkg_setup() { - # Needed for lrelease - export PATH="$(qt5_get_bindir):${PATH}" -} - -python_install() { - distutils-r1_python_install - - newicon data/retext-kde5.png retext.png - make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor" -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - virtx eunittest -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "dictionary support" dev-python/pyenchant - - einfo "Starting with retext-7.0.4 the markdown-math plugin is installed." - einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math." - einfo "For more details take a look at:" - einfo "https://github.com/mitya57/python-markdown-math#math-delimiters" -} - -pkg_postrm() { - xdg_icon_cache_update -} |