commit:     019d5f364c36a027f2a262dc4918e710a41b42ad
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 24 19:36:31 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 24 19:37:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019d5f36

app-editors/emacs: Fix compilation with glibc-2.34

Closes: https://bugs.gentoo.org/803644
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/Manifest              |   3 +
 app-editors/emacs/emacs-25.3-r11.ebuild | 356 +++++++++++++++++++++++++
 app-editors/emacs/emacs-26.3-r6.ebuild  | 376 +++++++++++++++++++++++++++
 app-editors/emacs/emacs-27.2-r4.ebuild  | 446 ++++++++++++++++++++++++++++++++
 4 files changed, 1181 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 98a01d3a490..023ec2a16e9 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -5,8 +5,11 @@ DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 
33dac5d27a63b7aab6b4053964a0ecf7f7939c7
 DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 
3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66
 SHA512 
fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B 
aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355
 SHA512 
89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 
93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf
 SHA512 
f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
+DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 
9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154
 SHA512 
fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
+DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 
1218c9a69deae0e3a55e061bd0cd2ab2b7099c86ebe861cc0b3c61a6d7a0756dce13553c861c41a9d2943b5ae78f3c607f099663e90b504d349d2a0be0f34682
 SHA512 
0e989e760e08675fdedb2cfca39ce63255dd092af38e0dd7febebb54aba10f5a186e1d360edecec3a4dd0ccc480dcc4430b3b9a73bdc84f8dc977591c3da395e
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 
433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057
 SHA512 
dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 DIST emacs-27.2-patches-2.tar.xz 7448 BLAKE2B 
4335438a43ba88f6638082bf034c77331808f3fbfee9b746d82bfcb6de5c6b6563c358e92d0296357e3b76c67a58e2b748c3234770a6cbff60170bf91eb1b8af
 SHA512 
b62498a8a26bf7b0939102d37508eb7ea0213f69a2e803cff3346dab70da03b3c63e1df2683cedd6fb85afb928bb1fb0072bfde8da326f4cabfd950457d2d368
+DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
new file mode 100644
index 00000000000..1b851ec3138
--- /dev/null
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2021 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-3.tar.xz";
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="25"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif 
gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd 
m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars 
wide-int Xaw3d xft +xpm zlib"
+
+RDEPEND="acct-group/mail
+       app-emacs/emacs-common[games?,gui(-)?]
+       net-libs/liblockfile
+       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 )
+       libxml2? ( >=dev-libs/libxml2-2.2.0 )
+       selinux? ( sys-libs/libselinux )
+       ssl? ( net-libs/gnutls:0= )
+       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
+               gconf? ( >=gnome-base/gconf-2.26.2 )
+               gsettings? ( >=dev-libs/glib-2.28.6 )
+               gif? ( media-libs/giflib:0= )
+               jpeg? ( virtual/jpeg:0= )
+               png? ( >=media-libs/libpng-1.4:0= )
+               svg? ( >=gnome-base/librsvg-2.0 )
+               tiff? ( media-libs/tiff:0 )
+               xpm? ( x11-libs/libXpm )
+               imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+               xft? (
+                       media-libs/fontconfig
+                       media-libs/freetype
+                       x11-libs/libXft
+                       x11-libs/libXrender
+                       cairo? ( >=x11-libs/cairo-1.12.18 )
+                       m17n-lib? (
+                               >=dev-libs/libotf-0.9.4
+                               >=dev-libs/m17n-lib-1.5.1
+                       )
+               )
+               gtk? ( x11-libs/gtk+:3 )
+               !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"
+# 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}"
+PATCHES=("${WORKDIR}/patch")
+
+src_prepare() {
+       default
+
+       # Fix filename reference in redirected man page
+       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+               || die "unable to sed ctags.1"
+
+       AT_M4DIR=m4 eautoreconf
+       touch src/stamp-h.in || die
+}
+
+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
+
+       # Don't trigger a floating point exception for NaNs on alpha
+       use alpha && append-flags -mieee
+
+       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+=" $(use_with 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"
+                       myconf+=" --without-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
+       fi
+
+       econf \
+               --program-suffix="-${EMACS_SUFFIX}" \
+               --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+               --localstatedir="${EPREFIX}"/var \
+               
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+               --with-gameuser=":gamestat" \
+               --without-compress-install \
+               --without-hesiod \
+               --with-file-notification=$(usev inotify || usev gfile || echo 
no) \
+               $(use_enable acl) \
+               $(use_with dbus) \
+               $(use_with dynamic-loading modules) \
+               $(use_with gpm) \
+               $(use_with kerberos) $(use_with kerberos kerberos5) \
+               $(use_with libxml2 xml2) \
+               $(use_with selinux) \
+               $(use_with ssl gnutls) \
+               $(use_with wide-int) \
+               $(use_with zlib) \
+               ${myconf}
+}
+
+src_compile() {
+       # 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 "moving emacs executable failed"
+       mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+               || die "moving emacs man page failed"
+
+       # move info dir to avoid collisions with the dir file generated by 
portage
+       mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+               || die "moving info dir failed"
+       touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+       docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+       # movemail must be setgid mail
+       fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+       fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
+       # avoid collision between slots, see bug #169033 e.g.
+       rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+       rm -rf "${ED}"/usr/share/{appdata,applications,icons} || 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 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          (setq Info-directory-list (prune-directory-list (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() {
+       # move Info dir file to correct name
+       if [[ -d ${ED}/usr/share/info ]]; then
+               mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+       fi
+}
+
+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-26.3-r6.ebuild 
b/app-editors/emacs/emacs-26.3-r6.ebuild
new file mode 100644
index 00000000000..7601f81ee0e
--- /dev/null
+++ b/app-editors/emacs/emacs-26.3-r6.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2021 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-1.tar.xz";
+
+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 gconf 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 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 )
+       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
+               gconf? ( >=gnome-base/gconf-2.26.2 )
+               gsettings? ( >=dev-libs/glib-2.28.6 )
+               gif? ( media-libs/giflib:0= )
+               jpeg? ( virtual/jpeg:0= )
+               png? ( >=media-libs/libpng-1.4:0= )
+               svg? ( >=gnome-base/librsvg-2.0 )
+               tiff? ( media-libs/tiff:0 )
+               xpm? ( x11-libs/libXpm )
+               imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+               xft? (
+                       media-libs/fontconfig
+                       media-libs/freetype
+                       x11-libs/libXft
+                       x11-libs/libXrender
+                       cairo? ( >=x11-libs/cairo-1.12.18 )
+                       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=
+                               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"
+# 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}"
+PATCHES=("${WORKDIR}/patch")
+
+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+=" $(use_with 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() {
+       # 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
+
+       # move info dir to avoid collisions with the dir file generated by 
portage
+       mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+       touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+       docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+       # 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          (setq Info-directory-list (prune-directory-list (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() {
+       # move Info dir file to correct name
+       if [[ -d ${ED}/usr/share/info ]]; then
+               mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+       fi
+}
+
+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-r4.ebuild 
b/app-editors/emacs/emacs-27.2-r4.ebuild
new file mode 100644
index 00000000000..f1c41cc33a9
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2021 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-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-3.tar.xz";
+       PATCHES=("${WORKDIR}/patch")
+       SLOT="${PV%%.*}"
+       [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 gconf 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 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 )
+       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
+               gconf? ( >=gnome-base/gconf-2.26.2 )
+               gsettings? ( >=dev-libs/glib-2.28.6 )
+               gif? ( media-libs/giflib:0= )
+               jpeg? ( virtual/jpeg:0= )
+               png? ( >=media-libs/libpng-1.4:0= )
+               svg? ( >=gnome-base/librsvg-2.0 )
+               tiff? ( media-libs/tiff:0 )
+               xpm? ( x11-libs/libXpm )
+               imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+               xft? (
+                       media-libs/fontconfig
+                       media-libs/freetype
+                       x11-libs/libXft
+                       x11-libs/libXrender
+                       cairo? ( >=x11-libs/cairo-1.12.18 )
+                       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=
+                               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}
+       !app-editors/emacs-vcs:27"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+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() {
+       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+=" $(use_with 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"
+       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() {
+       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
+
+       # move info dir to avoid collisions with the dir file generated by 
portage
+       mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+       touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+       docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+       # 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          (setq Info-directory-list (prune-directory-list (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() {
+       # move Info dir file to correct name
+       if [[ -d ${ED}/usr/share/info ]]; then
+               mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+       fi
+}
+
+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