commit: 68e71e4e80a501624001b48d1279d7a1439959dc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 08:43:32 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 08:44:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e71e4e
app-editors/emacs: Add libseccomp dependency and USE flag
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../emacs/{emacs-28.1.9999.ebuild => emacs-28.1-r1.ebuild} | 11 +++++++++--
.../emacs/{emacs-28.1.90.ebuild => emacs-28.1.90-r1.ebuild} | 13 ++++++++++---
app-editors/emacs/emacs-28.1.9999.ebuild | 9 ++++++++-
app-editors/emacs/emacs-29.0.9999.ebuild | 9 ++++++++-
4 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild
b/app-editors/emacs/emacs-28.1-r1.ebuild
similarity index 96%
copy from app-editors/emacs/emacs-28.1.9999.ebuild
copy to app-editors/emacs/emacs-28.1-r1.ebuild
index a3ba699d12bc..07b31db2a3d6 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1-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 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 seccomp 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[games?,gui(-)?]
@@ -59,6 +59,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
libxml2? ( >=dev-libs/libxml2-2.2.0 )
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( acct-group/mail net-libs/liblockfile )
+ seccomp? ( >=sys-libs/libseccomp-2.5.4 )
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
@@ -138,7 +139,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
src_prepare() {
if [[ ${PV##*.} = 9999 ]]; then
- FULL_VERSION=$(sed -n
's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+ 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}"
@@ -165,6 +166,12 @@ src_prepare() {
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+ if ! use seccomp; then
+ # libseccomp is detected even if not requested by its USE flag.
+ # Suppress it by supplying pkg-config with a wrong library name.
+ sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac
|| die
+ fi
+
AT_M4DIR=m4 eautoreconf
}
diff --git a/app-editors/emacs/emacs-28.1.90.ebuild
b/app-editors/emacs/emacs-28.1.90-r1.ebuild
similarity index 96%
rename from app-editors/emacs/emacs-28.1.90.ebuild
rename to app-editors/emacs/emacs-28.1.90-r1.ebuild
index 7875c15c2dcd..4ed01813450a 100644
--- a/app-editors/emacs/emacs-28.1.90.ebuild
+++ b/app-editors/emacs/emacs-28.1.90-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
if [[ ${PV##*.} = 9999 ]]; then
inherit git-r3
@@ -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 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 seccomp 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[games?,gui(-)?]
@@ -59,6 +59,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
libxml2? ( >=dev-libs/libxml2-2.2.0 )
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( acct-group/mail net-libs/liblockfile )
+ seccomp? ( >=sys-libs/libseccomp-2.5.4 )
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
@@ -165,7 +166,13 @@ src_prepare() {
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
- #AT_M4DIR=m4 eautoreconf
+ if ! use seccomp; then
+ # libseccomp is detected even if not requested by its USE flag.
+ # Suppress it by supplying pkg-config with a wrong library name.
+ sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac
|| die
+ fi
+
+ AT_M4DIR=m4 eautoreconf
}
src_configure() {
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild
b/app-editors/emacs/emacs-28.1.9999.ebuild
index a3ba699d12bc..4ed01813450a 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.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 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 seccomp 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[games?,gui(-)?]
@@ -59,6 +59,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
libxml2? ( >=dev-libs/libxml2-2.2.0 )
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( acct-group/mail net-libs/liblockfile )
+ seccomp? ( >=sys-libs/libseccomp-2.5.4 )
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
@@ -165,6 +166,12 @@ src_prepare() {
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+ if ! use seccomp; then
+ # libseccomp is detected even if not requested by its USE flag.
+ # Suppress it by supplying pkg-config with a wrong library name.
+ sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac
|| die
+ fi
+
AT_M4DIR=m4 eautoreconf
}
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild
b/app-editors/emacs/emacs-29.0.9999.ebuild
index 571ff6e3636c..16d41db01f4b 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.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 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 webp wide-int +X 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 seccomp selinux sound source
sqlite ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d
xft +xpm xwidgets zlib"
RESTRICT="test"
X_DEPEND="x11-libs/libICE
@@ -109,6 +109,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
libxml2? ( >=dev-libs/libxml2-2.2.0 )
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( acct-group/mail net-libs/liblockfile )
+ seccomp? ( >=sys-libs/libseccomp-2.5.4 )
selinux? ( sys-libs/libselinux )
sqlite? ( dev-db/sqlite:3 )
ssl? ( net-libs/gnutls:0= )
@@ -187,6 +188,12 @@ src_prepare() {
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+ if ! use seccomp; then
+ # libseccomp is detected even if not requested by its USE flag.
+ # Suppress it by supplying pkg-config with a wrong library name.
+ sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac
|| die
+ fi
+
AT_M4DIR=m4 eautoreconf
}
