commit:     4dd23ca5b39db685c1d1cf8c2e3c68a682ac021d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 10:01:21 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat May  6 10:01:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd23ca5

app-editors/emacs: drop 25.3-r15, 26.3-r11, 27.2-r9, 28.2-r4

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/Manifest              |   4 -
 app-editors/emacs/emacs-25.3-r15.ebuild | 355 ----------------------
 app-editors/emacs/emacs-26.3-r11.ebuild | 375 -----------------------
 app-editors/emacs/emacs-27.2-r9.ebuild  | 438 ---------------------------
 app-editors/emacs/emacs-28.2-r4.ebuild  | 517 --------------------------------
 5 files changed, 1689 deletions(-)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 92482b3f7571..6566ab3beb32 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,15 +1,11 @@
 DIST emacs-18.59-patches-15.tar.xz 34104 BLAKE2B 
9d14004d5188ec0ffe11099ae1beb431adfe159d220fc1b6f1d0be67da19b88911b66a206386beee9498bdcaa48e40a185755734cad2d60927c79bc8ddf0fa7d
 SHA512 
c82cd8e81acf63addd137716a60191b916ee9ac9f8176661be1e8dd0f347f63f8ca8bf9d4d225141499dcbf4c20444eb6526cc3a3912a2d4136fb2bd295e2c26
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B 
d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b
 SHA512 
03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
-DIST emacs-25.3-patches-4.tar.xz 5164 BLAKE2B 
30ef1e7ac6ee9a702678899cb27ea9c321eb0711d55917118ec99ea9e060e79bae179172d0a2dda5821c19902f6e0813e17ac71c198cd814c265838f96883b87
 SHA512 
ea487de3bb792386510c23c295441438c2fc4eae085fe9d41e5e16181fd4265c1d205b360ce977070a43343feeafac5b9392ea39414f2b170d7051f89ed58502
 DIST emacs-25.3-patches-5.tar.xz 6120 BLAKE2B 
dc56e5f9bc5368062260bb82123f2874c15daa2b90514db5c1e8b59ac44bfc7cdb590259905b2ffb1e38af00dcf195067d116a1cb5fa1a8eb102904f27b6e949
 SHA512 
21f2045d1c64151923d62c180f39b3c9eba9e65881096613219df1705f525b8eafa91e0a0dd3688b92b0acc7f41035ee319b09c191131a9e05693d1f25a71750
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
-DIST emacs-26.3-patches-3.tar.xz 4160 BLAKE2B 
ae6fac12a2d2d35c31c895f1be9104b54c283cf4385d21e0ccd3825a3349d60495e441a5fa9f535d4b3d4c60da530ee036a475643cb11862f2a6e1bb44dc7deb
 SHA512 
1edfdbbe6a97ffcdb17facc90336dd6f8d3d397bc95cf06fa170a4ca68e653226de8a5c2001d8dc3d3a0144d50421f2208c6fa3a816123ef952cb25df4aace49
 DIST emacs-26.3-patches-5.tar.xz 5484 BLAKE2B 
dc2011b35d948d6106cfa4fd7f2ca5d4591b91e93e2417cee09a5ec5e3ac74e5284c170305e606ee45c9d31b1833ccb10c1ac224f19433a341465298c36165f0
 SHA512 
f0a6094d72c8879707e914e3cc3526d814216e84e9358e211a4f32e5d4c5958664ce3e3cca217629e2a3324bcb7ac2500d333b1c395f156757210f602d7818d5
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
-DIST emacs-27.2-patches-4.tar.xz 10104 BLAKE2B 
c4a6651744583ed6d85a8f2f27f86999b6cea76229feb6423679f9b9da88e5ac2606fdb6933b4a5c2ada31ac760f3921721a0fd84912a81b8727c0eef84984ae
 SHA512 
fd16fa75e2453c6d3562ff3e98cebc24960774fdc8f0e72ae838376cec090308934e11be8df98fc7a100e14125cb096f23bcb29955e7c809090105ddc51495d6
 DIST emacs-27.2-patches-6.tar.xz 11600 BLAKE2B 
ed8bfb8b2c086423e7bf9f8de5ffb929aa63d8b2781361a8a9d274124a9df52ececdb38c3d4d7d0f0d0fa3a8eaea337c0078929967b073a70209ecdb2bb4cb58
 SHA512 
11f8af976148c957aebaa5fd2edd46b12ffe24036c09c20a61c47e65d8a2febe6480636be2a7f8f3f7c70a8da7091c2a7c254fd853bde56ec45d7db6a9ca94f5
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-DIST emacs-28.2-patches-1.tar.xz 3404 BLAKE2B 
af0ea87f8406b3fe646bc32fea5866c1c7bdeeb5bb5ef733a361cf31f96b72b0dc6a7afb9a166f6182b7835cadd7b0b25f61a79abed241788f35a74d5937513f
 SHA512 
02f9f574d2d06750ddf5218aaf3c725f954020bde94492264a9ad1d3294b24866f89d296b126ed26390f0597afb55daad944c31dde2bfedc6ea1ab769ea11c7d
 DIST emacs-28.2-patches-2.tar.xz 3760 BLAKE2B 
73a78b4fa05aec86ed29315acdad8219957f3acae4ebca130ec17a578522443e8fe911a3165c3918eee12d6a0b8173c0d22166888ae392d8a83689494bdfe689
 SHA512 
841fcde4f8a0428e017b1f6fb70a2e4f9f7c5ee2ead410f48381f66815b9c2c23990b23ec06988a78aef01fbc4e624ceef05bd2eafd071d2174e998ba09a79a6
 DIST emacs-28.2-patches-3.tar.xz 5416 BLAKE2B 
c361fdebf375427cf25c4ac206161b5b55d8d6de88752de35491c778ba90eedf277159a8c317ccda7aaf5e000035d6e33d8e70282436d6e03fa311c4576abe03
 SHA512 
acae15b577af831bc94e102323836f3fa5b0d51ec1096b84063c81c58f1087b67487507c05d93ba5ddacfce0fea4f3e755906a9ec582b061b65095ee7d693eac
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B 
a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552
 SHA512 
a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8

diff --git a/app-editors/emacs/emacs-25.3-r15.ebuild 
b/app-editors/emacs/emacs-25.3-r15.ebuild
deleted file mode 100644
index 0e66937ccffe..000000000000
--- a/app-editors/emacs/emacs-25.3-r15.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2022 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-4.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 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
-               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-6.6.2:0= )
-               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 )
-               !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+=" --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"
-                       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-r11.ebuild 
b/app-editors/emacs/emacs-26.3-r11.ebuild
deleted file mode 100644
index fa2ab258d052..000000000000
--- a/app-editors/emacs/emacs-26.3-r11.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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="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 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
-               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-6.6.2:0= )
-               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=
-                               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+=" --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() {
-       # 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-r9.ebuild 
b/app-editors/emacs/emacs-27.2-r9.ebuild
deleted file mode 100644
index 8519c6f3c3ad..000000000000
--- a/app-editors/emacs/emacs-27.2-r9.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
-
-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-4.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 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
-               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-6.6.2:0= )
-               xft? (
-                       media-libs/fontconfig
-                       media-libs/freetype
-                       x11-libs/libXft
-                       x11-libs/libXrender
-                       cairo? ( >=x11-libs/cairo-1.12.18[X] )
-                       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}"
-
-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() {
-       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() {
-       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
-}

diff --git a/app-editors/emacs/emacs-28.2-r4.ebuild 
b/app-editors/emacs/emacs-28.2-r4.ebuild
deleted file mode 100644
index 3e5b3dbdf06a..000000000000
--- a/app-editors/emacs/emacs-28.2-r4.ebuild
+++ /dev/null
@@ -1,517 +0,0 @@
-# Copyright 1999-2022 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-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-1.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 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 )
-       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-6.6.2:0= )
-               xft? (
-                       media-libs/fontconfig
-                       media-libs/freetype
-                       x11-libs/libXft
-                       x11-libs/libXrender
-                       cairo? ( >=x11-libs/cairo-1.12.18[X] )
-                       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}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-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
-
-       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() {
-       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: fails if bubblewrap (bwrap) is installed
-               # "bwrap: setting up uid map: Permission denied"
-               #
-               # bytecomp-tests--dest-mountpoint
-               %lisp/emacs-lisp/bytecomp-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
-
-       # 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)/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          (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