diff options
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/Manifest.gz | bin | 14110 -> 14113 bytes | |||
-rw-r--r-- | app-editors/emacs/Manifest | 10 | ||||
-rw-r--r-- | app-editors/emacs/emacs-30.0.93.ebuild | 630 | ||||
-rw-r--r-- | app-editors/emacs/emacs-30.0.9999-r1.ebuild | 630 | ||||
-rw-r--r-- | app-editors/emacs/emacs-30.1.9999.ebuild (renamed from app-editors/emacs/emacs-30.0.91.ebuild) | 0 | ||||
-rw-r--r-- | app-editors/emacs/emacs-30.1_rc1.ebuild (renamed from app-editors/emacs/emacs-30.0.92.ebuild) | 0 |
6 files changed, 3 insertions, 1267 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 0664f3be0a0e..3d28fbebdad0 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index cc5362c0df69..61a265385694 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -11,9 +11,7 @@ DIST emacs-28.2-patches-8.tar.xz 10504 BLAKE2B fe21b417a79f6f22ac594168aaa786359 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8 DIST emacs-29.4-patches-3.tar.xz 2364 BLAKE2B bf0d044ad0b12eeea1b87d76f143f3a542857eff6b29685abb2b37efd0105580cba2f4ca49655b4da6e13d3997e6c26f2966e597f66753b5321f6aa09f8c563d SHA512 4c6321a63a3f917f9644d464c74925fad0942caeb57966b2a5a0ed171eeb8987230b7039b2829f96526d205b4ad97fcc94f991ecdf7296d8dee355eb14d4df36 DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b08883bdd07be6d8acf0039df2aeebd294e679e98f4c64a9dd9bdad93589fc7c176cf3860d4fb823fce23f7f2b3cd SHA512 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80 -DIST emacs-30.0.91.tar.xz 54782188 BLAKE2B 9ef6f6bcca6b33fb9f70530ff1bb2ff8d56d88d201b8a9267d503e75f23efdb6e9707353495d1c504fbdd26a6a260d39cf98077188f41d65118af21e02715069 SHA512 43dd5d21dab16d88c1ca2e430a11dad1e4a7e173f217f5762aea0b6e68b526c6486a9e2856622c1f9aa06553192d2d0fa04454115f1e77e221b14b6b03dc31b6 -DIST emacs-30.0.92.tar.xz 54813380 BLAKE2B adb5eb9e9b8f6eb059688d28730276db07ac82878bc56c98f68c790053d7d7803c16e7898dc2497464d2394c6778e917104df7f0ca869c48decc5c4e41feac1a SHA512 d5cf786733986d8233379859eb15d382c69e71737b790a8732d66818361e1632c9137c26a14534ad14baa4f38bfdc5e4e3e0d94017cfe54586693067e5ff7d05 -DIST emacs-30.0.93.tar.xz 54820220 BLAKE2B 5c9a48eae9beaaa1a2ab2c4f3d4e3c4d1f4d71c180c07dfe1569df79d750479f7d96bbb6786608a2da748de89fdbd870b25ef04d27fec2c8f0642be76b945dc2 SHA512 030e9ecefc91c8088c6638a6b3a438c3999ccf0445f4362027d62bb56dcbdde744a7d003bd149cc1a2ad1528e4062cf42c6cfb3121890595d1e2b668a028dc28 +DIST emacs-30.1-rc1.tar.xz 54976476 BLAKE2B 4cefa714a7d5c1b52cf98211406d9a102e705188c755fa7ce9f4e94c97a78e6a3fd6c9dde5d4d2314ec2455bdb366d4f8c1a56d2f2a04b7e60a83f37fe9ebc66 SHA512 b23a079cf8e63283e16154967c0a24dab42bb70acf200a26c8e0978113bb40a591e150df858cdba5c751bc28b8fdc7effb5d91b48413b181e12b29189cedfc16 EBUILD emacs-18.59-r15.ebuild 4497 BLAKE2B 21a6196ab04e75817c273796559a56747ae16ad914285a692e7fd3c3f9087573402e99aada6fe1cda72c0036f30839c637db87da3974957b6d567ab9739bcae2 SHA512 971e5e2d3c361f605d044c47528093df26aa120d01a2f3351a7c601f0bba6f57cebf3c6193f9cd14fe4c657e189561612dd9d26f1c54a29412bcfcc5a7c1b965 EBUILD emacs-26.3-r19.ebuild 11823 BLAKE2B 0ddb554f48e9f62d06cd6df2a840436d516b2ed1301cd639ce19584ea9350d7ec765cf249fcfa7a1e7ff139f135bcd96aaacd2e20d450aee126d0d7c02915ec1 SHA512 10475df4b0c9685f0f3f491ecc625524146af1e850e60425ebdad46c288f2f7be57f0c98e899086cb7ee3a405f25c3c79b03f0dc4deee9b24e560690e6426354 EBUILD emacs-26.3-r21.ebuild 11743 BLAKE2B d7ab3b40724ec14f676cf0a8c8cf87b6d00bd1f8bb8b881366d5634deabdb9fa6906c872021119ee76f44969249fd21d2f9e106d911dbe64d10bcbf64a9c4dd2 SHA512 f3f00d41dd29263b59ea0bc05107758b3360f25d032b37ed4a9afc1dbb921e9130490af89b43e9293822b618ad13cc59c317b83064f95e16b7e2d192dd7d93fc @@ -23,9 +21,7 @@ EBUILD emacs-28.2-r13.ebuild 17522 BLAKE2B df13974f748f4b0b9c59e857c40b00625b21a EBUILD emacs-28.2-r15.ebuild 17754 BLAKE2B 7eec37eec6a1b95017a658ef97dd4de48b9c60c7da08356dc74024b7d0e8cf593781614b180c764290c449654bf9674e5cbea72a2df9c4e4fd5fbf34b1c0f2a0 SHA512 0db2ef3952490296244fbc916fd415cd8fc0a8d9816800deaa6ff1c7fdcd3ebe20108c0288e5120f87633c6fa13ea00f363feee3c9826c5de255dceb19e6482b EBUILD emacs-29.4-r1.ebuild 20467 BLAKE2B f6447e33a787e5a708942a676cbe0bcaf6cde4492a6b569d0e882e4cf17218b388a7f5feadbbaac6ff2fff5ed9684bca584a765b721fdde7464c03691e8a0cae SHA512 3a8eb627298a7fa802599becbb06f8a6d18d8f0a091333e46cc4de733bebf4743bc6e07b52be8090a08133ef67cc87797da4387fee698d3810ec5496c44e9c01 EBUILD emacs-29.4.ebuild 20313 BLAKE2B 1bed634eb42caf03b67df68474bf7d8b02b0f2086e8bbe820dd82096b81630af01fa184201fbc6c7b3797ff125ccf45b5dd465eae64443854781e9588acbd4d3 SHA512 d0ba494964d39737ed536e7e00a33212f215820971a449401ca6b60d7dc51715ae39f7fe6910e5673d7eba62683a1cc7d7dc20ef50e5dc5bb71c334f70387261 -EBUILD emacs-30.0.91.ebuild 20041 BLAKE2B 952c0772b1b031348a307b05555dd08b5e5a1c474a9009ab854bca3ca0c2e9264a7d418a1f962d0da75380e6f28742674aa6a550ae7adc1351c18cb67d0b739f SHA512 29c82e6b09b20cb9b37551ffd578ea3d5da5df41e7b847a2db541858294407a6e0820de4753a512ec6f97d909f72f342368e839c8357b12455a32dfd71ff5327 -EBUILD emacs-30.0.92.ebuild 20041 BLAKE2B 952c0772b1b031348a307b05555dd08b5e5a1c474a9009ab854bca3ca0c2e9264a7d418a1f962d0da75380e6f28742674aa6a550ae7adc1351c18cb67d0b739f SHA512 29c82e6b09b20cb9b37551ffd578ea3d5da5df41e7b847a2db541858294407a6e0820de4753a512ec6f97d909f72f342368e839c8357b12455a32dfd71ff5327 -EBUILD emacs-30.0.93.ebuild 20041 BLAKE2B 952c0772b1b031348a307b05555dd08b5e5a1c474a9009ab854bca3ca0c2e9264a7d418a1f962d0da75380e6f28742674aa6a550ae7adc1351c18cb67d0b739f SHA512 29c82e6b09b20cb9b37551ffd578ea3d5da5df41e7b847a2db541858294407a6e0820de4753a512ec6f97d909f72f342368e839c8357b12455a32dfd71ff5327 -EBUILD emacs-30.0.9999-r1.ebuild 20041 BLAKE2B 952c0772b1b031348a307b05555dd08b5e5a1c474a9009ab854bca3ca0c2e9264a7d418a1f962d0da75380e6f28742674aa6a550ae7adc1351c18cb67d0b739f SHA512 29c82e6b09b20cb9b37551ffd578ea3d5da5df41e7b847a2db541858294407a6e0820de4753a512ec6f97d909f72f342368e839c8357b12455a32dfd71ff5327 +EBUILD emacs-30.1.9999.ebuild 20041 BLAKE2B 952c0772b1b031348a307b05555dd08b5e5a1c474a9009ab854bca3ca0c2e9264a7d418a1f962d0da75380e6f28742674aa6a550ae7adc1351c18cb67d0b739f SHA512 29c82e6b09b20cb9b37551ffd578ea3d5da5df41e7b847a2db541858294407a6e0820de4753a512ec6f97d909f72f342368e839c8357b12455a32dfd71ff5327 +EBUILD emacs-30.1_rc1.ebuild 20041 BLAKE2B 952c0772b1b031348a307b05555dd08b5e5a1c474a9009ab854bca3ca0c2e9264a7d418a1f962d0da75380e6f28742674aa6a550ae7adc1351c18cb67d0b739f SHA512 29c82e6b09b20cb9b37551ffd578ea3d5da5df41e7b847a2db541858294407a6e0820de4753a512ec6f97d909f72f342368e839c8357b12455a32dfd71ff5327 EBUILD emacs-31.0.9999.ebuild 20039 BLAKE2B f7d0ed46fb865f136b81f9a9e35f948ee4606f1ce1830554e1c230e3b23bbf943739fa081289bf98a46637d5ee0c7244501a542fccd78e43367abd108202d829 SHA512 efe521741da1f059e53cab884766bdbadf5539e3e5013a393d73ba1fc96cf495599febef01b07fdeced7e1b8402d640217778650b4694ffd95c45641d3064d43 MISC metadata.xml 3434 BLAKE2B aaeef31ce265ae3b3c67ddfe01b3b41724b6fed7353e83f3efa1fe401944707391f3160d7cfea423802c67e78830387e210966f5fdc03a5a0a20b0e38f493b6d SHA512 2ad8128bfe05cbef0cdf19840e809918331c5e98976fb1af14127e0cb7adfba597ff83457a45079d1facd571953210c1650eb11b87d9bce2352e9ca865ebcc38 diff --git a/app-editors/emacs/emacs-30.0.93.ebuild b/app-editors/emacs/emacs-30.0.93.ebuild deleted file mode 100644 index db0b032c1121..000000000000 --- a/app-editors/emacs/emacs-30.0.93.ebuild +++ /dev/null @@ -1,630 +0,0 @@ -# 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 toolchain-funcs - -if [[ ${PV##*.} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" - EGIT_BRANCH="emacs-30" - EGIT_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 - SLOT="${PV%%.*}" - [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -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 - ) ) - ) - )" - -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] - 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 - ) - 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? ( - 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= ) - imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) - !aqua? ( - gsettings? ( - app-emacs/emacs-common[gsettings(-)] - >=dev-libs/glib-2.28.6 - ) - gtk? ( !X? ( - media-libs/fontconfig - media-libs/freetype - >=x11-libs/cairo-1.12.18 - x11-libs/gtk+:3 - harfbuzz? ( media-libs/harfbuzz:0= ) - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) ) - !gtk? ( ${X_DEPEND} ) - X? ( ${X_DEPEND} ) - ) - )" - -DEPEND="${RDEPEND} - gui? ( !aqua? ( - !gtk? ( x11-base/xorg-proto ) - X? ( x11-base/xorg-proto ) - ) )" - -BDEPEND="sys-apps/texinfo - virtual/pkgconfig - gzip-el? ( app-arch/gzip )" - -IDEPEND="app-eselect/eselect-emacs" - -RDEPEND+=" ${IDEPEND}" - -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${EMACS_SUFFIX}-gentoo.el" - -# Suppress false positive QA warnings #898304 #925091 -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' \ - 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 - - 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 -} - -src_configure() { - 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 - - # Prevents e.g. tests interfering with running Emacs. - unset EMACS_SOCKET_NAME - - 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) - --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 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) - ) - - 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 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 - ) - 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) - ) - else - # X11 - myconf+=( - --with-x --without-pgtk --without-ns - --without-gconf - $(use_with gsettings) - $(use_with toolkit-scroll-bars) - $(use_with xpm) - ) - - if use xft; then - myconf+=( - --with-xft - $(use_with cairo) - $(use_with harfbuzz) - $(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 <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and - <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. - 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 - - 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 - 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 "${myconf[@]}" -} - -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. - 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 - EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) - emake "${EMACS_EMAKE_ARGS[@]}" actual-all - else - EMACS_EMAKE_ARGS=() - emake - 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 - - # 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 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 ) - - # 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 -} - -src_install() { - emake \ - "${EMACS_EMAKE_ARGS[@]}" \ - 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 - - # 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/share/glib-2.0 || die #911117 - rm -rf "${ED}/usr/$(get_libdir)/systemd" || die - rm -rf "${ED}"/var || die - - # remove unused <version>/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 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 \ - -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 - 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: - \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable - \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" - 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-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild deleted file mode 100644 index db0b032c1121..000000000000 --- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild +++ /dev/null @@ -1,630 +0,0 @@ -# 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 toolchain-funcs - -if [[ ${PV##*.} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" - EGIT_BRANCH="emacs-30" - EGIT_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 - SLOT="${PV%%.*}" - [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -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 - ) ) - ) - )" - -RDEPEND="app-emacs/emacs-common[games?,gui(-)?] - 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 - ) - 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? ( - 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= ) - imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) - !aqua? ( - gsettings? ( - app-emacs/emacs-common[gsettings(-)] - >=dev-libs/glib-2.28.6 - ) - gtk? ( !X? ( - media-libs/fontconfig - media-libs/freetype - >=x11-libs/cairo-1.12.18 - x11-libs/gtk+:3 - harfbuzz? ( media-libs/harfbuzz:0= ) - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) ) - !gtk? ( ${X_DEPEND} ) - X? ( ${X_DEPEND} ) - ) - )" - -DEPEND="${RDEPEND} - gui? ( !aqua? ( - !gtk? ( x11-base/xorg-proto ) - X? ( x11-base/xorg-proto ) - ) )" - -BDEPEND="sys-apps/texinfo - virtual/pkgconfig - gzip-el? ( app-arch/gzip )" - -IDEPEND="app-eselect/eselect-emacs" - -RDEPEND+=" ${IDEPEND}" - -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${EMACS_SUFFIX}-gentoo.el" - -# Suppress false positive QA warnings #898304 #925091 -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' \ - 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 - - 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 -} - -src_configure() { - 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 - - # Prevents e.g. tests interfering with running Emacs. - unset EMACS_SOCKET_NAME - - 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) - --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 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) - ) - - 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 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 - ) - 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) - ) - else - # X11 - myconf+=( - --with-x --without-pgtk --without-ns - --without-gconf - $(use_with gsettings) - $(use_with toolkit-scroll-bars) - $(use_with xpm) - ) - - if use xft; then - myconf+=( - --with-xft - $(use_with cairo) - $(use_with harfbuzz) - $(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 <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and - <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. - 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 - - 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 - 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 "${myconf[@]}" -} - -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. - 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 - EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) - emake "${EMACS_EMAKE_ARGS[@]}" actual-all - else - EMACS_EMAKE_ARGS=() - emake - 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 - - # 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 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 ) - - # 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 -} - -src_install() { - emake \ - "${EMACS_EMAKE_ARGS[@]}" \ - 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 - - # 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/share/glib-2.0 || die #911117 - rm -rf "${ED}/usr/$(get_libdir)/systemd" || die - rm -rf "${ED}"/var || die - - # remove unused <version>/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 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 \ - -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 - 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: - \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable - \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" - 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-30.0.91.ebuild b/app-editors/emacs/emacs-30.1.9999.ebuild index db0b032c1121..db0b032c1121 100644 --- a/app-editors/emacs/emacs-30.0.91.ebuild +++ b/app-editors/emacs/emacs-30.1.9999.ebuild diff --git a/app-editors/emacs/emacs-30.0.92.ebuild b/app-editors/emacs/emacs-30.1_rc1.ebuild index db0b032c1121..db0b032c1121 100644 --- a/app-editors/emacs/emacs-30.0.92.ebuild +++ b/app-editors/emacs/emacs-30.1_rc1.ebuild |