From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1248666-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 58A6D1382C5
for <garchives@archives.gentoo.org>; Sat, 6 Feb 2021 23:00:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4056FE0828;
Sat, 6 Feb 2021 23:00:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 15E2AE0828
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Feb 2021 23:00:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 69A553435C6
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Feb 2021 23:00:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E1EC54BC
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Feb 2021 23:00:10 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1612652405.2d6765e58fc94e13dbc937d0c7dc59e49fe3f49f.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-editors/emacs/emacs-23.4-r21.ebuild app-editors/emacs/emacs-24.5-r10.ebuild app-editors/emacs/emacs-25.3-r9.ebuild app-editors/emacs/emacs-26.3-r4.ebuild app-editors/emacs/emacs-27.1-r4.ebuild app-editors/emacs/emacs-27.1.91-r1.ebuild app-editors/emacs/emacs-27.1.91.ebuild app-editors/emacs/emacs-27.1.9999-r1.ebuild app-editors/emacs/emacs-28.0.9999.ebuild
X-VCS-Directories: app-editors/emacs/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 2d6765e58fc94e13dbc937d0c7dc59e49fe3f49f
X-VCS-Branch: master
Date: Sat, 6 Feb 2021 23:00:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 96dcf809-8d05-4a02-a725-70aa50b239ab
X-Archives-Hash: 1450152d9a0bc195a626a457709e9892
commit: 2d6765e58fc94e13dbc937d0c7dc59e49fe3f49f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 6 22:54:47 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 6 23:00:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d6765e5
app-editors/emacs: Drop conditional gtk+:2 dependency
For slot 23, this means dropping GTK+ support entirely.
All later slots can be built with GTK+ 3.
Closes: https://bugs.gentoo.org/769023
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-editors/emacs/emacs-23.4-r21.ebuild | 345 +++++++++++++++++++++
...macs-28.0.9999.ebuild => emacs-24.5-r10.ebuild} | 188 +++--------
...emacs-28.0.9999.ebuild => emacs-25.3-r9.ebuild} | 170 +++-------
.../{emacs-27.1.91.ebuild => emacs-26.3-r4.ebuild} | 122 ++------
.../{emacs-27.1.91.ebuild => emacs-27.1-r4.ebuild} | 30 +-
...macs-27.1.91.ebuild => emacs-27.1.91-r1.ebuild} | 29 +-
app-editors/emacs/emacs-27.1.9999-r1.ebuild | 29 +-
app-editors/emacs/emacs-28.0.9999.ebuild | 29 +-
8 files changed, 475 insertions(+), 467 deletions(-)
diff --git a/app-editors/emacs/emacs-23.4-r21.ebuild b/app-editors/emacs/emacs-23.4-r21.ebuild
new file mode 100644
index 00000000000..d9c732a605e
--- /dev/null
+++ b/app-editors/emacs/emacs-23.4-r21.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WANT_AUTOMAKE="none"
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-23.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="alsa aqua athena dbus games gconf gif gpm gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm"
+
+RDEPEND="acct-group/mail
+ app-emacs/emacs-common-gentoo[games?,gui(-)?]
+ net-libs/liblockfile
+ sys-libs/ncurses:0=
+ kerberos? ( virtual/krb5 )
+ alsa? ( media-libs/alsa-lib )
+ games? ( acct-group/gamestat )
+ gpm? ( sys-libs/gpm )
+ dbus? ( sys-apps/dbus )
+ gui? ( !aqua? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-misc/xbitmaps
+ gconf? ( >=gnome-base/gconf-2.26.2 )
+ 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 )
+ 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
+ )
+ )
+ motif? (
+ >=x11-libs/motif-2.3:0
+ x11-libs/libXpm
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !motif? (
+ Xaw3d? (
+ x11-libs/libXaw3d
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !Xaw3d? ( athena? (
+ x11-libs/libXaw
+ x11-libs/libXext
+ 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
+
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+ || die "unable to sed ctags.1"
+
+ if ! use alsa; then
+ # ALSA is detected even if not requested by its USE flag.
+ # Suppress it by supplying pkg-config with a wrong library name.
+ sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+ || die "unable to sed configure.in"
+ fi
+ if ! use gzip-el; then
+ # Emacs' build system automatically detects the gzip binary and
+ # compresses el files. We don't want that so confuse it with a
+ # wrong binary name
+ sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+ || die "unable to sed configure.in"
+ fi
+
+ mv configure.in configure.ac || die
+ eautoreconf
+ touch src/stamp-h.in || die
+}
+
+src_configure() {
+ strip-flags
+ filter-flags -fstrict-aliasing -pie
+ append-flags $(test-flags -fno-strict-aliasing)
+ append-ldflags $(test-flags -no-pie) #639568
+
+ 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 && ! use sound; then
+ einfo "Although sound USE flag is disabled you chose to have alsa,"
+ einfo "so sound is switched on anyway."
+ myconf+=" --with-sound"
+ else
+ myconf+=" $(use_with sound)"
+ 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 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)"
+
+ 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
+ if 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
+
+ # According to configure, this option is only used for GNU/Linux
+ # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
+ # out the location because $(get_libdir) does not necessarily return
+ # something that matches the host OS's libdir naming (e.g. RHEL).
+ local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
+ crtdir=${crtdir%/*}
+
+ econf \
+ --program-suffix="-${EMACS_SUFFIX}" \
+ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+ --localstatedir="${EPREFIX}"/var \
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+ --with-crt-dir="${crtdir}" \
+ --with-gameuser=":gamestat" \
+ --without-hesiod \
+ $(use_with kerberos) $(use_with kerberos kerberos5) \
+ $(use_with gpm) \
+ $(use_with dbus) \
+ ${myconf}
+}
+
+src_compile() {
+ # Disable sandbox when dumping. For the unbelievers, see bug #131505
+ emake CC="$(tc-getCC)" \
+ AR="$(tc-getAR) cq" \
+ RANLIB="$(tc-getRANLIB)" \
+ RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+ || die "removing duplicate emacs executable failed"
+ mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
+ || die "moving emacs executable failed"
+
+ # move man pages to the correct place
+ local m
+ mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
+ || die "moving emacs man page failed"
+ for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
+ mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
+ || die "moving ${m} man page failed"
+ done
+
+ # 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
+
+ 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}
+ doins -r src/{m,s}
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+ 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 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-28.0.9999.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild
similarity index 60%
copy from app-editors/emacs/emacs-28.0.9999.ebuild
copy to app-editors/emacs/emacs-24.5-r10.ebuild
index bb7f7b6c96c..e67fbd411cb 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -3,74 +3,40 @@
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="master"
- 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
+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"
-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"
+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 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="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+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 )
- 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 )
@@ -86,23 +52,12 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
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? ( x11-libs/gtk+:3 )
!gtk? (
motif? (
>=x11-libs/motif-2.3:0
@@ -129,7 +84,6 @@ DEPEND="${RDEPEND}
gui? ( !aqua? ( x11-base/xorg-proto ) )"
BDEPEND="app-eselect/eselect-emacs
- sys-apps/texinfo
virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
@@ -138,30 +92,28 @@ RDEPEND="${RDEPEND}
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() {
- 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 ../patch
eapply_user
# Fix filename reference in redirected man page
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+ 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
@@ -169,6 +121,9 @@ src_configure() {
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
@@ -201,16 +156,11 @@ src_configure() {
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
@@ -228,13 +178,7 @@ src_configure() {
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
+ myconf+=" --with-x-toolkit=gtk3"
for f in motif Xaw3d athena; do
use ${f} && ewarn \
"USE flag \"${f}\" has no effect if \"gtk\" is set."
@@ -253,92 +197,55 @@ src_configure() {
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}" \
+ --with-gameuser=":gamestat" \
--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
+ # 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
+ 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
+ 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
- if ! use mailutils; then
- fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fi
+ 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}/usr/$(get_libdir)"
+ rm -rf "${ED}"/usr/share/{applications,icons}
rm -rf "${ED}"/var
# remove unused <version>/site-lisp dir
@@ -347,15 +254,6 @@ src_install() {
# 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 \
@@ -394,7 +292,7 @@ src_install() {
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
- dodoc README BUGS CONTRIBUTE
+ dodoc README BUGS
if use gui && use aqua; then
dodir /Applications/Gentoo
@@ -407,10 +305,9 @@ src_install() {
/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."
+ \\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
@@ -421,11 +318,6 @@ src_install() {
\"${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
}
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild
similarity index 65%
copy from app-editors/emacs/emacs-28.0.9999.ebuild
copy to app-editors/emacs/emacs-25.3-r9.ebuild
index bb7f7b6c96c..95929b38fad 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -3,64 +3,32 @@
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="master"
- 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
+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"
-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"
+SLOT="25"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+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 )
- 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
@@ -87,22 +55,12 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
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? ( x11-libs/gtk+:3 )
!gtk? (
motif? (
>=x11-libs/motif-2.3:0
@@ -129,34 +87,31 @@ 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-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() {
- 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 ../patch
eapply_user
# Fix filename reference in redirected man page
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+ 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() {
@@ -169,6 +124,9 @@ src_configure() {
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
@@ -202,7 +160,6 @@ src_configure() {
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
@@ -228,13 +185,8 @@ src_configure() {
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
+ 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."
@@ -253,92 +205,56 @@ src_configure() {
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}" \
+ --with-gameuser=":gamestat" \
--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
+ # 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
+ 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
+ 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
- if ! use mailutils; then
- fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fi
+ 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}/usr/$(get_libdir)"
rm -rf "${ED}"/var
# remove unused <version>/site-lisp dir
@@ -347,15 +263,6 @@ src_install() {
# 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 \
@@ -421,11 +328,6 @@ src_install() {
\"${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
}
diff --git a/app-editors/emacs/emacs-27.1.91.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild
similarity index 73%
copy from app-editors/emacs/emacs-27.1.91.ebuild
copy to app-editors/emacs/emacs-26.3-r4.ebuild
index d780f886638..41f63edeeb4 100644
--- a/app-editors/emacs/emacs-27.1.91.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -3,45 +3,16 @@
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
+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"
-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"
+SLOT="26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
sys-libs/ncurses:0=
@@ -49,10 +20,8 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
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 )
@@ -87,20 +56,16 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
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
- )
+ x11-libs/gtk+:3
+ xwidgets? (
+ net-libs/webkit-gtk:4=
+ x11-libs/libXcomposite
)
)
!gtk? (
@@ -129,29 +94,23 @@ 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-vcs:27
+ !<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() {
- 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 ../patch
eapply_user
# Fix filename reference in redirected man page
@@ -203,7 +162,6 @@ src_configure() {
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
@@ -229,13 +187,7 @@ src_configure() {
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
+ 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."
@@ -254,23 +206,8 @@ src_configure() {
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"
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
fi
econf \
@@ -283,14 +220,11 @@ src_configure() {
--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) \
@@ -305,17 +239,8 @@ src_configure() {
}
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
+ # Disable sandbox when dumping. For the unbelievers, see bug #131505
+ emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
}
src_install() {
@@ -422,11 +347,6 @@ src_install() {
\"${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
}
diff --git a/app-editors/emacs/emacs-27.1.91.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild
similarity index 94%
copy from app-editors/emacs/emacs-27.1.91.ebuild
copy to app-editors/emacs/emacs-27.1-r4.ebuild
index d780f886638..e585ef414e3 100644
--- a/app-editors/emacs/emacs-27.1.91.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
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"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
RESTRICT="test"
RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
)
)
gtk? (
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? (
- x11-libs/gtk+:3
- xwidgets? (
- net-libs/webkit-gtk:4=
- x11-libs/libXcomposite
- )
+ x11-libs/gtk+:3
+ xwidgets? (
+ net-libs/webkit-gtk:4=
+ x11-libs/libXcomposite
)
)
!gtk? (
@@ -134,6 +131,7 @@ BDEPEND="app-eselect/eselect-emacs
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"
@@ -229,13 +227,7 @@ src_configure() {
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
+ 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."
@@ -254,12 +246,8 @@ src_configure() {
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
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
fi
if tc-is-cross-compiler; then
diff --git a/app-editors/emacs/emacs-27.1.91.ebuild b/app-editors/emacs/emacs-27.1.91-r1.ebuild
similarity index 94%
rename from app-editors/emacs/emacs-27.1.91.ebuild
rename to app-editors/emacs/emacs-27.1.91-r1.ebuild
index d780f886638..f158a3cfe91 100644
--- a/app-editors/emacs/emacs-27.1.91.ebuild
+++ b/app-editors/emacs/emacs-27.1.91-r1.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
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"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
RESTRICT="test"
RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
)
)
gtk? (
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? (
- x11-libs/gtk+:3
- xwidgets? (
- net-libs/webkit-gtk:4=
- x11-libs/libXcomposite
- )
+ x11-libs/gtk+:3
+ xwidgets? (
+ net-libs/webkit-gtk:4=
+ x11-libs/libXcomposite
)
)
!gtk? (
@@ -229,13 +226,7 @@ src_configure() {
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
+ 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."
@@ -254,12 +245,8 @@ src_configure() {
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
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
fi
if tc-is-cross-compiler; then
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index 204c8f40dae..6ffdda65f73 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
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"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
RESTRICT="test"
RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
)
)
gtk? (
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? (
- x11-libs/gtk+:3
- xwidgets? (
- net-libs/webkit-gtk:4=
- x11-libs/libXcomposite
- )
+ x11-libs/gtk+:3
+ xwidgets? (
+ net-libs/webkit-gtk:4=
+ x11-libs/libXcomposite
)
)
!gtk? (
@@ -229,13 +226,7 @@ src_configure() {
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
+ 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."
@@ -254,12 +245,8 @@ src_configure() {
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
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
fi
if tc-is-cross-compiler; then
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index bb7f7b6c96c..c82a42541a8 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
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"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
RESTRICT="test"
RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
@@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
)
)
gtk? (
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? (
- x11-libs/gtk+:3
- xwidgets? (
- net-libs/webkit-gtk:4=
- x11-libs/libXcomposite
- )
+ x11-libs/gtk+:3
+ xwidgets? (
+ net-libs/webkit-gtk:4=
+ x11-libs/libXcomposite
)
)
!gtk? (
@@ -228,13 +225,7 @@ src_configure() {
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
+ 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."
@@ -253,12 +244,8 @@ src_configure() {
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
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
fi
if tc-is-cross-compiler; then