diff options
Diffstat (limited to 'app-editors')
19 files changed, 61 insertions, 1240 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 129a323bc94a..87e937912f3a 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest index acb1a1236365..7f25a16dbaff 100644 --- a/app-editors/gnome-text-editor/Manifest +++ b/app-editors/gnome-text-editor/Manifest @@ -1,3 +1,5 @@ DIST gnome-text-editor-45.1.tar.xz 618116 BLAKE2B c847ebb7293f959912447491c423fd814cf4084d0f80d04c5933f883e07f826251e6b332f2d69f318e32fb81764d11d0e04dab2129a63a01394c9470d8cc81cd SHA512 8e16f0e9f2bc264a890eb9c648d74cc64bd487dae8a7e9d8198e16e8abc97f9fba3f3521d15777b681ee17b23a9e8032e382cd8a438eeddd857a28d8cb069c30 +DIST gnome-text-editor-45.3.tar.xz 618756 BLAKE2B 45a6a78a665f833b0fb2e179125224e1d3757390deee5845b750bbc13368cd9b0b8521b290e42a2c5be82e2e7d78bab5e3aad256d1c87eade22547696807a8ba SHA512 d9fbdbb0dfbb5d10dc1b817f9ebf114a63e20724c3c230da683c8b7f1332371acf869c723a7067dbdafb5b4df23529944b40e5ec212e52a5a3220ca725388c95 EBUILD gnome-text-editor-45.1.ebuild 1072 BLAKE2B e1562b655b253a1d4ce93a37a11af6a3682654d5c0da8738e67f7908ee6f3aef6d6be385430d2f673e424211578cebe4f24c446f771c97c7acbd749bee5a1e6e SHA512 512e455ad2d85d552c0cea41f5c6aff5b3b993dabfb15a0947a738a871c1bc0dd0f49860effac348038fce924889ba71a26dda72000c3fc94b079b7a0e30082c +EBUILD gnome-text-editor-45.3.ebuild 1075 BLAKE2B e4ba735ccc8a11e0259538da46f872306bb1d41f50fbea4f4868d34e7db044b1aa60d868ce324061bd78f2608f67bbaf3c763457cab65d7623e09bc3be957c8e SHA512 8301fb69c0f99447ef40e0339fbf50c61cad0b620f09dcc07ab35add03e4b8f87a28b2650cab9a154cdebba82d20fb26f078bbe68c76aea7698d3e54d4de8702 MISC metadata.xml 358 BLAKE2B 908c67ba226a7e65b72a1cbaea99350f05fe9f904644c99b9c4e1e0c81f795c1420a0ca9cba1d56f59fb1b841151ffcf7d088add9f36a0e88314f7f52da94fcf SHA512 5862fb965119f76e19ed997e53e651778458604f1f9b69a1ee04db8eac52bdb6352da84ecb92555b31d3b8c62aa544c57c6040ed358af3beddd35fe356744d85 diff --git a/app-editors/gnome-text-editor/gnome-text-editor-45.3.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-45.3.ebuild new file mode 100644 index 000000000000..59aba2671d33 --- /dev/null +++ b/app-editors/gnome-text-editor/gnome-text-editor-45.3.ebuild @@ -0,0 +1,57 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="A simple text editor for the GNOME desktop" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-text-editor" +S="${WORKDIR}/gnome-text-editor-${PV/_/.}" + +LICENSE="GPL-3+ CC-BY-SA-3.0" +SLOT="0" + +IUSE="spell" + +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-libs/glib-2.73.0:2 + >=gui-libs/gtk-4.7:4 + >=gui-libs/gtksourceview-5.5.0:5 + >=gui-libs/libadwaita-1.4_alpha:1 + app-text/editorconfig-core-c + x11-libs/cairo + spell? ( + >=app-text/enchant-2.2.0:2 + dev-libs/icu:= + ) +" +RDEPEND="${DEPEND} + gnome-base/gsettings-desktop-schemas +" +BDEPEND=" + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.21 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + $(meson_feature spell enchant) + -Dbugreport_url="https://bugs.gentoo.org" + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest index 23da56e78d8c..5c7bd4a9db31 100644 --- a/app-editors/mousepad/Manifest +++ b/app-editors/mousepad/Manifest @@ -1,5 +1,5 @@ DIST mousepad-0.6.1.tar.bz2 1405279 BLAKE2B db94c433ba6dc697906258942abd0bcaa5a0a244c30c6e344e737944e84688045319551ebd1512aba541d87beafe5a8a26bb1265a06619aad64c7155140f33b3 SHA512 cf6ee9e32ecb1be9f1f54c587c4e8f653eb949f1103e378bf27959b88d8d6f268fb796285c8077bcef97926288cf941b9fb9426bfeb680ee728bddefa2d77d23 DIST mousepad-0.6.2.tar.bz2 1402314 BLAKE2B c783ec58317ca3c0eaa0023ade3043f4aa4f020a12c0258fe0cf1e2303aa07dfbc67b9aa0178ca9282da98754103fda6c90ba034fa4057dd855b400c0d371085 SHA512 086f60f6f405290ed76366f4c5195e9c8f9c5058d1892200a73e48d6378428efe47f2038e3eddb81186e22dd87d57580559a556b1b22f202b6f056c7f90b64ea EBUILD mousepad-0.6.1.ebuild 1267 BLAKE2B 4df6ffa8d9f58f47060f3f797a905b16dce37ecc78f886e1f4079087d8eb418fb5baaf767061678b57d46044c87a5d768eb28f504edc1a33a39270983d4535f4 SHA512 71236a1a56926708dbcec93af35b83da697299a52790421ea730961c73960dfa4426a0decfbb1043d107a2d7c45be691e9eabed518c73f6e4bd3cd6e21e9db20 -EBUILD mousepad-0.6.2.ebuild 1272 BLAKE2B 705da414728941a40ad79d929661891f8cb614935a996bd93790111c4d30b7bd2df4e381c54a1692041da6bde993661cf8f1170ae44e264cb6a01608dce2fe20 SHA512 83c2e82dd6081f8c2f68e131071730dfb8a8e31691587df68eed40f7580287624413302ac89fb6127e56a759fad42661631ddd4602c2dedb0591755f4d196c48 +EBUILD mousepad-0.6.2.ebuild 1268 BLAKE2B 6b3d4537ad61491a509bf8ea30193ec0961f9ac9525362e9faf4856bd9910873296c5fecc3d11d81904cf17c5ab3ece9c568e4f03f2bb87e2b5ca36b31295843 SHA512 a981485da4d7d32541c4a22c700c217643a5be4b55a4f4c1d7444c5915fb11b0adbb5acad06de31267c8b1a900bfb965aeebca31bbbb6df30a3ce6755ca184f5 MISC metadata.xml 318 BLAKE2B 53e8d0080a2643b6d5191012a6c86316d926678a85190371ce498705fc142f83d1a325a935a75f8f29c19c878a677ba96a35d5e8702a23c4f1e7ec210dbeef3e SHA512 89a0b309c4a205b97627be6c0d3fb1a280d9c4dfd2107c09854ef6a912e38e0dc2da39e0768d5103b81b72bf84eed7b1014084c52ff9482f4acc13e8d1a3def3 diff --git a/app-editors/mousepad/mousepad-0.6.2.ebuild b/app-editors/mousepad/mousepad-0.6.2.ebuild index 4d6ef31ee3be..7e6e7e6466fe 100644 --- a/app-editors/mousepad/mousepad-0.6.2.ebuild +++ b/app-editors/mousepad/mousepad-0.6.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86" IUSE="policykit spell +shortcuts" DEPEND=" diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index e9f185fc7cdb..1ba5a61ae436 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -4,28 +4,14 @@ AUX xemacs-21.4.24-gcc5.patch 1132 BLAKE2B 2a494b756f94112ba91a9d918fa540a645dfb AUX xemacs-21.4.24-glibc-macro.patch 1081 BLAKE2B 2b2aa4898e9a02402418a71abe4138f085e9177c90ee87ede767c682ec185f59cfa308284622d88c432b3e4eae9e20a05df075f7e48f73ac27e53d9f15a8d5ec SHA512 6802260f60cd8ad14f9f7f4dc156e1914cbefd7efae38837426f54f141bec6241c210c28120badfdf46d0cd2866014cf31b05ee228c407cdb0f387ea5cf56e3b AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae985568cd1b25e2d46a2149e5d712338cf8d3f69b825410d448a2dd81fe4069e3f320a3dac13a9046651d526d4b9272772b4 SHA512 61af7d1090f160802a6a5ff2ba28ff2d9d2a39ac615c692748a76f60c4f93b6d09a66fbf797467257efe1a269aa90033f5384423521b1e403defb6cbd8709bb3 AUX xemacs-21.4.24-strsignal.patch 4452 BLAKE2B f5f8d35a15f6c1aa59d6d31a8c4ed46b057f6af01ed8bb42cada466c6b95ba9633dbe8f0af5aa7a4779cc2c98bab42c629f4f16eb38aa558913a630a961110c5 SHA512 2858c5937f0a9f80f72f7f78f38ebd6abe9d65b79d44a817579c6346a46f20c42756291f399d464b4cc994dfc3ec9e2e1a32613d915f92f3c79ebf0f90cd7c64 -AUX xemacs-21.5.34-ar.patch 2238 BLAKE2B 2bcf0ebcec74fcf6c2c10755da8cf5975efd39e4c746f61bf70e914e44787aea27ba4aace239ae93e37865e959d6f832e208ad7700772d1e8da64f07d98791e1 SHA512 f297b854277fab85539ab70814bc0827345ad6e098138f55296d23935a6e5a23bc1d04bade23b4f5202735246ebe86ea82b0f3e4a50df5360761b6d922589d10 -AUX xemacs-21.5.34-as-needed.patch 921 BLAKE2B 18b67b2330cda62bb08fccdba8f71d0213f463aeb7e360b8b7f8cd791718cf89f44999858dea9b51a4c1f94b47b6774addd5a1ab9c36d65036f3890925847bb1 SHA512 3b55683346e6a0cac0b0b21ce21f3bc0ca4d2734307a20ce556cdea084e821d9c9be3c69db329ec1546bc249bfa5cae136e393e858bd53105db9152627514285 -AUX xemacs-21.5.34-autoloads-parallell-make.patch 8290 BLAKE2B c9bd81b499cd94a9551844922cbdf42f7df86a7b1812f3c18f782feb01c2e79fa9d2c4c7a6a115ac1deb8b661be6ac0190bfb8290bca89c83191a5956d82139b SHA512 b8230825ffccd146cd459a806fbeb096948dd8d0cc5ed0884b7441d49db21325e1bfc5c450b758ca1c200bfea4903d5e875d169567028616c54c5a56448bc59c -AUX xemacs-21.5.34-configure-libc-version.patch 957 BLAKE2B ae69bc6a5d3858571fec40d65bd097c65909fdccb282dbc05fe7014e654f73736f742c68ac24b8118c209b05dc399e2d1cc6109f288ae049e48bfee140d71d1f SHA512 e41b6fd7601dbd59c775e62f390e17c194eab9360cce2ae3d03e1b5f4f7fc59080ecd76401eab5211c2f0ab4fea4baf9746e10675ba00f05115067008cce5a6f -AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b -AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176 -AUX xemacs-21.5.34-module-autoloads.patch 5056 BLAKE2B d36535bb6ea75d832dae0300be4e46af7cfb5a657b4ab888337a9b22b66e489a1e2d7a45ca680c1e79b7a7752d0761d9b2324748a6322575fb806496de28d35e SHA512 875b9a59a77174a1c591e54cf70fd1b07d2dc36e2591209a4335c74c89911a06230ebef38d53dab8b2de95e3177253af54dffc3e8b107f4dbce64f5063d447f6 -AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765 -AUX xemacs-21.5.34-no-lock-on-finder-inf.patch 3946 BLAKE2B 195cb81df5ff7aecdb5f616178388a620d05e41975697df238928c2209a15652762aefb461eb681e3b6eb0f1736127d45101b6da478d2bb01d7b0735d0a94329 SHA512 754031e82c4c5236a3119973ee9d6635fc93a1d5b27eb4ae1ada2bf06ae45fbd306f00dc3bd8fbd1df9b855b1b031b24801bf1ba4c6f5e8f66903b151a3d0781 -AUX xemacs-21.5.34-process-test-qa.patch 501 BLAKE2B 11130d14b564181e35820acd99266e2fb8ba18b742f993ac6161d6b6cc04b8a14f92f4ddd8f21912e1521db88b8b6df0efa47df5dfd2cb1fe0bc20338d9553fa SHA512 03676ffa352871e278cf1cffb8bdc1e1c9052b49517d4009079734b5ff1de647e9808fb4c8a620ab9a8ec5dcbe02a454df0e11ef1f9e7867014c8fec830c90f5 -AUX xemacs-21.5.34-strsignal.patch 4675 BLAKE2B 09297a6e4979fdcf36fa7807072236ceebff1cfbee01c6d5034b93c0725833fbfe1da0488eb4e9d588ed0c49356835310989cdd2bfa819f5ad94a5a13378e4d2 SHA512 c5eb3a7e25b4ede9046b00b8d949fbdc07a430bec1095906888c3361a4b354ab6625353c168f3544a65c77226ae6f7762f07850a97087a0ac75b2556b1b661b2 AUX xemacs-21.5.35-configure.patch 1305 BLAKE2B 3625857381ed9113dcf92cfc89f70fb70d0a64267b7b2e006f3c3c495995ef1d5edd3c8ba63863b9ca678a83bebfe49febb0d6a67ad8e770bfa07feece0a598a SHA512 5556a8e8e9940177aa674e9d47f1bc00f8af90467c2d7bcdbd8820f0723de3b945eb9491961c041bbd7c66b39228e1996f3212931e8e2823c5f83e125ceb2fc9 AUX xemacs-21.5.35-mule-tests.patch 6312 BLAKE2B 0caee1f8f037128c9b781d6885e8e8a18cdab4280d9f05f68e73ddad9e52e7606ea60fd4a9bdda8d7ab57608fe88163e2d195adf096c3fa25e156545fa67c12f SHA512 0e6db8ca4061ae2493ce99c745b50336b3f3d05cb76000f63eb829a1befba293dbe8e9d88466f5e6849d7584253cfd1ac9edf4be7bf18ace13a8db5a1efa5c6d AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4eaa23c301b5d25a8c334971a1d89f8cfa551dce909891edaac6a7df956c912396fc8cfb88a720a6b SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69 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 EBUILD xemacs-21.4.24-r10.ebuild 7210 BLAKE2B d4ba5640df0f01408a3fa3ab1f345a570c8d525a6a4df8ec8014527418d1b6e43e14813404c44d7882b8c274c620a232162c19194bc8e78c2157cd78cfa8f2ad SHA512 078425d7ca1706520fca3025dad14cd31e3f4d1161192f78945cd749b55dca2634791b180bae2cd5e0bec86020b6a18af920f56e75e63b1a5ad7de640259453a EBUILD xemacs-21.4.24-r9.ebuild 7113 BLAKE2B b0cff6b002ee49f80b289e810c7f46c6864ccc60e7064a27857df148246999cb7c892a04bbf7e4d3cc37d55e49eb44bbf5a79fdb3d16983bbb3c5f4a01418e72 SHA512 1bf2721acc322fd1db5291ba54e43d0892ac5a925e88d7a69cc055cb7819d3ce341aef9e0a722ce329bcbb18f7cbc4380731a52c016b691f8382e33d21b0659d -EBUILD xemacs-21.5.34-r12.ebuild 7398 BLAKE2B 164e4216ee89823cceaa87e264b44d195704e43d121364d4fee887ab16dceb7fc591dbeafd0ec4a748381ea870847c6bc197d6584656d5fb5b637ddf967fd5ea SHA512 74474d406b3b6ac27f52f57abe4b5a77e447a90630780d217efd872998d7a3ec8ac276ca2a6e6a56be89167bd4f8d7d6751ce4bb09d928034fbe3c6788d8fc4d -EBUILD xemacs-21.5.34-r13.ebuild 7502 BLAKE2B cb7e76eec9c8efa4ed54c99576753f1c48f67f0c77fc9a2e123651c68a87804349f70612a1bf7ccd37f71f146477b58db222787e47b477dc2885e61ee368b264 SHA512 f85d415c55d205b1c8368fa0ef86ca5e2267d4dcdd3154539a76539c558ff0238819a5289b26574664ef92d97c87bbd0ed0bdefb8b07a0179012175cf3b85fda EBUILD xemacs-21.5.35.ebuild 7144 BLAKE2B b970e504f65f9b8309bb5024ea3a880f7f46e03836ee8bb71a3a31cfeece0ac57dbe4f56c43893c62c3b42c3423f2a95ceb78d2431fe7eec8fcf2bda0d982e35 SHA512 1383a53fa8f3985b28401209dfdfa61cc6c7e21d61aa40fd32c813f363b5a1427f044d80ccd993cf3431de09785602802a043f6e8e36e8bbabb588380d8c6105 EBUILD xemacs-21.5.9999.ebuild 7071 BLAKE2B 1290e111407fbde37ffac566bb1f6ac552c0ab6970beebaf0d465699c3ddce6fab777ccefe0634fd4eba7033658fdd6f0483c98c86f5041f1594d83cf6a7fa0c SHA512 24359322f293b251529d2ad6f06f4046080990d37a2ea068ca2bc85e4a41b85000b8409fef041de5e2a41313a6d69795c1da9e18b0162fa0c652e69e64371751 MISC metadata.xml 756 BLAKE2B 1237bb18a737c4473990bd73a4a1fdd5788c743867b1f7c6d963f6acd21a7133fbe5b1c0921556a5152ab7f3116e635a6c6087dad15b5d2430a2d742c63a1a05 SHA512 65c0a9a02a9d11bde55cae161344803177203f4868f508c970d87fc7ea7b4f552f63d2e70ad2b1829efb8ff2ca641e1717672976f681ec56ad51dec2eebc8464 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 -} |