commit: ba7cc5e2b5850273eebdeb893e879099a8cef646 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Mar 28 12:55:43 2023 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Tue Mar 28 12:55:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7cc5e2
app-editors/emacs: Set INFOPATH env variable in site-init file ... and leave the Info-directory-list variable alone. Closes: https://bugs.gentoo.org/903147 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> ...emacs-28.3_rc1.ebuild => emacs-25.3-r17.ebuild} | 273 ++++----------------- ...emacs-28.3_rc1.ebuild => emacs-26.3-r14.ebuild} | 216 +++------------- ...emacs-28.3_rc1.ebuild => emacs-27.2-r12.ebuild} | 117 +-------- ...{emacs-28.3_rc1.ebuild => emacs-28.2-r7.ebuild} | 24 +- ...cs-28.3_rc1.ebuild => emacs-28.3_rc1-r1.ebuild} | 3 +- app-editors/emacs/emacs-29.0.9999-r1.ebuild | 3 +- app-editors/emacs/emacs-30.0.9999.ebuild | 3 +- 7 files changed, 97 insertions(+), 542 deletions(-) diff --git a/app-editors/emacs/emacs-28.3_rc1.ebuild b/app-editors/emacs/emacs-25.3-r17.ebuild similarity index 53% copy from app-editors/emacs/emacs-28.3_rc1.ebuild copy to app-editors/emacs/emacs-25.3-r17.ebuild index f27c55f138e8..bba808a9aa66 100644 --- a/app-editors/emacs/emacs-28.3_rc1.ebuild +++ b/app-editors/emacs/emacs-25.3-r17.ebuild @@ -3,75 +3,32 @@ EAPI=8 -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_CHECKOUT_DIR="${WORKDIR}/emacs" - S="${EGIT_CHECKOUT_DIR}" - SLOT="${PV%%.*}-vcs" -else - # 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%%_*}" - SRC_URI="mirror://gnu/emacs/${P}.tar.xz" - S="${WORKDIR}/emacs-${FULL_VERSION}" - # PV can be in any of the following formats: - # 27.1 released version (slot 27) - # 27.1_rc1 upstream release candidate (27) - # 27.0.9999 live ebuild (slot 27-vcs) - # 27.0.90 upstream prerelease snapshot (27-vcs) - # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) - if [[ ${PV} == *_pre* ]]; then - SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"; - S="${WORKDIR}/emacs" - 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/${PN}-28.2-patches-2.tar.xz"; - #PATCHES=("${WORKDIR}/patch") - PATCHES=( - "${WORKDIR}/patch/01_all_libseccomp.patch" - # 02_all_etags.patch already applied upstream - "${WORKDIR}/patch/03_all_webkit-4.1.patch" - ) - SLOT="${PV%%.*}" - [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi +inherit autotools 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-5.tar.xz"; 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" +SLOT="25" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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 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[games?,gui(-)?] +RDEPEND="acct-group/mail + app-emacs/emacs-common[games?,gui(-)?] + net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) - 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 ) ssl? ( net-libs/gnutls:0= ) - systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE @@ -97,19 +54,12 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] 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.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -135,8 +85,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] DEPEND="${RDEPEND} gui? ( !aqua? ( x11-base/xorg-proto ) )" -BDEPEND="sys-apps/texinfo - virtual/pkgconfig +BDEPEND="virtual/pkgconfig gzip-el? ( app-arch/gzip )" IDEPEND="app-eselect/eselect-emacs" @@ -145,47 +94,38 @@ RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" +# 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}" +PATCHES=("${WORKDIR}/patch") src_prepare() { - if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ - configure.ac) - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EGIT_BRANCH}" - einfo "Commit: ${EGIT_VERSION}" - einfo "Emacs version number: ${FULL_VERSION}" - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ - || die "Upstream version number changed to ${FULL_VERSION}" - 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 - # for live ebuilds FULL_VERSION doesn't exist in global scope - QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" - - # gccjit doesn't play well with ccache or distcc #801580 - # For now, work around the problem with an explicit LIBRARY_PATH - has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ - && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ - | sed -n '/^libraries:/{s:^[^/]*::;p}') - fi - default # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ + || die "unable to sed ctags.1" AT_M4DIR=m4 eautoreconf + touch src/stamp-h.in || die } src_configure() { - local myconf + strip-flags + filter-flags -pie #526948 + + if use ia64; then + replace-flags "-O[2-9]" -O1 #325373 + else + replace-flags "-O[3-9]" -O2 + fi + + # Don't trigger a floating point exception for NaNs on alpha + use alpha && append-flags -mieee - # Prevents e.g. tests interfering with running Emacs. - unset EMACS_SOCKET_NAME + local myconf if use alsa; then use sound || ewarn \ @@ -195,14 +135,6 @@ src_configure() { myconf+=" --with-sound=$(usex sound oss)" 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 - if ! use gui; then einfo "Configuring to build without window system support" myconf+=" --without-x --without-ns" @@ -226,7 +158,6 @@ src_configure() { if use xft; then myconf+=" --with-xft" myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" myconf+=" $(use_with m17n-lib libotf)" myconf+=" $(use_with m17n-lib m17n-flt)" else @@ -252,7 +183,8 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3" + myconf+=" --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -271,152 +203,54 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - 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 - ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit - popd >/dev/null || die - # Don't try to execute the binary for dumping during the build - myconf+=" --with-dumping=none" - elif use m68k; then - # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" - else - myconf+=" --with-dumping=pdumper" fi econf \ --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}" \ + --with-gameuser=":gamestat" \ --without-compress-install \ --without-hesiod \ - --without-pop \ --with-file-notification=$(usev inotify || usev gfile || echo no) \ - --with-pdumper \ $(use_enable acl) \ $(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) \ - $(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 ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ $(use_with wide-int) \ + $(use_with zlib) \ ${myconf} } src_compile() { - if tc-is-cross-compiler; then - # Build native tools for compiling lisp etc. - emake -C "${S}-build" src - emake lib # Cross-compile dependencies first for timestamps - # 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 - emake -C lisp all EMACS="${S}-build/src/emacs" - fi - - emake -} - -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: 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) - # - # 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: fails if bubblewrap (bwrap) is installed - # "bwrap: setting up uid map: Permission denied" - # - # bytecomp-tests--dest-mountpoint - %lisp/emacs-lisp/bytecomp-tests.el - - # Reason: inconsistent years in files? - # test-correct-notice - # test-end-chop - %lisp/emacs-lisp/copyright-tests.el - - # The following tests fail with USE=jit #874681 - # ert-test-record-backtrace - # loadhist-tests-file-dependents - # loadhist-tests-file-provides - %lisp/emacs-lisp/ert-tests.el - %lisp/loadhist-tests.el - ) - - # See test/README for possible options - emake \ - EMACS_TEST_VERBOSE=1 \ - EXCLUDE_TESTS="${exclude_tests[*]}" \ - TEST_BACKTRACE_LINE_LENGTH=nil \ - check + # 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}.metainfo.xml || die + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ + || die "moving emacs executable failed" + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ + || die "moving emacs man page failed" # 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 + fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail # 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)/systemd" || die + rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die rm -rf "${ED}"/var || die # remove unused <version>/site-lisp dir @@ -425,15 +259,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 - assert - fi - if use gzip-el; then # compress .el files when a corresponding .elc exists find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ @@ -468,7 +293,8 @@ src_install() { 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 (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" + X (string-join (prune-directory-list (cdr p)) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die @@ -499,11 +325,6 @@ src_install() { \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink it into /Applications by yourself." 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: - \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable - \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-28.3_rc1.ebuild b/app-editors/emacs/emacs-26.3-r14.ebuild similarity index 60% copy from app-editors/emacs/emacs-28.3_rc1.ebuild copy to app-editors/emacs/emacs-26.3-r14.ebuild index f27c55f138e8..8a42cdd8d361 100644 --- a/app-editors/emacs/emacs-28.3_rc1.ebuild +++ b/app-editors/emacs/emacs-26.3-r14.ebuild @@ -3,52 +3,17 @@ EAPI=8 -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_CHECKOUT_DIR="${WORKDIR}/emacs" - S="${EGIT_CHECKOUT_DIR}" - SLOT="${PV%%.*}-vcs" -else - # 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%%_*}" - SRC_URI="mirror://gnu/emacs/${P}.tar.xz" - S="${WORKDIR}/emacs-${FULL_VERSION}" - # PV can be in any of the following formats: - # 27.1 released version (slot 27) - # 27.1_rc1 upstream release candidate (27) - # 27.0.9999 live ebuild (slot 27-vcs) - # 27.0.90 upstream prerelease snapshot (27-vcs) - # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) - if [[ ${PV} == *_pre* ]]; then - SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"; - S="${WORKDIR}/emacs" - 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/${PN}-28.2-patches-2.tar.xz"; - #PATCHES=("${WORKDIR}/patch") - PATCHES=( - "${WORKDIR}/patch/01_all_libseccomp.patch" - # 02_all_etags.patch already applied upstream - "${WORKDIR}/patch/03_all_webkit-4.1.patch" - ) - SLOT="${PV%%.*}" - [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi +inherit autotools 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-5.tar.xz"; 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" +SLOT="26" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 wide-int Xaw3d xft +xpm xwidgets zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -56,14 +21,8 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) - 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 ) @@ -97,7 +56,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] 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 @@ -135,8 +93,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] DEPEND="${RDEPEND} gui? ( !aqua? ( x11-base/xorg-proto ) )" -BDEPEND="sys-apps/texinfo - virtual/pkgconfig +BDEPEND="virtual/pkgconfig gzip-el? ( app-arch/gzip )" IDEPEND="app-eselect/eselect-emacs" @@ -145,34 +102,14 @@ RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" +# 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}" +PATCHES=("${WORKDIR}/patch") src_prepare() { - if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ - configure.ac) - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EGIT_BRANCH}" - einfo "Commit: ${EGIT_VERSION}" - einfo "Emacs version number: ${FULL_VERSION}" - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ - || die "Upstream version number changed to ${FULL_VERSION}" - 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 - # for live ebuilds FULL_VERSION doesn't exist in global scope - QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" - - # gccjit doesn't play well with ccache or distcc #801580 - # For now, work around the problem with an explicit LIBRARY_PATH - has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ - && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ - | sed -n '/^libraries:/{s:^[^/]*::;p}') - fi - default # Fix filename reference in redirected man page @@ -182,10 +119,16 @@ src_prepare() { } src_configure() { - local myconf + strip-flags + filter-flags -pie #526948 + + if use ia64; then + replace-flags "-O[2-9]" -O1 #325373 + else + replace-flags "-O[3-9]" -O2 + fi - # Prevents e.g. tests interfering with running Emacs. - unset EMACS_SOCKET_NAME + local myconf if use alsa; then use sound || ewarn \ @@ -195,14 +138,6 @@ src_configure() { myconf+=" --with-sound=$(usex sound oss)" 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 - if ! use gui; then einfo "Configuring to build without window system support" myconf+=" --without-x --without-ns" @@ -226,7 +161,6 @@ src_configure() { if use xft; then myconf+=" --with-xft" myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" myconf+=" $(use_with m17n-lib libotf)" myconf+=" $(use_with m17n-lib m17n-flt)" else @@ -275,20 +209,6 @@ src_configure() { "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." 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 - ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit - popd >/dev/null || die - # Don't try to execute the binary for dumping during the build - myconf+=" --with-dumping=none" - elif use m68k; then - # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" - else - myconf+=" --with-dumping=pdumper" - fi - econf \ --program-suffix="-${EMACS_SUFFIX}" \ --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ @@ -299,15 +219,11 @@ src_configure() { --without-hesiod \ --without-pop \ --with-file-notification=$(usev inotify || usev gfile || echo no) \ - --with-pdumper \ $(use_enable acl) \ $(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) \ - $(use_with json) \ $(use_with kerberos) $(use_with kerberos kerberos5) \ $(use_with lcms lcms2) \ $(use_with libxml2 xml2) \ @@ -317,83 +233,13 @@ src_configure() { $(use_with systemd libsystemd) \ $(use_with threads) \ $(use_with wide-int) \ + $(use_with zlib) \ ${myconf} } src_compile() { - if tc-is-cross-compiler; then - # Build native tools for compiling lisp etc. - emake -C "${S}-build" src - emake lib # Cross-compile dependencies first for timestamps - # 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 - emake -C lisp all EMACS="${S}-build/src/emacs" - fi - - emake -} - -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: 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) - # - # 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: fails if bubblewrap (bwrap) is installed - # "bwrap: setting up uid map: Permission denied" - # - # bytecomp-tests--dest-mountpoint - %lisp/emacs-lisp/bytecomp-tests.el - - # Reason: inconsistent years in files? - # test-correct-notice - # test-end-chop - %lisp/emacs-lisp/copyright-tests.el - - # The following tests fail with USE=jit #874681 - # ert-test-record-backtrace - # loadhist-tests-file-dependents - # loadhist-tests-file-provides - %lisp/emacs-lisp/ert-tests.el - %lisp/loadhist-tests.el - ) - - # See test/README for possible options - emake \ - EMACS_TEST_VERBOSE=1 \ - EXCLUDE_TESTS="${exclude_tests[*]}" \ - TEST_BACKTRACE_LINE_LENGTH=nil \ - check + # Disable sandbox when dumping. For the unbelievers, see bug #131505 + emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs" } src_install() { @@ -401,7 +247,7 @@ src_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 @@ -416,7 +262,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/$(get_libdir)/systemd" || die + rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die # remove unused <version>/site-lisp dir @@ -468,7 +314,8 @@ src_install() { 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 (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" + X (string-join (prune-directory-list (cdr p)) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die @@ -499,11 +346,6 @@ src_install() { \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink it into /Applications by yourself." 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: - \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable - \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-28.3_rc1.ebuild b/app-editors/emacs/emacs-27.2-r12.ebuild similarity index 79% copy from app-editors/emacs/emacs-28.3_rc1.ebuild copy to app-editors/emacs/emacs-27.2-r12.ebuild index f27c55f138e8..8aa6265b68e2 100644 --- a/app-editors/emacs/emacs-28.3_rc1.ebuild +++ b/app-editors/emacs/emacs-27.2-r12.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-27" EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" S="${EGIT_CHECKOUT_DIR}" SLOT="${PV%%.*}-vcs" @@ -32,13 +32,8 @@ else 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/${PN}-28.2-patches-2.tar.xz"; - #PATCHES=("${WORKDIR}/patch") - PATCHES=( - "${WORKDIR}/patch/01_all_libseccomp.patch" - # 02_all_etags.patch already applied upstream - "${WORKDIR}/patch/03_all_webkit-4.1.patch" - ) + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-6.tar.xz"; + PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" @@ -48,7 +43,8 @@ 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 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[games?,gui(-)?] sys-libs/ncurses:0= @@ -59,10 +55,6 @@ 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 ) @@ -148,7 +140,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}" @@ -158,21 +150,6 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" 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 - # for live ebuilds FULL_VERSION doesn't exist in global scope - QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" - - # gccjit doesn't play well with ccache or distcc #801580 - # For now, work around the problem with an explicit LIBRARY_PATH - has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ - && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ - | sed -n '/^libraries:/{s:^[^/]*::;p}') - fi - default # Fix filename reference in redirected man page @@ -184,9 +161,6 @@ src_prepare() { src_configure() { local myconf - # Prevents e.g. tests interfering with running Emacs. - unset EMACS_SOCKET_NAME - if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." @@ -195,14 +169,6 @@ src_configure() { myconf+=" --with-sound=$(usex sound oss)" 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 - if ! use gui; then einfo "Configuring to build without window system support" myconf+=" --without-x --without-ns" @@ -306,7 +272,6 @@ src_configure() { $(use_with games gameuser ":gamestat") \ $(use_with gmp libgmp) \ $(use_with gpm) \ - $(use_with jit native-compilation) \ $(use_with json) \ $(use_with kerberos) $(use_with kerberos kerberos5) \ $(use_with lcms lcms2) \ @@ -317,6 +282,7 @@ src_configure() { $(use_with systemd libsystemd) \ $(use_with threads) \ $(use_with wide-int) \ + $(use_with zlib) \ ${myconf} } @@ -334,74 +300,12 @@ src_compile() { emake } -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: 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) - # - # 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: fails if bubblewrap (bwrap) is installed - # "bwrap: setting up uid map: Permission denied" - # - # bytecomp-tests--dest-mountpoint - %lisp/emacs-lisp/bytecomp-tests.el - - # Reason: inconsistent years in files? - # test-correct-notice - # test-end-chop - %lisp/emacs-lisp/copyright-tests.el - - # The following tests fail with USE=jit #874681 - # ert-test-record-backtrace - # loadhist-tests-file-dependents - # loadhist-tests-file-provides - %lisp/emacs-lisp/ert-tests.el - %lisp/loadhist-tests.el - ) - - # See test/README for possible options - emake \ - EMACS_TEST_VERBOSE=1 \ - EXCLUDE_TESTS="${exclude_tests[*]}" \ - TEST_BACKTRACE_LINE_LENGTH=nil \ - check -} - 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}.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 @@ -416,7 +320,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/$(get_libdir)/systemd" || die + rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die # remove unused <version>/site-lisp dir @@ -468,7 +372,8 @@ src_install() { 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 (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" + X (string-join (prune-directory-list (cdr p)) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-28.3_rc1.ebuild b/app-editors/emacs/emacs-28.2-r7.ebuild similarity index 96% copy from app-editors/emacs/emacs-28.3_rc1.ebuild copy to app-editors/emacs/emacs-28.2-r7.ebuild index f27c55f138e8..38cb0d9bafd8 100644 --- a/app-editors/emacs/emacs-28.3_rc1.ebuild +++ b/app-editors/emacs/emacs-28.2-r7.ebuild @@ -32,13 +32,8 @@ else 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/${PN}-28.2-patches-2.tar.xz"; - #PATCHES=("${WORKDIR}/patch") - PATCHES=( - "${WORKDIR}/patch/01_all_libseccomp.patch" - # 02_all_etags.patch already applied upstream - "${WORKDIR}/patch/03_all_webkit-4.1.patch" - ) + 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 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" @@ -374,18 +369,6 @@ src_test() { # # bytecomp-tests--dest-mountpoint %lisp/emacs-lisp/bytecomp-tests.el - - # Reason: inconsistent years in files? - # test-correct-notice - # test-end-chop - %lisp/emacs-lisp/copyright-tests.el - - # The following tests fail with USE=jit #874681 - # ert-test-record-backtrace - # loadhist-tests-file-dependents - # loadhist-tests-file-provides - %lisp/emacs-lisp/ert-tests.el - %lisp/loadhist-tests.el ) # See test/README for possible options @@ -468,7 +451,8 @@ src_install() { 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 (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" + X (string-join (prune-directory-list (cdr p)) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-28.3_rc1.ebuild b/app-editors/emacs/emacs-28.3_rc1-r1.ebuild similarity index 99% rename from app-editors/emacs/emacs-28.3_rc1.ebuild rename to app-editors/emacs/emacs-28.3_rc1-r1.ebuild index f27c55f138e8..fa4e3b7069be 100644 --- a/app-editors/emacs/emacs-28.3_rc1.ebuild +++ b/app-editors/emacs/emacs-28.3_rc1-r1.ebuild @@ -468,7 +468,8 @@ src_install() { 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 (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" + X (string-join (prune-directory-list (cdr p)) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild index 16e932a02739..a7ec45f53dd7 100644 --- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild @@ -498,7 +498,8 @@ src_install() { 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 (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" + X (string-join (prune-directory-list (cdr p)) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 257e0e3e5c92..28e579c21b1a 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -498,7 +498,8 @@ src_install() { 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 (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" + X (string-join (prune-directory-list (cdr p)) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die
