commit: d7fbd72efd2cc6096a71ac654e1659f12963dfe3
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 17:21:17 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 11:43:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fbd72e
app-editors/emacs: Migrate from X to gui USE flag.
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
...acs-18.59-r12.ebuild => emacs-18.59-r13.ebuild} | 8 +++---
...emacs-23.4-r18.ebuild => emacs-23.4-r19.ebuild} | 32 ++++++++++------------
.../{emacs-24.5-r7.ebuild => emacs-24.5-r8.ebuild} | 28 +++++++++----------
.../{emacs-25.3-r6.ebuild => emacs-25.3-r7.ebuild} | 28 +++++++++----------
.../{emacs-26.3-r1.ebuild => emacs-26.3-r2.ebuild} | 28 +++++++++----------
.../{emacs-27.1.ebuild => emacs-27.1-r1.ebuild} | 28 +++++++++----------
app-editors/emacs/emacs-27.1.9999-r1.ebuild | 28 +++++++++----------
app-editors/emacs/emacs-28.0.9999.ebuild | 28 +++++++++----------
8 files changed, 103 insertions(+), 105 deletions(-)
diff --git a/app-editors/emacs/emacs-18.59-r12.ebuild
b/app-editors/emacs/emacs-18.59-r13.ebuild
similarity index 97%
rename from app-editors/emacs/emacs-18.59-r12.ebuild
rename to app-editors/emacs/emacs-18.59-r13.ebuild
index 964b14b1384..c5e4416862a 100644
--- a/app-editors/emacs/emacs-18.59-r12.ebuild
+++ b/app-editors/emacs/emacs-18.59-r13.ebuild
@@ -14,17 +14,17 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
LICENSE="GPL-1+ GPL-2+ BSD HPND"
SLOT="18"
KEYWORDS="amd64 x86"
-IUSE="abi_x86_x32 X"
+IUSE="abi_x86_x32 gui"
RDEPEND="sys-libs/ncurses:0=
amd64? (
abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
)
- X? ( x11-libs/libX11 )"
+ gui? ( x11-libs/libX11 )"
DEPEND="${RDEPEND}
- X? (
+ gui? (
x11-base/xorg-proto
x11-misc/xbitmaps
)"
@@ -62,7 +62,7 @@ src_configure() {
*) die "Architecture ${ARCH} not yet supported" ;;
esac
local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
- use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
+ use gui && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
sed -e "${cmd}" src/config.h-dist >src/config.h || die
cat <<-END >src/paths.h
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild
b/app-editors/emacs/emacs-23.4-r19.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-23.4-r18.ebuild
rename to app-editors/emacs/emacs-23.4-r19.ebuild
index a84fad2f8d3..a7ebc3b3470 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r19.ebuild
@@ -14,10 +14,9 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
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 ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos
livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft
+xpm"
-REQUIRED_USE="?? ( aqua X )"
+IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos
livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft
+xpm"
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
kerberos? ( virtual/krb5 )
@@ -25,7 +24,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
games? ( acct-group/gamestat )
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
- X? (
+ gui? ( !aqua? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -71,15 +70,13 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
) )
)
)
- )"
+ ) )"
DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
+ gui? ( !aqua? ( x11-base/xorg-proto ) )"
BDEPEND="app-eselect/eselect-emacs
- alsa? ( virtual/pkgconfig )
- dbus? ( virtual/pkgconfig )
- X? ( virtual/pkgconfig )
+ virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
@@ -144,7 +141,14 @@ src_configure() {
myconf+=" $(use_with sound)"
fi
- if use X; then
+ 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)"
@@ -191,12 +195,6 @@ src_configure() {
einfo "Configuring to build with no toolkit"
myconf+=" --with-x-toolkit=no"
fi
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
fi
# According to configure, this option is only used for GNU/Linux
@@ -313,7 +311,7 @@ src_install() {
it is strongly recommended that you use app-admin/emacs-updater
to rebuild all byte-compiled elisp files of the installed Emacs
packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ use gui && 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
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild
b/app-editors/emacs/emacs-24.5-r8.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-24.5-r7.ebuild
rename to app-editors/emacs/emacs-24.5-r8.ebuild
index e82a60ec1c2..19dd854cd07 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r8.ebuild
@@ -13,10 +13,9 @@ SRC_URI="mirror://gnu/emacs/${P}.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 ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2
gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png
selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm
zlib"
-REQUIRED_USE="?? ( aqua X )"
+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=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
acl? ( virtual/acl )
@@ -30,7 +29,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
zlib? ( sys-libs/zlib )
- X? (
+ gui? ( !aqua? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -81,10 +80,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
) )
)
)
- )"
+ ) )"
DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
+ gui? ( !aqua? ( x11-base/xorg-proto ) )"
BDEPEND="app-eselect/eselect-emacs
virtual/pkgconfig
@@ -137,7 +136,14 @@ src_configure() {
myconf+=" --with-sound=$(usex sound oss)"
fi
- if use X; then
+ 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)"
@@ -194,12 +200,6 @@ src_configure() {
fi
! use gtk && use gtk2 && ewarn \
"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
fi
econf \
@@ -307,7 +307,7 @@ src_install() {
\\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."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ use gui && 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
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild
b/app-editors/emacs/emacs-25.3-r7.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-25.3-r6.ebuild
rename to app-editors/emacs/emacs-25.3-r7.ebuild
index c5fbd04048e..d54d8a9d32f 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r7.ebuild
@@ -13,10 +13,9 @@ SRC_URI="mirror://gnu/emacs/${P}.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 ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2
livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars
wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
+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=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
acl? ( virtual/acl )
@@ -30,7 +29,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
zlib? ( sys-libs/zlib )
- X? (
+ gui? ( !aqua? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -84,10 +83,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
) )
)
)
- )"
+ ) )"
DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
+ gui? ( !aqua? ( x11-base/xorg-proto ) )"
BDEPEND="app-eselect/eselect-emacs
virtual/pkgconfig
@@ -140,7 +139,14 @@ src_configure() {
myconf+=" --with-sound=$(usex sound oss)"
fi
- if use X; then
+ 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)"
@@ -202,12 +208,6 @@ src_configure() {
fi
! use gtk && use gtk2 && ewarn \
"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
fi
econf \
@@ -317,7 +317,7 @@ src_install() {
it is strongly recommended that you use app-admin/emacs-updater
to rebuild all byte-compiled elisp files of the installed Emacs
packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ use gui && 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
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild
b/app-editors/emacs/emacs-26.3-r2.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-26.3-r1.ebuild
rename to app-editors/emacs/emacs-26.3-r2.ebuild
index 334f327910f..764b1ea0cc7 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r2.ebuild
@@ -12,10 +12,9 @@ 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 ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
gpm gsettings gtk gtk2 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 X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
+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-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
@@ -32,7 +31,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- X? (
+ gui? ( !aqua? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -92,10 +91,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
) )
)
)
- )"
+ ) )"
DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
+ gui? ( !aqua? ( x11-base/xorg-proto ) )"
BDEPEND="app-eselect/eselect-emacs
virtual/pkgconfig
@@ -143,7 +142,14 @@ src_configure() {
myconf+=" --with-sound=$(usex sound oss)"
fi
- if use X; then
+ 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)"
@@ -214,12 +220,6 @@ src_configure() {
use xwidgets && ewarn \
"USE flag \"xwidgets\" has no effect if \"gtk\"
is not set."
fi
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
fi
econf \
@@ -343,7 +343,7 @@ src_install() {
it is strongly recommended that you use app-admin/emacs-updater
to rebuild all byte-compiled elisp files of the installed Emacs
packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ use gui && 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
diff --git a/app-editors/emacs/emacs-27.1.ebuild
b/app-editors/emacs/emacs-27.1-r1.ebuild
similarity index 95%
rename from app-editors/emacs/emacs-27.1.ebuild
rename to app-editors/emacs/emacs-27.1-r1.ebuild
index 9258d36369f..b2548c76e2c 100644
--- a/app-editors/emacs/emacs-27.1.ebuild
+++ b/app-editors/emacs/emacs-27.1-r1.ebuild
@@ -40,11 +40,10 @@ 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 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 X Xaw3d xft +xpm
xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
+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-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
@@ -63,7 +62,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- X? (
+ gui? ( !aqua? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -124,10 +123,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
) )
)
)
- )"
+ ) )"
DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
+ gui? ( !aqua? ( x11-base/xorg-proto ) )"
BDEPEND="app-eselect/eselect-emacs
sys-apps/texinfo
@@ -182,7 +181,14 @@ src_configure() {
myconf+=" --with-sound=$(usex sound oss)"
fi
- if use X; then
+ 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)"
@@ -254,12 +260,6 @@ src_configure() {
use xwidgets && ewarn \
"USE flag \"xwidgets\" has no effect if \"gtk\"
is not set."
fi
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
fi
econf \
@@ -386,7 +386,7 @@ src_install() {
it is strongly recommended that you use app-admin/emacs-updater
to rebuild all byte-compiled elisp files of the installed Emacs
packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ use gui && 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
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index 78fc06dd7e0..bd826f2edf1 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -40,11 +40,10 @@ 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 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 X Xaw3d xft +xpm
xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
+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-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
@@ -63,7 +62,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- X? (
+ gui? ( !aqua? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -124,10 +123,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
) )
)
)
- )"
+ ) )"
DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
+ gui? ( !aqua? ( x11-base/xorg-proto ) )"
BDEPEND="app-eselect/eselect-emacs
sys-apps/texinfo
@@ -181,7 +180,14 @@ src_configure() {
myconf+=" --with-sound=$(usex sound oss)"
fi
- if use X; then
+ 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)"
@@ -253,12 +259,6 @@ src_configure() {
use xwidgets && ewarn \
"USE flag \"xwidgets\" has no effect if \"gtk\"
is not set."
fi
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
fi
econf \
@@ -385,7 +385,7 @@ src_install() {
it is strongly recommended that you use app-admin/emacs-updater
to rebuild all byte-compiled elisp files of the installed Emacs
packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ use gui && 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
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild
b/app-editors/emacs/emacs-28.0.9999.ebuild
index 8137dcdd89b..478d84767fc 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -40,11 +40,10 @@ 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 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 X Xaw3d xft +xpm
xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
+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-1.5[games?,X?]
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
@@ -63,7 +62,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
- X? (
+ gui? ( !aqua? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -124,10 +123,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
) )
)
)
- )"
+ ) )"
DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
+ gui? ( !aqua? ( x11-base/xorg-proto ) )"
BDEPEND="app-eselect/eselect-emacs
sys-apps/texinfo
@@ -180,7 +179,14 @@ src_configure() {
myconf+=" --with-sound=$(usex sound oss)"
fi
- if use X; then
+ 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)"
@@ -252,12 +258,6 @@ src_configure() {
use xwidgets && ewarn \
"USE flag \"xwidgets\" has no effect if \"gtk\"
is not set."
fi
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
fi
econf \
@@ -384,7 +384,7 @@ src_install() {
it is strongly recommended that you use app-admin/emacs-updater
to rebuild all byte-compiled elisp files of the installed Emacs
packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ use gui && 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
