From 0c97119fc8982c1a6f367de25542834e4dd6cda4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Mar 2024 12:46:41 +0000 Subject: gentoo auto-resync : 12:03:2024 - 12:46:41 --- app-editors/xemacs/Manifest | 4 +- .../xemacs-21.5.35-configure-libc-version.patch | 73 ++++++ app-editors/xemacs/xemacs-21.5.35-r1.ebuild | 258 +++++++++++++++++++++ app-editors/xemacs/xemacs-21.5.9999.ebuild | 14 +- 4 files changed, 345 insertions(+), 4 deletions(-) create mode 100644 app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch create mode 100644 app-editors/xemacs/xemacs-21.5.35-r1.ebuild (limited to 'app-editors/xemacs') diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index 1ba5a61ae436..e10009cd6a22 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -4,6 +4,7 @@ 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.35-configure-libc-version.patch 2169 BLAKE2B c3c6e7717971217f5a141ea6904193761a943d0656158f863c054f09858518f96975782dcb67a3bf0f4ef2bc29cc0b656198a28623043a1cbeb78bea0c6d2c1c SHA512 b386a92a474012e5583bc4fff7a958e1ae81aee90fc4c095c49e637bf4e35e8dfb90ea2ab1cd91190739ac975f5994f4465db56b150d0017dedff3ab3dd84a66 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 @@ -12,6 +13,7 @@ DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e54 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.35-r1.ebuild 7273 BLAKE2B 07f17467fdbd52bc0577f742ec1ee6ef194833c9ce75d8eeeae936add5e39010906a399a010da845a1a8bf0e51594fdd7d958047ff7e0af7a946dc7603744c02 SHA512 37c322efb7c031215b9821353e753821323d872d813136851c821632d0f763d799b42f1ef234a9cc7ab60df15cba9a6f0c73db5713c0b322ac7737e7fce45a60 EBUILD xemacs-21.5.35.ebuild 7144 BLAKE2B b970e504f65f9b8309bb5024ea3a880f7f46e03836ee8bb71a3a31cfeece0ac57dbe4f56c43893c62c3b42c3423f2a95ceb78d2431fe7eec8fcf2bda0d982e35 SHA512 1383a53fa8f3985b28401209dfdfa61cc6c7e21d61aa40fd32c813f363b5a1427f044d80ccd993cf3431de09785602802a043f6e8e36e8bbabb588380d8c6105 -EBUILD xemacs-21.5.9999.ebuild 7071 BLAKE2B 1290e111407fbde37ffac566bb1f6ac552c0ab6970beebaf0d465699c3ddce6fab777ccefe0634fd4eba7033658fdd6f0483c98c86f5041f1594d83cf6a7fa0c SHA512 24359322f293b251529d2ad6f06f4046080990d37a2ea068ca2bc85e4a41b85000b8409fef041de5e2a41313a6d69795c1da9e18b0162fa0c652e69e64371751 +EBUILD xemacs-21.5.9999.ebuild 7226 BLAKE2B 4f866ff2d71e3ea978dd3ab73a11b0c82578b94d37146ffd44ff81f6b57107ac4a73e789fa40ea78b3f1c85ed3bb14a21d2c0b931c51898a430e43e6c74a3aa6 SHA512 991f33a985eedf8bbdaf688639c3d2fb73595fac7b16527379042ba4fd921583b6dc5957cd6ae083d8bb1766b4741a78103018e12b0f894022b5c75a5a03e9d5 MISC metadata.xml 756 BLAKE2B 1237bb18a737c4473990bd73a4a1fdd5788c743867b1f7c6d963f6acd21a7133fbe5b1c0921556a5152ab7f3116e635a6c6087dad15b5d2430a2d742c63a1a05 SHA512 65c0a9a02a9d11bde55cae161344803177203f4868f508c970d87fc7ea7b4f552f63d2e70ad2b1829efb8ff2ca641e1717672976f681ec56ad51dec2eebc8464 diff --git a/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch new file mode 100644 index 000000000000..e744d3952b10 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch @@ -0,0 +1,73 @@ +diff -r 3761ed745bc6 configure.ac +--- a/configure.ac Sat Mar 02 17:26:00 2024 +0100 ++++ b/configure.ac Fri Mar 08 22:25:23 2024 +0100 +@@ -2192,7 +2192,6 @@ + + compiler_version="" + gcc_compiler_specs="" +-libc_version="" + + AC_MSG_CHECKING([for compiler version information]) + +@@ -2255,53 +2254,6 @@ + fi + AC_MSG_RESULT([$compiler_version]) + +-AC_MSG_CHECKING(for standard C library version information) +- +-case "$ac_cv_build" in +- *-*-linux*) +- dnl #### who would ever _not_ be running the distro's libc? +- dnl Maybe it would be better to get/augment this info with ldd? +- if test -f /etc/redhat-release ; then +- libc_version=`rpm -q glibc` +- elif test -f /etc/debian_version ; then +- libc_version=`dpkg-query --showformat='${version}' --show libc6` +- libc_version="GNU libc $libc_version (Debian)" +- dnl need SuSE et al checks here... +- 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,'` +- fi +- ;; +- +- *-*-aix*) +- libc_version="bos.rte.libc `lslpp -Lqc bos.rte.libc | cut -f3 -d:`" +- ;; +- +- *-*-solaris*) +- libc=`pkginfo -l SUNWcsl | grep VERSION: | awk '{print $2}'` +- libc_version="SUNWcsl $libc" +- +- ;; +- +- mips-sgi-irix*) +- libc_version="IRIX libc `uname -sRm`" +- ;; +- +- alpha*-dec-osf*) +- dnl Another ugly case +- (cd /usr/.smdb.; +- libc_version=` grep -h libc.so *.inv | awk '$9 == "f" {print $12}' | tr '\n' ','` +- ) +- ;; +-esac +- +-dnl Awww, shucks. +-if test -z "libc_version"; then +- libc_version="detection failed (please report this)" +-fi +-AC_MSG_RESULT([$libc_version]) +- + dnl --------------------------------------------------------- + dnl These directories are used to search for include subdirs. + dnl --------------------------------------------------------- +@@ -6122,7 +6074,6 @@ + echo " WARNING: CC and XEMACS_CC mismatched; check CFLAGS carefully." + fi + fi +-echo " libc version: $libc_version" + echo " Relocating allocator for buffers: $with_rel_alloc" + echo " + Package Search (a 'root' contains '{xemacs,mule,site}-packages'):" diff --git a/app-editors/xemacs/xemacs-21.5.35-r1.ebuild b/app-editors/xemacs/xemacs-21.5.35-r1.ebuild new file mode 100644 index 000000000000..505fb03625a3 --- /dev/null +++ b/app-editors/xemacs/xemacs-21.5.35-r1.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2024 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 freewnn 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/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 + 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 "${FILESDIR}/${P}-configure-libc-version.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} $(use_with freewnn 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 + + if use debug ; then + myconf="${myconf} --with-debug" + # bug #924339 + append-flags -fno-strict-aliasing + else + myconf="${myconf} --with-optimization --with-cflags-debugging=" + fi + + use bignum && myconf="${myconf} --with-bignum=openssl" || + myconf="${myconf} --with-bignum=no" + + 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 \ + --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 +} diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild index 15945ea32285..172643503b1d 100644 --- a/app-editors/xemacs/xemacs-21.5.9999.ebuild +++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with position independent code @@ -6,7 +6,7 @@ EAPI=8 -inherit flag-o-matic xdg-utils desktop +inherit flag-o-matic xdg-utils desktop autotools DESCRIPTION="highly customizable open source text editor and application development system" HOMEPAGE="https://www.xemacs.org/" @@ -64,9 +64,12 @@ src_prepare() { use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ find "${S}"/lisp -name '*.elc' -exec rm {} \; || die eapply "${FILESDIR}/${PN}-21.5.35-mule-tests.patch" + eapply "${FILESDIR}/${PN}-21.5.35-configure-libc-version.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. @@ -155,8 +158,13 @@ src_configure() { myconf="${myconf} --without-database" fi - use debug && myconf="${myconf} --with-debug" || + if use debug ; then + myconf="${myconf} --with-debug" + # bug #924339 + append-flags -fno-strict-aliasing + else myconf="${myconf} --with-optimization --with-cflags-debugging=" + fi use bignum && myconf="${myconf} --with-bignum=openssl" || myconf="${myconf} --with-bignum=no" -- cgit v1.2.3