* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2016-04-03 0:04 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2016-04-03 0:04 UTC (permalink / raw
To: gentoo-commits
commit: a7e28a58e95bb7540eafb21353b18345749bc215
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 23:57:47 2016 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 23:58:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e28a58
app-editors/xemacs: gcc-5.3 patch. See bug 576512.
Package-Manager: portage-2.2.26
app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch | 32 ++++++++++++++++++++++
app-editors/xemacs/xemacs-21.4.24.ebuild | 7 ++++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
new file mode 100644
index 0000000..494fc51
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
@@ -0,0 +1,32 @@
+diff -r e2da872593c0 configure.in
+--- a/configure.in Tue Mar 24 22:15:53 2015 -0400
++++ b/configure.in Sun Mar 13 13:48:24 2016 +0100
+@@ -1939,6 +1939,8 @@
+ CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes"
+ dnl Yuck, bad compares have been worth at least 3 crashes!
+ CFLAGS="$CFLAGS -Wsign-compare"
++ dnl Use old gnu inline semantics until we fix the source
++ CFLAGS="$CFLAGS -fgnu89-inline"
+ dnl XEmacs is known not to be strict-aliasing-safe.
+ case "`gcc -v --help 2>&1`" in
+ *-fstrict-aliasing* ) CFLAGS="$CFLAGS -fno-strict-aliasing" ;;
+diff -r e2da872593c0 src/lisp.h
+--- a/src/lisp.h Tue Mar 24 22:15:53 2015 -0400
++++ b/src/lisp.h Sun Mar 13 13:48:24 2016 +0100
+@@ -193,6 +193,8 @@
+ # endif /* GNUC */
+ #endif
+
++#ifndef _GCC_MAX_ALIGN_T
++#define _GCC_MAX_ALIGN_T
+ /* No type has a greater alignment requirement than max_align_t.
+ (except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -202,6 +204,7 @@
+ struct { void (*f)(void); } f;
+ struct { double d; } d;
+ } max_align_t;
++#endif
+
+ #ifndef ALIGNOF
+ # if defined (__GNUC__) && (__GNUC__ >= 2)
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 97f68ae..9ffda4d 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -9,7 +9,7 @@
EAPI="5"
WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
DESCRIPTION="highly customizable open source text editor and application development system"
HOMEPAGE="http://www.xemacs.org/"
@@ -62,6 +62,8 @@ src_unpack() {
src_prepare() {
# see bug 58350, 102540 and 143580
epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
+ # see bug 576512
+ epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
# Some binaries and man pages are installed under suffixed names
# to avoid collions with their GNU Emacs counterparts (see below).
@@ -168,6 +170,9 @@ src_configure() {
einfo "${myconf}"
+ # see bug 576512
+ append-cflags -std=gnu89
+
# Don't use econf because it uses options which this configure
# script does not understand (like --host).
./configure ${myconf} ${EXTRA_ECONF} \
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2017-03-31 20:02 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2017-03-31 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 5657e6d9c4d2e095ef880479e8daf5b9f3478fc0
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 19:58:38 2017 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 20:01:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5657e6d9
app-editors/xemacs: Use system malloc (bug 609110)
Move to EAPI=5, patch for glibc macro deprecation
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Manifest-Sign-Key: 0x377034660A5828DE!
app-editors/xemacs/Manifest | 45 ++++++++++++++++++++++
.../xemacs/files/xemacs-21.5.34-glibc-macro.patch | 32 +++++++++++++++
app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 12 +++---
3 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index ba31b4f2285..bd49e82b84e 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,6 +1,51 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX README.Gentoo 1426 SHA256 9fa4fa31fc4deb0742dd220c8a1cf41af2bb4f4651e4f995589389afcc9f5f92 SHA512 0576235fb09ea9ad5fbe5b1bbaa41dd37913603ab40773f2c476b72e147eac9b8de62f600717d06d5366184deadb55e0002e79b9987ba215bad5ebee41fdfbb1 WHIRLPOOL a0687729c64ac2323d3b2d3fb8db9a68368553a3188725ade8d2a1d2b5c09ae32e3f8079037edc9c1f1e933894b9d287dd0c24fa8feb5dde953df9490a5403de
+AUX xemacs-21.4.19-db.patch 3157 SHA256 c0c0cf18ccd01ee0e34e913c4f275977f4f61aa7343fef9fdff1f3ba84096022 SHA512 b4987784295c5d2335440dccca4e157d5ccece510d97fc131e33f701fc2dc48bd01080df577c6e588d926703f7b461a347d0d3e3f99931e10cdb8b11592b35be WHIRLPOOL 0ff39c8a7ba863194636a71e55831d145c79c2f45463c21705763618bcf4e2092ee2cef3ae485de8d8eb335dbe66d2d560674cf3028d29b23de1f1c358a0c122
+AUX xemacs-21.4.19-texi.patch 1107 SHA256 9f7af4de522d03c9e78076c4801db775ce919d30b27f4f84c8b055d17f476ae5 SHA512 8b032464dfdeed928c1d4fc566657762fa791e64a3b255a2725edf0d244b76c928c9dcc643584debbaa5b8c1d3c53f635950905ab30900f6d758ed5951d3c219 WHIRLPOOL 6aff14b5206492c5f519bd199927a438ecfc754527196e96f2106eaa2b5e416e09ee3e1313b93a53435249c5a44a626d37c1ab299a66927a9532ee5f04b394ba
+AUX xemacs-21.4.21-vcdiff.patch 476 SHA256 adf0bb95ef289187027203f28fb0055be817c6b54211912bc33c16a9ff9cfb2c SHA512 89d8c8ba5af0467057506b9e2b974fa5d09432e7375dcd0517007ad4d28fee8019895667bc4291fe500b1a039fbeef0b82d2318995ca41ed7045327dff860f85 WHIRLPOOL 0c0343e962bad880f328b292c73240dade407b60dea93c400101f9c3db76d92a0b4cd3a891647df390ba6cace35e1d1050961f576364f5478833d5ec411df4d5
+AUX xemacs-21.4.22-deprecated-ldap.patch 516 SHA256 41100c6c9fc45d90aa4618e9e9897f229854fbea60ba34fb0e6b82e8e8a37a7b SHA512 4761f5759741f733518668fededec21ab2e9ec1cb883a363ca23669e1c82d9d44c03126a758da02c21cad8a810c3f83f0516f2bad4103fbea2cf73b00516b388 WHIRLPOOL ae9da77b267b96e8fc3c87e3498f1bee86fd0a2629be4083da84a3ddf50651c18d32c9e6af552cb3fa569f944b58e559a23c38554e27af4e6cd3b2ae94ad3dfa
+AUX xemacs-21.4.22-large-images.patch 4695 SHA256 bde9b13e2e57f25564d732213fa5cb5f2bef17ce8580f8d18e81975febade3f8 SHA512 b1e03d7824d0fed82eff4fc6e5d6cd7e9f1b94e6eeec5d429b8a66027a9fc95943318c4c010bbb0f57d59b31a90bab94360a41bb0858735da59ffcfb75d59319 WHIRLPOOL 391d95c4fb41fb2a9fe40fb90973a7475fe69079e8199345a0a3029d08d08b6f593452e3ecc44805bd505f8790344be834ddc9fc12d85d587d76716854b7316b
+AUX xemacs-21.4.22-libpng15.patch 2593 SHA256 d2e1b5a1410cd6394f055092db591caba3c615f6bb26d4c8f1ff6507b0d70a69 SHA512 f026634a164e4d34eb10a4fa60da3a86743f9cd8bda8e760a7ad206fa4056a4e4c2236c9e8a4ac92d70883b5838086e48e5d5647979a3692c15da0a765aa2e1e WHIRLPOOL ec21ac2290415f0c6c475e4628be241a0f73301453cbd5e8d82a655882165e9b92b37084216d4f7eabf82676859e6b7c306aff0fccbbe739a5f5d4846b818f13
+AUX xemacs-21.4.22-texinfo-5.patch 12752 SHA256 282a8291a1e9c7436ffbfb86c6b458d5b80ab4154131bf783e4c97aa1685ca12 SHA512 0817a882ca75d99537865a23a4565e9f8b21af75b1cb90f951ee672b0ad6485542d10b28c5c7532267b07e1fae973879e40f174a1dac40ef7dc305f34a575637 WHIRLPOOL e6528655da5439f66e7f43d67cd19ea539af9d7ed87e136e59a54f40e02cf9d458ffb3b05bcc157dff3adfdbe3c6c98b4e3fd6f0ad5d28baa8a4c9b0d242f22a
+AUX xemacs-21.4.24-gcc5.patch 1132 SHA256 5a2ec81e20914af91ade0c80a4683783a46d4dd2ee993eaea2b138287ca15458 SHA512 1b3e56804594b82209ddb6318c2bff13b8e63f189d98e5ff313022eb66267eb45683841599dadd8a4d97e5e221dd85195121246fba5c91eade905e1d7b593749 WHIRLPOOL 05b61799c344e581fd23621ebc10743b9b5652c820c74432d219b4614b7e4fb84de9c344f023ba524dd94539c2559ce237245b23ee80ef585af37a7d06ab1f2e
+AUX xemacs-21.5.29-optimization-bug.patch 371 SHA256 14c5d9ddab865a9e4a1c6d4f64ed44e4b16e0eccb9fdcef94cedfaa30948863c SHA512 a955379e9abe736bdc17eeb9e924b9bf292bf4c9b2f59ca6221a09de8dafa020350ff5466732779bbb01f05152e8a823e333b9c967a6ec2fb5c1f2c9d7f694da WHIRLPOOL 9405db9d2dc618310f30e6a257a95667dfb94782db0f7ec3f5a7c702a210e9293bbe04cec5b8a1c59ec94a35b4960b1a03fbf3ce0892e29c3657fa93bbf97150
+AUX xemacs-21.5.33-no-mule-build.patch 1393 SHA256 805014085e7faeacd98d7bb2a3a57e49cf6a6f991db26dfa28230373044f2809 SHA512 2afac7a199455ad0ace5a63f6a1e2b73d8f2a8da3eb93b59975b2d654ae85acd24d206ba0d9cfe08e35fb1fdea757fc6cd3588f4b97b75991eb946885eab85b4 WHIRLPOOL 6d1e2d2df7059d0b8477eadccfeb8873a8dde3a129bc06ffdca4e86950c1df924070212198dcb309f00287f0a4525e230b6df1827c209bb058ae3f6d6feffa11
+AUX xemacs-21.5.34-gcc5.patch 1194 SHA256 e72a849fdcf4f4bc2ec4b5ef66e066a4498fd9b6ea17b71d52395c35097b9bcb SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b WHIRLPOOL 12c8179bbbcf9ef51eada3955444d4013fc85febb3cc51eb48ac69c81250412f0a497e9fdfd72f34a2ec358bd5ee16a687e42614531f389473f1ef39e185fb4b
+AUX xemacs-21.5.34-glibc-macro.patch 1369 SHA256 20c320e475d35b89f966b555ecba0dcd3cbbb8abe7e49939e8d4f309c4fe09c6 SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176 WHIRLPOOL bca96f308eba1e9c3b4be169d2cb83f2ecb98a2c89a88f4780399983a9c931f9241a7ac1f09d425f24bc327b7395e87f8a577a61ec13af210c5c20a3685de85c
+AUX xemacs-21.5.34-ncurses-tinfo.patch 699 SHA256 ded43ce90666103396d63e7a3180f9f65cfff81352db16bee5d304982c6ec3ef SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765 WHIRLPOOL 57f3dac98434869bf694992e32e00802237cdd89452fa2e3cd55b004767d19f0b43bab563321e2dfa94eb292c664d5a8f41f8ebcb32b5fd9e7e1d0324d3ef0ff
+AUX xemacs.desktop 1061 SHA256 0f73f0492c8f647892ff94c76d7fe99bb8271ca79573093061870a60f35eaf5e SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69 WHIRLPOOL 1124a7f80ce877110e8ddd27f36c656952d81408230ad05de0458a80d00aa51cc0e0704d5b98829c99d1e92206e9fa619274c9a50bb890325e1186583b514782
DIST NeXT_XEmacs.tar.gz 39571 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 WHIRLPOOL d47aafa6fe7a11de94196dffb752c683722b8ead23979a7f4344c61964ebcd052a4f0ad6b9ab42a5d41f5551c0a543f46af59656fc8a79340257626272c1faae
DIST xemacs-21.4.22.tar.gz 8357931 SHA256 87fb7633106625935105e821eb8fe65e521a3de44d45fe864109779c3a8e4bd1 SHA512 7ddd91f8d1a1b9f6d984a5bfddd98705dd6f7e3d6b4f81c1e03d971c93e33bff09b641bc2ad0a0d9d2e44170063550ad0399f3e28237dd34b8ad6200d8b197e8 WHIRLPOOL f1d313aa2dee7f4238190b90c10dc951a31302563a8a098e69ed740e85f428ac360b363e44f1e618f2d97782b5532846df290e9f79f11abdc7648a1e380cb44e
DIST xemacs-21.4.24.tar.gz 8543879 SHA256 9016a51496d4978cf3dba75000a8e38bfc8cb4ca3a3f3e71371aa19259f26cd5 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 WHIRLPOOL 469d52341833037e22cebeb6b554435c81b3f5749f64d86ddf31c3990dfc08a57f49fab7e868ab8c2009d1cae665f4fd731813f25c942d5aafd287ad7736a049
DIST xemacs-21.5.31.tar.gz 15802193 SHA256 d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d SHA512 17c385459edffc063d43537dae5b2883d2d7481e7f7596d02c9859ecb9dd4ee48921647b389ed979d65ede2745b647c9b196c9ef0873e6d526d21262f04b7f41 WHIRLPOOL b2a1741af341f260671e1c8479f47c30113b515b240d86b41b6449abde96be896371d3f6b038ab72a96c422f84704de0a41e403a16c9ca2a4861e590e65b1f59
DIST xemacs-21.5.33.tar.gz 15781151 SHA256 448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94 SHA512 75358b5cf2a012d23b95eb918e0ba1abf254db51d979d370f407b67871c6d09e2d59f59fe1acd46149933913222935e2c12be72cdf0314109c568f9f14438151 WHIRLPOOL 29d6a19d8cacc243afd3c21ed96cfabfa956531692e8ce4a454b958d32b08bb3eac47f52ada872ccfdb41082514145c602cc7ed81443bece7529365ba089f454
DIST xemacs-21.5.34.tar.gz 15816932 SHA256 33cc54a6a9a45224a64b6c57c8138b5a5f0f1be368951a6d9ec8c0aec5993ee5 SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a WHIRLPOOL 733aabc45309ff4172ab77492dd85e71f156722f2e06d9a185c0a4260b9fbea607ff8a41dc43fc009cb8cdf3f05d4523778610a501f27a4917ab43cea03c6209
+EBUILD xemacs-21.4.22-r4.ebuild 7274 SHA256 a08614d7d7aeb0f7520ebcddbb6ec37a014415a6731c0ab30034f2c25daa4c29 SHA512 4679ed1595dccbd12537aeee22175c599d956f29c7ca50296961f043aec8f5f2dc7c3c01131520de2603988439fbef6fffa0cf50eb9debdc7ea3ea817b1194b3 WHIRLPOOL 6706c6ff6efb6a794e8b0461163b6eca508ff2e15218b8f38a3256f335d294c0805b6737d76d858dedf371e5bb32b24828ba91b4deae96dd5b6ee5d79207263b
+EBUILD xemacs-21.4.24.ebuild 6931 SHA256 f8f121f72e7351031a4a64d2abd4a054ea8b07c15642b7a6fb7e7b398101bd81 SHA512 a1e649d2bd39ad8fe296e8495378a07a8047f7392370f8c35145bcac0e9007383825255bd995dc93a433abefb7d5f42d51735e8c59265f27963b40b17ffa2b0c WHIRLPOOL d039ea435fdd371ebc01708c5523e6241042e348a6839c0f9790e963472d732983c5b67e413f2245b956929fec079eeed4279c82da523db6119d13b3e5013316
+EBUILD xemacs-21.5.31.ebuild 6573 SHA256 ba732c465db30869f973f633ee6d38458d452ba62c6107acf760f2b8e033a705 SHA512 3612d0bdcc4db79461bc71fdd8fb61c2f758a08bf84a759b701135b9344ae78ebf4604b4622e74a4808874500346862e8b332b2657bd1489d07f9fd0be191ffc WHIRLPOOL bc640701f1ec28e2b1e8fb17049fea50b01ad2800a1e85cd09567d915c5edd1a29348e52a3149a3d71fccf9f3bd10e45d837c9473fb189e1dc4b90a2d005036d
+EBUILD xemacs-21.5.33.ebuild 6435 SHA256 88f4ddf3bc2db313ac6667d2a22c08d67b4ba894e6c68db09da3a8e68ed6c85a SHA512 589142dec075107324ffd87544d7d7d2cacdca034b42a55a7ab2845f9108ece3a3971eb0a86138dc4194ca37434bcac49657841a92c959b0f9562423f01b4e22 WHIRLPOOL dd1c1c275d0da44199ed925a0e0e295d63c72726ae284770b42f43776f57345e000a7432be46ddc8d645cb1cacec99349a0928995e4597af30e8f42f75c49240
+EBUILD xemacs-21.5.34-r2.ebuild 7032 SHA256 5811a0d9d9d68576cb5f82ab194b4c71c05844a68f86888a06c9aa8ff7fad6a6 SHA512 10dee7ed4d2cc8676aedff8bc6e812b60ae8a80a853673a119df0d06a4386d7f11c2c6992d279bf130d951faf2014580ebb08e54f8b50ee8bf61bef0cbc9f4a3 WHIRLPOOL 8f67985f023ec6fb7fc267a9db5fd8d94c0b1c001fcc8d65443aa58bf18681a94c992f58c6c1dac8e1fc58da37b44cd8ae1083d48bf190f73ef8379b248890e0
+EBUILD xemacs-21.5.34-r3.ebuild 7089 SHA256 0119279c4b0d13d9de82ca6455cb3c424aa914edeed00afd7e9b2f1e769179d9 SHA512 4585fa322460d4d2bc074bb154cd8546efc0ed51a41a9304148fe943e1a75f3d131b774cab5bc0e3742822060c60efbf77d15401e756e40d7df4576d60a4839a WHIRLPOOL 0d8b67654419fb29efa97357a63e5079b69512e7ef447e2493d127785216f7e019d8a0c709cefedc958cc8e2f69af50b0699fee61beb864863e6864aff1653ca
+EBUILD xemacs-21.5.34-r4.ebuild 7203 SHA256 90e5467a237f75a3b49561bc7a9dae0a994da18c93de98333da060b258d0d59a SHA512 71b06747e4c3d8e189fcbfc81b0191b52d8e15a97fbd398420c019ed30c27d692952b2690dc6c22a832012af5e0f694d6aff79dd388b9767db113b0687fa5fc0 WHIRLPOOL ac5733e5877138d1401b2e4255add99becec004f4cc5fdbecc9716fe44712fd198cb46d7c8032db8b9dff65fff17a48e3c6d0261a10a1bfad74c66e7ffd0ed65
+MISC metadata.xml 687 SHA256 f28d37a42139ff92026d345596f348b6c65549c8d274d73df08b58d3530f2a8c SHA512 aac1d99e5d83e74eaf7c11ef08d5d6c9ed4dda2cc06967535adfc40b15f079884892dc38ad9d2daae1b57bdeea9ecb66e4e64a55f7fa0782931f056194c50914 WHIRLPOOL c00b9a07a866ecae46e0104158418e446f0dcf760c13bca75e1ea9eec8a69bd7800565bff0d646b68c663b008141cc1afab36c880e690018bcb0c7e2f7ea156a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEE35B2rE+iuUAVGU99N3A0ZgpYKN4FAljetOJfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldERG
+OTA3NkFDNEZBMkI5NDAxNTE5NEY3RDM3NzAzNDY2MEE1ODI4REUACgkQN3A0ZgpY
+KN713w/+LZHOzGZ3oIc/FYcAie5V3gVzUxPdMa30gGHhPXK1mIeCxEkQpEubqQPH
+V/7i6i6getUmZNgcOkO2gUy54ddU/tzeK7yYe5u06B0LWcBY1q/fk0w2+EVF7uId
+GB9EUVhdvb1QaOfI038wOrmiuvKXA0W31e094v3RLZ/kcHgo0nSpLHesj+ycbk7U
+KEK4Kuce441fHI8aoPDVhaswMDV3hPGVVFxyvuN6k4H/zqD6qUpYQwbD2qjFTGRo
+U9C+WqZ5wWJu9DH/d82mY1bhzXcabyC3bzf8XE2fwCCfX8Ljz0QpYkaCKkb/8JhE
+a0f2OLPb61DmmsKuutUiGdQI52RkL/GCLMmbKKlWyj6zsrta/kshBmTY0J2Sb7xJ
+1Ue4apeQuYyANbjECgr4zum6QkGbMzQ7o0Bf3bGQQWJzLJCcRdpTJmv8wRC/IO7/
+/wM0cELUgxePwaOXLvv5ym4fgc+yfM2sFTm2Yjz3oI8DF5kPug+MkVL6mxISGfuA
+r1D9gxWM63iKqLwGBJwpvGKWXSSXyejDRbmeB6PW8Pnw7GT9VGBxG2F3VCTPaHl6
+UlmlrLjjbI4x3ZZSbVlyXHjvOHlog1Nbi4CWwb0Tr9bbCvX/ePsudQIbA3igo4Kj
+WcppmtSwy4b3jI0JHA6HPgAcpj+D4EG7N7wN8xf/XkIYB9HMgmg=
+=t+Zf
+-----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
new file mode 100644
index 00000000000..b611b15fd8b
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
@@ -0,0 +1,32 @@
+diff -r f412e9f093d4 configure
+--- a/configure Wed Jan 25 00:47:06 2017 +0000
++++ b/configure Sun Jan 29 19:32:47 2017 +0100
+@@ -13507,7 +13507,10 @@
+ -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
+ * ) val=1 ;;
+ esac
+- if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++ if grep "^#define $sym " confdefs.h >/dev/null || \
++ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++ then :; else
+ if test "$val" = "1"
+ then cat >>confdefs.h <<_ACEOF
+ #define $sym 1
+diff -r f412e9f093d4 configure.ac
+--- a/configure.ac Wed Jan 25 00:47:06 2017 +0000
++++ b/configure.ac Sun Jan 29 19:32:47 2017 +0100
+@@ -3136,7 +3136,12 @@
+ * ) val=1 ;;
+ esac
+ dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
+- if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
++dnl likes us to define; ignore them if appropriate.
++ if grep "^#define $sym " confdefs.h >/dev/null || \
++ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++ then :; else
+ if test "$val" = "1"
+ then AC_DEFINE_UNQUOTED($sym)
+ else AC_DEFINE_UNQUOTED($sym,$val)
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 90171f0d93d..e351b320cfe 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Note: xemacs currently does not work with a hardened profile. If you
# want to use xemacs on a hardened profile then compile with the
# -nopie flag in CFLAGS or help fix bug #75028.
-EAPI=4
+EAPI=5
WANT_AUTOCONF="2.5"
inherit eutils flag-o-matic multilib
@@ -23,14 +23,14 @@ IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
RDEPEND="
- berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
+ berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
>=sys-libs/zlib-1.1.4
!libressl? ( >=dev-libs/openssl-0.9.6:0 )
libressl? ( dev-libs/libressl )
>=media-libs/audiofile-0.2.3
gpm? ( >=sys-libs/gpm-1.19.6 )
- postgres? ( dev-db/postgresql )
+ postgres? ( dev-db/postgresql:= )
ldap? ( net-nds/openldap )
alsa? ( media-libs/alsa-lib )
nas? ( media-libs/nas )
@@ -47,7 +47,7 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
canna? ( app-i18n/canna )
freewnn? ( app-i18n/freewnn )
- >=sys-libs/ncurses-5.2
+ >=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"
DEPEND="${RDEPEND}
@@ -67,6 +67,7 @@ src_prepare() {
find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
epatch "${FILESDIR}/${P}-gcc5.patch"
+ epatch "${FILESDIR}/${P}-glibc-macro.patch"
# Some binaries and man pages are installed under suffixed names
# to avoid collions with their GNU Emacs counterparts (see below).
@@ -174,6 +175,7 @@ src_configure() {
--with-site-lisp=yes \
--with-site-modules=yes \
--with-newgc \
+ --with-system-malloc \
--enable-option-checking=no \
--with-last-packages=/usr/lib/xemacs \
|| die "configuration failed"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2019-07-09 8:25 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2019-07-09 8:25 UTC (permalink / raw
To: gentoo-commits
commit: 2db8cd966b9535468497485a2075b031549aac0a
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 9 08:16:51 2019 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Tue Jul 9 08:16:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db8cd96
app-editors/xemacs: Fix configure problem
libneXtaw was not found. This was caused by libs not being linked in
the right order which is required when '--as-needed' is used.
Bug: https://bugs.gentoo.org/689176
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.16
.../xemacs/files/xemacs-21.5.34-as-needed.patch | 25 ++++++++++++++++++++++
app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 3 ++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
new file mode 100644
index 00000000000..542ce14c36a
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
@@ -0,0 +1,25 @@
+diff -r 30910ee1cf8c configure
+--- a/configure Tue Jun 18 10:37:46 2019 +0100
++++ b/configure Mon Jul 08 20:38:49 2019 +0200
+@@ -16668,7 +16668,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$athena_variant $LIBS"
++LIBS="-l$athena_variant $libs_x $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+diff -r 30910ee1cf8c configure.ac
+--- a/configure.ac Tue Jun 18 10:37:46 2019 +0100
++++ b/configure.ac Mon Jul 08 20:38:49 2019 +0200
+@@ -4068,7 +4068,8 @@
+ athena_lib=Xaw;
+ AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
+ ],
+- [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]))
++ [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]),
++ $libs_x)
+ fi
+
+ dnl Now we locate the Athena headers that we need.
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 9747f72b358..28f843bc94a 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Note: xemacs currently does not work with position independent code
@@ -66,6 +66,7 @@ src_prepare() {
epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
epatch "${FILESDIR}/${P}-gcc5.patch"
epatch "${FILESDIR}/${P}-glibc-macro.patch"
+ epatch "${FILESDIR}/${P}-as-needed.patch"
# Some binaries and man pages are installed under suffixed names
# to avoid collions with their GNU Emacs counterparts (see below).
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2020-01-11 16:50 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2020-01-11 16:50 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 11119 bytes --]
commit: 5af69d7aa4d3b0169eb11d5b38dd5262b753aa80
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 16:47:07 2020 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 16:47:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af69d7a
app-editors/xemacs: Use EAPI=7 and use utf-8 for info
Use utf-8 in info files to allow use of texinfo 6.7
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
.../xemacs/files/xemacs-21.4.24-makeinfo.patch | 65 ++++++
app-editors/xemacs/xemacs-21.4.24-r2.ebuild | 246 +++++++++++++++++++++
2 files changed, 311 insertions(+)
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch b/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch
new file mode 100644
index 00000000000..511e2b146a3
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch
@@ -0,0 +1,65 @@
+diff -r e2da872593c0 man/lispref/ldap.texi
+--- a/man/lispref/ldap.texi Tue Mar 24 22:15:53 2015 -0400
++++ b/man/lispref/ldap.texi Wed Jan 01 22:53:19 2020 +0100
+@@ -105,7 +105,7 @@
+ library XEmacs was compiled with, they may include @code{simple},
+ @code{krbv41} and @code{krbv42}.
+ @item base
+-The base for the search. This may look like @samp{cÿ, o¬me}, see
++The base for the search. This may look like @samp{cÿ, o¬me}, see
+ RFC 1779 for syntax details.
+ @item scope
+ One of the symbols @code{base}, @code{onelevel} or @code{subtree}
+diff -r e2da872593c0 man/xemacs-faq.texi
+--- a/man/xemacs-faq.texi Tue Mar 24 22:15:53 2015 -0400
++++ b/man/xemacs-faq.texi Wed Jan 01 22:53:19 2020 +0100
+@@ -1,4 +1,4 @@
+-\input texinfo.tex @c -*- mode: texinfo; coding: iso-2022-8 -*-
++\input texinfo.tex @c -*- mode: texinfo; coding: utf-8 -*-
+ @c %**start of header
+ @setfilename ../info/xemacs-faq.info
+ @settitle Frequently asked questions about XEmacs
+@@ -2831,7 +2831,7 @@
+ all of the ISO 8859 family, the Indic languages, Thai, and so on), and
+ SKK, for Japanese. (SKK also supports an interface to an external
+ "dictionary server" process.) Quail supports both typical "dead-key"
+-methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces ä, LATIN
++methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces ä, LATIN
+ SMALL LETTER A WITH DIAERESIS), and the complex dictionary-based phonetic
+ methods used for Asian ideographic languages like Chinese.
+
+@@ -2877,7 +2877,7 @@
+ Wnn and SJ3 use the @code{egg} user interface. The interface for Canna
+ is specialized to Canna.
+
+-Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Kyôto
++Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Kyôto
+ University. It is a powerful and complex system. Wnn4 is free and Wnn6
+ is not. Wnn uses grammatical hints and probability of word association,
+ so in principle Wnn can be cleverer than other methods.
+@@ -4800,10 +4800,10 @@
+ @node Q3.0.6, Q3.0.7, Q3.0.5, Editing
+ @unnumberedsubsec Q3.0.6: How can you type in special characters in XEmacs?
+ One way is to use the package @code{x-compose}. Then you can use
+-sequences like @kbd{Compose " a} to get ä, etc.
++sequences like @kbd{Compose " a} to get ä, etc.
+
+ Another way is to use the @code{iso-insert} package. Then you can use
+-sequences like @kbd{C-x 8 " a} to get ä, etc.
++sequences like @kbd{C-x 8 " a} to get ä, etc.
+
+ @email{glynn@@sensei.co.uk, Glynn Clements} writes:
+
+@@ -4826,9 +4826,9 @@
+
+ Once you have Multi_key defined, you can use e.g.
+ @example
+- Multi a ' => á
+- Multi e " => ë
+- Multi c , => ç
++ Multi a ' => á
++ Multi e " => ë
++ Multi c , => ç
+ @end example
+
+ etc.
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
new file mode 100644
index 00000000000..7364c9f7242
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=7
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
+ http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+ berkdb? ( sys-libs/db:= )
+ gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+ >=sys-libs/zlib-1.1.4
+ >=dev-libs/openssl-0.9.6:0
+ >=media-libs/audiofile-0.2.3
+ gpm? ( >=sys-libs/gpm-1.19.6 )
+ postgres? ( dev-db/postgresql:= )
+ ldap? ( net-nds/openldap )
+ nas? ( media-libs/nas )
+ X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+ dnd? ( x11-libs/dnd )
+ motif? ( >=x11-libs/motif-2.3:0 )
+ athena? ( x11-libs/libXaw )
+ Xaw3d? ( x11-libs/libXaw3d )
+ neXt? ( x11-libs/neXtaw )
+ xface? ( media-libs/compface )
+ tiff? ( media-libs/tiff:0 )
+ png? ( >=media-libs/libpng-1.2:0 )
+ jpeg? ( virtual/jpeg:0 )
+ canna? ( app-i18n/canna )
+ !amd64? ( freewnn? ( app-i18n/freewnn ) )
+ >=sys-libs/ncurses-5.2:=
+ >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+ >=sys-apps/texinfo-5"
+
+PDEPEND="app-xemacs/xemacs-base
+ mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+ # see bug 58350, 102540 and 143580
+ eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
+ # see bug 576512
+ eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+ eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
+ # see bug 615544
+ eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
+ eapply "${FILESDIR}"/xemacs-21.4.24-makeinfo.patch
+
+ eapply_user
+
+ # Some binaries and man pages are installed under suffixed names
+ # to avoid collions with their GNU Emacs counterparts (see below).
+ # Fix internal filename references.
+ sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+ sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+ sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+
+ # Run autoconf. XEmacs tries to be smart by providing a stub
+ # configure.ac file for autoconf 2.59 but this throws our
+ # autotools eclass so it must be removed first.
+ rm "${S}"/configure.ac || die
+ eautoconf
+
+ use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+}
+
+src_configure() {
+ local myconf=""
+
+ # Can't build with pie. See bug #75028
+ test-flags -no-pie >/dev/null && append-flags -no-pie
+ filter-flags -pie
+
+ if use X; then
+
+ myconf="${myconf} --with-widgets=athena"
+ myconf="${myconf} --with-dialogs=athena"
+ myconf="${myconf} --with-menubars=lucid"
+ myconf="${myconf} --with-scrollbars=lucid"
+ if use motif ; then
+ myconf="--with-widgets=motif"
+ myconf="${myconf} --with-dialogs=motif"
+ myconf="${myconf} --with-scrollbars=motif"
+ myconf="${myconf} --with-menubars=lucid"
+ fi
+ if use athena ; then
+ myconf="--with-scrollbars=athena"
+ fi
+
+ if use Xaw3d; then
+ myconf="${myconf} --with-athena=3d"
+ elif use neXt; then
+ myconf="${myconf} --with-athena=next"
+ else
+ myconf="${myconf} --with-athena=xaw"
+ fi
+
+ use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+ myconf="${myconf} $(use_with tiff ) $(use_with png )"
+ myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
+ else
+ myconf="${myconf}
+ --without-x
+ --without-xpm
+ --without-dragndrop
+ --with-gif=no"
+ fi
+
+ if use mule ; then
+ myconf="${myconf} --with-mule"
+
+ if use xim ; then
+ if use motif ; then
+ myconf="${myconf} --with-xim=motif"
+ else
+ myconf="${myconf} --with-xim=xlib"
+ fi
+ else
+ myconf="${myconf} --with-xim=no"
+ fi
+
+ myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
+ fi
+
+ # This determines the type of sounds we are playing
+ local soundconf="native"
+
+ # This determines how these sounds should be played
+ use nas && soundconf="${soundconf},nas"
+
+ myconf="${myconf} --with-sound=${soundconf}"
+
+ if use gdbm || use berkdb ; then
+ use gdbm && mydb="gdbm"
+
+ use berkdb && mydb="${mydb},berkdb"
+
+ myconf="${myconf} --with-database=${mydb}"
+ else
+ myconf="${myconf} --without-database"
+ fi
+
+ # Enabling modules will cause segfaults outside the XEmacs build directory
+ use ia64 && myconf="${myconf} --without-modules"
+
+ einfo "${myconf}"
+
+ # see bug 576512
+ append-cflags -fgnu89-inline
+
+ # Don't use econf because it uses options which this configure
+ # script does not understand (like --host).
+ ./configure ${myconf} ${EXTRA_ECONF} \
+ $(use_with gif ) \
+ $(use_with gpm ) \
+ $(use_with postgres postgresql ) \
+ $(use_with ldap ) \
+ $(use_with eolconv file-coding ) \
+ $(use_with pop ) \
+ --compiler=$(tc-getCC) \
+ --prefix=/usr \
+ --with-ncurses \
+ --with-system-malloc \
+ --with-msw=no \
+ --mail-locking=flock \
+ --with-site-lisp=yes \
+ --with-site-modules=yes \
+ || die "The configure script failed to run properly"
+}
+
+src_install() {
+ emake prefix="${D}"/usr \
+ mandir="${D}"/usr/share/man/man1 \
+ infodir="${D}"/usr/share/info \
+ install gzip-el || die "emake install failed"
+
+ # Rename some applications installed in bin so that it is clear
+ # which application installed them and so that conflicting
+ # packages (emacs) can't clobber the actual applications.
+ # Addresses bug #62991.
+ for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
+ mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+ done
+
+ # rename man pages
+ for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+ mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+ done
+
+ # install base packages directories
+ dodir /usr/lib/xemacs/xemacs-packages/
+ dodir /usr/lib/xemacs/site-packages/
+ dodir /usr/lib/xemacs/site-modules/
+ dodir /usr/lib/xemacs/site-lisp/
+
+ if use mule;
+ then
+ dodir /usr/lib/xemacs/mule-packages
+ fi
+
+ # remove extraneous info files
+ cd "${D}"/usr/share/info
+ rm -f dir info.info texinfo* termcap* standards*
+
+ cd "${S}"
+ dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+ domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+ eselect emacs update ifunset
+ eselect gnuclient update ifunset
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ eselect emacs update ifunset
+ eselect gnuclient update ifunset
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2020-01-12 19:15 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2020-01-12 19:15 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 4687 bytes --]
commit: c878f5c46146e69469999846aba86b9c7ece66e2
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 18:00:12 2020 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 19:14:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c878f5c4
app-editors/xemacs: Convert iso-8859-1 texi files to utf-8
Convert iso-8859-1 files instead of patching since QA checks
don't like binary patch files.
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
.../xemacs/files/xemacs-21.4.24-makeinfo.patch | 65 ----------------------
app-editors/xemacs/xemacs-21.4.24-r2.ebuild | 7 ++-
2 files changed, 6 insertions(+), 66 deletions(-)
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch b/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch
deleted file mode 100644
index 511e2b146a3..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -r e2da872593c0 man/lispref/ldap.texi
---- a/man/lispref/ldap.texi Tue Mar 24 22:15:53 2015 -0400
-+++ b/man/lispref/ldap.texi Wed Jan 01 22:53:19 2020 +0100
-@@ -105,7 +105,7 @@
- library XEmacs was compiled with, they may include @code{simple},
- @code{krbv41} and @code{krbv42}.
- @item base
--The base for the search. This may look like @samp{cÿ, o¬me}, see
-+The base for the search. This may look like @samp{cÿ, o¬me}, see
- RFC 1779 for syntax details.
- @item scope
- One of the symbols @code{base}, @code{onelevel} or @code{subtree}
-diff -r e2da872593c0 man/xemacs-faq.texi
---- a/man/xemacs-faq.texi Tue Mar 24 22:15:53 2015 -0400
-+++ b/man/xemacs-faq.texi Wed Jan 01 22:53:19 2020 +0100
-@@ -1,4 +1,4 @@
--\input texinfo.tex @c -*- mode: texinfo; coding: iso-2022-8 -*-
-+\input texinfo.tex @c -*- mode: texinfo; coding: utf-8 -*-
- @c %**start of header
- @setfilename ../info/xemacs-faq.info
- @settitle Frequently asked questions about XEmacs
-@@ -2831,7 +2831,7 @@
- all of the ISO 8859 family, the Indic languages, Thai, and so on), and
- SKK, for Japanese. (SKK also supports an interface to an external
- "dictionary server" process.) Quail supports both typical "dead-key"
--methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces ä, LATIN
-+methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces ä, LATIN
- SMALL LETTER A WITH DIAERESIS), and the complex dictionary-based phonetic
- methods used for Asian ideographic languages like Chinese.
-
-@@ -2877,7 +2877,7 @@
- Wnn and SJ3 use the @code{egg} user interface. The interface for Canna
- is specialized to Canna.
-
--Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Kyôto
-+Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Kyôto
- University. It is a powerful and complex system. Wnn4 is free and Wnn6
- is not. Wnn uses grammatical hints and probability of word association,
- so in principle Wnn can be cleverer than other methods.
-@@ -4800,10 +4800,10 @@
- @node Q3.0.6, Q3.0.7, Q3.0.5, Editing
- @unnumberedsubsec Q3.0.6: How can you type in special characters in XEmacs?
- One way is to use the package @code{x-compose}. Then you can use
--sequences like @kbd{Compose " a} to get ä, etc.
-+sequences like @kbd{Compose " a} to get ä, etc.
-
- Another way is to use the @code{iso-insert} package. Then you can use
--sequences like @kbd{C-x 8 " a} to get ä, etc.
-+sequences like @kbd{C-x 8 " a} to get ä, etc.
-
- @email{glynn@@sensei.co.uk, Glynn Clements} writes:
-
-@@ -4826,9 +4826,9 @@
-
- Once you have Multi_key defined, you can use e.g.
- @example
-- Multi a ' => á
-- Multi e " => ë
-- Multi c , => ç
-+ Multi a ' => á
-+ Multi e " => ë
-+ Multi c , => ç
- @end example
-
- etc.
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 7364c9f7242..1f2018514ed 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -65,7 +65,12 @@ src_prepare() {
eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
# see bug 615544
eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
- eapply "${FILESDIR}"/xemacs-21.4.24-makeinfo.patch
+
+ # Convert to utf-8
+ iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
+ && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
+ iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \
+ && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
eapply_user
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2020-08-30 18:11 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2020-08-30 18:11 UTC (permalink / raw
To: gentoo-commits
commit: aa0f2ac8fe28b871da7d7b91844d7313daef909f
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 20:41:37 2020 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 18:11:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa0f2ac8
app-editors/xemacs: Compile on >=glibc-2.32
Use strsignal to compile on >=glibc-2.32.
Closes: https://bugs.gentoo.org/738396
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
.../xemacs/files/xemacs-21.5.34-strsignal.patch | 92 ++++++++++++++++++++++
app-editors/xemacs/xemacs-21.5.34-r5.ebuild | 1 +
2 files changed, 93 insertions(+)
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch b/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch
new file mode 100644
index 00000000000..464c6a542e8
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch
@@ -0,0 +1,92 @@
+diff -r 3ca291c0f7e3 configure
+--- a/configure Sun Jul 28 10:17:08 2019 +0100
++++ b/configure Thu Aug 27 00:15:50 2020 +0200
+@@ -18090,7 +18090,7 @@
+ esac
+
+
+-for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen
++for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+diff -r 3ca291c0f7e3 configure.ac
+--- a/configure.ac Sun Jul 28 10:17:08 2019 +0100
++++ b/configure.ac Thu Aug 27 00:15:50 2020 +0200
+@@ -4563,7 +4563,7 @@
+ dnl Check for POSIX functions.
+ dnl ----------------------------------------------------------------
+
+-AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen)
++AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen)
+
+ dnl getaddrinfo() is borked under hpux11
+ if test "$ac_cv_func_getaddrinfo" != "no" ; then
+diff -r 3ca291c0f7e3 src/config.h.in
+--- a/src/config.h.in Sun Jul 28 10:17:08 2019 +0100
++++ b/src/config.h.in Thu Aug 27 00:15:50 2020 +0200
+@@ -417,6 +417,7 @@
+ #undef HAVE_SNPRINTF
+ #undef HAVE_STRERROR
+ #undef HAVE_STRLWR
++#undef HAVE_STRSIGNAL
+ #undef HAVE_STRUPR
+ #undef HAVE_SYMLINK
+ #undef HAVE_TZSET
+diff -r 3ca291c0f7e3 src/process.c
+--- a/src/process.c Sun Jul 28 10:17:08 2019 +0100
++++ b/src/process.c Thu Aug 27 00:15:50 2020 +0200
+@@ -1646,7 +1646,11 @@
+ signal_name (int signum)
+ {
+ if (signum >= 0 && signum < NSIG)
++#ifdef HAVE_STRSIGNAL
++ return strsignal (signum);
++#else
+ return (const char *) sys_siglist[signum];
++#endif
+
+ return (const char *) GETTEXT ("unknown signal");
+ }
+diff -r 3ca291c0f7e3 src/s/linux.h
+--- a/src/s/linux.h Sun Jul 28 10:17:08 2019 +0100
++++ b/src/s/linux.h Thu Aug 27 00:15:50 2020 +0200
+@@ -36,10 +36,6 @@
+
+ /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */
+
+-/* This is needed for sysdep.c */
+-
+-#define HAVE_SYS_SIGLIST
+-
+ /* #define POSIX -- not used in XEmacs */
+
+ /* Deleted TERM stuff -- probably hugely obsolete */
+diff -r 3ca291c0f7e3 src/sysdep.c
+--- a/src/sysdep.c Sun Jul 28 10:17:08 2019 +0100
++++ b/src/sysdep.c Thu Aug 27 00:15:50 2020 +0200
+@@ -3520,7 +3520,7 @@
+ /* Strings corresponding to defined signals */
+ /************************************************************************/
+
+-#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST)
++#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST )
+
+ #if defined(WIN32_NATIVE) || defined(CYGWIN)
+ const char *sys_siglist[] =
+diff -r 3ca291c0f7e3 src/syssignal.h
+--- a/src/syssignal.h Sun Jul 28 10:17:08 2019 +0100
++++ b/src/syssignal.h Thu Aug 27 00:15:50 2020 +0200
+@@ -263,10 +263,8 @@
+ # endif
+ #endif
+
+-/* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems,
+- configure incorrectly fails to find it, so s/linux.h defines
+- HAVE_SYS_SIGLIST. */
+-#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST)
++/* Systems that have sys_siglist but do not declare it. */
++#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST )
+ extern const char *sys_siglist[];
+ #endif
+
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index 6e6d7958c4e..accb1cfdff3 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -69,6 +69,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}-as-needed.patch"
eapply "${FILESDIR}/${P}-configure-libc-version.patch"
eapply "${FILESDIR}/${P}-ar.patch"
+ eapply "${FILESDIR}/${P}-strsignal.patch"
eapply_user
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2022-06-16 21:16 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2022-06-16 21:16 UTC (permalink / raw
To: gentoo-commits
commit: b89aa72248232d5b4245610784d17147122d9341
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 21:09:29 2022 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 21:16:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b89aa722
app-editors/xemacs: patch for make problem in xemacs-21.5.34
Upstream found a problem that could explain the issues seen with
builds on tinderboxes with highly parallel builds.
Bug: https://bugs.gentoo.org/843236
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
.../xemacs-21.5.34-autoloads-parallell-make.patch | 184 +++++++++++++++++++++
app-editors/xemacs/xemacs-21.5.34-r9.ebuild | 1 +
2 files changed, 185 insertions(+)
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
new file mode 100644
index 000000000000..9a86046be992
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
@@ -0,0 +1,184 @@
+--- a/lisp/update-elc-2.el.orig 2022-06-16 21:58:48.748641021 +0200
++++ b/lisp/update-elc-2.el 2022-06-16 21:58:48.748641021 +0200
+@@ -137,37 +137,10 @@
+ (let ((dir (car command-line-args-left)))
+ ;; don't depend on being able to autoload `update-autoload-files'!
+ (load "autoload")
+- (autoload 'cl-compile-time-init "cl-macs")
+ (load "bytecomp")
+ (load "byte-optimize")
+- ;; #### the API used here is deprecated, convert to one with explicit
+- ;; arguments when it is available
+- ;; update-elc.el signals us to rebuild the autoloads when necessary.
+- ;; in some cases it will rebuild the autoloads itself, but doing it this
+- ;; way is slow, so we avoid it when possible.
+- (when (file-exists-p (expand-file-name "REBUILD_AUTOLOADS"
+- invocation-directory))
+- ;; if we were instructed to rebuild the autoloads, force the file
+- ;; to be touched even w/o changes; otherwise, we won't ever stop
+- ;; being told to rebuild them.
+- (update-autoload-files dir "auto" nil t)
+- (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0)
+- (when (featurep 'mule)
+- (let ((muledir (expand-file-name "../lisp/mule" (file-truename dir))))
+- ;; force here just like above.
+- (update-autoload-files muledir "mule" nil t)
+- (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0))))
+- (when (featurep 'modules)
+- (let* ((moddir (expand-file-name "../modules" (file-truename dir)))
+- (autofile (expand-file-name "auto-autoloads.el" moddir)))
+- (update-autoload-files
+- (delete (concat (file-name-as-directory moddir) ".")
+- (delete (concat (file-name-as-directory moddir) "..")
+- (directory-files moddir t nil nil 0)))
+- "modules" autofile)
+- (byte-recompile-file autofile 0)))
+- ;; now load the (perhaps newly rebuilt) autoloads; we were called with
+- ;; -no-autoloads so they're not already loaded.
++ ;; now load the autoloads; we were called with -no-autoloads so they're not
++ ;; already loaded.
+ (load (expand-file-name "auto-autoloads" lisp-directory))
+ (when (featurep 'mule)
+ (load (expand-file-name "mule/auto-autoloads" lisp-directory)))
+@@ -175,6 +148,8 @@
+ ;; there may be dependencies between one .el and another (even across
+ ;; directories), and we don't want to load an out-of-date .elc while
+ ;; byte-compiling a file.
++ (when (featurep 'modules)
++ (load (expand-file-name "auto-autoloads" module-directory)))
+ (message "Removing old or spurious .elcs in directory tree `%s'..." dir)
+ (do-update-elc-2 dir nil nil)
+ (message "Removing old or spurious .elcs in directory tree `%s'...done"
+--- a/lisp/update-elc.el.orig 2022-06-16 21:58:48.748641021 +0200
++++ b/lisp/update-elc.el 2022-06-16 21:58:48.748641021 +0200
+@@ -54,8 +54,11 @@
+ (defvar update-elc-files-to-compile nil)
+ (defvar need-to-rebuild-autoloads nil)
+ (defvar need-to-rebuild-mule-autoloads nil)
++(defvar need-to-rebuild-module-autoloads nil)
+ (defvar need-to-recompile-autoloads nil)
+ (defvar need-to-recompile-mule-autoloads nil)
++(defvar need-to-recompile-module-autoloads nil)
++
+ (defvar exe-target nil)
+ (defvar dump-target nil)
+ (defvar dump-target-out-of-date-wrt-dump-files nil)
+@@ -84,10 +87,14 @@
+
+ (defvar source-lisp-mule (expand-file-name "mule" source-lisp))
+ (defvar source-directory (expand-file-name ".." source-lisp))
++(defconst module-directory (expand-file-name "modules" source-directory))
++
+ (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp))
+ (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp))
+ (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule))
+ (defvar aac-lisp-mule (expand-file-name "auto-autoloads.elc" source-lisp-mule))
++(defvar aa-modules (expand-file-name "auto-autoloads.el" module-directory))
++(defvar aac-modules (expand-file-name "auto-autoloads.elc" module-directory))
+
+ (setq load-path (list source-lisp))
+
+@@ -130,7 +137,8 @@
+
+ (defvar lisp-files-ignored-when-checking-for-autoload-updating
+ '("custom-load.el"
+- "auto-autoloads.el")
++ "auto-autoloads.el"
++ "finder-inf.el")
+ "Lisp files that should not trigger auto-autoloads rebuilding.")
+
+ (defun update-elc-chop-extension (file)
+@@ -270,6 +278,18 @@
+ (setq all-files-in-dir (cdr all-files-in-dir))))
+ (setq dirs-to-check (cdr dirs-to-check))))
+
++ ;; Check for the module autoloads separately, given the need to run
++ ;; directory-files on subdirectories.
++ (let ((autoload-file
++ (expand-file-name "auto-autoloads.el" module-directory)))
++ (mapc
++ #'(lambda (full-dir)
++ (mapc #'(lambda (full-arg)
++ (when (file-newer-than-file-p full-arg autoload-file)
++ (setq need-to-rebuild-module-autoloads t)))
++ (directory-files full-dir t "\\.c$" nil t)))
++ (directory-files module-directory t nil t 'subdirs)))
++
+ (if dump-target-out-of-date-wrt-dump-files
+ (condition-case nil
+ (write-region-internal
+@@ -297,6 +317,14 @@
+ (file-newer-than-file-p aa-lisp-mule aac-lisp-mule))
+ (setq need-to-recompile-mule-autoloads t))
+
++(when (or need-to-rebuild-module-autoloads
++ ;; not necessary but ... see comment above.
++ (eq (file-exists-p aa-modules) nil)
++ ;; no need to check for file-exists of .elc due to definition
++ ;; of file-newer-than-file-p
++ (file-newer-than-file-p aa-modules aac-modules))
++ (setq need-to-recompile-module-autoloads t))
++
+ (when (not (featurep 'mule))
+ ;; sorry charlie.
+ (setq need-to-rebuild-mule-autoloads nil
+@@ -318,15 +346,18 @@
+ (if need-to-rebuild-mule-autoloads
+ (list "-f" "batch-update-directory-autoloads"
+ "mule" source-lisp-mule))
++ (if need-to-rebuild-module-autoloads
++ (list "-f" "batch-update-directory-autoloads"
++ "auto" module-directory))
+ (if need-to-recompile-autoloads
+ (list "-f" "batch-byte-compile-one-file"
+ aa-lisp))
+ (if need-to-recompile-mule-autoloads
+ (list "-f" "batch-byte-compile-one-file"
+- aa-lisp-mule)))))
+- (condition-case nil
+- (delete-file (expand-file-name "src/REBUILD_AUTOLOADS" build-directory))
+- (file-error nil))
++ aa-lisp-mule))
++ (if need-to-recompile-module-autoloads
++ (list "-f" "batch-byte-compile-one-file"
++ aa-modules)))))
+ (cond ((and (not update-elc-files-to-compile)
+ (not need-to-rebuild-autoloads)
+ (not need-to-rebuild-mule-autoloads)
+@@ -335,17 +366,25 @@
+ ;; (1) Nothing to do at all.
+ )
+ ((not update-elc-files-to-compile)
+- ;; (2) We have no files to byte-compile, but we do need to
+- ;; regenerate and compile the auto-autoloads file, so signal
+- ;; update-elc-2 to do it. This is much faster than loading
+- ;; all the .el's and doing it here. (We only need to rebuild
+- ;; the autoloads here when we have files to compile, since
+- ;; they may depend on the updated autoloads.)
+- (condition-case nil
+- (write-region-internal
+- "foo" nil (expand-file-name "src/REBUILD_AUTOLOADS" build-directory))
+- (file-error nil))
+- )
++ ;; (2) We have no files to byte-compile, but we do need to regenerate
++ ;; and compile the auto-autoloads file. Don't pass this on to
++ ;; update-elc-2.el to do, since that gives dependency problems
++ ;; with parallel builds (make -j and friends). Completely fine to
++ ;; use the compiled Lisp infrastructure for this, though, since we
++ ;; know it's up to date.
++ (setq command-line-args
++ (append
++ '("-l" "loadup-el.el" "run-temacs"
++ "-batch" "-no-packages" "-no-autoloads"
++ "-eval" "(setq stack-trace-on-error t)"
++ "-eval" "(setq load-always-display-messages t)"
++ "-l" "bytecomp.elc" "-l" "autoload.elc")
++ do-autoload-commands))
++ (write-sequence "\nNeed to regenerate auto-autoload files... "
++ 'external-debugging-output)
++ (let ((load-ignore-elc-files nil)
++ (purify-flag nil))
++ (load "loadup.el")))
+ (t
+ (let ((bc-bootstrap
+ (mapcar #'(lambda (arg)
diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index bba9dbfeb9b6..e0099ac478ba 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -67,6 +67,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}-ar.patch"
eapply "${FILESDIR}/${P}-strsignal.patch"
eapply "${FILESDIR}/${P}-process-test-qa.patch"
+ eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
eapply_user
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2024-03-09 15:27 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2024-03-09 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 0ef62beae1cf2ee152c613d7c68372b2e6316faf
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 15:20:33 2024 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 15:26:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef62bea
app-editors/xemacs: drop 21.5.34-r12, 21.5.34-r13
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
app-editors/xemacs/Manifest | 1 -
app-editors/xemacs/files/xemacs-21.5.34-ar.patch | 74 ------
.../xemacs/files/xemacs-21.5.34-as-needed.patch | 25 --
.../xemacs-21.5.34-autoloads-parallell-make.patch | 184 ---------------
.../xemacs-21.5.34-configure-libc-version.patch | 24 --
app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch | 35 ---
.../xemacs/files/xemacs-21.5.34-glibc-macro.patch | 32 ---
.../files/xemacs-21.5.34-module-autoloads.patch | 115 ---------
.../files/xemacs-21.5.34-ncurses-tinfo.patch | 13 -
.../xemacs-21.5.34-no-lock-on-finder-inf.patch | 99 --------
.../files/xemacs-21.5.34-process-test-qa.patch | 11 -
.../xemacs/files/xemacs-21.5.34-strsignal.patch | 92 --------
app-editors/xemacs/xemacs-21.5.34-r12.ebuild | 259 --------------------
app-editors/xemacs/xemacs-21.5.34-r13.ebuild | 261 ---------------------
14 files changed, 1225 deletions(-)
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 71147468cac4..d30897871d36 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,4 +1,3 @@
DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
-DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch
deleted file mode 100644
index fff6f5578733..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -r 3ca291c0f7e3 configure
---- a/configure Sun Jul 28 10:17:08 2019 +0100
-+++ b/configure Sun Apr 19 18:46:45 2020 +0200
-@@ -778,6 +778,5 @@
- INSTALL_SCRIPT
- INSTALL_PROGRAM
- RANLIB
--AR
- lib_gcc
- ld
-@@ -10296,47 +10307,6 @@
- fi
-
-
--# Extract the first word of "ar", so it can be a program name with args.
--set dummy ar; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_AR+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- if test -n "$AR"; then
-- ac_cv_prog_AR="$AR" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_AR="ar"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="not_found"
--fi
--fi
--AR=$ac_cv_prog_AR
--if test -n "$AR"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
--$as_echo "$AR" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test "$AR" = "not_found"; then
-- { echo "Error:" "ar not found -- is PATH set correctly?" >&2; exit 1; }
--fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-diff -r 3ca291c0f7e3 configure.ac
---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100
-+++ b/configure.ac Sun Apr 19 18:46:45 2020 +0200
-@@ -2557,12 +2557,6 @@
- dnl should make an entry in src/config.h, do not forget to add an
- dnl #undef clause to src/config.h.in for autoconf to modify.
-
--dnl Sun likes to hide these utilities. Steve Baur asked that we make
--dnl the failure occur at configure time, not at use time.
--AC_CHECK_PROG(AR,ar,ar,not_found)
--if test "$AR" = "not_found"; then
-- XE_DIE(["ar not found -- is PATH set correctly?"])
--fi
- dnl These tests don't necessarily check that the program exists.
- AC_PROG_RANLIB
- AC_PROG_INSTALL
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
deleted file mode 100644
index 542ce14c36af..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r 30910ee1cf8c configure
---- a/configure Tue Jun 18 10:37:46 2019 +0100
-+++ b/configure Mon Jul 08 20:38:49 2019 +0200
-@@ -16668,7 +16668,7 @@
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$athena_variant $LIBS"
-+LIBS="-l$athena_variant $libs_x $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-diff -r 30910ee1cf8c configure.ac
---- a/configure.ac Tue Jun 18 10:37:46 2019 +0100
-+++ b/configure.ac Mon Jul 08 20:38:49 2019 +0200
-@@ -4068,7 +4068,8 @@
- athena_lib=Xaw;
- AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
- ],
-- [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]))
-+ [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]),
-+ $libs_x)
- fi
-
- dnl Now we locate the Athena headers that we need.
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
deleted file mode 100644
index 9a86046be992..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
+++ /dev/null
@@ -1,184 +0,0 @@
---- a/lisp/update-elc-2.el.orig 2022-06-16 21:58:48.748641021 +0200
-+++ b/lisp/update-elc-2.el 2022-06-16 21:58:48.748641021 +0200
-@@ -137,37 +137,10 @@
- (let ((dir (car command-line-args-left)))
- ;; don't depend on being able to autoload `update-autoload-files'!
- (load "autoload")
-- (autoload 'cl-compile-time-init "cl-macs")
- (load "bytecomp")
- (load "byte-optimize")
-- ;; #### the API used here is deprecated, convert to one with explicit
-- ;; arguments when it is available
-- ;; update-elc.el signals us to rebuild the autoloads when necessary.
-- ;; in some cases it will rebuild the autoloads itself, but doing it this
-- ;; way is slow, so we avoid it when possible.
-- (when (file-exists-p (expand-file-name "REBUILD_AUTOLOADS"
-- invocation-directory))
-- ;; if we were instructed to rebuild the autoloads, force the file
-- ;; to be touched even w/o changes; otherwise, we won't ever stop
-- ;; being told to rebuild them.
-- (update-autoload-files dir "auto" nil t)
-- (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0)
-- (when (featurep 'mule)
-- (let ((muledir (expand-file-name "../lisp/mule" (file-truename dir))))
-- ;; force here just like above.
-- (update-autoload-files muledir "mule" nil t)
-- (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0))))
-- (when (featurep 'modules)
-- (let* ((moddir (expand-file-name "../modules" (file-truename dir)))
-- (autofile (expand-file-name "auto-autoloads.el" moddir)))
-- (update-autoload-files
-- (delete (concat (file-name-as-directory moddir) ".")
-- (delete (concat (file-name-as-directory moddir) "..")
-- (directory-files moddir t nil nil 0)))
-- "modules" autofile)
-- (byte-recompile-file autofile 0)))
-- ;; now load the (perhaps newly rebuilt) autoloads; we were called with
-- ;; -no-autoloads so they're not already loaded.
-+ ;; now load the autoloads; we were called with -no-autoloads so they're not
-+ ;; already loaded.
- (load (expand-file-name "auto-autoloads" lisp-directory))
- (when (featurep 'mule)
- (load (expand-file-name "mule/auto-autoloads" lisp-directory)))
-@@ -175,6 +148,8 @@
- ;; there may be dependencies between one .el and another (even across
- ;; directories), and we don't want to load an out-of-date .elc while
- ;; byte-compiling a file.
-+ (when (featurep 'modules)
-+ (load (expand-file-name "auto-autoloads" module-directory)))
- (message "Removing old or spurious .elcs in directory tree `%s'..." dir)
- (do-update-elc-2 dir nil nil)
- (message "Removing old or spurious .elcs in directory tree `%s'...done"
---- a/lisp/update-elc.el.orig 2022-06-16 21:58:48.748641021 +0200
-+++ b/lisp/update-elc.el 2022-06-16 21:58:48.748641021 +0200
-@@ -54,8 +54,11 @@
- (defvar update-elc-files-to-compile nil)
- (defvar need-to-rebuild-autoloads nil)
- (defvar need-to-rebuild-mule-autoloads nil)
-+(defvar need-to-rebuild-module-autoloads nil)
- (defvar need-to-recompile-autoloads nil)
- (defvar need-to-recompile-mule-autoloads nil)
-+(defvar need-to-recompile-module-autoloads nil)
-+
- (defvar exe-target nil)
- (defvar dump-target nil)
- (defvar dump-target-out-of-date-wrt-dump-files nil)
-@@ -84,10 +87,14 @@
-
- (defvar source-lisp-mule (expand-file-name "mule" source-lisp))
- (defvar source-directory (expand-file-name ".." source-lisp))
-+(defconst module-directory (expand-file-name "modules" source-directory))
-+
- (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp))
- (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp))
- (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule))
- (defvar aac-lisp-mule (expand-file-name "auto-autoloads.elc" source-lisp-mule))
-+(defvar aa-modules (expand-file-name "auto-autoloads.el" module-directory))
-+(defvar aac-modules (expand-file-name "auto-autoloads.elc" module-directory))
-
- (setq load-path (list source-lisp))
-
-@@ -130,7 +137,8 @@
-
- (defvar lisp-files-ignored-when-checking-for-autoload-updating
- '("custom-load.el"
-- "auto-autoloads.el")
-+ "auto-autoloads.el"
-+ "finder-inf.el")
- "Lisp files that should not trigger auto-autoloads rebuilding.")
-
- (defun update-elc-chop-extension (file)
-@@ -270,6 +278,18 @@
- (setq all-files-in-dir (cdr all-files-in-dir))))
- (setq dirs-to-check (cdr dirs-to-check))))
-
-+ ;; Check for the module autoloads separately, given the need to run
-+ ;; directory-files on subdirectories.
-+ (let ((autoload-file
-+ (expand-file-name "auto-autoloads.el" module-directory)))
-+ (mapc
-+ #'(lambda (full-dir)
-+ (mapc #'(lambda (full-arg)
-+ (when (file-newer-than-file-p full-arg autoload-file)
-+ (setq need-to-rebuild-module-autoloads t)))
-+ (directory-files full-dir t "\\.c$" nil t)))
-+ (directory-files module-directory t nil t 'subdirs)))
-+
- (if dump-target-out-of-date-wrt-dump-files
- (condition-case nil
- (write-region-internal
-@@ -297,6 +317,14 @@
- (file-newer-than-file-p aa-lisp-mule aac-lisp-mule))
- (setq need-to-recompile-mule-autoloads t))
-
-+(when (or need-to-rebuild-module-autoloads
-+ ;; not necessary but ... see comment above.
-+ (eq (file-exists-p aa-modules) nil)
-+ ;; no need to check for file-exists of .elc due to definition
-+ ;; of file-newer-than-file-p
-+ (file-newer-than-file-p aa-modules aac-modules))
-+ (setq need-to-recompile-module-autoloads t))
-+
- (when (not (featurep 'mule))
- ;; sorry charlie.
- (setq need-to-rebuild-mule-autoloads nil
-@@ -318,15 +346,18 @@
- (if need-to-rebuild-mule-autoloads
- (list "-f" "batch-update-directory-autoloads"
- "mule" source-lisp-mule))
-+ (if need-to-rebuild-module-autoloads
-+ (list "-f" "batch-update-directory-autoloads"
-+ "auto" module-directory))
- (if need-to-recompile-autoloads
- (list "-f" "batch-byte-compile-one-file"
- aa-lisp))
- (if need-to-recompile-mule-autoloads
- (list "-f" "batch-byte-compile-one-file"
-- aa-lisp-mule)))))
-- (condition-case nil
-- (delete-file (expand-file-name "src/REBUILD_AUTOLOADS" build-directory))
-- (file-error nil))
-+ aa-lisp-mule))
-+ (if need-to-recompile-module-autoloads
-+ (list "-f" "batch-byte-compile-one-file"
-+ aa-modules)))))
- (cond ((and (not update-elc-files-to-compile)
- (not need-to-rebuild-autoloads)
- (not need-to-rebuild-mule-autoloads)
-@@ -335,17 +366,25 @@
- ;; (1) Nothing to do at all.
- )
- ((not update-elc-files-to-compile)
-- ;; (2) We have no files to byte-compile, but we do need to
-- ;; regenerate and compile the auto-autoloads file, so signal
-- ;; update-elc-2 to do it. This is much faster than loading
-- ;; all the .el's and doing it here. (We only need to rebuild
-- ;; the autoloads here when we have files to compile, since
-- ;; they may depend on the updated autoloads.)
-- (condition-case nil
-- (write-region-internal
-- "foo" nil (expand-file-name "src/REBUILD_AUTOLOADS" build-directory))
-- (file-error nil))
-- )
-+ ;; (2) We have no files to byte-compile, but we do need to regenerate
-+ ;; and compile the auto-autoloads file. Don't pass this on to
-+ ;; update-elc-2.el to do, since that gives dependency problems
-+ ;; with parallel builds (make -j and friends). Completely fine to
-+ ;; use the compiled Lisp infrastructure for this, though, since we
-+ ;; know it's up to date.
-+ (setq command-line-args
-+ (append
-+ '("-l" "loadup-el.el" "run-temacs"
-+ "-batch" "-no-packages" "-no-autoloads"
-+ "-eval" "(setq stack-trace-on-error t)"
-+ "-eval" "(setq load-always-display-messages t)"
-+ "-l" "bytecomp.elc" "-l" "autoload.elc")
-+ do-autoload-commands))
-+ (write-sequence "\nNeed to regenerate auto-autoload files... "
-+ 'external-debugging-output)
-+ (let ((load-ignore-elc-files nil)
-+ (purify-flag nil))
-+ (load "loadup.el")))
- (t
- (let ((bc-bootstrap
- (mapcar #'(lambda (arg)
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch
deleted file mode 100644
index fdea052fba19..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r 3ca291c0f7e3 configure
---- a/configure Sun Jul 28 10:17:08 2019 +0100
-+++ b/configure Fri Mar 06 21:27:48 2020 +0100
-@@ -9987,7 +9987,7 @@
- libc_version="GNU libc $libc_version (Debian)"
- fi
- if test -z "$libc_version"; then
-- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'`
-+ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'`
- fi
- ;;
-
-diff -r 3ca291c0f7e3 configure.ac
---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100
-+++ b/configure.ac Fri Mar 06 21:27:48 2020 +0100
-@@ -2347,7 +2347,7 @@
- fi
- dnl #### Tested on Debian, does this actually work elsewhere? ;-)
- if test -z "$libc_version"; then
-- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'`
-+ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'`
- fi
- ;;
-
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
deleted file mode 100644
index 025a390f3335..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/lisp.h b/src/lisp.h
---- a/src/lisp.h
-+++ b/src/lisp.h
-@@ -1154,6 +1154,8 @@
-
- /* ------------------------ alignment definitions ------------------- */
-
-+#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \
-+ (!defined (__cplusplus) || __cplusplus < 201103L)
- /* No type has a greater alignment requirement than max_align_t.
- (except perhaps for types we don't use, like long double) */
- typedef union
-@@ -1163,6 +1165,7 @@
- struct { void (*f)(void); } f;
- struct { double d; } d;
- } max_align_t;
-+#endif
-
- /* ALIGNOF returns the required alignment of a type -- i.e. a value such
- that data of this type must begin at a memory address which is a
-@@ -1170,7 +1173,11 @@
- as the type itself. */
-
- #ifndef ALIGNOF
--# if defined (__GNUC__) && (__GNUC__ >= 2)
-+# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-+# define ALIGNOF(type) _Alignof(type)
-+# elif defined (__cplusplus) && __cplusplus >= 201103L
-+# define ALIGNOF(type) alignof(type)
-+# elif defined (__GNUC__) && (__GNUC__ >= 2)
- /* gcc has an extension that gives us exactly what we want. */
- # define ALIGNOF(type) __alignof__ (type)
- # elif ! defined (__cplusplus)
-
-
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
deleted file mode 100644
index b611b15fd8b1..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -r f412e9f093d4 configure
---- a/configure Wed Jan 25 00:47:06 2017 +0000
-+++ b/configure Sun Jan 29 19:32:47 2017 +0100
-@@ -13507,7 +13507,10 @@
- -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
- * ) val=1 ;;
- esac
-- if grep "^#define $sym " confdefs.h >/dev/null; then :; else
-+ if grep "^#define $sym " confdefs.h >/dev/null || \
-+ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
-+ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
-+ then :; else
- if test "$val" = "1"
- then cat >>confdefs.h <<_ACEOF
- #define $sym 1
-diff -r f412e9f093d4 configure.ac
---- a/configure.ac Wed Jan 25 00:47:06 2017 +0000
-+++ b/configure.ac Sun Jan 29 19:32:47 2017 +0100
-@@ -3136,7 +3136,12 @@
- * ) val=1 ;;
- esac
- dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
-- if grep "^#define $sym " confdefs.h >/dev/null; then :; else
-+dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
-+dnl likes us to define; ignore them if appropriate.
-+ if grep "^#define $sym " confdefs.h >/dev/null || \
-+ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
-+ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
-+ then :; else
- if test "$val" = "1"
- then AC_DEFINE_UNQUOTED($sym)
- else AC_DEFINE_UNQUOTED($sym,$val)
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch
deleted file mode 100644
index 8b5443dfcb10..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -u b/lisp/update-elc-2.el b/lisp/update-elc-2.el
---- b/lisp/update-elc-2.el Mon Jun 27 22:14:53 2022 +0900
-+++ b/lisp/update-elc-2.el Thu Jun 30 16:36:19 2022 +0100
-@@ -144,12 +144,12 @@
- (load (expand-file-name "auto-autoloads" lisp-directory))
- (when (featurep 'mule)
- (load (expand-file-name "mule/auto-autoloads" lisp-directory)))
-+ (when (featurep 'modules)
-+ (load (expand-file-name "auto-autoloads" module-directory)))
- ;; We remove all the bad .elcs before any byte-compilation, because
- ;; there may be dependencies between one .el and another (even across
- ;; directories), and we don't want to load an out-of-date .elc while
- ;; byte-compiling a file.
-- (when (featurep 'modules)
-- (load (expand-file-name "auto-autoloads" module-directory)))
- (message "Removing old or spurious .elcs in directory tree `%s'..." dir)
- (do-update-elc-2 dir nil nil)
- (message "Removing old or spurious .elcs in directory tree `%s'...done"
-unchanged:
---- a/src/Makefile.in.in Mon Jun 27 13:31:39 2022 +0100
-+++ b/src/Makefile.in.in Mon Jun 27 22:14:53 2022 +0900
-@@ -95,7 +95,12 @@
- SHELL=/bin/sh
- RM = rm -f
-
--LISP = $(SRC)/../lisp
-+## Earlier versions had $(SRC)/../lisp here, but currently ../lisp is a
-+## link to $(SRC)/../lisp in out-of-source builds. $(SRC)/../lisp breaks
-+## the modules build because the autoloads end up in $(SRCMODULES), but
-+## update-elc-2.el looks for them in $(BLDMODULES).
-+LISP = ../lisp
-+
- ETC = $(SRC)/../etc
- SRCMODULES = $(SRC)/../modules
- LIB_SRC = ../lib-src
-@@ -944,10 +949,14 @@
- -$(RM) $(RAW_EXE) $(DUMP_TARGET) $(DUMP_TARGET).dmp $(LIB_SRC)/DOC
- ## Remove the generated load files here; they cause lots of problems
- ## when they don't work right.
-+## Some older versions tried to put module load files in the SRC tree,
-+## but that breaks module builds, which expect them in the BLD tree,
-+## and that's where they belong anyway. Clean both.
- clean: mostlyclean versionclean
- -$(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \
- $(LISP)/mule/auto-autoloads.el* $(LISP)/mule/custom-load.el* \
-- $(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el*
-+ $(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el* \
-+ $(BLDMODULES)/auto-autoloads.el* $(BLDMODULES)/custom-load.el*
- ## This is used in making a distribution.
- ## Do not use it on development directories!
- distclean-noconfig: clean
-only in patch2:
-unchanged:
---- a/lisp/update-elc.el
-+++ b/lisp/update-elc.el
-@@ -87,8 +87,8 @@
-
- (defvar source-lisp-mule (expand-file-name "mule" source-lisp))
- (defvar source-directory (expand-file-name ".." source-lisp))
--(defconst module-directory (expand-file-name "modules" source-directory))
--
-+(defvar source-modules (expand-file-name "../modules" (file-truename source-lisp)))
-+(defconst module-directory (expand-file-name "modules" build-directory))
- (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp))
- (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp))
- (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule))
-@@ -280,15 +280,13 @@ If any of these files are changed, we need to redump.")
-
- ;; Check for the module autoloads separately, given the need to run
- ;; directory-files on subdirectories.
-- (let ((autoload-file
-- (expand-file-name "auto-autoloads.el" module-directory)))
-- (mapc
-- #'(lambda (full-dir)
-- (mapc #'(lambda (full-arg)
-- (when (file-newer-than-file-p full-arg autoload-file)
-- (setq need-to-rebuild-module-autoloads t)))
-- (directory-files full-dir t "\\.c$" nil t)))
-- (directory-files module-directory t nil t 'subdirs)))
-+ (mapc
-+ #'(lambda (full-dir)
-+ (mapc #'(lambda (full-arg)
-+ (when (file-newer-than-file-p full-arg aa-modules)
-+ (setq need-to-rebuild-module-autoloads t)))
-+ (directory-files full-dir t "\\.c$" nil t)))
-+ (directory-files source-modules t nil t 'subdirs))
-
- (if dump-target-out-of-date-wrt-dump-files
- (condition-case nil
-@@ -346,9 +344,22 @@ If any of these files are changed, we need to redump.")
- (if need-to-rebuild-mule-autoloads
- (list "-f" "batch-update-directory-autoloads"
- "mule" source-lisp-mule))
-- (if need-to-rebuild-module-autoloads
-- (list "-f" "batch-update-directory-autoloads"
-- "auto" module-directory))
-+ (if need-to-rebuild-module-autoloads
-+ (list "-eval"
-+ (concat
-+ "(update-autoload-files '("
-+ (mapconcat #'prin1-to-string
-+ (mapcan
-+ #'(lambda (full-dir)
-+ (unless (member*
-+ (file-name-nondirectory full-dir)
-+ '("." "..") :test #'equal)
-+ (directory-files full-dir
-+ t "\\.c$" nil t)))
-+ (directory-files source-modules
-+ t nil t 'subdirs))
-+ " ")
-+ ") \"modules\" " (prin1-to-string aa-modules) ")")))
- (if need-to-recompile-autoloads
- (list "-f" "batch-byte-compile-one-file"
- aa-lisp))
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch
deleted file mode 100644
index a08eda3c8a83..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r 6355de501637 configure
---- a/configure Thu Jan 23 15:03:16 2014 +0000
-+++ b/configure Fri Jan 31 23:55:12 2014 +0100
-@@ -19699,7 +19699,8 @@
- extra_objs="$extra_objs terminfo.o" && if test "$verbose" = "yes"; then
- echo " xemacs will be linked with \"terminfo.o\""
- fi
-- LIBS="-lncurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lncurses\" to \$LIBS"; fi
-+ ncurses_libs=$(pkg-config ncurses --libs)
-+ LIBS="$ncurses_libs $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$ncurses_libs\" to \$LIBS"; fi
-
- if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
- save_c_switch_site="$c_switch_site"
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch b/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch
deleted file mode 100644
index a37fc5e95fe0..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-# HG changeset patch
-# User Aidan Kehoe <kehoea@parhasard.net>
-# Date 1656333099 -3600
-# Mon Jun 27 13:31:39 2022 +0100
-# Node ID c6966a009d0dc3b546c9d843141c1fb5daa89b9e
-# Parent 16e37125d7ea85048e89197ce8fe83f44b00ccc5
-Don't create a lock file when generating finder-inf.el
-
-lisp/ChangeLog addition:
-
-2022-06-27 Aidan Kehoe <kehoea@parhasard.net>
-
- * finder.el (finder-compile-keywords):
- Don't use the save-buffer infrastructure when generating
- finder-inf.el, since that leads to lock files, making parallel
- builds less likely to work. Thank you Mats Lidell and the Gentoo
- users!
-
-src/ChangeLog addition:
-
-2022-06-27 Aidan Kehoe <kehoea@parhasard.net>
-
- * Makefile.in.in ($(LISP)/finder-inf.el):
- Don't remove finder-inf.el before regenerating it, Lisp will
- overwrite it.
-
-diff -r 16e37125d7ea -r c6966a009d0d lisp/finder.el
---- a/lisp/finder.el Sun Jun 26 19:14:02 2022 +0300
-+++ b/lisp/finder.el Mon Jun 27 13:31:39 2022 +0100
-@@ -151,7 +151,7 @@
- arguments compiles from `load-path'."
- (save-excursion
- ;; XEmacs change
-- (find-file (expand-file-name "finder-inf.el" lisp-directory))
-+ (set-buffer (generate-new-buffer "finder-inf.el"))
- (let ((processed nil)
- (directory-abbrev-alist
- (append
-@@ -160,11 +160,12 @@
- "")))
- finder-abbreviate-directory-list)
- directory-abbrev-alist))
-- (using-load-path))
-+ using-load-path second-line-marker finder-scratch)
- (or dirs (setq dirs load-path))
- (setq using-load-path (equal dirs load-path))
- (erase-buffer)
- (insert ";;; finder-inf.el --- keyword-to-package mapping\n")
-+ (setq second-line-marker (point-marker))
- (insert ";; Keywords: help\n")
- (insert ";;; Commentary:\n")
- (insert ";; Don't edit this file. It's generated by finder.el\n\n")
-@@ -180,7 +181,8 @@
- (if (not finder-compile-keywords-quiet)
- (message "Processing %s ..." f))
- (save-excursion
-- (set-buffer (get-buffer-create "*finder-scratch*"))
-+ (set-buffer (setq finder-scratch
-+ (get-buffer-create "*finder-scratch*")))
- (buffer-disable-undo (current-buffer))
- (erase-buffer)
- (insert-file-contents (expand-file-name f d))
-@@ -210,10 +212,23 @@
- (directory-files d nil "^[^=].*\\.el$"))))
- dirs)
- (insert "))\n\n(provide 'finder-inf)\n\n;;; finder-inf.el ends here\n")
-- (kill-buffer "*finder-scratch*")
-+ (if finder-scratch (kill-buffer finder-scratch))
- (unless noninteractive
- (eval-current-buffer)) ; So we get the new keyword list immediately
-- (basic-save-buffer))))
-+ (goto-char (point-min))
-+ (if (re-search-forward "[^\x00-\x7f]" nil t)
-+ (progn
-+ (goto-char (point-min))
-+ (if (re-search-forward "[^\x00-\xff]" nil t)
-+ (progn (goto-char second-line-marker)
-+ (insert ";;; -*- coding: escape-quoted -*-\n")
-+ (setq buffer-file-coding-system 'iso-8859-1-unix))
-+ (goto-char second-line-marker)
-+ (insert ";;; -*- coding: iso-8859-1 -*-\n")
-+ (setq buffer-file-coding-system 'escape-quoted-unix)))
-+ (setq buffer-file-coding-system 'no-conversion-unix))
-+ (write-region (point-min) (point-max)
-+ (expand-file-name "finder-inf.el" lisp-directory)))))
-
- (defun finder-compile-keywords-make-dist ()
- "Regenerate `finder-inf.el' for the Emacs distribution."
-diff -r 16e37125d7ea -r c6966a009d0d src/Makefile.in.in
---- a/src/Makefile.in.in Sun Jun 26 19:14:02 2022 +0300
-+++ b/src/Makefile.in.in Mon Jun 27 13:31:39 2022 +0100
-@@ -590,7 +590,6 @@
-
- $(LISP)/finder-inf.el: update-elc-2
- @echo "Building finder database ..."
-- $(RM) $(LISP)/finder-inf.el
- $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \
- -eval "(setq lisp-directory \"$(LISP)\")" \
- -l finder -f finder-compile-keywords
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch b/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch
deleted file mode 100644
index ff17f6b62411..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/automated/process-tests.el 2021-01-16 15:42:20.195864978 +0100
-+++ b/tests/automated/process-tests.el 2021-01-16 15:43:27.840426754 +0100
-@@ -49,7 +49,7 @@
- (goto-char (point-min))
- (Assert (looking-at "foo"))):
-
-- (Assert (= 127 (shell-command "unknown_command")))
-+ (Assert (= 127 (shell-command "unknown_command > /dev/null 2>&1")))
- (Assert (= 2 (shell-command "exit 2")))
- (Assert (equal "(Shell command failed with code 2 and no output)" (message-displayed-p t)))
-
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch b/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch
deleted file mode 100644
index 464c6a542e8c..000000000000
--- a/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -r 3ca291c0f7e3 configure
---- a/configure Sun Jul 28 10:17:08 2019 +0100
-+++ b/configure Thu Aug 27 00:15:50 2020 +0200
-@@ -18090,7 +18090,7 @@
- esac
-
-
--for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen
-+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen
- do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-diff -r 3ca291c0f7e3 configure.ac
---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100
-+++ b/configure.ac Thu Aug 27 00:15:50 2020 +0200
-@@ -4563,7 +4563,7 @@
- dnl Check for POSIX functions.
- dnl ----------------------------------------------------------------
-
--AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen)
-+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen)
-
- dnl getaddrinfo() is borked under hpux11
- if test "$ac_cv_func_getaddrinfo" != "no" ; then
-diff -r 3ca291c0f7e3 src/config.h.in
---- a/src/config.h.in Sun Jul 28 10:17:08 2019 +0100
-+++ b/src/config.h.in Thu Aug 27 00:15:50 2020 +0200
-@@ -417,6 +417,7 @@
- #undef HAVE_SNPRINTF
- #undef HAVE_STRERROR
- #undef HAVE_STRLWR
-+#undef HAVE_STRSIGNAL
- #undef HAVE_STRUPR
- #undef HAVE_SYMLINK
- #undef HAVE_TZSET
-diff -r 3ca291c0f7e3 src/process.c
---- a/src/process.c Sun Jul 28 10:17:08 2019 +0100
-+++ b/src/process.c Thu Aug 27 00:15:50 2020 +0200
-@@ -1646,7 +1646,11 @@
- signal_name (int signum)
- {
- if (signum >= 0 && signum < NSIG)
-+#ifdef HAVE_STRSIGNAL
-+ return strsignal (signum);
-+#else
- return (const char *) sys_siglist[signum];
-+#endif
-
- return (const char *) GETTEXT ("unknown signal");
- }
-diff -r 3ca291c0f7e3 src/s/linux.h
---- a/src/s/linux.h Sun Jul 28 10:17:08 2019 +0100
-+++ b/src/s/linux.h Thu Aug 27 00:15:50 2020 +0200
-@@ -36,10 +36,6 @@
-
- /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */
-
--/* This is needed for sysdep.c */
--
--#define HAVE_SYS_SIGLIST
--
- /* #define POSIX -- not used in XEmacs */
-
- /* Deleted TERM stuff -- probably hugely obsolete */
-diff -r 3ca291c0f7e3 src/sysdep.c
---- a/src/sysdep.c Sun Jul 28 10:17:08 2019 +0100
-+++ b/src/sysdep.c Thu Aug 27 00:15:50 2020 +0200
-@@ -3520,7 +3520,7 @@
- /* Strings corresponding to defined signals */
- /************************************************************************/
-
--#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST)
-+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST )
-
- #if defined(WIN32_NATIVE) || defined(CYGWIN)
- const char *sys_siglist[] =
-diff -r 3ca291c0f7e3 src/syssignal.h
---- a/src/syssignal.h Sun Jul 28 10:17:08 2019 +0100
-+++ b/src/syssignal.h Thu Aug 27 00:15:50 2020 +0200
-@@ -263,10 +263,8 @@
- # endif
- #endif
-
--/* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems,
-- configure incorrectly fails to find it, so s/linux.h defines
-- HAVE_SYS_SIGLIST. */
--#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST)
-+/* Systems that have sys_siglist but do not declare it. */
-+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST )
- extern const char *sys_siglist[];
- #endif
-
diff --git a/app-editors/xemacs/xemacs-21.5.34-r12.ebuild b/app-editors/xemacs/xemacs-21.5.34-r12.ebuild
deleted file mode 100644
index 9dae4dcb1575..000000000000
--- a/app-editors/xemacs/xemacs-21.5.34-r12.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=8
-
-inherit flag-o-matic xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
- neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
- berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
- gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
- >=sys-libs/zlib-1.1.4
- >=dev-libs/openssl-0.9.6:0=
- >=media-libs/audiofile-0.2.3
- gpm? ( >=sys-libs/gpm-1.19.6 )
- postgres? ( dev-db/postgresql:= )
- ldap? ( net-nds/openldap:= )
- alsa? ( media-libs/alsa-lib )
- nas? ( media-libs/nas )
- X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
- dnd? ( x11-libs/dnd )
- motif? ( >=x11-libs/motif-2.3:0[xft=] )
- athena? ( x11-libs/libXaw )
- Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
- xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
- neXt? ( x11-libs/neXtaw )
- xface? ( media-libs/compface )
- tiff? ( media-libs/tiff:= )
- png? ( >=media-libs/libpng-1.2:0 )
- jpeg? ( media-libs/libjpeg-turbo:= )
- freewnn? ( app-i18n/freewnn )
- >=sys-libs/ncurses-5.2:=
- >=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PDEPEND="app-xemacs/xemacs-base
- mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
- default_src_unpack
-}
-
-src_prepare() {
- use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
- find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
- eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
- eapply "${FILESDIR}/${P}-gcc5.patch"
- eapply "${FILESDIR}/${P}-glibc-macro.patch"
- eapply "${FILESDIR}/${P}-as-needed.patch"
- eapply "${FILESDIR}/${P}-configure-libc-version.patch"
- eapply "${FILESDIR}/${P}-ar.patch"
- eapply "${FILESDIR}/${P}-strsignal.patch"
- eapply "${FILESDIR}/${P}-process-test-qa.patch"
- eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
- eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch"
- eapply "${FILESDIR}/${P}-module-autoloads.patch"
-
- eapply_user
-
- # Some binaries and man pages are installed under suffixed names
- # to avoid collions with their GNU Emacs counterparts (see below).
- # Fix internal filename references.
- sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
- sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
- sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-}
-
-src_configure() {
- local myconf=""
-
- # bug #639642
- test-flags -no-pie >/dev/null && append-flags -no-pie
- filter-flags -pie
-
- if use X; then
-
- myconf="${myconf} --with-widgets=athena"
- myconf="${myconf} --with-dialogs=athena"
- myconf="${myconf} --with-menubars=lucid"
- myconf="${myconf} --with-scrollbars=lucid"
- if use motif ; then
- myconf="--with-widgets=motif"
- myconf="${myconf} --with-dialogs=motif"
- myconf="${myconf} --with-scrollbars=motif"
- myconf="${myconf} --with-menubars=lucid"
- fi
- if use athena or use Xaw3d ; then
- myconf="--with-scrollbars=athena"
- fi
-
- if use Xaw3d; then
- myconf="${myconf} --with-athena=3d"
- elif use neXt; then
- myconf="${myconf} --with-athena=next"
- else
- myconf="${myconf} --with-athena=xaw"
- fi
-
- use dnd && myconf="${myconf} --with-dragndrop"
-
- myconf="${myconf} $(use_with tiff )"
- myconf="${myconf} $(use_with png )"
- myconf="${myconf} $(use_with jpeg )"
- myconf="${myconf} $(use_with xface )"
-
- use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
- myconf="${myconf} --with-xft=no"
-
- else
- myconf="${myconf}
- --without-x
- --without-xpm
- --without-dragndrop
- --with-xft=no
- --with-gif=no"
- fi
-
- if use mule ; then
- myconf="${myconf} --with-mule"
-
- if use xim ; then
- if use motif ; then
- myconf="${myconf} --with-xim=motif"
- else
- myconf="${myconf} --with-xim=xlib"
- fi
- else
- myconf="${myconf} --with-xim=no"
- fi
-
- myconf="${myconf} $(use_with freewnn wnn )"
- fi
-
- # This determines the type of sounds we are playing
- local soundconf="native"
-
- # This determines how these sounds should be played
- use nas && soundconf="${soundconf},nas"
- use alsa && soundconf="${soundconf},alsa"
-
- myconf="${myconf} --with-sound=${soundconf}"
-
- if use gdbm || use berkdb ; then
- use gdbm && mydb="gdbm"
- use berkdb && mydb="${mydb},berkdb"
-
- myconf="${myconf} --with-database=${mydb}"
- else
- myconf="${myconf} --without-database"
- fi
-
- use debug && myconf="${myconf} --with-debug" ||
- myconf="${myconf} --with-optimization"
-
- econf ${myconf} \
- $(use_with gif ) \
- $(use_with gpm ) \
- $(use_with postgres postgresql ) \
- $(use_with ldap ) \
- $(use_with pop ) \
- --prefix=/usr \
- --without-canna \
- --with-ncurses \
- --with-msw=no \
- --with-mail-locking=flock \
- --with-site-lisp=yes \
- --with-site-modules=yes \
- --with-system-malloc \
- --enable-option-checking=no \
- --with-last-packages=/usr/lib/xemacs
-}
-
-src_compile() {
- emake EMACSLOADPATH="${S}"/lisp
-}
-
-src_install() {
- emake prefix="${ED}"/usr \
- mandir="${ED}"/usr/share/man/man1 \
- infodir="${ED}"/usr/share/info \
- libdir="${ED}"/usr/$(get_libdir) \
- datadir="${ED}"/usr/share \
- install
-
- # Rename some applications installed in bin so that it is clear
- # which application installed them and so that conflicting
- # packages (emacs) can't clobber the actual applications.
- # Addresses bug #62991.
- for i in b2m ctags etags gnuclient gnudoit gnuattach; do
- mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
- done
-
- # rename man pages
- for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
- mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
- done
-
- # install base packages directories
- dodir /usr/lib/xemacs/xemacs-packages/
- dodir /usr/lib/xemacs/site-packages/
- dodir /usr/lib/xemacs/site-modules/
- dodir /usr/lib/xemacs/site-lisp/
-
- if use mule;
- then
- dodir /usr/lib/xemacs/mule-packages
- fi
-
- # remove extraneous info files
- cd "${ED}"/usr/share/info
- rm -f dir info.info texinfo* termcap* standards*
-
- cd "${S}"
- dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
-
- newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
- domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-
- einfo "If you are upgrading from XEmacs 21.4 you should note the following"
- einfo "incompatibilities:"
- einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
- einfo "- The X resource class has changed from Emacs to XEmacs,"
- einfo " settings in your .Xdefaults file should be updated accordingly."
-
- if use xft;
- then
- einfo "You have enabled Xft font support. Xft requires font names to be provided"
- einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
- fi
-}
-
-pkg_postrm() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r13.ebuild b/app-editors/xemacs/xemacs-21.5.34-r13.ebuild
deleted file mode 100644
index 51b3f8f5095c..000000000000
--- a/app-editors/xemacs/xemacs-21.5.34-r13.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=8
-
-inherit flag-o-matic xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-$(ver_cut 1-2)/${P}.tar.gz
- neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
- berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
- gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
- >=sys-libs/zlib-1.1.4
- >=dev-libs/openssl-0.9.6:0=
- >=media-libs/audiofile-0.2.3
- gpm? ( >=sys-libs/gpm-1.19.6 )
- postgres? ( dev-db/postgresql:= )
- ldap? ( net-nds/openldap:= )
- alsa? ( media-libs/alsa-lib )
- nas? ( media-libs/nas )
- X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
- dnd? ( x11-libs/dnd )
- motif? ( >=x11-libs/motif-2.3:0[xft=] )
- athena? ( x11-libs/libXaw )
- Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
- xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
- neXt? ( x11-libs/neXtaw )
- xface? ( media-libs/compface )
- tiff? ( media-libs/tiff:= )
- png? ( >=media-libs/libpng-1.2:0 )
- jpeg? ( media-libs/libjpeg-turbo:= )
- freewnn? ( app-i18n/freewnn )
- >=sys-libs/ncurses-5.2:=
- >=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PDEPEND="app-xemacs/xemacs-base
- mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
- default_src_unpack
-}
-
-src_prepare() {
- use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
- find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
- eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
- eapply "${FILESDIR}/${P}-gcc5.patch"
- eapply "${FILESDIR}/${P}-glibc-macro.patch"
- eapply "${FILESDIR}/${P}-as-needed.patch"
- eapply "${FILESDIR}/${P}-configure-libc-version.patch"
- eapply "${FILESDIR}/${P}-ar.patch"
- eapply "${FILESDIR}/${P}-strsignal.patch"
- eapply "${FILESDIR}/${P}-process-test-qa.patch"
- eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
- eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch"
- eapply "${FILESDIR}/${P}-module-autoloads.patch"
-
- eapply_user
-
- # Some binaries and man pages are installed under suffixed names
- # to avoid collions with their GNU Emacs counterparts (see below).
- # Fix internal filename references.
- sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
- sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
- sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-}
-
-src_configure() {
- local myconf=""
-
- # bug #639642
- test-flags -no-pie >/dev/null && append-flags -no-pie
- filter-flags -pie
-
- if use X; then
-
- myconf="${myconf} --with-widgets=athena"
- myconf="${myconf} --with-dialogs=athena"
- myconf="${myconf} --with-menubars=lucid"
- myconf="${myconf} --with-scrollbars=lucid"
- if use motif ; then
- myconf="--with-widgets=motif"
- myconf="${myconf} --with-dialogs=motif"
- myconf="${myconf} --with-scrollbars=motif"
- myconf="${myconf} --with-menubars=lucid"
- fi
- if use athena or use Xaw3d ; then
- myconf="--with-scrollbars=athena"
- fi
-
- if use Xaw3d; then
- myconf="${myconf} --with-athena=3d"
- elif use neXt; then
- myconf="${myconf} --with-athena=next"
- else
- myconf="${myconf} --with-athena=xaw"
- fi
-
- use dnd && myconf="${myconf} --with-dragndrop"
-
- myconf="${myconf} $(use_with tiff )"
- myconf="${myconf} $(use_with png )"
- myconf="${myconf} $(use_with jpeg )"
- myconf="${myconf} $(use_with xface )"
-
- use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
- myconf="${myconf} --with-xft=no"
-
- else
- myconf="${myconf}
- --without-x
- --without-xpm
- --without-dragndrop
- --with-xft=no
- --with-gif=no"
- fi
-
- if use mule ; then
- myconf="${myconf} --with-mule"
-
- if use xim ; then
- if use motif ; then
- myconf="${myconf} --with-xim=motif"
- else
- myconf="${myconf} --with-xim=xlib"
- fi
- else
- myconf="${myconf} --with-xim=no"
- fi
-
- myconf="${myconf} $(use_with freewnn wnn )"
- fi
-
- # This determines the type of sounds we are playing
- local soundconf="native"
-
- # This determines how these sounds should be played
- use nas && soundconf="${soundconf},nas"
- use alsa && soundconf="${soundconf},alsa"
-
- myconf="${myconf} --with-sound=${soundconf}"
-
- if use gdbm || use berkdb ; then
- use gdbm && mydb="gdbm"
- use berkdb && mydb="${mydb},berkdb"
-
- myconf="${myconf} --with-database=${mydb}"
- else
- myconf="${myconf} --without-database"
- fi
-
- use debug && myconf="${myconf} --with-debug" ||
- myconf="${myconf} --with-optimization --with-cflags-debugging="
-
- use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn"
-
- econf ${myconf} \
- $(use_with gif ) \
- $(use_with gpm ) \
- $(use_with postgres postgresql ) \
- $(use_with ldap ) \
- $(use_with pop ) \
- --prefix=/usr \
- --without-canna \
- --with-ncurses \
- --with-msw=no \
- --with-mail-locking=flock \
- --with-site-lisp=yes \
- --with-site-modules=yes \
- --with-system-malloc \
- --enable-option-checking=no \
- --with-last-packages=/usr/lib/xemacs
-}
-
-src_compile() {
- emake EMACSLOADPATH="${S}"/lisp
-}
-
-src_install() {
- emake prefix="${ED}"/usr \
- mandir="${ED}"/usr/share/man/man1 \
- infodir="${ED}"/usr/share/info \
- libdir="${ED}"/usr/$(get_libdir) \
- datadir="${ED}"/usr/share \
- install
-
- # Rename some applications installed in bin so that it is clear
- # which application installed them and so that conflicting
- # packages (emacs) can't clobber the actual applications.
- # Addresses bug #62991.
- for i in b2m ctags etags gnuclient gnudoit gnuattach; do
- mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
- done
-
- # rename man pages
- for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
- mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
- done
-
- # install base packages directories
- dodir /usr/lib/xemacs/xemacs-packages/
- dodir /usr/lib/xemacs/site-packages/
- dodir /usr/lib/xemacs/site-modules/
- dodir /usr/lib/xemacs/site-lisp/
-
- if use mule;
- then
- dodir /usr/lib/xemacs/mule-packages
- fi
-
- # remove extraneous info files
- cd "${ED}"/usr/share/info
- rm -f dir info.info texinfo* termcap* standards*
-
- cd "${S}"
- dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
-
- newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
- domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-
- einfo "If you are upgrading from XEmacs 21.4 you should note the following"
- einfo "incompatibilities:"
- einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
- einfo "- The X resource class has changed from Emacs to XEmacs,"
- einfo " settings in your .Xdefaults file should be updated accordingly."
-
- if use xft;
- then
- einfo "You have enabled Xft font support. Xft requires font names to be provided"
- einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
- fi
-}
-
-pkg_postrm() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2024-09-26 16:04 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2024-09-26 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 5cfb56344c1caa63e87ce7e3a890b0f62843d1c7
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 16:00:24 2024 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 16:04:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cfb5634
app-editors/xemacs: Do not use which in configure
Close: https://bugs.gentoo.org/940218
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
app-editors/xemacs/files/xemacs-21.5.35-which.patch | 12 ++++++++++++
.../{xemacs-21.5.35-r2.ebuild => xemacs-21.5.35-r3.ebuild} | 1 +
2 files changed, 13 insertions(+)
diff --git a/app-editors/xemacs/files/xemacs-21.5.35-which.patch b/app-editors/xemacs/files/xemacs-21.5.35-which.patch
new file mode 100644
index 000000000000..cf8b554490fc
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-which.patch
@@ -0,0 +1,12 @@
+diff -r 22f2684b1b82 configure.ac
+--- a/configure.ac Mon Sep 23 16:24:03 2024 +0100
++++ b/configure.ac Thu Sep 26 07:57:11 2024 +0200
+@@ -2518,7 +2518,7 @@
+ dnl We need a recent version of makeinfo
+ AC_MSG_CHECKING([for makeinfo >= 4.12])
+ MAKEINFO=
+-for prog in `which -a makeinfo`; do
++for prog in `type -P makeinfo`; do
+ mi_verstr=[`$prog --version | sed -n '1s/^.* \([0-9][0-9.]*\)$/\1/p'`]
+ mi_major=`echo $mi_verstr | cut -d. -f1`
+ mi_minor=`echo $mi_verstr | cut -d. -f2`
diff --git a/app-editors/xemacs/xemacs-21.5.35-r2.ebuild b/app-editors/xemacs/xemacs-21.5.35-r3.ebuild
similarity index 99%
rename from app-editors/xemacs/xemacs-21.5.35-r2.ebuild
rename to app-editors/xemacs/xemacs-21.5.35-r3.ebuild
index 16f96c54d3de..c6d6120f7236 100644
--- a/app-editors/xemacs/xemacs-21.5.35-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r3.ebuild
@@ -63,6 +63,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}-configure.patch"
eapply "${FILESDIR}/${P}-mule-tests.patch"
eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+ eapply "${FILESDIR}/${P}-which.patch"
eapply_user
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2024-09-28 20:28 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2024-09-28 20:28 UTC (permalink / raw
To: gentoo-commits
commit: ee416a879d94e6c9a14cc858480d5cb97aa1f89e
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 20:19:20 2024 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 20:28:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee416a87
app-editors/xemacs: Add misalignment and va_args patches
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
.../xemacs/files/xemacs-21.5.35-misalignment.patch | 67 ++++++++
.../xemacs/files/xemacs-21.5.35-va_args.patch | 179 +++++++++++++++++++++
...-21.5.35-r3.ebuild => xemacs-21.5.35-r4.ebuild} | 2 +
3 files changed, 248 insertions(+)
diff --git a/app-editors/xemacs/files/xemacs-21.5.35-misalignment.patch b/app-editors/xemacs/files/xemacs-21.5.35-misalignment.patch
new file mode 100644
index 000000000000..deb3ef36664a
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-misalignment.patch
@@ -0,0 +1,67 @@
+# HG changeset patch
+# User Aidan Kehoe <kehoea@parhasard.net>
+# Date 1727073391 -3600
+# Mon Sep 23 07:36:31 2024 +0100
+# Node ID 00eb7276ebb1a22e20e6f6b9b5247b196b44f3f1
+# Parent d40990b854cf32198aea31eae0d60ce91ce0f4f7
+Avoid misaligned coding systems objects in the dump file,
+
+src/ChangeLog addition:
+
+2024-09-22 Aidan Kehoe <kehoea@parhasard.net>
+
+ * file-coding.c:
+ * file-coding.c (aligned_sizeof_coding_system): New.
+ * file-coding.c (allocate_coding_system): Use it.
+ Avoid misaligned coding systems objects in the dump file,
+ previously addressed for lstreams, specifiers, opaque data in
+ Martin Buchholz's change of 2001-01-24. Approach taken the same as
+ that for specifiers.
+ * file-coding.c (struct convert_eol_coding_system):
+ Remove a dummy integer no longer needed.
+
+[Changelog patch removed]
+
+diff -r d40990b854cf -r 00eb7276ebb1 src/file-coding.c
+--- a/src/file-coding.c Mon Sep 23 08:03:15 2024 +0100
++++ b/src/file-coding.c Mon Sep 23 07:36:31 2024 +0100
+@@ -312,11 +312,18 @@
+ MAYBE_XCODESYSMETH (obj, finalize, (obj));
+ }
+
++inline static Bytecount
++aligned_sizeof_coding_system (Bytecount type_specific_size)
++{
++ return MAX_ALIGN_SIZE (offsetof (Lisp_Coding_System, data)
++ + type_specific_size);
++}
++
+ static Bytecount
+ sizeof_coding_system (Lisp_Object obj)
+ {
+ const Lisp_Coding_System *p = XCODING_SYSTEM (obj);
+- return offsetof (Lisp_Coding_System, data) + p->methods->extra_data_size;
++ return aligned_sizeof_coding_system (p->methods->extra_data_size);
+ }
+
+ static const struct memory_description coding_system_methods_description_1[]
+@@ -835,7 +842,7 @@
+ Bytecount data_size,
+ Lisp_Object name)
+ {
+- Bytecount total_size = offsetof (Lisp_Coding_System, data) + data_size;
++ Bytecount total_size = aligned_sizeof_coding_system (data_size);
+ Lisp_Object obj = ALLOC_SIZED_LISP_OBJECT (total_size, coding_system);
+ Lisp_Coding_System *codesys = XCODING_SYSTEM (obj);
+
+@@ -3951,10 +3958,6 @@
+ struct convert_eol_coding_system
+ {
+ enum eol_type subtype;
+- int dummy; /* On some architectures (eg ia64) the portable dumper can
+- produce unaligned access errors without this field. Probably
+- because the combined structure of this structure and
+- Lisp_Coding_System is not properly aligned. */
+ };
+
+ #define CODING_SYSTEM_CONVERT_EOL_SUBTYPE(codesys) \
diff --git a/app-editors/xemacs/files/xemacs-21.5.35-va_args.patch b/app-editors/xemacs/files/xemacs-21.5.35-va_args.patch
new file mode 100644
index 000000000000..a3d5f14b728a
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-va_args.patch
@@ -0,0 +1,179 @@
+# HG changeset patch
+# User Aidan Kehoe <kehoea@parhasard.net>
+# Date 1727074995 -3600
+# Mon Sep 23 08:03:15 2024 +0100
+# Node ID d40990b854cf32198aea31eae0d60ce91ce0f4f7
+# Parent d3dfe7ea1c31cc619bf8416e04c5466927d9c6f5
+Avoid passing an int among Lisp_Object va_args, specifier instantiate methods.
+
+src/ChangeLog addition:
+
+2024-09-08 Aidan Kehoe <kehoea@parhasard.net>
+
+ * fontcolor.c (color_instantiate):
+ * fontcolor.c (font_instantiate):
+ * fontcolor.c (face_boolean_instantiate):
+ * fontcolor.c (face_background_placement_instantiate):
+ * glyphs.c (image_instantiate):
+ * specifier.c (specifier_instance_from_inst_list):
+ * specifier.h (struct specifier_methods):
+ Avoid passing an int among the Lisp_Object va_args of the
+ specifier instantiate methods, this is not portable behaviour,
+ thank you clang and -fsanitize=undefined.
+
+[Changelog patch removed]
+
+diff -r d3dfe7ea1c31 -r d40990b854cf src/fontcolor.c
+--- a/src/fontcolor.c Mon Sep 23 08:01:37 2024 +0100
++++ b/src/fontcolor.c Mon Sep 23 08:03:15 2024 +0100
+@@ -1380,7 +1380,7 @@
+ static Lisp_Object
+ color_instantiate (Lisp_Object specifier, Lisp_Object UNUSED (matchspec),
+ Lisp_Object domain, Lisp_Object instantiator,
+- Lisp_Object depth, int no_fallback)
++ Lisp_Object depth, Lisp_Object no_fallback)
+ {
+ /* When called, we're inside of call_with_suspended_errors(),
+ so we can freely error. */
+@@ -1436,7 +1436,7 @@
+ (Fget_face (XVECTOR_DATA (instantiator)[0]),
+ COLOR_SPECIFIER_FACE_PROPERTY
+ (XCOLOR_SPECIFIER (specifier)),
+- domain, ERROR_ME, no_fallback, depth));
++ domain, ERROR_ME, !NILP (no_fallback), depth));
+
+ case 2:
+ return (FACE_PROPERTY_INSTANCE_1
+@@ -1653,7 +1653,7 @@
+ font_instantiate (Lisp_Object UNUSED (specifier),
+ Lisp_Object USED_IF_MULE (matchspec),
+ Lisp_Object domain, Lisp_Object instantiator,
+- Lisp_Object depth, int no_fallback)
++ Lisp_Object depth, Lisp_Object no_fallback)
+ {
+ /* When called, we're inside of call_with_suspended_errors(),
+ so we can freely error. */
+@@ -1766,13 +1766,15 @@
+
+ match_inst = face_property_matching_instance
+ (Fget_face (XVECTOR_DATA (instantiator)[0]), Qfont,
+- charset, domain, ERROR_ME, no_fallback, depth, STAGE_INITIAL);
++ charset, domain, ERROR_ME, !NILP (no_fallback),
++ depth, STAGE_INITIAL);
+
+ if (UNBOUNDP(match_inst))
+ {
+ match_inst = face_property_matching_instance
+ (Fget_face (XVECTOR_DATA (instantiator)[0]), Qfont,
+- charset, domain, ERROR_ME, no_fallback, depth, STAGE_FINAL);
++ charset, domain, ERROR_ME, !NILP (no_fallback), depth,
++ STAGE_FINAL);
+ }
+
+ return match_inst;
+@@ -1868,7 +1870,7 @@
+ face_boolean_instantiate (Lisp_Object specifier,
+ Lisp_Object UNUSED (matchspec),
+ Lisp_Object domain, Lisp_Object instantiator,
+- Lisp_Object depth, int no_fallback)
++ Lisp_Object depth, Lisp_Object no_fallback)
+ {
+ /* When called, we're inside of call_with_suspended_errors(),
+ so we can freely error. */
+@@ -1895,7 +1897,7 @@
+
+ retval = (FACE_PROPERTY_INSTANCE_1
+ (Fget_face (XVECTOR_DATA (instantiator)[0]),
+- prop, domain, ERROR_ME, no_fallback, depth));
++ prop, domain, ERROR_ME, !NILP (no_fallback), depth));
+
+ if (instantiator_len == 3 && !NILP (XVECTOR_DATA (instantiator)[2]))
+ retval = NILP (retval) ? Qt : Qnil;
+@@ -2015,7 +2017,7 @@
+ Lisp_Object domain,
+ Lisp_Object instantiator,
+ Lisp_Object depth,
+- int no_fallback)
++ Lisp_Object no_fallback)
+ {
+ /* When called, we're inside of call_with_suspended_errors(),
+ so we can freely error. */
+@@ -2027,7 +2029,7 @@
+
+ return FACE_PROPERTY_INSTANCE_1
+ (Fget_face (XVECTOR_DATA (instantiator)[0]),
+- Qbackground_placement, domain, ERROR_ME, no_fallback, depth);
++ Qbackground_placement, domain, ERROR_ME, !NILP (no_fallback), depth);
+ }
+ else
+ ABORT (); /* Eh? */
+diff -r d3dfe7ea1c31 -r d40990b854cf src/glyphs.c
+--- a/src/glyphs.c Mon Sep 23 08:01:37 2024 +0100
++++ b/src/glyphs.c Mon Sep 23 08:03:15 2024 +0100
+@@ -3179,7 +3179,7 @@
+ static Lisp_Object
+ image_instantiate (Lisp_Object specifier, Lisp_Object UNUSED (matchspec),
+ Lisp_Object domain, Lisp_Object instantiator,
+- Lisp_Object depth, int no_fallback)
++ Lisp_Object depth, Lisp_Object no_fallback)
+ {
+ Lisp_Object glyph = IMAGE_SPECIFIER_ATTACHEE (XIMAGE_SPECIFIER (specifier));
+ int dest_mask = XIMAGE_SPECIFIER_ALLOWED (specifier);
+@@ -3218,7 +3218,7 @@
+ assert (XVECTOR_LENGTH (instantiator) == 3);
+ return (FACE_PROPERTY_INSTANCE
+ (Fget_face (XVECTOR_DATA (instantiator)[2]),
+- Qbackground_pixmap, domain, no_fallback, depth));
++ Qbackground_pixmap, domain, !NILP (no_fallback), depth));
+ }
+ else
+ {
+diff -r d3dfe7ea1c31 -r d40990b854cf src/specifier.c
+--- a/src/specifier.c Mon Sep 23 08:01:37 2024 +0100
++++ b/src/specifier.c Mon Sep 23 08:03:15 2024 +0100
+@@ -2862,8 +2862,8 @@
+ if (HAS_SPECMETH_P (sp, instantiate))
+ val = call_with_suspended_errors
+ ((lisp_fn_t) RAW_SPECMETH (sp, instantiate),
+- Qunbound, Qspecifier, ERROR_ME_WARN, 5, specifier,
+- matchspec, domain, val, depth, no_fallback);
++ Qunbound, Qspecifier, ERROR_ME_WARN, 6, specifier,
++ matchspec, domain, val, depth, no_fallback ? Qt : Qnil);
+
+ if (!UNBOUNDP (val))
+ {
+@@ -2911,8 +2911,8 @@
+ if (HAS_SPECMETH_P (sp, instantiate))
+ val = call_with_suspended_errors
+ ((lisp_fn_t) RAW_SPECMETH (sp, instantiate),
+- Qunbound, Qspecifier, errb, 5, specifier,
+- matchspec, domain, val, depth, no_fallback);
++ Qunbound, Qspecifier, errb, 6, specifier,
++ matchspec, domain, val, depth, no_fallback ? Qt : Qnil);
+
+ if (!UNBOUNDP (val))
+ {
+diff -r d3dfe7ea1c31 -r d40990b854cf src/specifier.h
+--- a/src/specifier.h Mon Sep 23 08:01:37 2024 +0100
++++ b/src/specifier.h Mon Sep 23 08:03:15 2024 +0100
+@@ -147,8 +147,9 @@
+ name specifier_instance) to avoid creating "external"
+ specification loops.
+
+- NO_FALLBACK indicates that the method should not try the fallbacks
+- (and thus simply return Qunbound) in case of a failure to instantiate.
++ NO_FALLBACK non-nil indicates that the method should not try the
++ fallbacks (and thus simply return Qunbound) in case of a failure to
++ instantiate.
+
+ This method must presume that both INSTANTIATOR and MATCHSPEC are
+ already validated by the corresponding validate_* methods, and
+@@ -165,7 +166,7 @@
+ Lisp_Object domain,
+ Lisp_Object instantiator,
+ Lisp_Object depth,
+- int no_fallback);
++ Lisp_Object no_fallback);
+
+ /* Going-to-add method: Called when an instantiator is about
+ to be added to a specifier. This function can specify
diff --git a/app-editors/xemacs/xemacs-21.5.35-r3.ebuild b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
similarity index 98%
rename from app-editors/xemacs/xemacs-21.5.35-r3.ebuild
rename to app-editors/xemacs/xemacs-21.5.35-r4.ebuild
index c6d6120f7236..ded18e39b3c5 100644
--- a/app-editors/xemacs/xemacs-21.5.35-r3.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
@@ -64,6 +64,8 @@ src_prepare() {
eapply "${FILESDIR}/${P}-mule-tests.patch"
eapply "${FILESDIR}/${P}-configure-libc-version.patch"
eapply "${FILESDIR}/${P}-which.patch"
+ eapply "${FILESDIR}/${P}-misalignment.patch"
+ eapply "${FILESDIR}/${P}-va_args.patch"
eapply_user
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2024-10-18 20:38 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2024-10-18 20:38 UTC (permalink / raw
To: gentoo-commits
commit: c390fa2cb398038e30190e64d6ed41e88db5d5ea
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 20:29:31 2024 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 20:37:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c390fa2c
app-editors/xemacs: Let compiler driver handle LDFLAGS
Add upstream patch to no longer use XE_PROTECT_LINKER_FLAGS on
LDFLAGS.
Closes: https://bugs.gentoo.org/940327
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
.../xemacs/files/xemacs-21.5.35-linker-flags.patch | 24 ++++++++++++++++++++++
app-editors/xemacs/xemacs-21.5.35-r4.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/app-editors/xemacs/files/xemacs-21.5.35-linker-flags.patch b/app-editors/xemacs/files/xemacs-21.5.35-linker-flags.patch
new file mode 100644
index 000000000000..4d95b56608f0
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-linker-flags.patch
@@ -0,0 +1,24 @@
+changeset: 7521:ce06831b299c
+parent: 7519:fb35ba719d24
+user: Aidan Kehoe <kehoea@parhasard.net>
+date: Thu Oct 17 09:01:54 2024 +0100
+summary: configure.ac: No longer use XE_PROTECT_LINKER_FLAGS on LDFLAGS.
+
+diff -r fb35ba719d24 -r ce06831b299c configure.ac
+--- a/configure.ac Mon Oct 14 19:18:08 2024 +0100
++++ b/configure.ac Thu Oct 17 09:01:54 2024 +0100
+@@ -2155,8 +2155,12 @@
+ XE_PROTECT_LINKER_FLAGS(ld_switch_system)
+ XE_PROTECT_LINKER_FLAGS(ld_switch_machine)
+ XE_PROTECT_LINKER_FLAGS(ld_switch_site)
+-XE_PROTECT_LINKER_FLAGS(LDFLAGS)
+ XE_PROTECT_LINKER_FLAGS(ld_call_shared)
++dnl No longer do this for LDFLAGS, since that interacts poorly with link time
++dnl optimization. Unclear if XE_PROTECT_LINKER_FLAGS() is still needed in
++dnl general, it was introduced for GCC versions in the 90s and things have
++dnl changed, but unlikely to be an issue with the other flags. See
++dnl https://bugs.gentoo.org/940327 for a relevant bug report.
+
+ dnl Add s&m-determined objects to link line
+ test -n "$objects_machine" && XE_ADD_OBJS($objects_machine)
+
diff --git a/app-editors/xemacs/xemacs-21.5.35-r4.ebuild b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
index 7e74432b1405..766ac26ff39b 100644
--- a/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
@@ -68,6 +68,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}-which.patch"
eapply "${FILESDIR}/${P}-misalignment.patch"
eapply "${FILESDIR}/${P}-va_args.patch"
+ eapply "${FILESDIR}/${P}-linker-flags.patch"
eapply_user
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/
@ 2024-11-01 22:48 Mats Lidell
0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2024-11-01 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 5fe43a60d090042f1b4dfdf96f01e5effa77c8c8
Author: Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 22:37:35 2024 +0000
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 22:43:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe43a60
app-editors/xemacs: drop 21.4.24-r9, 21.4.24-r10, 21.5.35
Remove unused use flags:
- mule, the default now in 21.5
- eolconv, only used in 21.4
Also remove files/README.Gentoo that was assuming 21.4 and not easy to
update to be useful.
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>
app-editors/xemacs/Manifest | 1 -
app-editors/xemacs/files/README.Gentoo | 45 ----
app-editors/xemacs/files/xemacs-21.4.19-db.patch | 84 -------
app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch | 32 ---
.../xemacs/files/xemacs-21.4.24-glibc-macro.patch | 28 ---
.../files/xemacs-21.4.24-ncurses-tinfo.patch | 12 -
.../xemacs/files/xemacs-21.4.24-strsignal.patch | 89 --------
app-editors/xemacs/metadata.xml | 3 -
app-editors/xemacs/xemacs-21.4.24-r10.ebuild | 248 --------------------
app-editors/xemacs/xemacs-21.4.24-r9.ebuild | 248 --------------------
app-editors/xemacs/xemacs-21.5.35.ebuild | 249 ---------------------
11 files changed, 1039 deletions(-)
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index d30897871d36..376833f275e8 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,3 +1,2 @@
DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
-DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
diff --git a/app-editors/xemacs/files/README.Gentoo b/app-editors/xemacs/files/README.Gentoo
deleted file mode 100644
index abb71cc90988..000000000000
--- a/app-editors/xemacs/files/README.Gentoo
+++ /dev/null
@@ -1,45 +0,0 @@
-README.Gentoo
--------------
-
-This is a quick tutorial on how to configure the XEmacs package user
-interface (package-ui). After you configure package-ui, you will be
-able to download and install XEmacs packages and dependencies while in
-XEmacs. For the complete documentation, see
-/usr/share/doc/xemacs-21.4.*/README.packages.gz
-
-Once XEmacs is emerged onto a Gentoo Linux system, you will only have
-the following elisp modules installed: xemacs-base, efs and
-(optionally if you had mule in USE) mule-base. This guide will show
-how to use package-ui to download and install your own preference in
-elisp modules to ~/.xemacs/xemacs-packages.
-
-First, start XEmacs and load the package-ui elisp module.
-
- M-x load-library RET package-ui RET
-
-The first thing to set is the download site (package-ui installs via
-network).
-
- M-x customize-variable RET package-get-remote RET
-
-Insert a new value, then:
-
- Choice: Remote
- Host: ibiblio.org
- Directory: /pub/packages/editors/xemacs/packages/
-
-Make sure you set and save the change. Note, other host/directories
-are possible. The the documentation for package-ui for more
-information. Hint: ibiblio.org is *fast*.
-
-Then set the location package-ui should install to:
-
- M-x customize-variable RET pui-package-install-dest-dir RET
-
- Directory: ~/.xemacs/xemacs-packages
-
-Make sure you set and save the change.
-
-At this point you can install your modules:
-
- M-x pui-list-packages
diff --git a/app-editors/xemacs/files/xemacs-21.4.19-db.patch b/app-editors/xemacs/files/xemacs-21.4.19-db.patch
deleted file mode 100644
index cf87d60e628a..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.19-db.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-This patch fixes several database-related problems.
-
-dbm_open has been moved into gdbm_compat, so we check for that and include it.
-
-ndbm.h is located in /usr/include/gdbm on Gentoo, so we only check
-there, given that we don't support normal dbm installations, and we
-patch database.c as well. Not portable beyond Gentoo, but will work
-for us.
-
-The checks for Berkeley DB only took into account up to version
-3. Added checks to deal with several versions 4 as well.
-
---- xemacs-21.4.19/configure.in 2005-12-24 01:48:14.000000000 +0100
-+++ xemacs-21.4.19-db/configure.in 2006-06-11 22:43:52.000000000 +0200
-@@ -4502,7 +4502,7 @@
-
- dnl Check for ndbm.h, required for either kind of DBM support.
- if test "$with_database_gdbm $with_database_dbm" != "no no"; then
-- AC_CHECK_HEADER(ndbm.h, [:], [
-+ AC_CHECK_HEADER(gdbm/ndbm.h, [:], [
- test "$with_database_gdbm" = "yes" -o \
- "$with_database_dbm" = "yes" && \
- XE_DIE("Required DBM support cannot be provided.")
-@@ -4513,10 +4513,13 @@
- if test "$with_database_gdbm" != "no"; then
- AC_CHECK_LIB(gdbm, dbm_open, [
- with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
-+ AC_CHECK_LIB(gdbm_compat, dbm_open, [
-+ with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
- if test "$with_database_gdbm" = "yes"; then
- XE_DIE("Required GNU DBM support cannot be provided.")
- fi
-- with_database_gdbm=no])
-+ with_database_gdbm=no], -lgdbm)
-+ ])
- fi
-
- dnl Check for DBM support in libc and libdbm.
-@@ -4614,11 +4617,30 @@
- #if DB_VERSION_MAJOR > 2
- yes
- #endif
--], [AC_MSG_RESULT(3); dbfunc=db_create],[
-- AC_MSG_RESULT(2); dbfunc=db_open])],[
-- AC_MSG_RESULT(1); dbfunc=dbopen])
-+], [AC_EGREP_CPP(yes,
-+[#include <$db_h_file>
-+#if DB_VERSION_MAJOR > 3
-+yes
-+#endif
-+], [AC_MSG_RESULT(4); dbfunc=db_create; dbver=4],[
-+ AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[
-+ AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[
-+ AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1])
- AC_CHECK_FUNC($dbfunc, with_database_berkdb=yes need_libdb=no, [
-- AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes)])
-+ AC_CHECK_LIB(db, db_create_4002, with_database_berkdb=yes need_libdb=yes)])
-+ fi
-+
-+ dnl Berk db 4.1 decorates public functions with version information
-+ if test "$have_database_berkdb" != "yes" -a "$dbver" = "4"; then
-+ rm -f $tempcname
-+ echo "#include <$db_h_file>" > $tempcname
-+ echo "configure___ dbfunc=db_create" >> $tempcname
-+ define(TAB, [ ])dnl
-+ eval `$CPP -Isrc $tempcname \
-+ | sed -n -e "s/[[ TAB]]*=[[ TAB\"]]*/='/" -e "s/[[ TAB\"]]*\$/'/" -e "s/^configure___//p"`
-+ rm -f $tempcname
-+ AC_MSG_WARN("db_create is really $dbfunc")
-+ AC_CHECK_LIB(db, $dbfunc, have_database_berkdb=yes need_libdb=yes)
- fi
-
- if test "$with_database_berkdb" = "yes"; then
---- xemacs-21.4.19/src/database.c 2005-12-24 01:52:35.000000000 +0100
-+++ xemacs-21.4.19-db/src/database.c 2006-06-13 21:00:01.000000000 +0200
-@@ -82,7 +82,7 @@
- #endif /* HAVE_BERKELEY_DB */
-
- #ifdef HAVE_DBM
--#include <ndbm.h>
-+#include <gdbm/ndbm.h>
- Lisp_Object Qdbm;
- #endif /* HAVE_DBM */
-
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
deleted file mode 100644
index 494fc51c3b88..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -r e2da872593c0 configure.in
---- a/configure.in Tue Mar 24 22:15:53 2015 -0400
-+++ b/configure.in Sun Mar 13 13:48:24 2016 +0100
-@@ -1939,6 +1939,8 @@
- CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes"
- dnl Yuck, bad compares have been worth at least 3 crashes!
- CFLAGS="$CFLAGS -Wsign-compare"
-+ dnl Use old gnu inline semantics until we fix the source
-+ CFLAGS="$CFLAGS -fgnu89-inline"
- dnl XEmacs is known not to be strict-aliasing-safe.
- case "`gcc -v --help 2>&1`" in
- *-fstrict-aliasing* ) CFLAGS="$CFLAGS -fno-strict-aliasing" ;;
-diff -r e2da872593c0 src/lisp.h
---- a/src/lisp.h Tue Mar 24 22:15:53 2015 -0400
-+++ b/src/lisp.h Sun Mar 13 13:48:24 2016 +0100
-@@ -193,6 +193,8 @@
- # endif /* GNUC */
- #endif
-
-+#ifndef _GCC_MAX_ALIGN_T
-+#define _GCC_MAX_ALIGN_T
- /* No type has a greater alignment requirement than max_align_t.
- (except perhaps for types we don't use, like long double) */
- typedef union
-@@ -202,6 +204,7 @@
- struct { void (*f)(void); } f;
- struct { double d; } d;
- } max_align_t;
-+#endif
-
- #ifndef ALIGNOF
- # if defined (__GNUC__) && (__GNUC__ >= 2)
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
deleted file mode 100644
index 62d26ccc053c..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Don't define deprecated glibc symbol
-
-Avoid defining the deprecated symbols _BSD_SOURCE and _SVID_SOURCE
-that xmkmf thinks are needed to compile X programs.
-
-diff -r 09d56098ea2c -r 32a8151f8af7 configure.in
---- a/configure.in Sat Feb 11 01:24:06 2017 +0100
-+++ b/configure.in Sat Feb 11 01:59:40 2017 +0100
-@@ -2868,10 +2868,15 @@
- * ) val=1 ;;
- esac
- dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
-- if grep "^#define $sym " confdefs.h >/dev/null; then :; else
-- if test "$val" = "1"
-- then AC_DEFINE_UNQUOTED($sym)
-- else AC_DEFINE_UNQUOTED($sym,$val)
-+dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
-+dnl likes us to define; ignore them if appropriate.
-+ if grep "^#define $sym " confdefs.h >/dev/null || \
-+ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
-+ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
-+ then :; else
-+ if test "$val" = "1"
-+ then AC_DEFINE_UNQUOTED($sym)
-+ else AC_DEFINE_UNQUOTED($sym,$val)
- fi
- fi ;;
- esac
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
deleted file mode 100644
index 19b8984db2d0..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r e2da872593c0 configure.in
---- a/configure.in Tue Mar 24 22:15:53 2015 -0400
-+++ b/configure.in Mon Apr 17 10:13:05 2017 +0200
-@@ -4449,7 +4449,7 @@
- AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
- AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
- XE_ADD_OBJS(terminfo.o)
-- XE_PREPEND(-lncurses, LIBS)
-+ XE_PREPEND($(pkg-config ncurses --libs), LIBS)
-
- if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
- dnl Try again, and check for the bogus ncurses/ include bug.
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch b/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch
deleted file mode 100644
index a44b925ccdd5..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -r ab1558b934ff configure
---- a/configure Sun Aug 30 22:05:05 2020 +0200
-+++ b/configure Sun Aug 30 22:38:03 2020 +0200
-@@ -11333,7 +11333,7 @@
- fi
-
-
--for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
-+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strsignal tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:11340: checking for $ac_func" >&5
-diff -r ab1558b934ff configure.in
---- a/configure.in Sun Aug 30 22:05:05 2020 +0200
-+++ b/configure.in Sun Aug 30 22:38:03 2020 +0200
-@@ -4012,7 +4012,7 @@
- dnl Check for POSIX functions.
- dnl ----------------------------------------------------------------
-
--AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask)
-+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strsignal tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask)
-
- dnl getaddrinfo() is borked under hpux11
- if test "$ac_cv_func_getaddrinfo" != "no" ; then
-diff -r ab1558b934ff src/config.h.in
---- a/src/config.h.in Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/config.h.in Sun Aug 30 22:38:03 2020 +0200
-@@ -346,6 +346,7 @@
- #undef HAVE_SNPRINTF
- #undef HAVE_STPCPY
- #undef HAVE_STRERROR
-+#undef HAVE_STRSIGNAL
- #undef HAVE_TZSET
- #undef HAVE_ULIMIT
- #undef HAVE_USLEEP
-diff -r ab1558b934ff src/process.c
---- a/src/process.c Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/process.c Sun Aug 30 22:38:03 2020 +0200
-@@ -1311,7 +1311,11 @@
- signal_name (int signum)
- {
- if (signum >= 0 && signum < NSIG)
-+#ifdef HAVE_STRSIGNAL
-+ return strsignal (signum);
-+#else
- return (const char *) sys_siglist[signum];
-+#endif
-
- return (const char *) GETTEXT ("unknown signal");
- }
-diff -r ab1558b934ff src/s/linux.h
---- a/src/s/linux.h Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/s/linux.h Sun Aug 30 22:38:03 2020 +0200
-@@ -107,7 +107,6 @@
-
- #define NO_SIOCTL_H /* don't have sioctl.h */
-
--#define HAVE_SYS_SIGLIST
- #define HAVE_WAIT_HEADER
-
- #define POSIX /* affects getpagesize.h and systty.h */
-diff -r ab1558b934ff src/sysdep.c
---- a/src/sysdep.c Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/sysdep.c Sun Aug 30 22:38:03 2020 +0200
-@@ -3526,7 +3526,7 @@
- /* Strings corresponding to defined signals */
- /************************************************************************/
-
--#if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
-+#if !defined(HAVE_STRSIGNAL) && !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
-
- #if defined(WIN32_NATIVE) || defined(CYGWIN)
- const char *sys_siglist[] =
-diff -r ab1558b934ff src/syssignal.h
---- a/src/syssignal.h Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/syssignal.h Sun Aug 30 22:38:03 2020 +0200
-@@ -223,10 +223,8 @@
- # define NSIG (SIGUSR2+1) /* guess how many elements are in sys_siglist... */
- #endif
-
--/* SYS_SIGLIST_DECLARED is determined by configure. On Linux, it seems,
-- configure incorrectly fails to find it, so s/linux.h defines
-- HAVE_SYS_SIGLIST. */
--#if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
-+/* Systems that have sys_siglist but do not declare it. */
-+#if !defined(HAVE_STRSIGNAL) && !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
- extern const char *sys_siglist[];
- #endif
-
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index b96ffa800d92..07a844ae677c 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -8,9 +8,6 @@
<flag name="athena">Chooses the MIT Athena widget set</flag>
<flag name="dnd">Enables support for the <pkg>x11-libs/dnd</pkg>
drag-n-drop library</flag>
- <flag name="eolconv">Support detection and translation of newline
- conventions</flag>
- <flag name="mule">Add multi-language support to XEmacs</flag>
<flag name="pop">Support POP for mail retrieval</flag>
<flag name="xim">Enable X11 XiM input method</flag>
<flag name="bignum">Support for OpenSSL bignum implementation</flag>
diff --git a/app-editors/xemacs/xemacs-21.4.24-r10.ebuild b/app-editors/xemacs/xemacs-21.4.24-r10.ebuild
deleted file mode 100644
index a6933b3ba2b4..000000000000
--- a/app-editors/xemacs/xemacs-21.4.24-r10.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=7
-
-WANT_AUTOCONF="2.1"
-inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
- neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] )
- >=sys-libs/zlib-1.1.4
- >=dev-libs/openssl-0.9.6:0=
- >=media-libs/audiofile-0.2.3
- gpm? ( >=sys-libs/gpm-1.19.6 )
- postgres? ( dev-db/postgresql:= )
- ldap? ( net-nds/openldap:= )
- nas? ( media-libs/nas )
- X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
- dnd? ( x11-libs/dnd )
- motif? ( >=x11-libs/motif-2.3:0 )
- athena? ( x11-libs/libXaw )
- Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
- neXt? ( x11-libs/neXtaw )
- xface? ( media-libs/compface )
- tiff? ( media-libs/tiff:= )
- png? ( >=media-libs/libpng-1.2:0 )
- jpeg? ( media-libs/libjpeg-turbo:= )
- >=sys-libs/ncurses-5.2:=
- >=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
- >=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
- mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
- unpack ${P}.tar.gz
- use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
- # see bug 58350, 102540 and 143580
- eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
- # see bug 576512
- eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
- eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
- # see bug 615544
- eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
- eapply "${FILESDIR}"/xemacs-21.4.24-strsignal.patch
-
- # Convert to utf-8
- iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
- && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
- iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \
- && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
-
- eapply_user
-
- # Some binaries and man pages are installed under suffixed names
- # to avoid collions with their GNU Emacs counterparts (see below).
- # Fix internal filename references.
- sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
- sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
- sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
- # Run autoconf. XEmacs tries to be smart by providing a stub
- # configure.ac file for autoconf 2.59 but this throws our
- # autotools eclass so it must be removed first.
- rm "${S}"/configure.ac || die
- eautoconf
-
- use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
- local myconf=""
-
- # Can't build with pie. See bug #75028
- test-flags -no-pie >/dev/null && append-flags -no-pie
- filter-flags -pie
-
- if use X; then
-
- myconf="${myconf} --with-widgets=athena"
- myconf="${myconf} --with-dialogs=athena"
- myconf="${myconf} --with-menubars=lucid"
- myconf="${myconf} --with-scrollbars=lucid"
- if use motif ; then
- myconf="--with-widgets=motif"
- myconf="${myconf} --with-dialogs=motif"
- myconf="${myconf} --with-scrollbars=motif"
- myconf="${myconf} --with-menubars=lucid"
- fi
- if use athena ; then
- myconf="--with-scrollbars=athena"
- fi
-
- if use Xaw3d; then
- myconf="${myconf} --with-athena=3d"
- elif use neXt; then
- myconf="${myconf} --with-athena=next"
- else
- myconf="${myconf} --with-athena=xaw"
- fi
-
- use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
- myconf="${myconf} $(use_with tiff ) $(use_with png )"
- myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
- else
- myconf="${myconf}
- --without-x
- --without-xpm
- --without-dragndrop
- --with-gif=no"
- fi
-
- if use mule ; then
- myconf="${myconf} --with-mule"
-
- if use xim ; then
- if use motif ; then
- myconf="${myconf} --with-xim=motif"
- else
- myconf="${myconf} --with-xim=xlib"
- fi
- else
- myconf="${myconf} --with-xim=no"
- fi
-
- myconf="${myconf} --without-wnn"
- fi
-
- # This determines the type of sounds we are playing
- local soundconf="native"
-
- # This determines how these sounds should be played
- use nas && soundconf="${soundconf},nas"
-
- myconf="${myconf} --with-sound=${soundconf}"
-
- if use gdbm || use berkdb ; then
- use gdbm && mydb="gdbm"
-
- use berkdb && mydb="${mydb},berkdb"
-
- myconf="${myconf} --with-database=${mydb}"
- else
- myconf="${myconf} --without-database"
- fi
-
- einfo "${myconf}"
-
- # see bug 576512
- append-cflags -fgnu89-inline
-
- # Don't use econf because it uses options which this configure
- # script does not understand (like --host).
- ./configure ${myconf} ${EXTRA_ECONF} \
- $(use_with gif ) \
- $(use_with gpm ) \
- $(use_with postgres postgresql ) \
- $(use_with ldap ) \
- $(use_with eolconv file-coding ) \
- $(use_with pop ) \
- --compiler="$(tc-getCC)" \
- --prefix=/usr \
- --without-canna \
- --with-ncurses \
- --with-system-malloc \
- --with-msw=no \
- --mail-locking=flock \
- --with-site-lisp=yes \
- --with-site-modules=yes \
- || die "The configure script failed to run properly"
-}
-
-src_install() {
- emake prefix="${D}"/usr \
- mandir="${D}"/usr/share/man/man1 \
- infodir="${D}"/usr/share/info \
- install gzip-el || die "emake install failed"
-
- # Rename some applications installed in bin so that it is clear
- # which application installed them and so that conflicting
- # packages (emacs) can't clobber the actual applications.
- # Addresses bug #62991.
- for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
- mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
- done
-
- # rename man pages
- for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
- mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
- done
-
- # install base packages directories
- dodir /usr/lib/xemacs/xemacs-packages/
- dodir /usr/lib/xemacs/site-packages/
- dodir /usr/lib/xemacs/site-modules/
- dodir /usr/lib/xemacs/site-lisp/
-
- if use mule;
- then
- dodir /usr/lib/xemacs/mule-packages
- fi
-
- # remove extraneous info files
- cd "${D}"/usr/share/info
- rm -f dir info.info texinfo* termcap* standards*
-
- cd "${S}"
- dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
- dodoc "${FILESDIR}"/README.Gentoo
-
- newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
- domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.4.24-r9.ebuild b/app-editors/xemacs/xemacs-21.4.24-r9.ebuild
deleted file mode 100644
index 578aa12874b6..000000000000
--- a/app-editors/xemacs/xemacs-21.4.24-r9.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=7
-
-WANT_AUTOCONF="2.1"
-inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
- http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] )
- >=sys-libs/zlib-1.1.4
- >=dev-libs/openssl-0.9.6:0=
- >=media-libs/audiofile-0.2.3
- gpm? ( >=sys-libs/gpm-1.19.6 )
- postgres? ( dev-db/postgresql:= )
- ldap? ( net-nds/openldap:= )
- nas? ( media-libs/nas )
- X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
- dnd? ( x11-libs/dnd )
- motif? ( >=x11-libs/motif-2.3:0 )
- athena? ( x11-libs/libXaw )
- Xaw3d? ( x11-libs/libXaw3d )
- neXt? ( x11-libs/neXtaw )
- xface? ( media-libs/compface )
- tiff? ( media-libs/tiff:= )
- png? ( >=media-libs/libpng-1.2:0 )
- jpeg? ( media-libs/libjpeg-turbo:= )
- >=sys-libs/ncurses-5.2:=
- >=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
- >=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
- mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
- unpack ${P}.tar.gz
- use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
- # see bug 58350, 102540 and 143580
- eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
- # see bug 576512
- eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
- eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
- # see bug 615544
- eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
- eapply "${FILESDIR}"/xemacs-21.4.24-strsignal.patch
-
- # Convert to utf-8
- iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
- && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
- iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \
- && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
-
- eapply_user
-
- # Some binaries and man pages are installed under suffixed names
- # to avoid collions with their GNU Emacs counterparts (see below).
- # Fix internal filename references.
- sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
- sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
- sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
- # Run autoconf. XEmacs tries to be smart by providing a stub
- # configure.ac file for autoconf 2.59 but this throws our
- # autotools eclass so it must be removed first.
- rm "${S}"/configure.ac || die
- eautoconf
-
- use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
- local myconf=""
-
- # Can't build with pie. See bug #75028
- test-flags -no-pie >/dev/null && append-flags -no-pie
- filter-flags -pie
-
- if use X; then
-
- myconf="${myconf} --with-widgets=athena"
- myconf="${myconf} --with-dialogs=athena"
- myconf="${myconf} --with-menubars=lucid"
- myconf="${myconf} --with-scrollbars=lucid"
- if use motif ; then
- myconf="--with-widgets=motif"
- myconf="${myconf} --with-dialogs=motif"
- myconf="${myconf} --with-scrollbars=motif"
- myconf="${myconf} --with-menubars=lucid"
- fi
- if use athena ; then
- myconf="--with-scrollbars=athena"
- fi
-
- if use Xaw3d; then
- myconf="${myconf} --with-athena=3d"
- elif use neXt; then
- myconf="${myconf} --with-athena=next"
- else
- myconf="${myconf} --with-athena=xaw"
- fi
-
- use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
- myconf="${myconf} $(use_with tiff ) $(use_with png )"
- myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
- else
- myconf="${myconf}
- --without-x
- --without-xpm
- --without-dragndrop
- --with-gif=no"
- fi
-
- if use mule ; then
- myconf="${myconf} --with-mule"
-
- if use xim ; then
- if use motif ; then
- myconf="${myconf} --with-xim=motif"
- else
- myconf="${myconf} --with-xim=xlib"
- fi
- else
- myconf="${myconf} --with-xim=no"
- fi
-
- myconf="${myconf} --without-wnn"
- fi
-
- # This determines the type of sounds we are playing
- local soundconf="native"
-
- # This determines how these sounds should be played
- use nas && soundconf="${soundconf},nas"
-
- myconf="${myconf} --with-sound=${soundconf}"
-
- if use gdbm || use berkdb ; then
- use gdbm && mydb="gdbm"
-
- use berkdb && mydb="${mydb},berkdb"
-
- myconf="${myconf} --with-database=${mydb}"
- else
- myconf="${myconf} --without-database"
- fi
-
- einfo "${myconf}"
-
- # see bug 576512
- append-cflags -fgnu89-inline
-
- # Don't use econf because it uses options which this configure
- # script does not understand (like --host).
- ./configure ${myconf} ${EXTRA_ECONF} \
- $(use_with gif ) \
- $(use_with gpm ) \
- $(use_with postgres postgresql ) \
- $(use_with ldap ) \
- $(use_with eolconv file-coding ) \
- $(use_with pop ) \
- --compiler="$(tc-getCC)" \
- --prefix=/usr \
- --without-canna \
- --with-ncurses \
- --with-system-malloc \
- --with-msw=no \
- --mail-locking=flock \
- --with-site-lisp=yes \
- --with-site-modules=yes \
- || die "The configure script failed to run properly"
-}
-
-src_install() {
- emake prefix="${D}"/usr \
- mandir="${D}"/usr/share/man/man1 \
- infodir="${D}"/usr/share/info \
- install gzip-el || die "emake install failed"
-
- # Rename some applications installed in bin so that it is clear
- # which application installed them and so that conflicting
- # packages (emacs) can't clobber the actual applications.
- # Addresses bug #62991.
- for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
- mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
- done
-
- # rename man pages
- for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
- mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
- done
-
- # install base packages directories
- dodir /usr/lib/xemacs/xemacs-packages/
- dodir /usr/lib/xemacs/site-packages/
- dodir /usr/lib/xemacs/site-modules/
- dodir /usr/lib/xemacs/site-lisp/
-
- if use mule;
- then
- dodir /usr/lib/xemacs/mule-packages
- fi
-
- # remove extraneous info files
- cd "${D}"/usr/share/info
- rm -f dir info.info texinfo* termcap* standards*
-
- cd "${S}"
- dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
- dodoc "${FILESDIR}"/README.Gentoo
-
- newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
- domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.5.35.ebuild b/app-editors/xemacs/xemacs-21.5.35.ebuild
deleted file mode 100644
index aff1f6acbb7c..000000000000
--- a/app-editors/xemacs/xemacs-21.5.35.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=8
-
-inherit flag-o-matic xdg-utils desktop autotools
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-
-SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
- neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
- berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
- gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
- >=sys-libs/zlib-1.1.4
- >=dev-libs/openssl-0.9.6:0=
- >=media-libs/audiofile-0.2.3
- gpm? ( >=sys-libs/gpm-1.19.6 )
- postgres? ( dev-db/postgresql:= )
- ldap? ( net-nds/openldap:= )
- alsa? ( media-libs/alsa-lib )
- nas? ( media-libs/nas )
- X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
- dnd? ( x11-libs/dnd )
- motif? ( >=x11-libs/motif-2.3:0[xft=] )
- athena? ( x11-libs/libXaw )
- Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
- xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
- neXt? ( x11-libs/neXtaw )
- xface? ( media-libs/compface )
- tiff? ( media-libs/tiff:= )
- png? ( >=media-libs/libpng-1.2:0 )
- jpeg? ( media-libs/libjpeg-turbo:= )
- >=sys-libs/ncurses-5.2:=
- >=app-eselect/eselect-emacs-1.15
- bignum? ( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PDEPEND="app-xemacs/xemacs-base
- app-xemacs/mule-base"
-
-src_unpack() {
- default_src_unpack
-}
-
-src_prepare() {
- use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
- find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
- eapply "${FILESDIR}/${P}-configure.patch"
- eapply "${FILESDIR}/${P}-mule-tests.patch"
-
- eapply_user
-
- eautoconf
-
- # Some binaries and man pages are installed under suffixed names
- # to avoid collions with their GNU Emacs counterparts (see below).
- # Fix internal filename references.
- sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
- sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
- sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-}
-
-src_configure() {
- local myconf=""
-
- # bug #639642
- test-flags -no-pie >/dev/null && append-flags -no-pie
- filter-flags -pie
-
- if use X; then
-
- myconf="${myconf} --with-widgets=athena"
- myconf="${myconf} --with-dialogs=athena"
- myconf="${myconf} --with-menubars=lucid"
- myconf="${myconf} --with-scrollbars=lucid"
- if use motif ; then
- myconf="--with-widgets=motif"
- myconf="${myconf} --with-dialogs=motif"
- myconf="${myconf} --with-scrollbars=motif"
- myconf="${myconf} --with-menubars=lucid"
- fi
- if use athena or use Xaw3d ; then
- myconf="--with-scrollbars=athena"
- fi
-
- if use Xaw3d; then
- myconf="${myconf} --with-athena=3d"
- elif use neXt; then
- myconf="${myconf} --with-athena=next"
- else
- myconf="${myconf} --with-athena=xaw"
- fi
-
- use dnd && myconf="${myconf} --with-dragndrop"
-
- myconf="${myconf} $(use_with tiff )"
- myconf="${myconf} $(use_with png )"
- myconf="${myconf} $(use_with jpeg )"
- myconf="${myconf} $(use_with xface )"
-
- use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
- myconf="${myconf} --with-xft=no"
-
- else
- myconf="${myconf}
- --without-x
- --without-xpm
- --without-dragndrop
- --with-xft=no
- --with-gif=no"
- fi
-
- if use xim ; then
- if use motif ; then
- myconf="${myconf} --with-xim=motif"
- else
- myconf="${myconf} --with-xim=xlib"
- fi
- else
- myconf="${myconf} --with-xim=no"
- fi
-
- myconf="${myconf} --without-wnn"
-
- # This determines the type of sounds we are playing
- local soundconf="native"
-
- # This determines how these sounds should be played
- use nas && soundconf="${soundconf},nas"
- use alsa && soundconf="${soundconf},alsa"
-
- myconf="${myconf} --with-sound=${soundconf}"
-
- if use gdbm || use berkdb ; then
- use gdbm && mydb="gdbm"
- use berkdb && mydb="${mydb},berkdb"
-
- myconf="${myconf} --with-database=${mydb}"
- else
- myconf="${myconf} --without-database"
- fi
-
- use debug && myconf="${myconf} --with-debug" ||
- myconf="${myconf} --with-optimization --with-cflags-debugging="
-
- use bignum && myconf="${myconf} --with-bignum=openssl" ||
- myconf="${myconf} --with-bignum=no"
-
- econf ${myconf} \
- $(use_with gif ) \
- $(use_with gpm ) \
- $(use_with postgres postgresql ) \
- $(use_with ldap ) \
- $(use_with pop ) \
- --prefix=/usr \
- --with-mule \
- --with-unicode-internal \
- --without-canna \
- --with-ncurses \
- --with-msw=no \
- --with-mail-locking=flock \
- --with-site-lisp=yes \
- --with-site-modules=yes \
- --enable-option-checking=no \
- --with-last-packages=/usr/lib/xemacs
-}
-
-src_compile() {
- emake EMACSLOADPATH="${S}"/lisp
-}
-
-src_install() {
- emake prefix="${ED}"/usr \
- mandir="${ED}"/usr/share/man/man1 \
- infodir="${ED}"/usr/share/info \
- libdir="${ED}"/usr/$(get_libdir) \
- datadir="${ED}"/usr/share \
- install
-
- # Rename some applications installed in bin so that it is clear
- # which application installed them and so that conflicting
- # packages (emacs) can't clobber the actual applications.
- # Addresses bug #62991.
- for i in b2m ctags etags gnuclient gnudoit gnuattach; do
- mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
- done
-
- # rename man pages
- for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
- mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
- done
-
- # install base packages directories
- dodir /usr/lib/xemacs/xemacs-packages/
- dodir /usr/lib/xemacs/site-packages/
- dodir /usr/lib/xemacs/site-modules/
- dodir /usr/lib/xemacs/site-lisp/
- dodir /usr/lib/xemacs/mule-packages
-
- # remove extraneous info files
- cd "${ED}"/usr/share/info
- rm -f dir info.info texinfo* termcap* standards*
-
- cd "${S}"
- dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
-
- newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
- domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-
- einfo "If you are upgrading from XEmacs 21.4 you should note the following"
- einfo "incompatibilities:"
- einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
- einfo "- The X resource class has changed from Emacs to XEmacs,"
- einfo " settings in your .Xdefaults file should be updated accordingly."
-
- if use xft;
- then
- einfo "You have enabled Xft font support. Xft requires font names to be provided"
- einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
- fi
-}
-
-pkg_postrm() {
- eselect emacs update ifunset
- eselect gnuclient update ifunset
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-11-01 22:48 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-30 18:11 [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/ Mats Lidell
-- strict thread matches above, loose matches on Subject: below --
2024-11-01 22:48 Mats Lidell
2024-10-18 20:38 Mats Lidell
2024-09-28 20:28 Mats Lidell
2024-09-26 16:04 Mats Lidell
2024-03-09 15:27 Mats Lidell
2022-06-16 21:16 Mats Lidell
2020-01-12 19:15 Mats Lidell
2020-01-11 16:50 Mats Lidell
2019-07-09 8:25 Mats Lidell
2017-03-31 20:02 Mats Lidell
2016-04-03 0:04 Mats Lidell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox