summaryrefslogtreecommitdiff
path: root/app-editors
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-11-29 13:20:26 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-11-29 13:20:26 +0000
commit82020bf7ff936f52f6f1efc646ae374e46b5ed36 (patch)
tree1b1d0c4ea3c8e8d77a6066d8ac29c51cececd1a9 /app-editors
parent0bdb5244708888dfc364e30b08facc0a45281f78 (diff)
gentoo auto-resync : 29:11:2022 - 13:20:25
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/Manifest.gzbin14092 -> 14091 bytes
-rw-r--r--app-editors/emacs/Manifest4
-rw-r--r--app-editors/emacs/emacs-29.0.9999-r1.ebuild (renamed from app-editors/emacs/emacs-28.2.9999.ebuild)185
-rw-r--r--app-editors/emacs/emacs-30.0.9999.ebuild (renamed from app-editors/emacs/emacs-29.0.9999.ebuild)0
4 files changed, 117 insertions, 72 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 963c0661944f..61b901b7f403 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
Binary files differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 885d982d442b..31a38c5276d6 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -22,6 +22,6 @@ EBUILD emacs-27.2-r6.ebuild 14313 BLAKE2B ab1798c47805676f82f07833872d4dea0a5bd7
EBUILD emacs-28.1-r2.ebuild 14929 BLAKE2B af1a7d0560b7ff6643f20f4d4f2e5ce9a1a25b21c9cefec9a884bc362f76efa5624785a69cae91bd2bd42c94659fd43b16a9771c9190ac730678c9f26d991592 SHA512 aaeba27e9eb6b5de5c28525609a8e05e08fc755ad7a14c39fab36324ae433561711dd671db65f0b20036fa37a61c703e2ed938009c5acb4f8c638f8785db00f3
EBUILD emacs-28.1-r3.ebuild 15014 BLAKE2B a3101a3515f1a65d53e627f98bae37ae5bdad146385e1972fe42cd2e4d027cc24e3bf7127fa660a590fc0f67c42b384dd10d03f122849c1b07f9d78831ecd026 SHA512 d3afb32c3098919e892921a1a7311e79fede41ee588e5d8edd9695931a42ef81cbf39e55bba28e043bc645b1ad4d52de32c2704e9cef5b1e174b4ceb4b1aa3d2
EBUILD emacs-28.2-r1.ebuild 16772 BLAKE2B 358d7cd7107263ad003c03222f12ec389b736439babb3b42f44da127ad5bd62f1ed58a2b260e8c9885a1face1f332eb1fd53f2701880dc7d119a0bf3c0e94669 SHA512 cfa93adc3e64d8efdcdcbadcb708f4f145a612493d918d5809dddf0a89614b0d3d967caa47ad3eebb3a163fc895374d3a54e852ce79ac79738629d8e8888a595
-EBUILD emacs-28.2.9999.ebuild 16869 BLAKE2B 7b2689a37c8b0f7d9df094087b519e3007583f3ffd95cf550062a632425ecb26734f62453643715d44d6233a613707751a42b22f6cc17a0dbf261d9e29de2f6a SHA512 a6e204a5df72499d4e599898a8f69d01bafd24c059744847836239386c4d933d943098e2226975626edc3dbea9c74a4c6f2adbb53fcf8e72d5222d242c457ea7
-EBUILD emacs-29.0.9999.ebuild 18190 BLAKE2B 3211fec409a7f811c0b30aa2a22e18e319be31557c31691c0320706450a80fe4f898a915ff47c1c0393f9c1cfaf975e3247bd9205b6c9bae45a59d04ec7f050e SHA512 b46dce463e7a5eabe59b299313475239b25d50798d5ed417169092e5446a6e53079dcb213a80af6e1ccdbef4e35d765c20ad0ef33d6e46091362ddfe687ec460
+EBUILD emacs-29.0.9999-r1.ebuild 18192 BLAKE2B af9feb741daf980b1337fad8e784818d9af12b06fec9a67093d6b8f2ff511de9bb7d11420fd932908afd82f66f76e676aebb645231c5df918786e6f0142b9a7a SHA512 b5c5830f6dd1cb60fffb731a4c5a5bb88f6344e92864cad4eac0ba076bcea0d37532c2472f34732c75c88e1fb5b7e00f6e909e5f9a58f7ce65aa842c29e9e03f
+EBUILD emacs-30.0.9999.ebuild 18190 BLAKE2B 3211fec409a7f811c0b30aa2a22e18e319be31557c31691c0320706450a80fe4f898a915ff47c1c0393f9c1cfaf975e3247bd9205b6c9bae45a59d04ec7f050e SHA512 b46dce463e7a5eabe59b299313475239b25d50798d5ed417169092e5446a6e53079dcb213a80af6e1ccdbef4e35d765c20ad0ef33d6e46091362ddfe687ec460
MISC metadata.xml 3360 BLAKE2B dff967a79d9c9c964e2badf2427d996be01f8e95aff50da48ce980d6803bd4fd6766139f66968a127dda883e3997988488a4d085d575d0c14c88aedc465e17fc SHA512 37315a414b4c95312f674277df34fc030ff630d6c8c63c8e61a06bb817d7aa44c16520824d5b51b7140fbc20c7e16bc86e93f33a700b4b790457894665b508c8
diff --git a/app-editors/emacs/emacs-28.2.9999.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
index 790b902a9586..d473bc2fba8a 100644
--- a/app-editors/emacs/emacs-28.2.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
if [[ ${PV##*.} = 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
- EGIT_BRANCH="emacs-28"
+ EGIT_BRANCH="emacs-29"
EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
S="${EGIT_CHECKOUT_DIR}"
SLOT="${PV%%.*}-vcs"
@@ -40,7 +40,57 @@ 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 gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
+
+X_DEPEND="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
+ xpm? ( x11-libs/libXpm )
+ xft? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/libXrender
+ cairo? ( >=x11-libs/cairo-1.12.18[X] )
+ harfbuzz? ( media-libs/harfbuzz:0= )
+ m17n-lib? (
+ >=dev-libs/libotf-0.9.4
+ >=dev-libs/m17n-lib-1.5.1
+ )
+ )
+ gtk? (
+ x11-libs/gtk+:3
+ xwidgets? (
+ net-libs/webkit-gtk:4=
+ x11-libs/libXcomposite
+ )
+ )
+ !gtk? (
+ motif? (
+ >=x11-libs/motif-2.3:0
+ x11-libs/libXpm
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !motif? (
+ Xaw3d? (
+ x11-libs/libXaw3d
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !Xaw3d? ( athena? (
+ x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ ) )
+ )
+ )"
RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-libs/ncurses:0=
@@ -62,70 +112,43 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( acct-group/mail net-libs/liblockfile )
selinux? ( sys-libs/libselinux )
+ sqlite? ( dev-db/sqlite:3 )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
+ tree-sitter? ( dev-libs/tree-sitter )
zlib? ( sys-libs/zlib )
- gui? ( !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libxcb
- x11-misc/xbitmaps
- gsettings? ( >=dev-libs/glib-2.28.6 )
+ gui? (
gif? ( media-libs/giflib:0= )
jpeg? ( media-libs/libjpeg-turbo:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff:0 )
- xpm? ( x11-libs/libXpm )
+ webp? ( media-libs/libwebp:0= )
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- x11-libs/libXrender
- cairo? ( >=x11-libs/cairo-1.12.18[X] )
- harfbuzz? ( media-libs/harfbuzz:0= )
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? (
- x11-libs/gtk+:3
- xwidgets? (
- net-libs/webkit-gtk:4=
- x11-libs/libXcomposite
- )
- )
- !gtk? (
- motif? (
- >=x11-libs/motif-2.3:0
- x11-libs/libXpm
- x11-libs/libXmu
- x11-libs/libXt
- )
- !motif? (
- Xaw3d? (
- x11-libs/libXaw3d
- x11-libs/libXmu
- x11-libs/libXt
+ !aqua? (
+ gsettings? ( >=dev-libs/glib-2.28.6 )
+ gtk? ( !X? (
+ media-libs/fontconfig
+ media-libs/freetype
+ >=x11-libs/cairo-1.12.18
+ x11-libs/gtk+:3
+ harfbuzz? ( media-libs/harfbuzz:0= )
+ m17n-lib? (
+ >=dev-libs/libotf-0.9.4
+ >=dev-libs/m17n-lib-1.5.1
)
- !Xaw3d? ( athena? (
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXt
- ) )
- )
+ xwidgets? ( net-libs/webkit-gtk:4= )
+ ) )
+ !gtk? ( ${X_DEPEND} )
+ X? ( ${X_DEPEND} )
)
- ) )"
+ )"
DEPEND="${RDEPEND}
- gui? ( !aqua? ( x11-base/xorg-proto ) )"
+ gui? ( !aqua? (
+ !gtk? ( x11-base/xorg-proto )
+ X? ( x11-base/xorg-proto )
+ ) )"
BDEPEND="sys-apps/texinfo
virtual/pkgconfig
@@ -151,7 +174,6 @@ src_prepare() {
fi
if use jit; then
- export NATIVE_FULL_AOT=1
find lisp -type f -name "*.elc" -delete || die
# These files ignore LDFLAGS. We assign the variable here, because
@@ -192,6 +214,17 @@ src_configure() {
myconf+=" --with-sound=$(usex sound oss)"
fi
+ # Emacs supports these window systems:
+ # X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa).
+ # General GUI support is enabled by the "gui" USE flag, then
+ # the window system is selected as follows:
+ # "aqua" -> Nextstep
+ # "gtk -X" -> pure GTK
+ # otherwise -> X11
+ # For X11 there is the further choice of toolkits GTK, Motif,
+ # Athena (Lucid), or no toolkit. They are enabled (in order of
+ # preference) with the "gtk", "motif", "Xaw3d", and "athena" flags.
+
if use jit; then
use zlib || ewarn \
"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
@@ -202,23 +235,28 @@ src_configure() {
if ! use gui; then
einfo "Configuring to build without window system support"
- myconf+=" --without-x --without-ns"
+ myconf+=" --without-x --without-pgtk --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"
+ myconf+=" --without-x --without-pgtk"
+ elif use gtk && ! use X; then
+ einfo "Configuring to build with pure GTK (without X11) support"
+ myconf+=" --with-pgtk --without-x --without-ns"
+ myconf+=" --with-toolkit-scroll-bars" #836392
+ myconf+=" --without-gconf"
+ myconf+=" $(use_with gsettings)"
+ myconf+=" $(use_with harfbuzz)"
+ myconf+=" $(use_with m17n-lib libotf)"
+ myconf+=" $(use_with m17n-lib m17n-flt)"
+ myconf+=" $(use_with xwidgets)"
else
- myconf+=" --with-x --without-ns"
+ # X11
+ myconf+=" --with-x --without-pgtk --without-ns"
myconf+=" --without-gconf"
myconf+=" $(use_with gsettings)"
myconf+=" $(use_with toolkit-scroll-bars)"
- myconf+=" $(use_with gif)"
- myconf+=" $(use_with jpeg)"
- myconf+=" $(use_with png)"
- myconf+=" $(use_with svg rsvg)"
- myconf+=" $(use_with tiff)"
myconf+=" $(use_with xpm)"
- myconf+=" $(use_with imagemagick)"
if use xft; then
myconf+=" --with-xft"
@@ -272,6 +310,17 @@ src_configure() {
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
fi
+ if use gui; then
+ # Common flags recognised for all GUIs
+ myconf+=" $(use_with gif)"
+ myconf+=" $(use_with jpeg)"
+ myconf+=" $(use_with png)"
+ myconf+=" $(use_with svg rsvg)"
+ myconf+=" $(use_with tiff)"
+ myconf+=" $(use_with webp)"
+ myconf+=" $(use_with imagemagick)"
+ 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
@@ -303,16 +352,18 @@ src_configure() {
$(use_with games gameuser ":gamestat") \
$(use_with gmp libgmp) \
$(use_with gpm) \
- $(use_with jit native-compilation) \
+ $(use_with jit native-compilation aot) \
$(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 sqlite sqlite3) \
$(use_with ssl gnutls) \
$(use_with systemd libsystemd) \
$(use_with threads) \
+ $(use_with tree-sitter) \
$(use_with wide-int) \
${myconf}
}
@@ -344,12 +395,6 @@ src_test() {
# mml-secure-sign-verify-1
%lisp/gnus/mml-sec-tests.el
- # Reason: race condition
- # Looks like it should be fixed in 29.x at least:
- # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706
- # files-tests-file-name-non-special-file-in-directory-p
- %lisp/files-tests.el
-
# Reason: permission denied on /nonexistent
# (vc-*-bzr only fails if breezy is installed, as they
# try to access cache dirs under /nonexistent)
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild
index fb40e01fa66e..fb40e01fa66e 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild