From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C6C21582EF for ; Mon, 10 Mar 2025 11:55:07 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 59C80343129 for ; Mon, 10 Mar 2025 11:55:07 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id F03E21103A8; Mon, 10 Mar 2025 11:55:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E231F1103A8 for ; Mon, 10 Mar 2025 11:55:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53F43340C57 for ; Mon, 10 Mar 2025 11:55:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E063228AE for ; Mon, 10 Mar 2025 11:55:00 +0000 (UTC) From: "Ulrich Müller" 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" Message-ID: <1741607685.3d06a1ed1192e35cc6186bd2f8e3e701f9f57573.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-26.3-r23.ebuild app-editors/emacs/emacs-27.2-r21.ebuild app-editors/emacs/emacs-28.2-r17.ebuild app-editors/emacs/emacs-29.4-r3.ebuild app-editors/emacs/emacs-30.1-r1.ebuild app-editors/emacs/emacs-30.1.9999.ebuild app-editors/emacs/emacs-31.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 3d06a1ed1192e35cc6186bd2f8e3e701f9f57573 X-VCS-Branch: master Date: Mon, 10 Mar 2025 11:55:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fbb6b962-f036-4e9c-8e9a-551eb3b5ebd8 X-Archives-Hash: fdf8fb34c586290400290923b13fe611 commit: 3d06a1ed1192e35cc6186bd2f8e3e701f9f57573 Author: Ulrich Müller gentoo org> AuthorDate: Mon Mar 10 11:47:44 2025 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Mar 10 11:54:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d06a1ed app-editors/emacs: Don't install the systemd unit file This have been moved to app-emacs/emacs-common. Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-26.3-r23.ebuild | 368 +++++++++++++++++++++ ...macs-31.0.9999.ebuild => emacs-27.2-r21.ebuild} | 324 ++++-------------- ...macs-31.0.9999.ebuild => emacs-28.2-r17.ebuild} | 265 ++++++--------- ...emacs-30.1.9999.ebuild => emacs-29.4-r3.ebuild} | 47 ++- ...emacs-30.1.9999.ebuild => emacs-30.1-r1.ebuild} | 16 +- app-editors/emacs/emacs-30.1.9999.ebuild | 11 +- app-editors/emacs/emacs-31.0.9999.ebuild | 11 +- 7 files changed, 577 insertions(+), 465 deletions(-) diff --git a/app-editors/emacs/emacs-26.3-r23.ebuild b/app-editors/emacs/emacs-26.3-r23.ebuild new file mode 100644 index 000000000000..4c8b484977e3 --- /dev/null +++ b/app-editors/emacs/emacs-26.3-r23.ebuild @@ -0,0 +1,368 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools eapi9-pipestatus 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-12.tar.xz" +# 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}" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +SLOT="26" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games 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 valgrind wide-int Xaw3d xft +xpm zlib" + +RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui(-)?] + sys-libs/ncurses:0= + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + dbus? ( sys-apps/dbus ) + games? ( acct-group/gamestat ) + gpm? ( sys-libs/gpm ) + !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) + 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 ) + valgrind? ( dev-debug/valgrind ) + 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 ) + 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:= ) + xpm? ( x11-libs/libXpm ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXft + x11-libs/libXrender + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + ) + gtk? ( x11-libs/gtk+:3 ) + !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 + ) ) + ) + ) + ) )" + +DEPEND="${RDEPEND} + gui? ( !aqua? ( x11-base/xorg-proto ) )" + +BDEPEND="virtual/pkgconfig + gzip-el? ( app-arch/gzip )" + +IDEPEND="app-eselect/eselect-emacs" + +RDEPEND+=" ${IDEPEND}" + +EMACS_SUFFIX="emacs-${SLOT}" +SITEFILE="20${EMACS_SUFFIX}-gentoo.el" +PATCHES=("${WORKDIR}/patch") + +# Suppress false positive QA warnings #898304 +QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state ) + +src_prepare() { + default + + # Fix filename reference in redirected man page + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + strip-flags + filter-flags -pie #526948 + replace-flags "-O[3-9]" -O2 #839405 + + # We want floating-point arithmetic to be correct #933380 + replace-flags -Ofast -O2 + append-flags -fno-fast-math -ffp-contract=off + + local myconf=( + --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}" + --without-compress-install + --without-hesiod + --without-pop + --with-file-notification=$(usev inotify || usev gfile || echo no) + $(use_enable acl) + $(use_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gpm) + $(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) + ) + + if use alsa; then + use sound || ewarn \ + "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." + myconf+=( --with-sound=alsa ) + else + myconf+=( --with-sound=$(usex sound oss no) ) + 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 + --without-x + ) + else + myconf+=( + --with-x --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with xpm) + $(use_with imagemagick) + ) + + if use xft; then + myconf+=( + --with-xft + $(use_with cairo) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) + else + myconf+=( + --without-xft + --without-cairo + --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 + + local f line + if use gtk; then + einfo "Configuring to build with GIMP Toolkit (GTK+)" + while read line; do ewarn "${line}"; done <<-EOF + Your version of GTK+ will have problems with closing open + displays. This is no problem if you just use one display, but + if you use more than one and close one of them Emacs may crash. + See and + . + If you intend to use more than one display, then it is strongly + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. + EOF + myconf+=( --with-x-toolkit=gtk3 --without-xwidgets ) + for f in motif Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"gtk\" is set." + done + elif 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 + + econf "${myconf[@]}" +} + +src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + + # 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 + + # dissuade Portage from removing our dir file #257260 + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir + + # 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 + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die + rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}/usr/$(get_libdir)" || die + rm -rf "${ED}"/var || die + + # remove unused /site-lisp dir + rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die + + # remove COPYING file (except for etc/COPYING used by describe-copying) + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die + + if use gzip-el; then + # compress .el files when a corresponding .elc exists + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + pipestatus || die "gzip .el pipeline failed" + fi + + 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} + 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-equal emacs-version "${FULL_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 (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":")))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS CONTRIBUTE + + if use gui && use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + 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() { + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die +} + +pkg_postinst() { + elisp-site-regen + readme.gentoo_print_elog + + # Force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd. + # Otherwise, create it only when it is not yet set. + eselect --root="${ROOT}" emacs update $(usev !livecd ifunset) +} + +pkg_postrm() { + elisp-site-regen + eselect --root="${ROOT}" emacs update ifunset +} diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-27.2-r21.ebuild similarity index 62% copy from app-editors/emacs/emacs-31.0.9999.ebuild copy to app-editors/emacs/emacs-27.2-r21.ebuild index 5646bc84b384..145352804803 100644 --- a/app-editors/emacs/emacs-31.0.9999.ebuild +++ b/app-editors/emacs/emacs-27.2-r21.ebuild @@ -8,7 +8,7 @@ inherit autotools eapi9-pipestatus elisp-common flag-o-matic readme.gentoo-r1 to if [[ ${PV##*.} = 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" - EGIT_BRANCH="master" + EGIT_BRANCH="emacs-27" EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" S="${EGIT_CHECKOUT_DIR}" SLOT="${PV%%.*}-vcs" @@ -31,65 +31,22 @@ 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-12.tar.xz" + PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" 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" - -X_DEPEND="x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libxcb - x11-libs/xcb-util - x11-misc/xbitmaps - xpm? ( x11-libs/libXpm ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXrender - cairo? ( >=x11-libs/cairo-1.12.18[X] ) - !cairo? ( x11-libs/libXft ) - 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 ) - !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 - ) ) - ) - )" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games 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 valgrind wide-int Xaw3d xft +xpm zlib" +RESTRICT="test" -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] +RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -98,57 +55,72 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - jit? ( - 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 ) 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:= ) valgrind? ( dev-debug/valgrind ) - xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) - gui? ( + 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 ) 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:= ) - webp? ( media-libs/libwebp:0= ) + xpm? ( x11-libs/libXpm ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) - !aqua? ( - gsettings? ( - app-emacs/emacs-common[gsettings(-)] - >=dev-libs/glib-2.28.6 + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXrender + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) + 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 ) + !gtk? ( + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXpm + x11-libs/libXmu + x11-libs/libXt ) - 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 + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt ) - ) ) - !gtk? ( ${X_DEPEND} ) - X? ( ${X_DEPEND} ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) ) - )" + ) )" DEPEND="${RDEPEND} - gui? ( !aqua? ( - !gtk? ( x11-base/xorg-proto ) - X? ( x11-base/xorg-proto ) - ) )" + gui? ( !aqua? ( x11-base/xorg-proto ) )" BDEPEND="sys-apps/texinfo virtual/pkgconfig @@ -161,12 +133,12 @@ RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" -# Suppress false positive QA warnings #898304 #925091 +# Suppress false positive QA warnings #898304 #925449 QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 ) 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}" @@ -178,44 +150,9 @@ src_prepare() { default - if use jit; then - find lisp -type f -name "*.elc" -delete || die - - # These files ignore LDFLAGS. We assign the variable here, because - # for live ebuilds FULL_VERSION doesn't exist in global scope - QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" - - # The build system requires gcc for native compilation #874657 - if ! tc-is-gcc; then - ewarn "Emacs must be built with gcc[jit] if USE=jit is enabled." - ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc" - export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar NM=${CHOST}-gcc-nm \ - RANLIB=${CHOST}-gcc-ranlib - tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}" - fi - - # gccjit doesn't play well with ccache or distcc #801580 - # For now, work around the problem with an explicit LIBRARY_PATH - if has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc; then - export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ - | sed -n '/^libraries:/{s:^[^/]*::;p}') - fi - fi - # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die - # libseccomp is detected by configure but doesn't appear to have any - # effect on the installed image. Suppress it by supplying pkg-config - # with a wrong library name. - sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die - - # Tests that use bubblewrap don't work in the sandbox: - # "bwrap: setting up uid map: Permission denied" - # So, disrupt the search for the bwrap executable. - sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ - test/lisp/emacs-lisp/bytecomp-tests.el || die - AT_M4DIR=m4 eautoreconf } @@ -226,9 +163,6 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - # Prevents e.g. tests interfering with running Emacs. - unset EMACS_SOCKET_NAME - local myconf=( --program-suffix="-${EMACS_SUFFIX}" --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} @@ -241,24 +175,22 @@ 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) $(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) + $(use_with zlib) ) if use alsa; then @@ -269,56 +201,30 @@ src_configure() { myconf+=( --with-sound=$(usex sound oss no) ) fi - if use jit; then - use zlib || ewarn \ - "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=( --with-zlib ) - else - myconf+=( $(use_with zlib) ) - 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 gui; then einfo "Configuring to build without window system support" myconf+=( - --without-x --without-pgtk --without-ns + --without-x --without-ns ) elif use aqua; then einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" myconf+=( --with-ns --disable-ns-self-contained - --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 - --with-toolkit-scroll-bars #836392 - --without-gconf - --without-xwidgets - $(use_with gsettings) - $(use_with harfbuzz) - $(use_with m17n-lib libotf) - $(use_with m17n-lib m17n-flt) + --without-x ) else - # X11 myconf+=( - --with-x --without-pgtk --without-ns + --with-x --without-ns --without-gconf $(use_with gsettings) $(use_with toolkit-scroll-bars) + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) $(use_with xpm) + $(use_with imagemagick) ) if use xft; then @@ -375,19 +281,6 @@ src_configure() { fi fi - if use gui; then - # Common flags recognised for all GUIs - myconf+=( - $(use_with gif) - $(use_with jpeg) - $(use_with png) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with imagemagick) - ) - fi - if tc-is-cross-compiler; then # Configure a CBUILD directory when cross-compiling to make tools mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die @@ -407,7 +300,6 @@ src_configure() { src_compile() { export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) - append-cppflags -DUSE_VALGRIND=$(usex valgrind) if tc-is-cross-compiler; then # Build native tools for compiling lisp etc. @@ -416,74 +308,18 @@ src_compile() { # 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 - EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) - emake "${EMACS_EMAKE_ARGS[@]}" actual-all - else - EMACS_EMAKE_ARGS=() - emake + emake -C lisp all EMACS="${S}-build/src/emacs" fi -} -src_test() { - # List .el test files with a comment above listing the exact - # subtests which caused failure. Elements should begin with a %. - # e.g. %lisp/gnus/mml-sec-tests.el. - local exclude_tests=( - # Reason: permission denied on /nonexistent - # (vc-*-bzr only fails if breezy is installed, as they - # try to access cache dirs under /nonexistent) - # - # rmail-undigest-test-multipart-mixed-digest - # rmail-undigest-test-rfc1153-less-strict-digest - # rmail-undigest-test-rfc1153-sloppy-digest - # rmail-undigest-test-rfc934-digest - # vc-test-bzr02-state - # vc-test-bzr05-rename-file - # vc-test-bzr06-version-diff - # vc-bzr-test-bug9781 - %lisp/mail/undigest-tests.el - %lisp/vc/vc-tests.el - %lisp/vc/vc-bzr-tests.el - - # Reason: tries to access network - # internet-is-working - %src/process-tests.el - ) - use threads || exclude_tests+=( - %lisp/progmodes/eglot-tests.el - %src/emacs-module-tests.el - %src/keyboard-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 - local f - for f in browser extra ssh; do - printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \ - > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die - done - - # See test/README for possible options - emake \ - EMACS_TEST_VERBOSE=1 \ - EXCLUDE_TESTS="${exclude_tests[*]}" \ - TERM=dumb \ - TEST_BACKTRACE_LINE_LENGTH=nil \ - check + emake } src_install() { - emake \ - "${EMACS_EMAKE_ARGS[@]}" \ - DESTDIR="${D}" \ - NO_BIN_LINK=t \ - BLESSMAIL_TARGET="" \ - 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}.metainfo.xml || die + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die # dissuade Portage from removing our dir file #257260 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir @@ -498,8 +334,7 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die rm -rf "${ED}"/usr/share/{applications,icons} || die - rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 - rm -rf "${ED}/usr/$(get_libdir)/systemd" || die + rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die # remove unused /site-lisp dir @@ -508,15 +343,6 @@ src_install() { # remove COPYING file (except for etc/COPYING used by describe-copying) rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die - 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 - pipestatus || die - fi - if use gzip-el; then # compress .el files when a corresponding .elc exists find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ @@ -582,14 +408,6 @@ src_install() { \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink it into /Applications by yourself." fi - if ! use mailutils; then - DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs' - own e-mail features are going to be used as an e-mail client - (e.g. Rmail), you are strongly encouraged to enable it. If not, - Emacs will use its own implementation of movemail; which has - fewer features and is less secure. For more information see: - https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html" - 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: diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-28.2-r17.ebuild similarity index 76% copy from app-editors/emacs/emacs-31.0.9999.ebuild copy to app-editors/emacs/emacs-28.2-r17.ebuild index 5646bc84b384..6060644a39f3 100644 --- a/app-editors/emacs/emacs-31.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.2-r17.ebuild @@ -8,7 +8,7 @@ inherit autotools eapi9-pipestatus elisp-common flag-o-matic readme.gentoo-r1 to if [[ ${PV##*.} = 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" - EGIT_BRANCH="master" + EGIT_BRANCH="emacs-28" EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" S="${EGIT_CHECKOUT_DIR}" SLOT="${PV%%.*}-vcs" @@ -31,65 +31,21 @@ 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-11.tar.xz" + PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" 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" - -X_DEPEND="x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libxcb - x11-libs/xcb-util - x11-misc/xbitmaps - xpm? ( x11-libs/libXpm ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXrender - cairo? ( >=x11-libs/cairo-1.12.18[X] ) - !cairo? ( x11-libs/libXft ) - 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 ) - !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 - ) ) - ) - )" +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 valgrind wide-int Xaw3d xft +xpm zlib" -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] +RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -102,53 +58,72 @@ 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 ) 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:= ) valgrind? ( dev-debug/valgrind ) - xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) - gui? ( + 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 ) 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:= ) - webp? ( media-libs/libwebp:0= ) + xpm? ( x11-libs/libXpm ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) - !aqua? ( - gsettings? ( - app-emacs/emacs-common[gsettings(-)] - >=dev-libs/glib-2.28.6 + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXrender + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 ) - 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 + ) + gtk? ( x11-libs/gtk+:3 ) + !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 ) - ) ) - !gtk? ( ${X_DEPEND} ) - X? ( ${X_DEPEND} ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) ) - )" + ) )" DEPEND="${RDEPEND} - gui? ( !aqua? ( - !gtk? ( x11-base/xorg-proto ) - X? ( x11-base/xorg-proto ) - ) )" + gui? ( !aqua? ( x11-base/xorg-proto ) )" BDEPEND="sys-apps/texinfo virtual/pkgconfig @@ -161,7 +136,7 @@ RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" -# Suppress false positive QA warnings #898304 #925091 +# Suppress false positive QA warnings #898304 #925449 QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 ) src_prepare() { @@ -176,9 +151,8 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi - default - 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 @@ -202,14 +176,11 @@ src_prepare() { fi fi + default + # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die - # libseccomp is detected by configure but doesn't appear to have any - # effect on the installed image. Suppress it by supplying pkg-config - # with a wrong library name. - sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die - # Tests that use bubblewrap don't work in the sandbox: # "bwrap: setting up uid map: Permission denied" # So, disrupt the search for the bwrap executable. @@ -241,23 +212,21 @@ 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 jit native-compilation) + $(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) ) @@ -277,48 +246,30 @@ src_configure() { myconf+=( $(use_with zlib) ) 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 gui; then einfo "Configuring to build without window system support" myconf+=( - --without-x --without-pgtk --without-ns + --without-x --without-ns ) elif use aqua; then einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" myconf+=( --with-ns --disable-ns-self-contained - --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 - --with-toolkit-scroll-bars #836392 - --without-gconf - --without-xwidgets - $(use_with gsettings) - $(use_with harfbuzz) - $(use_with m17n-lib libotf) - $(use_with m17n-lib m17n-flt) + --without-x ) else - # X11 myconf+=( - --with-x --without-pgtk --without-ns + --with-x --without-ns --without-gconf $(use_with gsettings) $(use_with toolkit-scroll-bars) + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) $(use_with xpm) + $(use_with imagemagick) ) if use xft; then @@ -375,19 +326,6 @@ src_configure() { fi fi - if use gui; then - # Common flags recognised for all GUIs - myconf+=( - $(use_with gif) - $(use_with jpeg) - $(use_with png) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with imagemagick) - ) - fi - if tc-is-cross-compiler; then # Configure a CBUILD directory when cross-compiling to make tools mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die @@ -416,12 +354,10 @@ src_compile() { # 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 - EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) - emake "${EMACS_EMAKE_ARGS[@]}" actual-all - else - EMACS_EMAKE_ARGS=() - emake + emake -C lisp all EMACS="${S}-build/src/emacs" fi + + emake } src_test() { @@ -429,6 +365,20 @@ src_test() { # subtests which caused failure. Elements should begin with a %. # e.g. %lisp/gnus/mml-sec-tests.el. local exclude_tests=( + # Reason: not yet known + # mml-secure-en-decrypt-{1,2,3,4} + # mml-secure-find-usable-keys-{1,2} + # mml-secure-key-checks + # mml-secure-select-preferred-keys-4 + # 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) @@ -445,25 +395,27 @@ src_test() { %lisp/vc/vc-tests.el %lisp/vc/vc-bzr-tests.el + # Reason: some copyright years differ + %lisp/emacs-lisp/copyright-tests.el + + # Reason: quoting issues (fixed in Emacs 29) + %lib-src/emacsclient-tests.el + # Reason: tries to access network # internet-is-working %src/process-tests.el ) + use elibc_musl && exclude_tests+=( + # Reason: newlocale(3) lenient locale validation #906012 + # fns-tests-collate-strings + %src/fns-tests.el + ) use threads || exclude_tests+=( - %lisp/progmodes/eglot-tests.el %src/emacs-module-tests.el %src/keyboard-tests.el + %src/thread-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 - local f - for f in browser extra ssh; do - printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \ - > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die - done - # See test/README for possible options emake \ EMACS_TEST_VERBOSE=1 \ @@ -474,12 +426,7 @@ src_test() { } src_install() { - emake \ - "${EMACS_EMAKE_ARGS[@]}" \ - DESTDIR="${D}" \ - NO_BIN_LINK=t \ - BLESSMAIL_TARGET="" \ - 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 @@ -498,7 +445,6 @@ src_install() { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die rm -rf "${ED}"/usr/share/{applications,icons} || die - rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 rm -rf "${ED}/usr/$(get_libdir)/systemd" || die rm -rf "${ED}"/var || die @@ -508,15 +454,6 @@ src_install() { # remove COPYING file (except for etc/COPYING used by describe-copying) rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die - 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 - pipestatus || die - fi - if use gzip-el; then # compress .el files when a corresponding .elc exists find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ @@ -582,14 +519,6 @@ src_install() { \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink it into /Applications by yourself." fi - if ! use mailutils; then - DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs' - own e-mail features are going to be used as an e-mail client - (e.g. Rmail), you are strongly encouraged to enable it. If not, - Emacs will use its own implementation of movemail; which has - fewer features and is less secure. For more information see: - https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html" - 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: diff --git a/app-editors/emacs/emacs-30.1.9999.ebuild b/app-editors/emacs/emacs-29.4-r3.ebuild similarity index 93% copy from app-editors/emacs/emacs-30.1.9999.ebuild copy to app-editors/emacs/emacs-29.4-r3.ebuild index c41918367fa9..bb4ba8bcca52 100644 --- a/app-editors/emacs/emacs-30.1.9999.ebuild +++ b/app-editors/emacs/emacs-29.4-r3.ebuild @@ -8,7 +8,7 @@ inherit autotools eapi9-pipestatus elisp-common flag-o-matic readme.gentoo-r1 to 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-4.tar.xz" + PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 @@ -89,7 +92,7 @@ X_DEPEND="x11-libs/libICE ) )" -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] +RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -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= ) @@ -241,13 +244,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) @@ -448,12 +451,37 @@ src_test() { # Reason: tries to access network # internet-is-working %src/process-tests.el + + # Reason: fails with stable version of tree-sitter-json due to + # ast changes. Bug #922525 + %src/treesit-tests.log + + # Reason: test is not skipped if tree-sitter-tsx is not installed + # Bug #922525 + %lisp/progmodes/typescript-ts-mode-tests.el ) + use elibc_musl && exclude_tests+=( + # Reason: newlocale(3) lenient locale validation #906012 + # fns-tests-collate-strings + %src/fns-tests.el + ) use threads || exclude_tests+=( + %lisp/server-tests.el %lisp/progmodes/eglot-tests.el %src/emacs-module-tests.el %src/keyboard-tests.el ) + 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. @@ -508,15 +536,6 @@ src_install() { # remove COPYING file (except for etc/COPYING used by describe-copying) rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die - 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 - pipestatus || die - fi - if use gzip-el; then # compress .el files when a corresponding .elc exists find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ diff --git a/app-editors/emacs/emacs-30.1.9999.ebuild b/app-editors/emacs/emacs-30.1-r1.ebuild similarity index 98% copy from app-editors/emacs/emacs-30.1.9999.ebuild copy to app-editors/emacs/emacs-30.1-r1.ebuild index c41918367fa9..8cf6f74d807e 100644 --- a/app-editors/emacs/emacs-30.1.9999.ebuild +++ b/app-editors/emacs/emacs-30.1-r1.ebuild @@ -89,7 +89,7 @@ X_DEPEND="x11-libs/libICE ) )" -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] +RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -449,6 +449,11 @@ src_test() { # internet-is-working %src/process-tests.el ) + use elibc_musl && exclude_tests+=( + # Reason: newlocale(3) lenient locale validation #906012 + # fns-tests-collate-strings + %src/fns-tests.el + ) use threads || exclude_tests+=( %lisp/progmodes/eglot-tests.el %src/emacs-module-tests.el @@ -508,15 +513,6 @@ src_install() { # remove COPYING file (except for etc/COPYING used by describe-copying) rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die - 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 - pipestatus || die - fi - if use gzip-el; then # compress .el files when a corresponding .elc exists find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ diff --git a/app-editors/emacs/emacs-30.1.9999.ebuild b/app-editors/emacs/emacs-30.1.9999.ebuild index c41918367fa9..b4501aac7198 100644 --- a/app-editors/emacs/emacs-30.1.9999.ebuild +++ b/app-editors/emacs/emacs-30.1.9999.ebuild @@ -89,7 +89,7 @@ X_DEPEND="x11-libs/libICE ) )" -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] +RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -508,15 +508,6 @@ src_install() { # remove COPYING file (except for etc/COPYING used by describe-copying) rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die - 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 - pipestatus || die - fi - if use gzip-el; then # compress .el files when a corresponding .elc exists find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild index 5646bc84b384..520cd319d3fb 100644 --- a/app-editors/emacs/emacs-31.0.9999.ebuild +++ b/app-editors/emacs/emacs-31.0.9999.ebuild @@ -89,7 +89,7 @@ X_DEPEND="x11-libs/libICE ) )" -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] +RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -508,15 +508,6 @@ src_install() { # remove COPYING file (except for etc/COPYING used by describe-copying) rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die - 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 - pipestatus || die - fi - if use gzip-el; then # compress .el files when a corresponding .elc exists find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \