commit:     cd3d4a41cb71f1b85daae8cd989938bf53df5090
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 10:29:49 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 10:36:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd3d4a41

app-editors/emacs: Remove old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/emacs-24.5-r9.ebuild | 355 -------------------------
 app-editors/emacs/emacs-25.3-r8.ebuild | 365 --------------------------
 app-editors/emacs/emacs-26.3-r3.ebuild | 392 ----------------------------
 app-editors/emacs/emacs-27.1-r3.ebuild | 460 ---------------------------------
 app-editors/emacs/metadata.xml         |   2 -
 5 files changed, 1574 deletions(-)

diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild 
b/app-editors/emacs/emacs-24.5-r9.ebuild
deleted file mode 100644
index 56490c31b21..00000000000
--- a/app-editors/emacs/emacs-24.5-r9.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-5.tar.xz";
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 
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-gentoo[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/libXinerama
-               x11-libs/libXrandr
-               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
-                       m17n-lib? (
-                               >=dev-libs/libotf-0.9.4
-                               >=dev-libs/m17n-lib-1.5.1
-                       )
-               )
-               gtk? (
-                       gtk2? ( x11-libs/gtk+:2 )
-                       !gtk2? ( 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="app-eselect/eselect-emacs
-       virtual/pkgconfig
-       gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-       app-eselect/eselect-emacs"
-
-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}"
-
-src_prepare() {
-       eapply ../patch
-       eapply_user
-
-       # 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
-       append-ldflags $(test-flags -no-pie)    #639570
-
-       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 m17n-lib libotf)"
-                       myconf+=" $(use_with m17n-lib m17n-flt)"
-               else
-                       myconf+=" --without-xft"
-                       myconf+=" --without-libotf --without-m17n-flt"
-                       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=$(usex gtk2 gtk2 gtk3)"
-                       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 gtk2 && ewarn \
-                       "USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-       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 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
-       rm -rf "${ED}"/usr/share/{applications,icons}
-       rm -rf "${ED}"/var
-
-       # remove unused <version>/site-lisp dir
-       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-       # remove COPYING file (except for etc/COPYING used by describe-copying)
-       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-       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
-
-       if use gui && use aqua; then
-               dodir /Applications/Gentoo
-               rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
-               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 Emacs version 24.2 or earlier, 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
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
-       else
-               eselect emacs update ifunset
-       fi
-}
-
-pkg_postrm() {
-       elisp-site-regen
-       eselect emacs update ifunset
-}

diff --git a/app-editors/emacs/emacs-25.3-r8.ebuild 
b/app-editors/emacs/emacs-25.3-r8.ebuild
deleted file mode 100644
index c2026007bfb..00000000000
--- a/app-editors/emacs/emacs-25.3-r8.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-2.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 gtk2 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-gentoo[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? (
-                       gtk2? ( x11-libs/gtk+:2 )
-                       !gtk2? ( 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="app-eselect/eselect-emacs
-       virtual/pkgconfig
-       gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-       !<app-editors/emacs-vcs-${PV}
-       app-eselect/eselect-emacs"
-
-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}"
-
-src_prepare() {
-       eapply ../patch
-       eapply_user
-
-       # 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=$(usex gtk2 gtk2 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
-               ! use gtk && use gtk2 && ewarn \
-                       "USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-       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
-       rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-       rm -rf "${ED}"/var
-
-       # remove unused <version>/site-lisp dir
-       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-       # remove COPYING file (except for etc/COPYING used by describe-copying)
-       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-       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
-               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
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
-       else
-               eselect emacs update ifunset
-       fi
-}
-
-pkg_postrm() {
-       elisp-site-regen
-       eselect emacs update ifunset
-}

diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild 
b/app-editors/emacs/emacs-26.3-r3.ebuild
deleted file mode 100644
index fb901b73ff1..00000000000
--- a/app-editors/emacs/emacs-26.3-r3.ebuild
+++ /dev/null
@@ -1,392 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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 gtk2 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-gentoo[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? (
-                       gtk2? ( x11-libs/gtk+:2 )
-                       !gtk2? (
-                               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="app-eselect/eselect-emacs
-       virtual/pkgconfig
-       gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-       !<app-editors/emacs-vcs-${PV}
-       app-eselect/eselect-emacs"
-
-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}"
-
-src_prepare() {
-       #eapply ../patch
-       eapply_user
-
-       # 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
-                       if use gtk2; then
-                               myconf+=" --with-x-toolkit=gtk2 
--without-xwidgets"
-                               use xwidgets && ewarn \
-                                       "USE flag \"xwidgets\" has no effect if 
\"gtk2\" is set."
-                       else
-                               myconf+=" --with-x-toolkit=gtk3 $(use_with 
xwidgets)"
-                       fi
-                       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
-               if ! use gtk; then
-                       use gtk2 && ewarn \
-                               "USE flag \"gtk2\" has no effect if \"gtk\" is 
not set."
-                       use xwidgets && ewarn \
-                               "USE flag \"xwidgets\" has no effect if \"gtk\" 
is not set."
-               fi
-       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
-       rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-       rm -rf "${ED}/usr/$(get_libdir)"
-       rm -rf "${ED}"/var
-
-       # remove unused <version>/site-lisp dir
-       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-       # remove COPYING file (except for etc/COPYING used by describe-copying)
-       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-       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
-               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
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
-       else
-               eselect emacs update ifunset
-       fi
-}
-
-pkg_postrm() {
-       elisp-site-regen
-       eselect emacs update ifunset
-}

diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild 
b/app-editors/emacs/emacs-27.1-r3.ebuild
deleted file mode 100644
index 35b541f8883..00000000000
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-       fi
-       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 gtk2 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-gentoo[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? (
-                       gtk2? ( x11-libs/gtk+:2 )
-                       !gtk2? (
-                               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="app-eselect/eselect-emacs
-       sys-apps/texinfo
-       virtual/pkgconfig
-       gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-       !<=app-editors/emacs-27.1.9999-r0:27-vcs
-       !app-editors/emacs-vcs:27
-       app-eselect/eselect-emacs"
-
-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
-
-       eapply_user
-
-       # 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
-                       if use gtk2; then
-                               myconf+=" --with-x-toolkit=gtk2 
--without-xwidgets"
-                               use xwidgets && ewarn \
-                                       "USE flag \"xwidgets\" has no effect if 
\"gtk2\" is set."
-                       else
-                               myconf+=" --with-x-toolkit=gtk3 $(use_with 
xwidgets)"
-                       fi
-                       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
-               if ! use gtk; then
-                       use gtk2 && ewarn \
-                               "USE flag \"gtk2\" has no effect if \"gtk\" is 
not set."
-                       use xwidgets && ewarn \
-                               "USE flag \"xwidgets\" has no effect if \"gtk\" 
is not set."
-               fi
-       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
-       rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-       rm -rf "${ED}/usr/$(get_libdir)"
-       rm -rf "${ED}"/var
-
-       # remove unused <version>/site-lisp dir
-       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-       # remove COPYING file (except for etc/COPYING used by describe-copying)
-       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-       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
-               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 --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
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
-       else
-               eselect emacs update ifunset
-       fi
-}
-
-pkg_postrm() {
-       elisp-site-regen
-       eselect emacs update ifunset
-}

diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 1d93ee69f3e..b3d9de5e45e 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -31,8 +31,6 @@
     notification</flag>
   <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
     system font name</flag>
-  <flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3
-    (<pkg>x11-libs/gtk+</pkg>)</flag>
   <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
   <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> as text shaping
     engine</flag>

Reply via email to