commit: a73bf72677419284760a0ada9333f8de1df1e1f0
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 09:50:54 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 11:42:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73bf726
app-editors/emacs: Replace string-match by string-equal in site-init file
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
...emacs-26.3-r20.ebuild => emacs-26.3-r21.ebuild} | 2 +-
...emacs-27.2-r18.ebuild => emacs-27.2-r19.ebuild} | 2 +-
...emacs-28.2-r14.ebuild => emacs-28.2-r15.ebuild} | 2 +-
.../{emacs-30.0.92.ebuild => emacs-29.4-r1.ebuild} | 25 ++++++++++++++++------
app-editors/emacs/emacs-30.0.91.ebuild | 2 +-
app-editors/emacs/emacs-30.0.92.ebuild | 2 +-
app-editors/emacs/emacs-30.0.9999-r1.ebuild | 2 +-
app-editors/emacs/emacs-31.0.9999.ebuild | 2 +-
8 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/app-editors/emacs/emacs-26.3-r20.ebuild
b/app-editors/emacs/emacs-26.3-r21.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-26.3-r20.ebuild
rename to app-editors/emacs/emacs-26.3-r21.ebuild
index d88bee4ca93d..a0ed4c9895fa 100644
--- a/app-editors/emacs/emacs-26.3-r20.ebuild
+++ b/app-editors/emacs/emacs-26.3-r21.ebuild
@@ -299,7 +299,7 @@ src_install() {
X
;;; ${EMACS_SUFFIX} site-lisp configuration
X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ (when (string-equal emacs-version "${FULL_VERSION}")
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-27.2-r18.ebuild
b/app-editors/emacs/emacs-27.2-r19.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-27.2-r18.ebuild
rename to app-editors/emacs/emacs-27.2-r19.ebuild
index fa4fb7f27cbb..7b92be2c5fa7 100644
--- a/app-editors/emacs/emacs-27.2-r18.ebuild
+++ b/app-editors/emacs/emacs-27.2-r19.ebuild
@@ -367,7 +367,7 @@ src_install() {
X
;;; ${EMACS_SUFFIX} site-lisp configuration
X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ (when (string-equal emacs-version "${FULL_VERSION}")
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-28.2-r14.ebuild
b/app-editors/emacs/emacs-28.2-r15.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-28.2-r14.ebuild
rename to app-editors/emacs/emacs-28.2-r15.ebuild
index 7fe1a7298698..55534cd81160 100644
--- a/app-editors/emacs/emacs-28.2-r14.ebuild
+++ b/app-editors/emacs/emacs-28.2-r15.ebuild
@@ -463,7 +463,7 @@ src_install() {
X
;;; ${EMACS_SUFFIX} site-lisp configuration
X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ (when (string-equal emacs-version "${FULL_VERSION}")
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-30.0.92.ebuild
b/app-editors/emacs/emacs-29.4-r1.ebuild
similarity index 95%
copy from app-editors/emacs/emacs-30.0.92.ebuild
copy to app-editors/emacs/emacs-29.4-r1.ebuild
index 3c000ffedb94..2ff9989a9764 100644
--- a/app-editors/emacs/emacs-30.0.92.ebuild
+++ b/app-editors/emacs/emacs-29.4-r1.ebuild
@@ -8,7 +8,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-30"
+ EGIT_BRANCH="emacs-29"
EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
S="${EGIT_CHECKOUT_DIR}"
SLOT="${PV%%.*}-vcs"
@@ -31,6 +31,9 @@ else
elif [[ ${PV//[0-9]} != "." ]]; then
SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz";
fi
+ # Patchset from proj/emacs-patches.git
+ SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz";
+ PATCHES=("${WORKDIR}/patch")
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
@@ -40,7 +43,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 gfile gif +gmp gpm
gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms
libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg
systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X
xattr Xaw3d xft +xpm 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 valgrind webp
wide-int +X Xaw3d xft +xpm zlib"
X_DEPEND="x11-libs/libICE
x11-libs/libSM
@@ -102,6 +105,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-devel/gcc:=[jit(-)]
sys-libs/zlib
)
+ json? ( dev-libs/jansson:= )
kerberos? ( virtual/krb5 )
lcms? ( media-libs/lcms:2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
@@ -113,7 +117,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
systemd? ( sys-apps/systemd )
tree-sitter? ( dev-libs/tree-sitter:= )
valgrind? ( dev-debug/valgrind )
- xattr? ( sys-apps/attr )
zlib? ( sys-libs/zlib )
gui? (
gif? ( media-libs/giflib:0= )
@@ -163,7 +166,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
# Suppress false positive QA warnings #898304 #925091
QA_CONFIG_IMPL_DECL_SKIP=(
- malloc_set_state malloc_get_state MIN static_assert alignof unreachable
+ malloc_set_state malloc_get_state MIN static_assert alignof
statvfs64 re_set_syntax re_compile_pattern re_search re_match
)
@@ -363,13 +366,13 @@ src_configure() {
--with-file-notification=$(usev inotify || usev gfile || echo
no) \
--with-pdumper \
$(use_enable acl) \
- $(use_enable xattr) \
$(use_with dbus) \
$(use_with dynamic-loading modules) \
$(use_with games gameuser ":gamestat") \
$(use_with gmp libgmp) \
$(use_with gpm) \
$(use_with jit native-compilation aot) \
+ $(use_with json) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with lcms lcms2) \
$(use_with libxml2 xml2) \
@@ -444,6 +447,16 @@ src_test() {
)
use xpm || exclude_tests+=( %src/image-tests.el )
+ # Some tests hang with gnupg-2.2.42
+ local gpgver=$(best_version app-crypt/gnupg)
+ gpgver=${gpgver#*gnupg-}
+ [[ -n ${gpgver} ]] \
+ && ver_test "${gpgver}" -ge 2.2.42 && ver_test "${gpgver}" -lt
2.3 \
+ && exclude_tests+=(
+ %lisp/epg-tests.el
+ %lisp/gnus/mml-sec-tests.el
+ )
+
# Redirect GnuPG's sockets, in order not to exceed the 108 char limit
# for socket paths on Linux.
mkdir -p "${T}"/gpg || die
@@ -528,7 +541,7 @@ src_install() {
X
;;; ${EMACS_SUFFIX} site-lisp configuration
X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ (when (string-equal emacs-version "${FULL_VERSION}")
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-30.0.91.ebuild
b/app-editors/emacs/emacs-30.0.91.ebuild
index 3c000ffedb94..7058569f30e2 100644
--- a/app-editors/emacs/emacs-30.0.91.ebuild
+++ b/app-editors/emacs/emacs-30.0.91.ebuild
@@ -528,7 +528,7 @@ src_install() {
X
;;; ${EMACS_SUFFIX} site-lisp configuration
X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ (when (string-equal emacs-version "${FULL_VERSION}")
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-30.0.92.ebuild
b/app-editors/emacs/emacs-30.0.92.ebuild
index 3c000ffedb94..7058569f30e2 100644
--- a/app-editors/emacs/emacs-30.0.92.ebuild
+++ b/app-editors/emacs/emacs-30.0.92.ebuild
@@ -528,7 +528,7 @@ src_install() {
X
;;; ${EMACS_SUFFIX} site-lisp configuration
X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ (when (string-equal emacs-version "${FULL_VERSION}")
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild
b/app-editors/emacs/emacs-30.0.9999-r1.ebuild
index 3c000ffedb94..7058569f30e2 100644
--- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild
@@ -528,7 +528,7 @@ src_install() {
X
;;; ${EMACS_SUFFIX} site-lisp configuration
X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ (when (string-equal emacs-version "${FULL_VERSION}")
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild
b/app-editors/emacs/emacs-31.0.9999.ebuild
index 33390f3a6274..22cbd35f4139 100644
--- a/app-editors/emacs/emacs-31.0.9999.ebuild
+++ b/app-editors/emacs/emacs-31.0.9999.ebuild
@@ -528,7 +528,7 @@ src_install() {
X
;;; ${EMACS_SUFFIX} site-lisp configuration
X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ (when (string-equal emacs-version "${FULL_VERSION}")
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
