commit:     f209f6283f44692afafea6933296fb65730bd465
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 20:08:32 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 20:10:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f209f628

app-editors/emacs: Fix build with mksh, fix for autoconf-2.72

Closes: https://bugs.gentoo.org/930502
Closes: https://bugs.gentoo.org/930086
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/Manifest              |   4 +
 app-editors/emacs/emacs-26.3-r18.ebuild | 379 +++++++++++++++++++
 app-editors/emacs/emacs-27.2-r16.ebuild | 445 +++++++++++++++++++++++
 app-editors/emacs/emacs-28.2-r12.ebuild | 540 +++++++++++++++++++++++++++
 app-editors/emacs/emacs-29.3-r2.ebuild  | 627 ++++++++++++++++++++++++++++++++
 5 files changed, 1995 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 488bad4ae26d..6beaca41db53 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -2,14 +2,18 @@ DIST emacs-18.59-patches-15.tar.xz 34104 BLAKE2B 
9d14004d5188ec0ffe11099ae1beb43
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B 
d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b
 SHA512 
03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 DIST emacs-26.3-patches-6.tar.xz 6264 BLAKE2B 
0973df2f34d623a5478a01ab18c80d38e864d7bfb15bc5d3dac3ecb31911eb9edfc622f5ed407d9f418ed6d85e96d5881ffb53a94766aec144a3089ac1332bbf
 SHA512 
b9c833ccd0505f2b78e30c17b43549fcaca3bc767b18e5260160a3aa7063504030e58e848a78f83e76ace7d64db13bfbc69281c3eab9c6e413c3adef06803c9d
 DIST emacs-26.3-patches-7.tar.xz 6724 BLAKE2B 
df984126b09099b625ae4b2e8eae0f38dcea0b1395752924a1f19beab1f2dfe46e04af74e0cc4c1f5893f4f67bbdcbc5c47852e72fc5e6bea39538c06d9bec98
 SHA512 
22d864713b60ddc535e815c0c24161dbf35bf0a8df8ea5f9b57c91a2ff1f659c662247c8ce3be9ddef361f3608269e5099b1ef98a344e20427ec23f58155692a
+DIST emacs-26.3-patches-8.tar.xz 7404 BLAKE2B 
507533497028958c797ded16343bc381c933660c5d0c9734ed41215f87ff72bad4e828a7237839eb4efdfee67be4fef943fc770d62f1426ad255909e068c01d6
 SHA512 
3ea0797c746eb48a893cbb77783d91d1c93260755473d0216ef19cf0811be3253664b7ccb664e20593bb95cd7f68e5f284e865349303b29581150fdb694ddf39
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-7.tar.xz 12356 BLAKE2B 
8d991bd3e87d2fc0086b535d481dbe8399e42d15b21417d19341c5ef8426c65cb471f23eb6e41067750a1ad6dced8cb7b2fd4a6b34bd911913ccfe858e9257f9
 SHA512 
285c0ca69fc5c7fd398d4ca0a8c5a2a4412a858504445c415cb6eeca9eb170680f6d9bf0dfcd2ae4925e75f01d1d1858c194760a22ee98ad16ebcc347fa588ec
 DIST emacs-27.2-patches-8.tar.xz 13884 BLAKE2B 
0adfac5586134eea17ed3f333fa21f70d93ecb4569d2bcb06959236c14e7519cd64594859cb6abac9635526b737eee8aaaa8f40915213d2ce671d5eb3464ce5e
 SHA512 
0b50b3c36bdeb678bd08f31fc37ecf96491522cde4b74b8c1b657e52e269077e2f87beaa2a60c82986680e48f4c62375c6a53e9891bcb7a77720d6a976027734
+DIST emacs-27.2-patches-9.tar.xz 14560 BLAKE2B 
f82ba15bcf4a8c962836150daa59325bea13b51bb32d8271a411bd9bfb32f05245b2b84645e1d73447f14b88432d36e70971c94c730dc1d4e976302ecb9a833f
 SHA512 
01887429273f9b4bad9e4e1320d2e6b7fda636a59dd1b548e79c8956432e24eadfa0dbc6377f40c486eed5fd987c416221106d25ca6ff6be0fbd29c801a17b85
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 DIST emacs-28.2-patches-5.tar.xz 6932 BLAKE2B 
1cf79142b3031d377b5ba56996a41c44801a114e993ed7e93f937fd88cd35cf142fbc8d98c7970984f44df9fd267d8032f9c6e559d69c18c945510b2e93029bd
 SHA512 
9a246680045868029d9f67652d60d0859d44c3f016ba57cae5ba991c138ece39890230ad303220e2558ccca904b2053b691874da04c6529faa0e8e4f6ea4b6f2
 DIST emacs-28.2-patches-6.tar.xz 9068 BLAKE2B 
267f9ade4fb36cdf336c684ceca95fe636cc9ab2f50742442b957504ddaa7a144950926095c75edef5f39cc3dbaf580831129c7004fe906f78b8a97250540c72
 SHA512 
abba35ee23e4f01100b443d2442ed4323a8d67b993f51b1822ce8e369c11e98a44b760a257e6373287975575b40b92046a4157c84d79cff1db0928e28c315a25
+DIST emacs-28.2-patches-7.tar.xz 9768 BLAKE2B 
6ab0a30cfdb1d54ce1b977fc7dcbcd65499eaabeca0abfbefe76fe9825d4c33de46c76e82451ebfb7a380cba8fe1607171898147b56c17fd7618bc3ebe4aeb45
 SHA512 
567b7f85b8e40f8c58252c0632cdb460cc912248fa871eaccaef8df8dad546a3d4c94126db6d53d23375c764b8f6bd9842296292bee46a108a309c4a53aa24d7
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B 
a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552
 SHA512 
a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 DIST emacs-29.2-patches-2.tar.xz 2232 BLAKE2B 
5a74b286a47a03a7b24298fb9da69135485a25351a1451351412825f7b570e9ab40e988e03218eef8b6345124b982a6ea7c67ac03adbb72061e74438a5910836
 SHA512 
efc5855a66b1895145b9eb792c790850f319cdfaf8c03579aecfc51940a3e010d825e68003d218929278c9cbfa7e0039a8244838126e67db15cb52718dddf35c
 DIST emacs-29.2.tar.xz 52162080 BLAKE2B 
d634fbd94a2fde4824daf5d4d44d6f9e9693900af9ebeda75488fd4d14b7f6cd22e0c9fc15a4c73b4b90843aa782dbd698ba0d40c50465eb4b902105cd9e2c2c
 SHA512 
293fdc2387d58dfa506ae1960b05ccdb4c16ec53c4f55a1a6b665a4fe2815cabfad6257f2b62231040889ab3843d56a01ef62fc9efc1118bf833d7773c64820a
 DIST emacs-29.3-patches-1.tar.xz 1552 BLAKE2B 
5f9ddd816b03b4a2fe077cef23d76b0c41e2e7dafac35d0dd718ee406e6e57dcb102223251dddc68280f9f2bd41f5b141cda46dca8ccc78258d5939a84ee1665
 SHA512 
d61dfc6944d58b6ea5749f3089e5c575cf60c8138962aa5c8131274504124505db87489a4d3806e69b646ffffd4c924ef94018c4d7bdcbb2c84322fad6441ffc
+DIST emacs-29.3-patches-2.tar.xz 2304 BLAKE2B 
1005194bc2ed6d9be0cadcf449f4f82c1bcda178e6126f27f8ea0c359344bcf6a9368226a6eaf9d4b655a0c59ed6beecc3130b4409c84bb3ed19911ba22d9e80
 SHA512 
67250b08cf0b1d4f8279987cea19da0838f520c98ae91b16200c8bf5b5e2a171ffdb7c06a266c6f220ec8466a9264af55529dc150b002588937597e328a581d2
 DIST emacs-29.3.tar.xz 52203168 BLAKE2B 
73651c52e508d5341f66659bbaf98e839040239198cb66f62239f489a961794adf837d9a14e9b605f059b7b612803e0ce5998ec47100ba545db642baacdb55ec
 SHA512 
efaecfc46a0b88f61de477d92c08ee592b8838e6c34724151a3b1502efa7ebd4d4837733c694807e6de1ba4b8d37d2ec382c6bb2ed000b67ad8f0e11c7df2a6b

diff --git a/app-editors/emacs/emacs-26.3-r18.ebuild 
b/app-editors/emacs/emacs-26.3-r18.ebuild
new file mode 100644
index 000000000000..7d38b46167c1
--- /dev/null
+++ b/app-editors/emacs/emacs-26.3-r18.ebuild
@@ -0,0 +1,379 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/";
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+       https://dev.gentoo.org/~ulm/emacs/${P}-patches-8.tar.xz";
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm 
gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 
livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd 
+threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets 
zlib"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+       sys-libs/ncurses:0=
+       acl? ( virtual/acl )
+       alsa? ( media-libs/alsa-lib )
+       dbus? ( sys-apps/dbus )
+       games? ( acct-group/gamestat )
+       gpm? ( sys-libs/gpm )
+       !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+       kerberos? ( virtual/krb5 )
+       lcms? ( media-libs/lcms:2 )
+       libxml2? ( >=dev-libs/libxml2-2.2.0 )
+       mailutils? ( net-mail/mailutils[clients] )
+       !mailutils? ( acct-group/mail net-libs/liblockfile )
+       selinux? ( sys-libs/libselinux )
+       ssl? ( net-libs/gnutls:0= )
+       systemd? ( sys-apps/systemd )
+       valgrind? ( dev-debug/valgrind )
+       zlib? ( sys-libs/zlib )
+       gui? ( !aqua? (
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libX11
+               x11-libs/libXext
+               x11-libs/libXfixes
+               x11-libs/libXinerama
+               x11-libs/libXrandr
+               x11-libs/libxcb
+               x11-misc/xbitmaps
+               gsettings? ( >=dev-libs/glib-2.28.6 )
+               gif? ( media-libs/giflib:0= )
+               jpeg? ( media-libs/libjpeg-turbo:0= )
+               png? ( >=media-libs/libpng-1.4:0= )
+               svg? ( >=gnome-base/librsvg-2.0 )
+               tiff? ( media-libs/tiff:= )
+               xpm? ( x11-libs/libXpm )
+               imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+               xft? (
+                       media-libs/fontconfig
+                       media-libs/freetype
+                       x11-libs/libXft
+                       x11-libs/libXrender
+                       cairo? ( >=x11-libs/cairo-1.12.18[X] )
+                       m17n-lib? (
+                               >=dev-libs/libotf-0.9.4
+                               >=dev-libs/m17n-lib-1.5.1
+                       )
+               )
+               gtk? (
+                       x11-libs/gtk+:3
+                       xwidgets? (
+                               net-libs/webkit-gtk:4.1=
+                               x11-libs/libXcomposite
+                       )
+               )
+               !gtk? (
+                       motif? (
+                               >=x11-libs/motif-2.3:0
+                               x11-libs/libXpm
+                               x11-libs/libXmu
+                               x11-libs/libXt
+                       )
+                       !motif? (
+                               Xaw3d? (
+                                       x11-libs/libXaw3d
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               )
+                               !Xaw3d? ( athena? (
+                                       x11-libs/libXaw
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               ) )
+                       )
+               )
+       ) )"
+
+DEPEND="${RDEPEND}
+       gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="virtual/pkgconfig
+       gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+PATCHES=("${WORKDIR}/patch")
+
+# Suppress false positive QA warnings #898304
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{set,get}_state MIN )
+
+src_prepare() {
+       default
+
+       # Fix filename reference in redirected man page
+       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+       AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+       strip-flags
+       filter-flags -pie                                       #526948
+
+       if use ia64; then
+               replace-flags "-O[2-9]" -O1             #325373
+       else
+               replace-flags "-O[3-9]" -O2
+       fi
+
+       local myconf
+
+       if use alsa; then
+               use sound || ewarn \
+                       "USE flag \"alsa\" overrides \"-sound\"; enabling sound 
support."
+               myconf+=" --with-sound=alsa"
+       else
+               myconf+=" --with-sound=$(usex sound oss)"
+       fi
+
+       if ! use gui; then
+               einfo "Configuring to build without window system support"
+               myconf+=" --without-x --without-ns"
+       elif use aqua; then
+               einfo "Configuring to build with Nextstep (Macintosh Cocoa) 
support"
+               myconf+=" --with-ns --disable-ns-self-contained"
+               myconf+=" --without-x"
+       else
+               myconf+=" --with-x --without-ns"
+               myconf+=" --without-gconf"
+               myconf+=" $(use_with gsettings)"
+               myconf+=" $(use_with toolkit-scroll-bars)"
+               myconf+=" $(use_with gif)"
+               myconf+=" $(use_with jpeg)"
+               myconf+=" $(use_with png)"
+               myconf+=" $(use_with svg rsvg)"
+               myconf+=" $(use_with tiff)"
+               myconf+=" $(use_with xpm)"
+               myconf+=" $(use_with imagemagick)"
+
+               if use xft; then
+                       myconf+=" --with-xft"
+                       myconf+=" $(use_with cairo)"
+                       myconf+=" $(use_with m17n-lib libotf)"
+                       myconf+=" $(use_with m17n-lib m17n-flt)"
+               else
+                       myconf+=" --without-xft"
+                       myconf+=" --without-cairo"
+                       myconf+=" --without-libotf --without-m17n-flt"
+                       use cairo && ewarn \
+                               "USE flag \"cairo\" has no effect if \"xft\" is 
not set."
+                       use m17n-lib && ewarn \
+                               "USE flag \"m17n-lib\" has no effect if \"xft\" 
is not set."
+               fi
+
+               local f line
+               if use gtk; then
+                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
+                       while read line; do ewarn "${line}"; done <<-EOF
+                               Your version of GTK+ will have problems with 
closing open
+                               displays. This is no problem if you just use 
one display, but
+                               if you use more than one and close one of them 
Emacs may crash.
+                               See 
<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+                               
<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+                               If you intend to use more than one display, 
then it is strongly
+                               recommended that you compile Emacs with the 
Athena/Lucid or the
+                               Motif toolkit instead.
+                       EOF
+                       myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+                       for f in motif Xaw3d athena; do
+                               use ${f} && ewarn \
+                                       "USE flag \"${f}\" has no effect if 
\"gtk\" is set."
+                       done
+               elif use motif; then
+                       einfo "Configuring to build with Motif toolkit"
+                       myconf+=" --with-x-toolkit=motif"
+                       for f in Xaw3d athena; do
+                               use ${f} && ewarn \
+                                       "USE flag \"${f}\" has no effect if 
\"motif\" is set."
+                       done
+               elif use athena || use Xaw3d; then
+                       einfo "Configuring to build with Athena/Lucid toolkit"
+                       myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d 
xaw3d)"
+               else
+                       einfo "Configuring to build with no toolkit"
+                       myconf+=" --with-x-toolkit=no"
+               fi
+               ! use gtk && use xwidgets && ewarn \
+                       "USE flag \"xwidgets\" has no effect if \"gtk\" is not 
set."
+       fi
+
+       econf \
+               --program-suffix="-${EMACS_SUFFIX}" \
+               --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+               --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+               --localstatedir="${EPREFIX}"/var \
+               
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+               --without-compress-install \
+               --without-hesiod \
+               --without-pop \
+               --with-file-notification=$(usev inotify || usev gfile || echo 
no) \
+               $(use_enable acl) \
+               $(use_with dbus) \
+               $(use_with dynamic-loading modules) \
+               $(use_with games gameuser ":gamestat") \
+               $(use_with gpm) \
+               $(use_with kerberos) $(use_with kerberos kerberos5) \
+               $(use_with lcms lcms2) \
+               $(use_with libxml2 xml2) \
+               $(use_with mailutils) \
+               $(use_with selinux) \
+               $(use_with ssl gnutls) \
+               $(use_with systemd libsystemd) \
+               $(use_with threads) \
+               $(use_with wide-int) \
+               $(use_with zlib) \
+               ${myconf}
+}
+
+src_compile() {
+       export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+
+       # Disable sandbox when dumping. For the unbelievers, see bug #131505
+       emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install() {
+       emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+       mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+       mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+       mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || 
die
+
+       # dissuade Portage from removing our dir file #257260
+       touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+       docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+       # movemail must be setgid mail
+       if ! use mailutils; then
+               fowners root:mail 
/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+               fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+       fi
+
+       # avoid collision between slots, see bug #169033 e.g.
+       rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+       rm -rf "${ED}"/usr/share/{applications,icons} || die
+       rm -rf "${ED}/usr/$(get_libdir)" || die
+       rm -rf "${ED}"/var || die
+
+       # remove unused <version>/site-lisp dir
+       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+       # remove COPYING file (except for etc/COPYING used by describe-copying)
+       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+       if use systemd; then
+               insinto /usr/lib/systemd/user
+               sed -e "/^##/d" \
+                       -e 
"/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+                       -e 
"/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+                       etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+               assert
+       fi
+
+       if use gzip-el; then
+               # compress .el files when a corresponding .elc exists
+               find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+                       -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip 
-9n
+               assert "gzip .el failed"
+       fi
+
+       local cdir
+       if use source; then
+               cdir="/usr/share/emacs/${FULL_VERSION}/src"
+               insinto "${cdir}"
+               # This is not meant to install all the source -- just the
+               # C source you might find via find-function
+               doins src/*.{c,h,m}
+       elif has installsources ${FEATURES}; then
+               cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+       fi
+
+       sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || 
die
+       X
+       ;;; ${EMACS_SUFFIX} site-lisp configuration
+       X
+       (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+       Y  (setq find-function-C-source-directory
+       Y       "${EPREFIX}${cdir}")
+       X  (let ((path (getenv "INFOPATH"))
+       X       (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+       X       (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+       X    (and path
+       X        ;; move Emacs Info dir before anything else in /usr/share
+       X        (let* ((p (cons nil (split-string path ":" t))) (q p))
+       X          (while (and (cdr q) (not (string-match re (cadr q))))
+       X            (setq q (cdr q)))
+       X          (setcdr q (cons dir (delete dir (cdr q))))
+       X          (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+       EOF
+       elisp-site-file-install "${T}/${SITEFILE}" || die
+
+       dodoc README BUGS CONTRIBUTE
+
+       if use gui && use aqua; then
+               dodir /Applications/Gentoo
+               rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+               mv nextstep/Emacs.app \
+                       "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+       fi
+
+       local DOC_CONTENTS="You can set the version to be started by
+               /usr/bin/emacs through the Emacs eselect module, which also
+               redirects man and info pages. Therefore, several Emacs versions 
can
+               be installed at the same time. \"man emacs.eselect\" for 
details.
+               \\n\\nIf you upgrade from a previous major version of Emacs, 
then
+               it is strongly recommended that you use app-admin/emacs-updater
+               to rebuild all byte-compiled elisp files of the installed Emacs
+               packages."
+       if use gui; then
+               DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+                       Installing media-fonts/font-adobe-{75,100}dpi on the X 
server's
+                       machine would satisfy basic Emacs requirements under 
X11.
+                       See also 
https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+                       for how to enable anti-aliased fonts."
+               use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+                       \"${EPREFIX}/Applications/Gentoo\". You may want to 
copy or
+                       symlink it into /Applications by yourself."
+       fi
+       readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+       # verify that the PM hasn't removed our Info directory index #257260
+       local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+       [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+       elisp-site-regen
+       readme.gentoo_print_elog
+
+       if use livecd; then
+               # force an update of the emacs symlink for the livecd/dvd,
+               # because some microemacs packages set it with USE=livecd
+               eselect emacs update
+       else
+               eselect emacs update ifunset
+       fi
+}
+
+pkg_postrm() {
+       elisp-site-regen
+       eselect emacs update ifunset
+}

diff --git a/app-editors/emacs/emacs-27.2-r16.ebuild 
b/app-editors/emacs/emacs-27.2-r16.ebuild
new file mode 100644
index 000000000000..62a360a471c3
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2-r16.ebuild
@@ -0,0 +1,445 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git";
+       EGIT_BRANCH="emacs-27"
+       EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+       S="${EGIT_CHECKOUT_DIR}"
+       SLOT="${PV%%.*}-vcs"
+else
+       # FULL_VERSION keeps the full version number, which is needed in
+       # order to determine some path information correctly for copy/move
+       # operations later on
+       FULL_VERSION="${PV%%_*}"
+       SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+       S="${WORKDIR}/emacs-${FULL_VERSION}"
+       # PV can be in any of the following formats:
+       # 27.1                 released version (slot 27)
+       # 27.1_rc1             upstream release candidate (27)
+       # 27.0.9999            live ebuild (slot 27-vcs)
+       # 27.0.90              upstream prerelease snapshot (27-vcs)
+       # 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+       if [[ ${PV} == *_pre* ]]; then
+               SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz";
+               S="${WORKDIR}/emacs"
+       elif [[ ${PV//[0-9]} != "." ]]; then
+               
SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz";
+       fi
+       # Patchset from proj/emacs-patches.git
+       SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-9.tar.xz";
+       PATCHES=("${WORKDIR}/patch")
+       SLOT="${PV%%.*}"
+       [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/";
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm 
gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms 
libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg 
systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm 
xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+       sys-libs/ncurses:0=
+       acl? ( virtual/acl )
+       alsa? ( media-libs/alsa-lib )
+       dbus? ( sys-apps/dbus )
+       games? ( acct-group/gamestat )
+       gmp? ( dev-libs/gmp:0= )
+       gpm? ( sys-libs/gpm )
+       !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+       json? ( dev-libs/jansson:= )
+       kerberos? ( virtual/krb5 )
+       lcms? ( media-libs/lcms:2 )
+       libxml2? ( >=dev-libs/libxml2-2.2.0 )
+       mailutils? ( net-mail/mailutils[clients] )
+       !mailutils? ( acct-group/mail net-libs/liblockfile )
+       selinux? ( sys-libs/libselinux )
+       ssl? ( net-libs/gnutls:0= )
+       systemd? ( sys-apps/systemd )
+       valgrind? ( dev-debug/valgrind )
+       zlib? ( sys-libs/zlib )
+       gui? ( !aqua? (
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libX11
+               x11-libs/libXext
+               x11-libs/libXfixes
+               x11-libs/libXinerama
+               x11-libs/libXrandr
+               x11-libs/libxcb
+               x11-misc/xbitmaps
+               gsettings? ( >=dev-libs/glib-2.28.6 )
+               gif? ( media-libs/giflib:0= )
+               jpeg? ( media-libs/libjpeg-turbo:0= )
+               png? ( >=media-libs/libpng-1.4:0= )
+               svg? ( >=gnome-base/librsvg-2.0 )
+               tiff? ( media-libs/tiff:= )
+               xpm? ( x11-libs/libXpm )
+               imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+               xft? (
+                       media-libs/fontconfig
+                       media-libs/freetype
+                       x11-libs/libXrender
+                       cairo? ( >=x11-libs/cairo-1.12.18[X] )
+                       !cairo? ( x11-libs/libXft )
+                       harfbuzz? ( media-libs/harfbuzz:0= )
+                       m17n-lib? (
+                               >=dev-libs/libotf-0.9.4
+                               >=dev-libs/m17n-lib-1.5.1
+                       )
+               )
+               gtk? (
+                       x11-libs/gtk+:3
+                       xwidgets? (
+                               net-libs/webkit-gtk:4.1=
+                               x11-libs/libXcomposite
+                       )
+               )
+               !gtk? (
+                       motif? (
+                               >=x11-libs/motif-2.3:0
+                               x11-libs/libXpm
+                               x11-libs/libXmu
+                               x11-libs/libXt
+                       )
+                       !motif? (
+                               Xaw3d? (
+                                       x11-libs/libXaw3d
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               )
+                               !Xaw3d? ( athena? (
+                                       x11-libs/libXaw
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               ) )
+                       )
+               )
+       ) )"
+
+DEPEND="${RDEPEND}
+       gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+       virtual/pkgconfig
+       gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+# Suppress false positive QA warnings #898304 #925449
+QA_CONFIG_IMPL_DECL_SKIP=(
+       malloc_set_state malloc_get_state MIN
+       statvfs64 re_set_syntax re_compile_pattern re_search re_match
+)
+
+src_prepare() {
+       if [[ ${PV##*.} = 9999 ]]; then
+               FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ 
\t,)]*\).*/\1/p' \
+                       configure.ac)
+               [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs 
version"
+               einfo "Emacs branch: ${EGIT_BRANCH}"
+               einfo "Commit: ${EGIT_VERSION}"
+               einfo "Emacs version number: ${FULL_VERSION}"
+               [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+                       || die "Upstream version number changed to 
${FULL_VERSION}"
+       fi
+
+       default
+
+       # Fix filename reference in redirected man page
+       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+       AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+       local myconf
+
+       if use alsa; then
+               use sound || ewarn \
+                       "USE flag \"alsa\" overrides \"-sound\"; enabling sound 
support."
+               myconf+=" --with-sound=alsa"
+       else
+               myconf+=" --with-sound=$(usex sound oss)"
+       fi
+
+       if ! use gui; then
+               einfo "Configuring to build without window system support"
+               myconf+=" --without-x --without-ns"
+       elif use aqua; then
+               einfo "Configuring to build with Nextstep (Macintosh Cocoa) 
support"
+               myconf+=" --with-ns --disable-ns-self-contained"
+               myconf+=" --without-x"
+       else
+               myconf+=" --with-x --without-ns"
+               myconf+=" --without-gconf"
+               myconf+=" $(use_with gsettings)"
+               myconf+=" $(use_with toolkit-scroll-bars)"
+               myconf+=" $(use_with gif)"
+               myconf+=" $(use_with jpeg)"
+               myconf+=" $(use_with png)"
+               myconf+=" $(use_with svg rsvg)"
+               myconf+=" $(use_with tiff)"
+               myconf+=" $(use_with xpm)"
+               myconf+=" $(use_with imagemagick)"
+
+               if use xft; then
+                       myconf+=" --with-xft"
+                       myconf+=" $(use_with cairo)"
+                       myconf+=" $(use_with harfbuzz)"
+                       myconf+=" $(use_with m17n-lib libotf)"
+                       myconf+=" $(use_with m17n-lib m17n-flt)"
+               else
+                       myconf+=" --without-xft"
+                       myconf+=" --without-cairo"
+                       myconf+=" --without-libotf --without-m17n-flt"
+                       use cairo && ewarn \
+                               "USE flag \"cairo\" has no effect if \"xft\" is 
not set."
+                       use m17n-lib && ewarn \
+                               "USE flag \"m17n-lib\" has no effect if \"xft\" 
is not set."
+               fi
+
+               local f line
+               if use gtk; then
+                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
+                       while read line; do ewarn "${line}"; done <<-EOF
+                               Your version of GTK+ will have problems with 
closing open
+                               displays. This is no problem if you just use 
one display, but
+                               if you use more than one and close one of them 
Emacs may crash.
+                               See 
<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+                               
<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+                               If you intend to use more than one display, 
then it is strongly
+                               recommended that you compile Emacs with the 
Athena/Lucid or the
+                               Motif toolkit instead.
+                       EOF
+                       myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+                       for f in motif Xaw3d athena; do
+                               use ${f} && ewarn \
+                                       "USE flag \"${f}\" has no effect if 
\"gtk\" is set."
+                       done
+               elif use motif; then
+                       einfo "Configuring to build with Motif toolkit"
+                       myconf+=" --with-x-toolkit=motif"
+                       for f in Xaw3d athena; do
+                               use ${f} && ewarn \
+                                       "USE flag \"${f}\" has no effect if 
\"motif\" is set."
+                       done
+               elif use athena || use Xaw3d; then
+                       einfo "Configuring to build with Athena/Lucid toolkit"
+                       myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d 
xaw3d)"
+               else
+                       einfo "Configuring to build with no toolkit"
+                       myconf+=" --with-x-toolkit=no"
+               fi
+               ! use gtk && use xwidgets && ewarn \
+                       "USE flag \"xwidgets\" has no effect if \"gtk\" is not 
set."
+       fi
+
+       if tc-is-cross-compiler; then
+               # Configure a CBUILD directory when cross-compiling to make 
tools
+               mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+               ECONF_SOURCE="${S}" econf_build --without-all 
--without-x-toolkit
+               popd >/dev/null || die
+               # Don't try to execute the binary for dumping during the build
+               myconf+=" --with-dumping=none"
+       elif use m68k; then
+               # Workaround for https://debbugs.gnu.org/44531
+               myconf+=" --with-dumping=unexec"
+       else
+               myconf+=" --with-dumping=pdumper"
+       fi
+
+       econf \
+               --program-suffix="-${EMACS_SUFFIX}" \
+               --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+               --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+               --localstatedir="${EPREFIX}"/var \
+               
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+               --without-compress-install \
+               --without-hesiod \
+               --without-pop \
+               --with-file-notification=$(usev inotify || usev gfile || echo 
no) \
+               --with-pdumper \
+               $(use_enable acl) \
+               $(use_with dbus) \
+               $(use_with dynamic-loading modules) \
+               $(use_with games gameuser ":gamestat") \
+               $(use_with gmp libgmp) \
+               $(use_with gpm) \
+               $(use_with json) \
+               $(use_with kerberos) $(use_with kerberos kerberos5) \
+               $(use_with lcms lcms2) \
+               $(use_with libxml2 xml2) \
+               $(use_with mailutils) \
+               $(use_with selinux) \
+               $(use_with ssl gnutls) \
+               $(use_with systemd libsystemd) \
+               $(use_with threads) \
+               $(use_with wide-int) \
+               $(use_with zlib) \
+               ${myconf}
+}
+
+src_compile() {
+       export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+
+       if tc-is-cross-compiler; then
+               # Build native tools for compiling lisp etc.
+               emake -C "${S}-build" src
+               emake lib          # Cross-compile dependencies first for 
timestamps
+               # Save native build tools in the cross-directory
+               cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || 
die
+               # Specify the native Emacs to compile lisp
+               emake -C lisp all EMACS="${S}-build/src/emacs"
+       fi
+
+       emake
+}
+
+src_install() {
+       emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+       mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+       mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+       mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || 
die
+
+       # dissuade Portage from removing our dir file #257260
+       touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+       docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+       # movemail must be setgid mail
+       if ! use mailutils; then
+               fowners root:mail 
/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+               fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+       fi
+
+       # avoid collision between slots, see bug #169033 e.g.
+       rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+       rm -rf "${ED}"/usr/share/{applications,icons} || die
+       rm -rf "${ED}/usr/$(get_libdir)" || die
+       rm -rf "${ED}"/var || die
+
+       # remove unused <version>/site-lisp dir
+       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+       # remove COPYING file (except for etc/COPYING used by describe-copying)
+       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+       if use systemd; then
+               insinto /usr/lib/systemd/user
+               sed -e "/^##/d" \
+                       -e 
"/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+                       -e 
"/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+                       etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+               assert
+       fi
+
+       if use gzip-el; then
+               # compress .el files when a corresponding .elc exists
+               find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+                       -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip 
-9n
+               assert "gzip .el failed"
+       fi
+
+       local cdir
+       if use source; then
+               cdir="/usr/share/emacs/${FULL_VERSION}/src"
+               insinto "${cdir}"
+               # This is not meant to install all the source -- just the
+               # C source you might find via find-function
+               doins src/*.{c,h,m}
+       elif has installsources ${FEATURES}; then
+               cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+       fi
+
+       sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || 
die
+       X
+       ;;; ${EMACS_SUFFIX} site-lisp configuration
+       X
+       (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+       Y  (setq find-function-C-source-directory
+       Y       "${EPREFIX}${cdir}")
+       X  (let ((path (getenv "INFOPATH"))
+       X       (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+       X       (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+       X    (and path
+       X        ;; move Emacs Info dir before anything else in /usr/share
+       X        (let* ((p (cons nil (split-string path ":" t))) (q p))
+       X          (while (and (cdr q) (not (string-match re (cadr q))))
+       X            (setq q (cdr q)))
+       X          (setcdr q (cons dir (delete dir (cdr q))))
+       X          (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+       EOF
+       elisp-site-file-install "${T}/${SITEFILE}" || die
+
+       dodoc README BUGS CONTRIBUTE
+
+       if use gui && use aqua; then
+               dodir /Applications/Gentoo
+               rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+               mv nextstep/Emacs.app \
+                       "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+       fi
+
+       local DOC_CONTENTS="You can set the version to be started by
+               /usr/bin/emacs through the Emacs eselect module, which also
+               redirects man and info pages. Therefore, several Emacs versions 
can
+               be installed at the same time. \"man emacs.eselect\" for 
details.
+               \\n\\nIf you upgrade from a previous major version of Emacs, 
then
+               it is strongly recommended that you use app-admin/emacs-updater
+               to rebuild all byte-compiled elisp files of the installed Emacs
+               packages."
+       if use gui; then
+               DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+                       Installing media-fonts/font-adobe-{75,100}dpi on the X 
server's
+                       machine would satisfy basic Emacs requirements under 
X11.
+                       See also 
https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+                       for how to enable anti-aliased fonts."
+               use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+                       \"${EPREFIX}/Applications/Gentoo\". You may want to 
copy or
+                       symlink it into /Applications by yourself."
+       fi
+       tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+               a portable dump file due to being cross-compiled.
+               To create this file at run time, execute the following command:
+               \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+               \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+       readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+       # verify that the PM hasn't removed our Info directory index #257260
+       local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+       [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+       elisp-site-regen
+       readme.gentoo_print_elog
+
+       if use livecd; then
+               # force an update of the emacs symlink for the livecd/dvd,
+               # because some microemacs packages set it with USE=livecd
+               eselect emacs update
+       else
+               eselect emacs update ifunset
+       fi
+}
+
+pkg_postrm() {
+       elisp-site-regen
+       eselect emacs update ifunset
+}

diff --git a/app-editors/emacs/emacs-28.2-r12.ebuild 
b/app-editors/emacs/emacs-28.2-r12.ebuild
new file mode 100644
index 000000000000..8f8896400b0f
--- /dev/null
+++ b/app-editors/emacs/emacs-28.2-r12.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git";
+       EGIT_BRANCH="emacs-28"
+       EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+       S="${EGIT_CHECKOUT_DIR}"
+       SLOT="${PV%%.*}-vcs"
+else
+       # FULL_VERSION keeps the full version number, which is needed in
+       # order to determine some path information correctly for copy/move
+       # operations later on
+       FULL_VERSION="${PV%%_*}"
+       SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+       S="${WORKDIR}/emacs-${FULL_VERSION}"
+       # PV can be in any of the following formats:
+       # 27.1                 released version (slot 27)
+       # 27.1_rc1             upstream release candidate (27)
+       # 27.0.9999            live ebuild (slot 27-vcs)
+       # 27.0.90              upstream prerelease snapshot (27-vcs)
+       # 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+       if [[ ${PV} == *_pre* ]]; then
+               SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz";
+               S="${WORKDIR}/emacs"
+       elif [[ ${PV//[0-9]} != "." ]]; then
+               
SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz";
+       fi
+       # Patchset from proj/emacs-patches.git
+       SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-7.tar.xz";
+       PATCHES=("${WORKDIR}/patch")
+       SLOT="${PV%%.*}"
+       [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/";
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm 
gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos 
lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg 
systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm 
xwidgets zlib"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+       sys-libs/ncurses:0=
+       acl? ( virtual/acl )
+       alsa? ( media-libs/alsa-lib )
+       dbus? ( sys-apps/dbus )
+       games? ( acct-group/gamestat )
+       gmp? ( dev-libs/gmp:0= )
+       gpm? ( sys-libs/gpm )
+       !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+       jit? (
+               sys-devel/gcc:=[jit(-)]
+               sys-libs/zlib
+       )
+       json? ( dev-libs/jansson:= )
+       kerberos? ( virtual/krb5 )
+       lcms? ( media-libs/lcms:2 )
+       libxml2? ( >=dev-libs/libxml2-2.2.0 )
+       mailutils? ( net-mail/mailutils[clients] )
+       !mailutils? ( acct-group/mail net-libs/liblockfile )
+       selinux? ( sys-libs/libselinux )
+       ssl? ( net-libs/gnutls:0= )
+       systemd? ( sys-apps/systemd )
+       valgrind? ( dev-debug/valgrind )
+       zlib? ( sys-libs/zlib )
+       gui? ( !aqua? (
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libX11
+               x11-libs/libXext
+               x11-libs/libXfixes
+               x11-libs/libXinerama
+               x11-libs/libXrandr
+               x11-libs/libxcb
+               x11-misc/xbitmaps
+               gsettings? ( >=dev-libs/glib-2.28.6 )
+               gif? ( media-libs/giflib:0= )
+               jpeg? ( media-libs/libjpeg-turbo:0= )
+               png? ( >=media-libs/libpng-1.4:0= )
+               svg? ( >=gnome-base/librsvg-2.0 )
+               tiff? ( media-libs/tiff:= )
+               xpm? ( x11-libs/libXpm )
+               imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+               xft? (
+                       media-libs/fontconfig
+                       media-libs/freetype
+                       x11-libs/libXrender
+                       cairo? ( >=x11-libs/cairo-1.12.18[X] )
+                       !cairo? ( x11-libs/libXft )
+                       harfbuzz? ( media-libs/harfbuzz:0= )
+                       m17n-lib? (
+                               >=dev-libs/libotf-0.9.4
+                               >=dev-libs/m17n-lib-1.5.1
+                       )
+               )
+               gtk? (
+                       x11-libs/gtk+:3
+                       xwidgets? (
+                               net-libs/webkit-gtk:4.1=
+                               x11-libs/libXcomposite
+                       )
+               )
+               !gtk? (
+                       motif? (
+                               >=x11-libs/motif-2.3:0
+                               x11-libs/libXpm
+                               x11-libs/libXmu
+                               x11-libs/libXt
+                       )
+                       !motif? (
+                               Xaw3d? (
+                                       x11-libs/libXaw3d
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               )
+                               !Xaw3d? ( athena? (
+                                       x11-libs/libXaw
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               ) )
+                       )
+               )
+       ) )"
+
+DEPEND="${RDEPEND}
+       gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+       virtual/pkgconfig
+       gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+# Suppress false positive QA warnings #898304 #925449
+QA_CONFIG_IMPL_DECL_SKIP=(
+       malloc_set_state malloc_get_state MIN
+       statvfs64 re_set_syntax re_compile_pattern re_search re_match
+)
+
+src_prepare() {
+       if [[ ${PV##*.} = 9999 ]]; then
+               FULL_VERSION=$(sed -n 
's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+                       configure.ac)
+               [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs 
version"
+               einfo "Emacs branch: ${EGIT_BRANCH}"
+               einfo "Commit: ${EGIT_VERSION}"
+               einfo "Emacs version number: ${FULL_VERSION}"
+               [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+                       || die "Upstream version number changed to 
${FULL_VERSION}"
+       fi
+
+       if use jit; then
+               export NATIVE_FULL_AOT=1
+               find lisp -type f -name "*.elc" -delete || die
+
+               # These files ignore LDFLAGS. We assign the variable here, 
because
+               # for live ebuilds FULL_VERSION doesn't exist in global scope
+               
QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+               # gccjit doesn't play well with ccache or distcc #801580
+               # For now, work around the problem with an explicit LIBRARY_PATH
+               has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
+                       && export LIBRARY_PATH=$("$(tc-getCC)" 
-print-search-dirs \
+                               | sed -n '/^libraries:/{s:^[^/]*::;p}')
+       fi
+
+       default
+
+       # Fix filename reference in redirected man page
+       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+       # Tests that use bubblewrap don't work in the sandbox:
+       # "bwrap: setting up uid map: Permission denied"
+       # So, disrupt the search for the bwrap executable.
+       sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
+               test/lisp/emacs-lisp/bytecomp-tests.el || die
+
+       AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+       local myconf
+
+       # Prevents e.g. tests interfering with running Emacs.
+       unset EMACS_SOCKET_NAME
+
+       if use alsa; then
+               use sound || ewarn \
+                       "USE flag \"alsa\" overrides \"-sound\"; enabling sound 
support."
+               myconf+=" --with-sound=alsa"
+       else
+               myconf+=" --with-sound=$(usex sound oss)"
+       fi
+
+       if use jit; then
+               use zlib || ewarn \
+                       "USE flag \"jit\" overrides \"-zlib\"; enabling zlib 
support."
+               myconf+=" --with-zlib"
+       else
+               myconf+=" $(use_with zlib)"
+       fi
+
+       if ! use gui; then
+               einfo "Configuring to build without window system support"
+               myconf+=" --without-x --without-ns"
+       elif use aqua; then
+               einfo "Configuring to build with Nextstep (Macintosh Cocoa) 
support"
+               myconf+=" --with-ns --disable-ns-self-contained"
+               myconf+=" --without-x"
+       else
+               myconf+=" --with-x --without-ns"
+               myconf+=" --without-gconf"
+               myconf+=" $(use_with gsettings)"
+               myconf+=" $(use_with toolkit-scroll-bars)"
+               myconf+=" $(use_with gif)"
+               myconf+=" $(use_with jpeg)"
+               myconf+=" $(use_with png)"
+               myconf+=" $(use_with svg rsvg)"
+               myconf+=" $(use_with tiff)"
+               myconf+=" $(use_with xpm)"
+               myconf+=" $(use_with imagemagick)"
+
+               if use xft; then
+                       myconf+=" --with-xft"
+                       myconf+=" $(use_with cairo)"
+                       myconf+=" $(use_with harfbuzz)"
+                       myconf+=" $(use_with m17n-lib libotf)"
+                       myconf+=" $(use_with m17n-lib m17n-flt)"
+               else
+                       myconf+=" --without-xft"
+                       myconf+=" --without-cairo"
+                       myconf+=" --without-libotf --without-m17n-flt"
+                       use cairo && ewarn \
+                               "USE flag \"cairo\" has no effect if \"xft\" is 
not set."
+                       use m17n-lib && ewarn \
+                               "USE flag \"m17n-lib\" has no effect if \"xft\" 
is not set."
+               fi
+
+               local f line
+               if use gtk; then
+                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
+                       while read line; do ewarn "${line}"; done <<-EOF
+                               Your version of GTK+ will have problems with 
closing open
+                               displays. This is no problem if you just use 
one display, but
+                               if you use more than one and close one of them 
Emacs may crash.
+                               See 
<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+                               
<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+                               If you intend to use more than one display, 
then it is strongly
+                               recommended that you compile Emacs with the 
Athena/Lucid or the
+                               Motif toolkit instead.
+                       EOF
+                       myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+                       for f in motif Xaw3d athena; do
+                               use ${f} && ewarn \
+                                       "USE flag \"${f}\" has no effect if 
\"gtk\" is set."
+                       done
+               elif use motif; then
+                       einfo "Configuring to build with Motif toolkit"
+                       myconf+=" --with-x-toolkit=motif"
+                       for f in Xaw3d athena; do
+                               use ${f} && ewarn \
+                                       "USE flag \"${f}\" has no effect if 
\"motif\" is set."
+                       done
+               elif use athena || use Xaw3d; then
+                       einfo "Configuring to build with Athena/Lucid toolkit"
+                       myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d 
xaw3d)"
+               else
+                       einfo "Configuring to build with no toolkit"
+                       myconf+=" --with-x-toolkit=no"
+               fi
+               ! use gtk && use xwidgets && ewarn \
+                       "USE flag \"xwidgets\" has no effect if \"gtk\" is not 
set."
+       fi
+
+       if tc-is-cross-compiler; then
+               # Configure a CBUILD directory when cross-compiling to make 
tools
+               mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+               ECONF_SOURCE="${S}" econf_build --without-all 
--without-x-toolkit
+               popd >/dev/null || die
+               # Don't try to execute the binary for dumping during the build
+               myconf+=" --with-dumping=none"
+       elif use m68k; then
+               # Workaround for https://debbugs.gnu.org/44531
+               myconf+=" --with-dumping=unexec"
+       else
+               myconf+=" --with-dumping=pdumper"
+       fi
+
+       econf \
+               --program-suffix="-${EMACS_SUFFIX}" \
+               --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+               --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+               --localstatedir="${EPREFIX}"/var \
+               
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+               --without-compress-install \
+               --without-hesiod \
+               --without-pop \
+               --with-file-notification=$(usev inotify || usev gfile || echo 
no) \
+               --with-pdumper \
+               $(use_enable acl) \
+               $(use_with dbus) \
+               $(use_with dynamic-loading modules) \
+               $(use_with games gameuser ":gamestat") \
+               $(use_with gmp libgmp) \
+               $(use_with gpm) \
+               $(use_with jit native-compilation) \
+               $(use_with json) \
+               $(use_with kerberos) $(use_with kerberos kerberos5) \
+               $(use_with lcms lcms2) \
+               $(use_with libxml2 xml2) \
+               $(use_with mailutils) \
+               $(use_with selinux) \
+               $(use_with ssl gnutls) \
+               $(use_with systemd libsystemd) \
+               $(use_with threads) \
+               $(use_with wide-int) \
+               ${myconf}
+}
+
+src_compile() {
+       export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+       append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
+       if tc-is-cross-compiler; then
+               # Build native tools for compiling lisp etc.
+               emake -C "${S}-build" src
+               emake lib          # Cross-compile dependencies first for 
timestamps
+               # Save native build tools in the cross-directory
+               cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || 
die
+               # Specify the native Emacs to compile lisp
+               emake -C lisp all EMACS="${S}-build/src/emacs"
+       fi
+
+       emake
+}
+
+src_test() {
+       # List .el test files with a comment above listing the exact
+       # subtests which caused failure. Elements should begin with a %.
+       # e.g. %lisp/gnus/mml-sec-tests.el.
+       local exclude_tests=(
+               # Reason: not yet known
+               # mml-secure-en-decrypt-{1,2,3,4}
+               # mml-secure-find-usable-keys-{1,2}
+               # mml-secure-key-checks
+               # mml-secure-select-preferred-keys-4
+               # mml-secure-sign-verify-1
+               %lisp/gnus/mml-sec-tests.el
+
+               # Reason: race condition
+               # Looks like it should be fixed in 29.x at least:
+               # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706
+               # files-tests-file-name-non-special-file-in-directory-p
+               %lisp/files-tests.el
+
+               # Reason: permission denied on /nonexistent
+               # (vc-*-bzr only fails if breezy is installed, as they
+               # try to access cache dirs under /nonexistent)
+               #
+               # rmail-undigest-test-multipart-mixed-digest
+               # rmail-undigest-test-rfc1153-less-strict-digest
+               # rmail-undigest-test-rfc1153-sloppy-digest
+               # rmail-undigest-test-rfc934-digest
+               # vc-test-bzr02-state
+               # vc-test-bzr05-rename-file
+               # vc-test-bzr06-version-diff
+               # vc-bzr-test-bug9781
+               %lisp/mail/undigest-tests.el
+               %lisp/vc/vc-tests.el
+               %lisp/vc/vc-bzr-tests.el
+
+               # Reason: some copyright years differ
+               %lisp/emacs-lisp/copyright-tests.el
+
+               # Reason: quoting issues (fixed in Emacs 29)
+               %lib-src/emacsclient-tests.el
+
+               # Reason: tries to access network
+               # internet-is-working
+               %src/process-tests.el
+       )
+       use threads || exclude_tests+=(
+                       %src/emacs-module-tests.el
+                       %src/keyboard-tests.el
+                       %src/thread-tests.el
+               )
+
+       # See test/README for possible options
+       emake \
+               EMACS_TEST_VERBOSE=1 \
+               EXCLUDE_TESTS="${exclude_tests[*]}" \
+               TEST_BACKTRACE_LINE_LENGTH=nil \
+               check
+}
+
+src_install() {
+       emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+       mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+       mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+       mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || 
die
+
+       # dissuade Portage from removing our dir file #257260
+       touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+       docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+       # movemail must be setgid mail
+       if ! use mailutils; then
+               fowners root:mail 
/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+               fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+       fi
+
+       # avoid collision between slots, see bug #169033 e.g.
+       rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+       rm -rf "${ED}"/usr/share/{applications,icons} || die
+       rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+       rm -rf "${ED}"/var || die
+
+       # remove unused <version>/site-lisp dir
+       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+       # remove COPYING file (except for etc/COPYING used by describe-copying)
+       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+       if use systemd; then
+               insinto /usr/lib/systemd/user
+               sed -e "/^##/d" \
+                       -e 
"/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+                       -e 
"/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+                       etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+               assert
+       fi
+
+       if use gzip-el; then
+               # compress .el files when a corresponding .elc exists
+               find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+                       -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip 
-9n
+               assert "gzip .el failed"
+       fi
+
+       local cdir
+       if use source; then
+               cdir="/usr/share/emacs/${FULL_VERSION}/src"
+               insinto "${cdir}"
+               # This is not meant to install all the source -- just the
+               # C source you might find via find-function
+               doins src/*.{c,h,m}
+       elif has installsources ${FEATURES}; then
+               cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+       fi
+
+       sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || 
die
+       X
+       ;;; ${EMACS_SUFFIX} site-lisp configuration
+       X
+       (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+       Y  (setq find-function-C-source-directory
+       Y       "${EPREFIX}${cdir}")
+       X  (let ((path (getenv "INFOPATH"))
+       X       (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+       X       (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+       X    (and path
+       X        ;; move Emacs Info dir before anything else in /usr/share
+       X        (let* ((p (cons nil (split-string path ":" t))) (q p))
+       X          (while (and (cdr q) (not (string-match re (cadr q))))
+       X            (setq q (cdr q)))
+       X          (setcdr q (cons dir (delete dir (cdr q))))
+       X          (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+       EOF
+       elisp-site-file-install "${T}/${SITEFILE}" || die
+
+       dodoc README BUGS CONTRIBUTE
+
+       if use gui && use aqua; then
+               dodir /Applications/Gentoo
+               rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+               mv nextstep/Emacs.app \
+                       "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+       fi
+
+       local DOC_CONTENTS="You can set the version to be started by
+               /usr/bin/emacs through the Emacs eselect module, which also
+               redirects man and info pages. Therefore, several Emacs versions 
can
+               be installed at the same time. \"man emacs.eselect\" for 
details.
+               \\n\\nIf you upgrade from a previous major version of Emacs, 
then
+               it is strongly recommended that you use app-admin/emacs-updater
+               to rebuild all byte-compiled elisp files of the installed Emacs
+               packages."
+       if use gui; then
+               DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+                       Installing media-fonts/font-adobe-{75,100}dpi on the X 
server's
+                       machine would satisfy basic Emacs requirements under 
X11.
+                       See also 
https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+                       for how to enable anti-aliased fonts."
+               use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+                       \"${EPREFIX}/Applications/Gentoo\". You may want to 
copy or
+                       symlink it into /Applications by yourself."
+       fi
+       tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+               a portable dump file due to being cross-compiled.
+               To create this file at run time, execute the following command:
+               \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+               \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+       readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+       # verify that the PM hasn't removed our Info directory index #257260
+       local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+       [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+       elisp-site-regen
+       readme.gentoo_print_elog
+
+       if use livecd; then
+               # force an update of the emacs symlink for the livecd/dvd,
+               # because some microemacs packages set it with USE=livecd
+               eselect emacs update
+       else
+               eselect emacs update ifunset
+       fi
+}
+
+pkg_postrm() {
+       elisp-site-regen
+       eselect emacs update ifunset
+}

diff --git a/app-editors/emacs/emacs-29.3-r2.ebuild 
b/app-editors/emacs/emacs-29.3-r2.ebuild
new file mode 100644
index 000000000000..315355117504
--- /dev/null
+++ b/app-editors/emacs/emacs-29.3-r2.ebuild
@@ -0,0 +1,627 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git";
+       EGIT_BRANCH="emacs-29"
+       EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+       S="${EGIT_CHECKOUT_DIR}"
+       SLOT="${PV%%.*}-vcs"
+else
+       # FULL_VERSION keeps the full version number, which is needed in
+       # order to determine some path information correctly for copy/move
+       # operations later on
+       FULL_VERSION="${PV%%_*}"
+       SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+       S="${WORKDIR}/emacs-${FULL_VERSION}"
+       # PV can be in any of the following formats:
+       # 27.1                 released version (slot 27)
+       # 27.1_rc1             upstream release candidate (27)
+       # 27.0.9999            live ebuild (slot 27-vcs)
+       # 27.0.90              upstream prerelease snapshot (27-vcs)
+       # 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+       if [[ ${PV} == *_pre* ]]; then
+               SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz";
+               S="${WORKDIR}/emacs"
+       elif [[ ${PV//[0-9]} != "." ]]; then
+               
SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz";
+       fi
+       # Patchset from proj/emacs-patches.git
+       SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz";
+       PATCHES=("${WORKDIR}/patch")
+       SLOT="${PV%%.*}"
+       [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/";
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm 
gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos 
lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite 
ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp 
wide-int +X Xaw3d xft +xpm xwidgets zlib"
+
+X_DEPEND="x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libXcomposite
+       x11-libs/libXext
+       x11-libs/libXfixes
+       x11-libs/libXi
+       x11-libs/libXinerama
+       x11-libs/libXrandr
+       x11-libs/libxcb
+       x11-libs/xcb-util
+       x11-misc/xbitmaps
+       xpm? ( x11-libs/libXpm )
+       xft? (
+               media-libs/fontconfig
+               media-libs/freetype
+               x11-libs/libXrender
+               cairo? ( >=x11-libs/cairo-1.12.18[X] )
+               !cairo? ( x11-libs/libXft )
+               harfbuzz? ( media-libs/harfbuzz:0= )
+               m17n-lib? (
+                       >=dev-libs/libotf-0.9.4
+                       >=dev-libs/m17n-lib-1.5.1
+               )
+       )
+       gtk? (
+               x11-libs/gtk+:3
+               xwidgets? (
+                       net-libs/webkit-gtk:4.1=
+                       x11-libs/libXcomposite
+               )
+       )
+       !gtk? (
+               motif? (
+                       >=x11-libs/motif-2.3:0
+                       x11-libs/libXpm
+                       x11-libs/libXmu
+                       x11-libs/libXt
+               )
+               !motif? (
+                       Xaw3d? (
+                               x11-libs/libXaw3d
+                               x11-libs/libXmu
+                               x11-libs/libXt
+                       )
+                       !Xaw3d? ( athena? (
+                               x11-libs/libXaw
+                               x11-libs/libXmu
+                               x11-libs/libXt
+                       ) )
+               )
+       )"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+       sys-libs/ncurses:0=
+       acl? ( virtual/acl )
+       alsa? ( media-libs/alsa-lib )
+       dbus? ( sys-apps/dbus )
+       games? ( acct-group/gamestat )
+       gmp? ( dev-libs/gmp:0= )
+       gpm? ( sys-libs/gpm )
+       !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+       jit? (
+               sys-devel/gcc:=[jit(-)]
+               sys-libs/zlib
+       )
+       json? ( dev-libs/jansson:= )
+       kerberos? ( virtual/krb5 )
+       lcms? ( media-libs/lcms:2 )
+       libxml2? ( >=dev-libs/libxml2-2.2.0 )
+       mailutils? ( net-mail/mailutils[clients] )
+       !mailutils? ( acct-group/mail net-libs/liblockfile )
+       selinux? ( sys-libs/libselinux )
+       sqlite? ( dev-db/sqlite:3 )
+       ssl? ( net-libs/gnutls:0= )
+       systemd? ( sys-apps/systemd )
+       tree-sitter? ( dev-libs/tree-sitter:= )
+       valgrind? ( dev-debug/valgrind )
+       zlib? ( sys-libs/zlib )
+       gui? (
+               gif? ( media-libs/giflib:0= )
+               jpeg? ( media-libs/libjpeg-turbo:0= )
+               png? ( >=media-libs/libpng-1.4:0= )
+               svg? ( >=gnome-base/librsvg-2.0 )
+               tiff? ( media-libs/tiff:= )
+               webp? ( media-libs/libwebp:0= )
+               imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+               !aqua? (
+                       gsettings? (
+                               app-emacs/emacs-common[gsettings(-)]
+                               >=dev-libs/glib-2.28.6
+                       )
+                       gtk? ( !X? (
+                               media-libs/fontconfig
+                               media-libs/freetype
+                               >=x11-libs/cairo-1.12.18
+                               x11-libs/gtk+:3
+                               harfbuzz? ( media-libs/harfbuzz:0= )
+                               m17n-lib? (
+                                       >=dev-libs/libotf-0.9.4
+                                       >=dev-libs/m17n-lib-1.5.1
+                               )
+                               xwidgets? ( net-libs/webkit-gtk:4.1= )
+                       ) )
+                       !gtk? ( ${X_DEPEND} )
+                       X? ( ${X_DEPEND} )
+               )
+       )"
+
+DEPEND="${RDEPEND}
+       gui? ( !aqua? (
+               !gtk? ( x11-base/xorg-proto )
+               X? ( x11-base/xorg-proto )
+       ) )"
+
+BDEPEND="sys-apps/texinfo
+       virtual/pkgconfig
+       gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+# Suppress false positive QA warnings #898304 #925091
+QA_CONFIG_IMPL_DECL_SKIP=(
+       malloc_set_state malloc_get_state MIN static_assert alignof
+       statvfs64 re_set_syntax re_compile_pattern re_search re_match
+)
+
+src_prepare() {
+       if [[ ${PV##*.} = 9999 ]]; then
+               FULL_VERSION=$(sed -n 
's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+                       configure.ac)
+               [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs 
version"
+               einfo "Emacs branch: ${EGIT_BRANCH}"
+               einfo "Commit: ${EGIT_VERSION}"
+               einfo "Emacs version number: ${FULL_VERSION}"
+               [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+                       || die "Upstream version number changed to 
${FULL_VERSION}"
+       fi
+
+       default
+
+       if use jit; then
+               find lisp -type f -name "*.elc" -delete || die
+
+               # These files ignore LDFLAGS. We assign the variable here, 
because
+               # for live ebuilds FULL_VERSION doesn't exist in global scope
+               
QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+               # gccjit doesn't play well with ccache or distcc #801580
+               # For now, work around the problem with an explicit LIBRARY_PATH
+               has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
+                       && export LIBRARY_PATH=$("$(tc-getCC)" 
-print-search-dirs \
+                               | sed -n '/^libraries:/{s:^[^/]*::;p}')
+       fi
+
+       # Fix filename reference in redirected man page
+       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+       # libseccomp is detected by configure but doesn't appear to have any
+       # effect on the installed image. Suppress it by supplying pkg-config
+       # with a wrong library name.
+       sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
+       # Tests that use bubblewrap don't work in the sandbox:
+       # "bwrap: setting up uid map: Permission denied"
+       # So, disrupt the search for the bwrap executable.
+       sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
+               test/lisp/emacs-lisp/bytecomp-tests.el || die
+
+       AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+       local myconf
+
+       # Prevents e.g. tests interfering with running Emacs.
+       unset EMACS_SOCKET_NAME
+
+       if use alsa; then
+               use sound || ewarn \
+                       "USE flag \"alsa\" overrides \"-sound\"; enabling sound 
support."
+               myconf+=" --with-sound=alsa"
+       else
+               myconf+=" --with-sound=$(usex sound oss)"
+       fi
+
+       if use jit; then
+               use zlib || ewarn \
+                       "USE flag \"jit\" overrides \"-zlib\"; enabling zlib 
support."
+               myconf+=" --with-zlib"
+       else
+               myconf+=" $(use_with zlib)"
+       fi
+
+       # Emacs supports these window systems:
+       # X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa).
+       # General GUI support is enabled by the "gui" USE flag, then
+       # the window system is selected as follows:
+       #   "aqua" -> Nextstep
+       #   "gtk -X" -> pure GTK
+       #   otherwise -> X11
+       # For X11 there is the further choice of toolkits GTK, Motif,
+       # Athena (Lucid), or no toolkit. They are enabled (in order of
+       # preference) with the "gtk", "motif", "Xaw3d", and "athena" flags.
+
+       if ! use gui; then
+               einfo "Configuring to build without window system support"
+               myconf+=" --without-x --without-pgtk --without-ns"
+       elif use aqua; then
+               einfo "Configuring to build with Nextstep (Macintosh Cocoa) 
support"
+               myconf+=" --with-ns --disable-ns-self-contained"
+               myconf+=" --without-x --without-pgtk"
+       elif use gtk && ! use X; then
+               einfo "Configuring to build with pure GTK (without X11) support"
+               myconf+=" --with-pgtk --without-x --without-ns"
+               myconf+=" --with-toolkit-scroll-bars" #836392
+               myconf+=" --without-gconf"
+               myconf+=" $(use_with gsettings)"
+               myconf+=" $(use_with harfbuzz)"
+               myconf+=" $(use_with m17n-lib libotf)"
+               myconf+=" $(use_with m17n-lib m17n-flt)"
+               myconf+=" $(use_with xwidgets)"
+       else
+               # X11
+               myconf+=" --with-x --without-pgtk --without-ns"
+               myconf+=" --without-gconf"
+               myconf+=" $(use_with gsettings)"
+               myconf+=" $(use_with toolkit-scroll-bars)"
+               myconf+=" $(use_with xpm)"
+
+               if use xft; then
+                       myconf+=" --with-xft"
+                       myconf+=" $(use_with cairo)"
+                       myconf+=" $(use_with harfbuzz)"
+                       myconf+=" $(use_with m17n-lib libotf)"
+                       myconf+=" $(use_with m17n-lib m17n-flt)"
+               else
+                       myconf+=" --without-xft"
+                       myconf+=" --without-cairo"
+                       myconf+=" --without-libotf --without-m17n-flt"
+                       use cairo && ewarn \
+                               "USE flag \"cairo\" has no effect if \"xft\" is 
not set."
+                       use m17n-lib && ewarn \
+                               "USE flag \"m17n-lib\" has no effect if \"xft\" 
is not set."
+               fi
+
+               local f line
+               if use gtk; then
+                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
+                       while read line; do ewarn "${line}"; done <<-EOF
+                               Your version of GTK+ will have problems with 
closing open
+                               displays. This is no problem if you just use 
one display, but
+                               if you use more than one and close one of them 
Emacs may crash.
+                               See 
<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+                               
<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+                               If you intend to use more than one display, 
then it is strongly
+                               recommended that you compile Emacs with the 
Athena/Lucid or the
+                               Motif toolkit instead.
+                       EOF
+                       myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+                       for f in motif Xaw3d athena; do
+                               use ${f} && ewarn \
+                                       "USE flag \"${f}\" has no effect if 
\"gtk\" is set."
+                       done
+               elif use motif; then
+                       einfo "Configuring to build with Motif toolkit"
+                       myconf+=" --with-x-toolkit=motif"
+                       for f in Xaw3d athena; do
+                               use ${f} && ewarn \
+                                       "USE flag \"${f}\" has no effect if 
\"motif\" is set."
+                       done
+               elif use athena || use Xaw3d; then
+                       einfo "Configuring to build with Athena/Lucid toolkit"
+                       myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d 
xaw3d)"
+               else
+                       einfo "Configuring to build with no toolkit"
+                       myconf+=" --with-x-toolkit=no"
+               fi
+               ! use gtk && use xwidgets && ewarn \
+                       "USE flag \"xwidgets\" has no effect if \"gtk\" is not 
set."
+       fi
+
+       if use gui; then
+               # Common flags recognised for all GUIs
+               myconf+=" $(use_with gif)"
+               myconf+=" $(use_with jpeg)"
+               myconf+=" $(use_with png)"
+               myconf+=" $(use_with svg rsvg)"
+               myconf+=" $(use_with tiff)"
+               myconf+=" $(use_with webp)"
+               myconf+=" $(use_with imagemagick)"
+       fi
+
+       if tc-is-cross-compiler; then
+               # Configure a CBUILD directory when cross-compiling to make 
tools
+               mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+               ECONF_SOURCE="${S}" econf_build --without-all 
--without-x-toolkit
+               popd >/dev/null || die
+               # Don't try to execute the binary for dumping during the build
+               myconf+=" --with-dumping=none"
+       elif use m68k; then
+               # Workaround for https://debbugs.gnu.org/44531
+               myconf+=" --with-dumping=unexec"
+       else
+               myconf+=" --with-dumping=pdumper"
+       fi
+
+       econf \
+               --program-suffix="-${EMACS_SUFFIX}" \
+               --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+               --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+               --localstatedir="${EPREFIX}"/var \
+               
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+               --without-compress-install \
+               --without-hesiod \
+               --without-pop \
+               --with-file-notification=$(usev inotify || usev gfile || echo 
no) \
+               --with-pdumper \
+               $(use_enable acl) \
+               $(use_with dbus) \
+               $(use_with dynamic-loading modules) \
+               $(use_with games gameuser ":gamestat") \
+               $(use_with gmp libgmp) \
+               $(use_with gpm) \
+               $(use_with jit native-compilation aot) \
+               $(use_with json) \
+               $(use_with kerberos) $(use_with kerberos kerberos5) \
+               $(use_with lcms lcms2) \
+               $(use_with libxml2 xml2) \
+               $(use_with mailutils) \
+               $(use_with selinux) \
+               $(use_with sqlite sqlite3) \
+               $(use_with ssl gnutls) \
+               $(use_with systemd libsystemd) \
+               $(use_with threads) \
+               $(use_with tree-sitter) \
+               $(use_with wide-int) \
+               ${myconf}
+}
+
+src_compile() {
+       export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+       append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
+       if tc-is-cross-compiler; then
+               # Build native tools for compiling lisp etc.
+               emake -C "${S}-build" src
+               emake lib          # Cross-compile dependencies first for 
timestamps
+               # Save native build tools in the cross-directory
+               cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || 
die
+               # Specify the native Emacs to compile lisp
+               EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
+               emake "${EMACS_EMAKE_ARGS[@]}" actual-all
+       else
+               EMACS_EMAKE_ARGS=()
+               emake
+       fi
+}
+
+src_test() {
+       # List .el test files with a comment above listing the exact
+       # subtests which caused failure. Elements should begin with a %.
+       # e.g. %lisp/gnus/mml-sec-tests.el.
+       local exclude_tests=(
+               # Reason: permission denied on /nonexistent
+               # (vc-*-bzr only fails if breezy is installed, as they
+               # try to access cache dirs under /nonexistent)
+               #
+               # rmail-undigest-test-multipart-mixed-digest
+               # rmail-undigest-test-rfc1153-less-strict-digest
+               # rmail-undigest-test-rfc1153-sloppy-digest
+               # rmail-undigest-test-rfc934-digest
+               # vc-test-bzr02-state
+               # vc-test-bzr05-rename-file
+               # vc-test-bzr06-version-diff
+               # vc-bzr-test-bug9781
+               %lisp/mail/undigest-tests.el
+               %lisp/vc/vc-tests.el
+               %lisp/vc/vc-bzr-tests.el
+
+               # Reason: tries to access network
+               # internet-is-working
+               %src/process-tests.el
+
+               # Reason: fails with stable version of tree-sitter-json due to
+               # ast changes. Bug #922525
+               %src/treesit-tests.log
+
+               # Reason: test is not skipped if tree-sitter-tsx is not 
installed
+               # Bug #922525
+               %lisp/progmodes/typescript-ts-mode-tests.el
+       )
+       use threads || exclude_tests+=(
+                       %lisp/server-tests.el
+                       %lisp/progmodes/eglot-tests.el
+                       %src/emacs-module-tests.el
+                       %src/keyboard-tests.el
+               )
+       use xpm || exclude_tests+=( %src/image-tests.el )
+
+       # Some tests hang with gnupg-2.2.42
+       local gpgver=$(best_version app-crypt/gnupg)
+       gpgver=${gpgver#*gnupg-}
+       [[ -n ${gpgver} ]] \
+               && ver_test "${gpgver}" -ge 2.2.42 && ver_test "${gpgver}" -lt 
2.3 \
+               && exclude_tests+=(
+                       %lisp/epg-tests.el
+                       %lisp/gnus/mml-sec-tests.el
+               )
+
+       # Redirect GnuPG's sockets, in order not to exceed the 108 char limit
+       # for socket paths on Linux.
+       mkdir "${T}"/gpg || die
+       local f
+       for f in browser extra ssh; do
+               printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \
+                       > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" 
|| die
+       done
+
+       # See test/README for possible options
+       emake \
+               EMACS_TEST_VERBOSE=1 \
+               EXCLUDE_TESTS="${exclude_tests[*]}" \
+               TEST_BACKTRACE_LINE_LENGTH=nil \
+               check
+}
+
+src_install() {
+       emake \
+               "${EMACS_EMAKE_ARGS[@]}" \
+               DESTDIR="${D}" \
+               NO_BIN_LINK=t \
+               BLESSMAIL_TARGET="" \
+               install
+
+       mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+       mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+       mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || 
die
+
+       # dissuade Portage from removing our dir file #257260
+       touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+       docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+       # movemail must be setgid mail
+       if ! use mailutils; then
+               fowners root:mail 
/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+               fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+       fi
+
+       # avoid collision between slots, see bug #169033 e.g.
+       rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+       rm -rf "${ED}"/usr/share/{applications,icons} || die
+       rm -rf "${ED}"/usr/share/glib-2.0 || die #911117
+       rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+       rm -rf "${ED}"/var || die
+
+       # remove unused <version>/site-lisp dir
+       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+       # remove COPYING file (except for etc/COPYING used by describe-copying)
+       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+       if use systemd; then
+               insinto /usr/lib/systemd/user
+               sed -e "/^##/d" \
+                       -e 
"/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+                       -e 
"/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+                       etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+               assert
+       fi
+
+       if use gzip-el; then
+               # compress .el files when a corresponding .elc exists
+               find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+                       -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip 
-9n
+               assert "gzip .el failed"
+       fi
+
+       local cdir
+       if use source; then
+               cdir="/usr/share/emacs/${FULL_VERSION}/src"
+               insinto "${cdir}"
+               # This is not meant to install all the source -- just the
+               # C source you might find via find-function
+               doins src/*.{c,h,m}
+       elif has installsources ${FEATURES}; then
+               cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+       fi
+
+       sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || 
die
+       X
+       ;;; ${EMACS_SUFFIX} site-lisp configuration
+       X
+       (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+       Y  (setq find-function-C-source-directory
+       Y       "${EPREFIX}${cdir}")
+       X  (let ((path (getenv "INFOPATH"))
+       X       (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+       X       (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+       X    (and path
+       X        ;; move Emacs Info dir before anything else in /usr/share
+       X        (let* ((p (cons nil (split-string path ":" t))) (q p))
+       X          (while (and (cdr q) (not (string-match re (cadr q))))
+       X            (setq q (cdr q)))
+       X          (setcdr q (cons dir (delete dir (cdr q))))
+       X          (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+       EOF
+       elisp-site-file-install "${T}/${SITEFILE}" || die
+
+       dodoc README BUGS CONTRIBUTE
+
+       if use gui && use aqua; then
+               dodir /Applications/Gentoo
+               rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+               mv nextstep/Emacs.app \
+                       "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+       fi
+
+       local DOC_CONTENTS="You can set the version to be started by
+               /usr/bin/emacs through the Emacs eselect module, which also
+               redirects man and info pages. Therefore, several Emacs versions 
can
+               be installed at the same time. \"man emacs.eselect\" for 
details.
+               \\n\\nIf you upgrade from a previous major version of Emacs, 
then
+               it is strongly recommended that you use app-admin/emacs-updater
+               to rebuild all byte-compiled elisp files of the installed Emacs
+               packages."
+       if use gui; then
+               DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+                       Installing media-fonts/font-adobe-{75,100}dpi on the X 
server's
+                       machine would satisfy basic Emacs requirements under 
X11.
+                       See also 
https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+                       for how to enable anti-aliased fonts."
+               use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+                       \"${EPREFIX}/Applications/Gentoo\". You may want to 
copy or
+                       symlink it into /Applications by yourself."
+       fi
+       if ! use mailutils; then
+               DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If 
Emacs'
+               own e-mail features are going to be used as an e-mail client
+               (e.g. Rmail), you are strongly encouraged to enable it. If not,
+               Emacs will use its own implementation of movemail; which has
+               fewer features and is less secure. For more information see:
+               
https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html";
+       fi
+       tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+               a portable dump file due to being cross-compiled.
+               To create this file at run time, execute the following command:
+               \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+               \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+       readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+       # verify that the PM hasn't removed our Info directory index #257260
+       local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+       [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+       elisp-site-regen
+       readme.gentoo_print_elog
+
+       if use livecd; then
+               # force an update of the emacs symlink for the livecd/dvd,
+               # because some microemacs packages set it with USE=livecd
+               eselect emacs update
+       else
+               eselect emacs update ifunset
+       fi
+}
+
+pkg_postrm() {
+       elisp-site-regen
+       eselect emacs update ifunset
+}

Reply via email to