From 1534d50aaf24272ec425fa439389ef7e1f7bf174 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 20 Feb 2025 00:15:26 +0000 Subject: gentoo auto-resync : 20:02:2025 - 00:15:26 --- app-editors/Manifest.gz | Bin 14112 -> 14110 bytes app-editors/xemacs/Manifest | 3 +- .../xemacs-21.5.35-delay-fcinit-until-needed.patch | 63 +++++ app-editors/xemacs/xemacs-21.5.35-r7.ebuild | 264 -------------------- app-editors/xemacs/xemacs-21.5.35-r8.ebuild | 265 +++++++++++++++++++++ 5 files changed, 330 insertions(+), 265 deletions(-) create mode 100644 app-editors/xemacs/files/xemacs-21.5.35-delay-fcinit-until-needed.patch delete mode 100644 app-editors/xemacs/xemacs-21.5.35-r7.ebuild create mode 100644 app-editors/xemacs/xemacs-21.5.35-r8.ebuild (limited to 'app-editors') diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index 6d931fbbf6b5..0664f3be0a0e 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index 20125e61738c..a4758852e85f 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -1,6 +1,7 @@ AUX xemacs-21.5.35-batch-segfault.patch 5755 BLAKE2B 87e5099a8ad9810188eae487931e82d4cb473215963bb9869161ba02f9270c444cb2a6f22eff2d5cecb8101379157a9f3edca2cbbb2c5655bfe16f54cfa28c60 SHA512 7c4a001b408d66a69b4f92483a7f3ab53dd4eddf2da8fbe25b9b6dfad9ae2a699ecd94c7eb13980ff3b399211a6551e0541243ae88236fbb47156a7e43fa88ec 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-delay-fcinit-until-needed.patch 2126 BLAKE2B f5eeed624c67767cacf83c6a82f3f2fddc07ae5b0bf738fa1855ba7ef818557fa390c3230ad20540597331f99b4236e8a5643378a6edf4878fdf95a5f78ec822 SHA512 8ad02fb8899cc6853a65c654855f8406cdfdded81c2d22de825b360a39870b67c067f4932ba0213ab7944209b7736cd09b6e010710f5fe7535b18e2a80074393 AUX xemacs-21.5.35-linker-flags.patch 1078 BLAKE2B 32678544c488c2b272503d79f0fed1783c1674b8fe5fd3e9ff6a25a782db561e9a59b1adc9adf2a627894b9b09458c087e670609c88f76d9927bfe1af68a963c SHA512 58b3b055fe1915ef72041832ec930edf7d365a7907d7603ba627379f0736ad7119e8c8ff1fa6b5d46b770760325ea5fd3484e5decb0d47f42ba5095571d46cfb AUX xemacs-21.5.35-misalignment.patch 2383 BLAKE2B e3a1c462b9da8bcf22f8e776b38884c9f3a7e4ae2300a3971794bccd9614b32b345fee6f414eb2a8705c064a4ce2f6ce3ae4e8ca4190b835853e35c7cede31e0 SHA512 2b228668e9365e4a2f7d91e2376bb066271a1f0eb962118d84937a1db31c1f6d60853939e62f56906b1a9d2d3e8fea7dc937b8d695b7f9dea67310d1d39785a8 AUX xemacs-21.5.35-mule-tests.patch 6312 BLAKE2B 0caee1f8f037128c9b781d6885e8e8a18cdab4280d9f05f68e73ddad9e52e7606ea60fd4a9bdda8d7ab57608fe88163e2d195adf096c3fa25e156545fa67c12f SHA512 0e6db8ca4061ae2493ce99c745b50336b3f3d05cb76000f63eb829a1befba293dbe8e9d88466f5e6849d7584253cfd1ac9edf4be7bf18ace13a8db5a1efa5c6d @@ -13,6 +14,6 @@ DIST xemacs-21.5.35-info-handle-compress.patch.xz 7852 BLAKE2B 61b8d3a7d63d76311 DIST xemacs-21.5.35-ootags-boolint.patch.xz 7660 BLAKE2B 9567cebeea7828dd7a207e627c4a21d49ef129ea7cf92defde67c068aab6694d0c7f70d90648b9177cea8b6ea3fc3734e1f65f1821b5e4c820df507bb6d6835b SHA512 f43656a5e4c9781e2250fca7f8750bbc131223f4a252dfdfc6315e06ac578974877ac0bbc695f957ade5a7960c4257b090ee34199965110da28851e58986e985 DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019 EBUILD xemacs-21.5.35-r6.ebuild 7534 BLAKE2B 9b36a46f43c215389dcc77bea0f3fe27c6d0da75756223eb15ea02750af002631da51d9153a1fd64744c7f5d3a8fc45a022378d9877e428a7e848d9ce223bac1 SHA512 71b6bcec57277e36a9b5689fe98a1c23d37e73141d9cc73e9641520cbe3dfd1651bd8413168f8fa88597a467c505c77c189a5e530711fd6852f96940c49f7046 -EBUILD xemacs-21.5.35-r7.ebuild 7588 BLAKE2B 25c7077f33650fe3b4ec6e435d2c831d51ecc90f933af768a234d8495be06d2e0b8f2cfa958dc6fa62b20e3695fbb36a3e926854ff98bca6d1459300dbb417eb SHA512 fd9d556957a257f01c0494134468d745b42f047b6e4a4241bbb404d06f016dbdc36a049f8ac571ee3c88a725724a21e7d3f1b01bdc88f1425f0155507d068c9f +EBUILD xemacs-21.5.35-r8.ebuild 7647 BLAKE2B 1f4f62680511c26e40551a7345f35985d09f8cfec3ef410a5f38e1c41e5dbb3c49d55cd3f380434bdbf6e908f8c27c83330859b428ceca81ee189fa92b9b78d7 SHA512 d5b1c0e49020bd6ea1361acab2199d77d6556b39a385337d032b03c359f934dc2376f2e14affdc3ef659f870dfea4ff8d34bf421a5a6679b4ebcf9a29da74124 EBUILD xemacs-21.5.9999.ebuild 7039 BLAKE2B 3401ac584e443e62e755e64d86b0a0dd4027bec6f807b6a82469da457f42cb95c7ef392bdd609af3e502bc6d8dbd00786eb78fa3710395782ae2f420f2d54e5c SHA512 3e36df884d4548189fa486408dd6990ef0913e4bcd47f2d2f2ca1d1022e882e277108c555a793326787b10809bd38fee282d9f5d6b007e6cf8c24da507a1b722 MISC metadata.xml 493 BLAKE2B c7a32db428883c28b8ddf1aab3e899d2ce022a7b61eed05dd16a6152bf5f525e5e32a90ff4c8362b5dc49f5a262f0f21bd29425f9bc16ba5d1d1fcd9b3b85de2 SHA512 55a343e9e8713b1167034409dce6f5729d1818ef20aa4164980d0f25e7d929d3bb7772968fbad30cd01973eb7d6a3bafc491b60070a3ab41238fe032e4e2170d diff --git a/app-editors/xemacs/files/xemacs-21.5.35-delay-fcinit-until-needed.patch b/app-editors/xemacs/files/xemacs-21.5.35-delay-fcinit-until-needed.patch new file mode 100644 index 000000000000..c7e8600a635e --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-delay-fcinit-until-needed.patch @@ -0,0 +1,63 @@ +# HG changeset patch +# User Aidan Kehoe +# Date 1739950047 0 +# Wed Feb 19 07:27:27 2025 +0000 +# Node ID 10e8e0fb778fdfcace7e2257d1f1cd0a74446e66 +# Parent b2a7a1a58d1fba872a100db28ba45ddc6239cfeb +Delay calls to FcInit() at startup until an XFT font is actually opened. + +src/ChangeLog addition: + +2025-02-19 Aidan Kehoe + + Delay calls to FcInit() until + lwlib-fonts.c:xft_open_font_by_name() or + fontcolor-xlike-inc.c:xft_find_charset_font(), avoiding updating + out-of-tree cache files at build time, something Gentoo does not + like. Thank you for the bug report, Mats Lidell. + * emacs.c (main_1): + Remove the call to reinit_vars_of_font_mgr() here. + * font-mgr.c (reinit_vars_of_font_mgr): Removed. All it did was + call FcInit() basically directly after pdump_load(), for which + there is no need, reasonable to delay until we open an X11 device. + * symsinit.h: + Remove its declaration. + +diff -r b2a7a1a58d1f -r 10e8e0fb778f src/emacs.c +--- a/src/emacs.c Wed Feb 19 06:13:45 2025 +0000 ++++ b/src/emacs.c Wed Feb 19 07:27:27 2025 +0000 +@@ -2235,9 +2235,6 @@ + #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) + reinit_vars_of_gui_x (); + #endif +-#ifdef HAVE_XFT +- reinit_vars_of_font_mgr (); +-#endif + #endif /* HAVE_X_WINDOWS */ + + reinit_vars_of_mule_coding (); +diff -r b2a7a1a58d1f -r 10e8e0fb778f src/font-mgr.c +--- a/src/font-mgr.c Wed Feb 19 06:13:45 2025 +0000 ++++ b/src/font-mgr.c Wed Feb 19 07:27:27 2025 +0000 +@@ -1439,9 +1439,4 @@ + Vxlfd_font_name_regexp = make_xlfd_font_regexp(); + } + +-void +-reinit_vars_of_font_mgr (void) +-{ +- FcInit (); +-} +- ++/* font-mgr.c ends here */ +diff -r b2a7a1a58d1f -r 10e8e0fb778f src/symsinit.h +--- a/src/symsinit.h Wed Feb 19 06:13:45 2025 +0000 ++++ b/src/symsinit.h Wed Feb 19 07:27:27 2025 +0000 +@@ -419,7 +419,6 @@ + void vars_of_font_lock (void); + void reinit_vars_of_font_lock (void); + void vars_of_font_mgr (void); +-void reinit_vars_of_font_mgr (void); + void vars_of_frame (void); + void vars_of_frame_gtk (void); + void vars_of_frame_mswindows (void); diff --git a/app-editors/xemacs/xemacs-21.5.35-r7.ebuild b/app-editors/xemacs/xemacs-21.5.35-r7.ebuild deleted file mode 100644 index e0cc1c23695a..000000000000 --- a/app-editors/xemacs/xemacs-21.5.35-r7.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2025 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 - https://dev.gentoo.org/~matsl/${P}-ootags-boolint.patch.xz - https://dev.gentoo.org/~matsl/${P}-info-handle-compress.patch.xz - 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 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:= ) - 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 ) ) ) - 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" - -BDEPEND="sys-apps/texinfo" - -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 "${FILESDIR}/${P}-which.patch" - eapply "${FILESDIR}/${P}-misalignment.patch" - eapply "${FILESDIR}/${P}-va_args.patch" - eapply "${FILESDIR}/${P}-linker-flags.patch" - eapply "${WORKDIR}/${P}-ootags-boolint.patch" - eapply "${FILESDIR}/${P}-unknown-command-test.patch" - eapply "${WORKDIR}/${P}-info-handle-compress.patch" - eapply "${FILESDIR}/${P}-batch-segfault.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 - - 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 - - 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" - - 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.35-r8.ebuild b/app-editors/xemacs/xemacs-21.5.35-r8.ebuild new file mode 100644 index 000000000000..abd1600b2156 --- /dev/null +++ b/app-editors/xemacs/xemacs-21.5.35-r8.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2025 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 + https://dev.gentoo.org/~matsl/${P}-ootags-boolint.patch.xz + https://dev.gentoo.org/~matsl/${P}-info-handle-compress.patch.xz + 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 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:= ) + 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 ) ) ) + 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" + +BDEPEND="sys-apps/texinfo" + +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 "${FILESDIR}/${P}-which.patch" + eapply "${FILESDIR}/${P}-misalignment.patch" + eapply "${FILESDIR}/${P}-va_args.patch" + eapply "${FILESDIR}/${P}-linker-flags.patch" + eapply "${WORKDIR}/${P}-ootags-boolint.patch" + eapply "${FILESDIR}/${P}-unknown-command-test.patch" + eapply "${WORKDIR}/${P}-info-handle-compress.patch" + eapply "${FILESDIR}/${P}-batch-segfault.patch" + eapply "${FILESDIR}/${P}-delay-fcinit-until-needed.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 + + 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 + + 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" + + 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 +} -- cgit v1.2.3