From 7fa8a1e3f149eea4c844c47cfe26136ed7614c58 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 15 Apr 2024 12:04:03 +0100 Subject: gentoo auto-resync : 15:04:2024 - 12:04:02 --- app-editors/Manifest.gz | Bin 13949 -> 13958 bytes app-editors/emacs/Manifest | 8 +- app-editors/emacs/emacs-29.2-r1.ebuild | 619 -------------------- app-editors/emacs/emacs-29.2-r2.ebuild | 619 ++++++++++++++++++++ app-editors/emacs/emacs-29.3-r1.ebuild | 627 +++++++++++++++++++++ app-editors/emacs/emacs-29.3.9999.ebuild | 2 +- app-editors/emacs/emacs-29.3.ebuild | 627 --------------------- app-editors/emacs/emacs-30.0.9999.ebuild | 2 +- app-editors/gedit/Manifest | 2 - app-editors/gedit/gedit-46.1-r1.ebuild | 87 --- app-editors/ghex/Manifest | 6 +- app-editors/ghex/ghex-44.2.ebuild | 66 --- app-editors/ghex/ghex-45.0.ebuild | 66 --- app-editors/ghex/ghex-9999.ebuild | 4 +- app-editors/gnome-text-editor/Manifest | 2 - .../gnome-text-editor-45.1.ebuild | 57 -- 16 files changed, 1255 insertions(+), 1539 deletions(-) delete mode 100644 app-editors/emacs/emacs-29.2-r1.ebuild create mode 100644 app-editors/emacs/emacs-29.2-r2.ebuild create mode 100644 app-editors/emacs/emacs-29.3-r1.ebuild delete mode 100644 app-editors/emacs/emacs-29.3.ebuild delete mode 100644 app-editors/gedit/gedit-46.1-r1.ebuild delete mode 100644 app-editors/ghex/ghex-44.2.ebuild delete mode 100644 app-editors/ghex/ghex-45.0.ebuild delete mode 100644 app-editors/gnome-text-editor/gnome-text-editor-45.1.ebuild (limited to 'app-editors') diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index 506de45afba0..eede386c303a 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 707227020670..4c6dfc5ec27a 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -20,8 +20,8 @@ EBUILD emacs-27.2-r14.ebuild 14566 BLAKE2B e89a78c3c2a7ac795d20c1703d68069d238fb EBUILD emacs-27.2-r15.ebuild 14571 BLAKE2B 7845f109d6a7d5b57d23122b7d71995d76fe2bb4cc85c2f7452a92717a033c66a33d083be928a11526e84dde0f3de932b8cc670d952fa61d114a474763ab52b2 SHA512 4e9032e9fa54d26cc62304cd38c6506ccc24a4d89e09d12aa99e9a67eeae307cff4396d069d64f024d1b02fbd91974eeadaa2102b664a9d6412d1e93ae30adc1 EBUILD emacs-28.2-r10.ebuild 17448 BLAKE2B 2a7c5398eb3cecdea919a0b749fbdde75d6b446dd244f65678294900771b6c9e56c65e1f3b4f34716fe43aa4551f1a64b5fc721b2941ea7d4e296d84748f535b SHA512 cfac978dbd2cbd38175359c7815858a79093e3b5535ceb559485cff2b4bc63089f7c0ae16f8f2ba4555ab44ed38eaad68e5813c7f5a91f3cf4054bca60ca3187 EBUILD emacs-28.2-r11.ebuild 17538 BLAKE2B bbaa257eea0663d3e7b3e35571e4dace44d94452d90769f22ace7c4ff4414aa8397605a9891bd861a2335a460a7620bd85e77fe89cc9b09ebe483480e18f99b2 SHA512 812ce038f1af1acacfc6005344aa88b7686754b50722eff53b4b80c2d57fe4f5e94404c1ae72bf756d3901075392a3f73347e79d41885699543b7a2b7b094d5c -EBUILD emacs-29.2-r1.ebuild 19929 BLAKE2B c013480b13805fedc680bd0ecd66bfbfca0173409519ead8c4ef5e9805bc7316f856940f0ce07a0931973f5ec50eec5f3cac9e1b2cbe6f1ce885a34305b1c723 SHA512 169a8c83195e34bbc634d3caa0dbbfe752f6af2a62b6a0e1e51f476e992ec34333725b89826e55be4f008c8e1399b4bb66a960d4a58bff98474cfd629aefe636 -EBUILD emacs-29.3.9999.ebuild 19945 BLAKE2B fb593e5e5e2a11b44b60f627f278f38c005f0bfb5fd3aa97034097a963270bca0832b26abdeaaa9e245e039e8370b4eb60cf5e6b73c32c423f7e286815e9f713 SHA512 cc76d3d973ca04dac441904f99e39cd252ace69d2c1af94d3c988e06489ca9ae782cf88a5962b3e05547a36b6f98da0d52dab16eb2ca5e7da28409f40f20b579 -EBUILD emacs-29.3.ebuild 20359 BLAKE2B ca2d2d5b2a9b2914093ff683225996f5fb302fb524f33d3adf4a43d7c07917d2a78aab7c65c2fa8441f8a8674bb6f3d0903ad72cbabd2ef04b2f29dfde66de94 SHA512 387a47491d04c6f817a3b25b7ef56545bf559aed478f953b11242611e9ad4895931b78efa45250e7fd37d0f18761cca83803bbbb78a9bc1bd107fcf4c000575f -EBUILD emacs-30.0.9999.ebuild 19955 BLAKE2B c78ecd0cce45e39add2d8ebe9d0b324093247e54187469073f705142a1243cdc3821cb5b5d20b797de958d64b46bc7b7035fc9586a08bf1f3c1613c7e3a36838 SHA512 9e28271c9fd6efb6f0d5c7794c96ae5fe7426e02a9dd5d5acb3849f5ae8de11c6cfc04659539be967762e1a9375fc8f7cc98dbdbbbb8addd31cad6e99d05d7ba +EBUILD emacs-29.2-r2.ebuild 19931 BLAKE2B 7f73caf80e0d7ef23610e2c265941644f325c7699beb94663722759f7f198d55304207505e90c5b47a9942aad00df1bbd892e246ef5def91a7d93b0ec4ac0ad0 SHA512 68b1b52aca1718ab45dc630eea5a107ca597ff441909ee71a3bec60525e02ba8e900b569e1a0a0ae8c87b7e5419880451a9b807421669660b1cfda836b594885 +EBUILD emacs-29.3-r1.ebuild 20361 BLAKE2B 66195b34b694cd0da33b442f9e9a82c8d29a47892855d61b93132b4b4e60413955867aa4468202501632b608f1c2a2a03cb687da62adb030fc5f4e94dc99380b SHA512 e6c545159b8de20927a44a31ca5100fbec7b946e68094b58b056f6d5e48b45f9fef7208e33a53f759dcfc26c08b6213c417393a7717fcf4fea5ac3891b9863c8 +EBUILD emacs-29.3.9999.ebuild 19947 BLAKE2B a3f97634ea07159d27c24b8048f67a6907a5e99dbea02524ae19bbc1785507e95245566e897b8504cd446dfd9199c910ec20763808771ba37db93215326c86ed SHA512 4d5940bed8a1b702e66ab540da596eb16ba26ff58a99c13b5cdb61bb7d71d0d3e353fbf7b237a005154db9229b7a7989eeddb80ec56a909c16dd1af36bb5d8bf +EBUILD emacs-30.0.9999.ebuild 19957 BLAKE2B 57d11a618973c8f6a54a16aa6f7b23005c29b782b96e6c836124d617174b2046e96337759a45e11c2150a3c6e0e82e8dadb9554690dd32d3f4708f3771174cfc SHA512 a68a0ecb98f516c2d64b25250abc3934f3b134820adb251dbb250a86deb597791a6587757e34d32d7aa746baea34bb1baed41cdd2a3e09a792c67e607daed774 MISC metadata.xml 3265 BLAKE2B e4f61b7e8859672fe9798ebaae20d8fb490d4677db7be8a856f313f4dfd5f02b38623250ddc45cdab1f0d0b64b941b4874b95252c796e893d5a28e5a318277bc SHA512 4b79a448076ddee7de95dc2f1a999fb86295d04a20d016a9bb2fe8a038ee5424517ca8f1991a884a08ca52847191c83becb06fb7cb8d4bb2a609cf4b2e25d020 diff --git a/app-editors/emacs/emacs-29.2-r1.ebuild b/app-editors/emacs/emacs-29.2-r1.ebuild deleted file mode 100644 index 6b943b04d393..000000000000 --- a/app-editors/emacs/emacs-29.2-r1.ebuild +++ /dev/null @@ -1,619 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs - -if [[ ${PV##*.} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" - EGIT_BRANCH="emacs-29" - 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/${P}-patches-2.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" -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 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 xwidgets 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 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) - !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 - ) - 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 ) - 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 - ) - xwidgets? ( net-libs/webkit-gtk:4.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_set_state malloc_get_state MIN static_assert alignof - statvfs64 re_set_syntax re_compile_pattern re_search re_match -) - -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/.*" - - # 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 - - # 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() { - 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." - myconf+=" --with-sound=alsa" - else - 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 - - # 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" - myconf+=" --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" - myconf+=" --with-toolkit-scroll-bars" #836392 - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" - myconf+=" $(use_with xwidgets)" - else - # X11 - myconf+=" --with-x --without-pgtk --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with xpm)" - - 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 - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --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 $(use_with 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 - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi - - if use gui; then - # Common flags recognised for all GUIs - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with webp)" - myconf+=" $(use_with imagemagick)" - 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}" \ - --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 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) \ - ${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 ) - - # Some tests hang with gnupg-2.2.42 - local gpgver=$(best_version app-crypt/gnupg) - gpgver=${gpgver#*gnupg-} - [[ -n ${gpgver} ]] \ - && ver_test "${gpgver}" -ge 2.2.42 && ver_test "${gpgver}" -lt 2.3 \ - && exclude_tests+=( - %lisp/epg-tests.el - %lisp/gnus/mml-sec-tests.el - ) - - # Redirect GnuPG's sockets, in order not to exceed the 108 char limit - # for socket paths on Linux. - mkdir "${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[*]}" \ - 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 /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 - 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 \ - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n - assert "gzip .el 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-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-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 - 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 - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-29.2-r2.ebuild b/app-editors/emacs/emacs-29.2-r2.ebuild new file mode 100644 index 000000000000..970be5ea8634 --- /dev/null +++ b/app-editors/emacs/emacs-29.2-r2.ebuild @@ -0,0 +1,619 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" + EGIT_BRANCH="emacs-29" + 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/${P}-patches-2.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" +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 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 xwidgets 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 + xwidgets? ( + net-libs/webkit-gtk:4.1= + x11-libs/libXcomposite + ) + ) + !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 + ) + 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 ) + 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 + ) + xwidgets? ( net-libs/webkit-gtk:4.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_set_state malloc_get_state MIN static_assert alignof + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + +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/.*" + + # 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 + + # 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() { + 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." + myconf+=" --with-sound=alsa" + else + 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 + + # 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" + myconf+=" --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" + myconf+=" --with-toolkit-scroll-bars" #836392 + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=" $(use_with xwidgets)" + else + # X11 + myconf+=" --with-x --without-pgtk --without-ns" + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with toolkit-scroll-bars)" + myconf+=" $(use_with xpm)" + + 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 + myconf+=" --without-xft" + myconf+=" --without-cairo" + myconf+=" --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 $(use_with 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 + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." + fi + + if use gui; then + # Common flags recognised for all GUIs + myconf+=" $(use_with gif)" + myconf+=" $(use_with jpeg)" + myconf+=" $(use_with png)" + myconf+=" $(use_with svg rsvg)" + myconf+=" $(use_with tiff)" + myconf+=" $(use_with webp)" + myconf+=" $(use_with imagemagick)" + 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}" \ + --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 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) \ + ${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 ) + + # Some tests hang with gnupg-2.2.42 + local gpgver=$(best_version app-crypt/gnupg) + gpgver=${gpgver#*gnupg-} + [[ -n ${gpgver} ]] \ + && ver_test "${gpgver}" -ge 2.2.42 && ver_test "${gpgver}" -lt 2.3 \ + && exclude_tests+=( + %lisp/epg-tests.el + %lisp/gnus/mml-sec-tests.el + ) + + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${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[*]}" \ + 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 /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 + 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 \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el 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-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-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 + 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 + + if use livecd; then + # force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd + eselect emacs update + else + eselect emacs update ifunset + fi +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} diff --git a/app-editors/emacs/emacs-29.3-r1.ebuild b/app-editors/emacs/emacs-29.3-r1.ebuild new file mode 100644 index 000000000000..b827e1c7f472 --- /dev/null +++ b/app-editors/emacs/emacs-29.3-r1.ebuild @@ -0,0 +1,627 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" + EGIT_BRANCH="emacs-29" + 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/${P}-patches-1.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" +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 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 xwidgets 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 + xwidgets? ( + net-libs/webkit-gtk:4.1= + x11-libs/libXcomposite + ) + ) + !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 + ) + 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 ) + 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 + ) + xwidgets? ( net-libs/webkit-gtk:4.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_set_state malloc_get_state MIN static_assert alignof + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + +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/.*" + + # 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 + + # 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() { + 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." + myconf+=" --with-sound=alsa" + else + 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 + + # 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" + myconf+=" --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" + myconf+=" --with-toolkit-scroll-bars" #836392 + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=" $(use_with xwidgets)" + else + # X11 + myconf+=" --with-x --without-pgtk --without-ns" + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with toolkit-scroll-bars)" + myconf+=" $(use_with xpm)" + + 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 + myconf+=" --without-xft" + myconf+=" --without-cairo" + myconf+=" --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 $(use_with 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 + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." + fi + + if use gui; then + # Common flags recognised for all GUIs + myconf+=" $(use_with gif)" + myconf+=" $(use_with jpeg)" + myconf+=" $(use_with png)" + myconf+=" $(use_with svg rsvg)" + myconf+=" $(use_with tiff)" + myconf+=" $(use_with webp)" + myconf+=" $(use_with imagemagick)" + 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}" \ + --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 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) \ + ${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 ) + + # Some tests hang with gnupg-2.2.42 + local gpgver=$(best_version app-crypt/gnupg) + gpgver=${gpgver#*gnupg-} + [[ -n ${gpgver} ]] \ + && ver_test "${gpgver}" -ge 2.2.42 && ver_test "${gpgver}" -lt 2.3 \ + && exclude_tests+=( + %lisp/epg-tests.el + %lisp/gnus/mml-sec-tests.el + ) + + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${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[*]}" \ + 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 /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 + 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 \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el 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-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-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 + + if use livecd; then + # force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd + eselect emacs update + else + eselect emacs update ifunset + fi +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} diff --git a/app-editors/emacs/emacs-29.3.9999.ebuild b/app-editors/emacs/emacs-29.3.9999.ebuild index 1aab6b584222..fbd5febcfaa7 100644 --- a/app-editors/emacs/emacs-29.3.9999.ebuild +++ b/app-editors/emacs/emacs-29.3.9999.ebuild @@ -118,7 +118,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) - tree-sitter? ( dev-libs/tree-sitter ) + tree-sitter? ( dev-libs/tree-sitter:= ) valgrind? ( dev-debug/valgrind ) zlib? ( sys-libs/zlib ) gui? ( diff --git a/app-editors/emacs/emacs-29.3.ebuild b/app-editors/emacs/emacs-29.3.ebuild deleted file mode 100644 index c3b4ffc30b6b..000000000000 --- a/app-editors/emacs/emacs-29.3.ebuild +++ /dev/null @@ -1,627 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs - -if [[ ${PV##*.} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" - EGIT_BRANCH="emacs-29" - 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/${P}-patches-1.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" -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 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 xwidgets 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 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) - !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 - ) - 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 ) - 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 - ) - xwidgets? ( net-libs/webkit-gtk:4.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_set_state malloc_get_state MIN static_assert alignof - statvfs64 re_set_syntax re_compile_pattern re_search re_match -) - -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/.*" - - # 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 - - # 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() { - 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." - myconf+=" --with-sound=alsa" - else - 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 - - # 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" - myconf+=" --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" - myconf+=" --with-toolkit-scroll-bars" #836392 - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" - myconf+=" $(use_with xwidgets)" - else - # X11 - myconf+=" --with-x --without-pgtk --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with xpm)" - - 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 - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --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 $(use_with 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 - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi - - if use gui; then - # Common flags recognised for all GUIs - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with webp)" - myconf+=" $(use_with imagemagick)" - 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}" \ - --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 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) \ - ${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 ) - - # Some tests hang with gnupg-2.2.42 - local gpgver=$(best_version app-crypt/gnupg) - gpgver=${gpgver#*gnupg-} - [[ -n ${gpgver} ]] \ - && ver_test "${gpgver}" -ge 2.2.42 && ver_test "${gpgver}" -lt 2.3 \ - && exclude_tests+=( - %lisp/epg-tests.el - %lisp/gnus/mml-sec-tests.el - ) - - # Redirect GnuPG's sockets, in order not to exceed the 108 char limit - # for socket paths on Linux. - mkdir "${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[*]}" \ - 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 /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 - 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 \ - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n - assert "gzip .el 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-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-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 - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 75914892e14a..572a28d32bdb 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -117,7 +117,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) - tree-sitter? ( dev-libs/tree-sitter ) + tree-sitter? ( dev-libs/tree-sitter:= ) valgrind? ( dev-debug/valgrind ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index 8cb8f60bf89f..aa9625c0b231 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1,5 +1,3 @@ -DIST gedit-46.1.tar.xz 2756336 BLAKE2B b79c04b12b0220429d6284c9d966e7a8cc2a454b0cd0b7ef807576b4a3e0dccab52f5fdbdaf9f774880c801eb842484260818036e30e5853d573c1fbb4dd14b6 SHA512 42cf210afd35df8d6d3590ebb5ff310b74ccf9da803277cd375474629e2bd32bc542f34e3c307a1f591c04e861b92e153e4c9a2daa852e5250fc1294d4bbf72d DIST gedit-46.2.tar.xz 2756340 BLAKE2B 832694a69562b6e8e0dda03be313ccae936645f19812a8244b0eb1f62b43b838fd5decac6a3f7d958017623a63bc857151d3f02dfe7a3aeeb1a0867f7854cfec SHA512 47aa160172d1af8cbb0f7ba270364ab7fe7527fd07819efea570afe67f3684a6df2e093f4b6fb85802e29c11bbe029a0515422d4ebd6e11ae78ae7359d82497f -EBUILD gedit-46.1-r1.ebuild 1743 BLAKE2B c237ea9bcdb1afd1494875617e36cda30958aa105a6b07ddd63ed3781cdaf15a1af6fb02244c8f2beb52b8c97b0d7986ae88fc1f759c55ec3cc7858c8ed5563c SHA512 cb0e546f7dbcda8c025a20b5cbb0d9fbee644e0d3b2e72f58e4c9821df5e5cbf3adbc4dc5c422f96d0772d55685ab9b5db7cd68ad67fda1211eeb7bc96cd7274 EBUILD gedit-46.2.ebuild 1743 BLAKE2B 2a3154f8483f2112da27d2c5c05d3e5472fd57b5497739504e3704880716542d6c1c204d7878ea37c1834a3702febf466f32f224abd7324366dd76055b741f8e SHA512 b5a2504dcf16357a31b8f148943c27aeaf97432edca6fe4a6a7fd3d1ba348d37d01bc1fdd6edf2d1478d44ba4bf7ac32ffb84e04edab9f863534b44c28de39ff MISC metadata.xml 346 BLAKE2B 59226b3220bd9b1770fad0f5acf3b1888a57a3496f9e0a6eb0eb09c12b7a5aa461961753dd8a5a6f01db1cdb97af5b28d6a8d1d632b60f499f86e0864e29264f SHA512 3e1d83ad67b85a681b85f8fece9d6c2c3eab2f2f726447230dc1f2399a21cba211d97e11d8c06d0d1b1803fafe67be4b32c04b39c5f8586a421c525624f6697d diff --git a/app-editors/gedit/gedit-46.1-r1.ebuild b/app-editors/gedit/gedit-46.1-r1.ebuild deleted file mode 100644 index c0f1ed0f1fc3..000000000000 --- a/app-editors/gedit/gedit-46.1-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit gnome.org gnome2-utils meson python-single-r1 vala xdg - -DESCRIPTION="A text editor for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Gedit" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" - -IUSE="+python gtk-doc" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - >=dev-libs/glib-2.70:2 - >=x11-libs/gtk+-3.22.0:3[introspection] - >=gui-libs/libgedit-amtk-5.6:= - >=gui-libs/tepl-6.8.0:= - >=dev-libs/libpeas-1.14.1:0[gtk] - >=dev-libs/gobject-introspection-1.54:= - >=app-text/gspell-0.2.5:0= - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pycairo[${PYTHON_USEDEP}] - >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] - dev-libs/libpeas:0[python,${PYTHON_SINGLE_USEDEP}] - ') - ) - - gui-libs/libgedit-gtksourceview:300 -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme - gnome-base/gsettings-desktop-schemas - gnome-base/gvfs -" -BDEPEND=" - $(vala_depend) - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1 ) - dev-util/itstool - >=sys-devel/gettext-0.18 - virtual/pkgconfig -" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - vala_setup - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtk_doc) - -Duser_documentation=true - - ) - meson_src_configure -} - -src_install() { - meson_src_install - if use python; then - python_optimize - python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest index c25493037064..f00b223658f0 100644 --- a/app-editors/ghex/Manifest +++ b/app-editors/ghex/Manifest @@ -1,8 +1,4 @@ -DIST ghex-44.2.tar.xz 897944 BLAKE2B 0db001b90390f7747792ac89a5daaf9d38165b72dce77c3a2fd41914a4386001b9f15aaf4352a3b41a204a9104a5234a6ac50a3a7269e10a151c000d57228480 SHA512 a06876e06488bb25b17fbdf17ea73e57f563fe49a414c173d680a6bf4db9b66b40fce90ad67cfb73c62f25d88f436a58b7e0fd588c7a664faf78c5058524cabf -DIST ghex-45.0.tar.xz 902480 BLAKE2B 9001be3c01a3f5974606180cede15e753ccda0ec6f4fa77cdaf3aea5030117d303b5cb4fb68dfb09de6aee87d76baf689ae250be457c41b8e4c9d3387b691e90 SHA512 1f6fa7da2e4cfcb89113780d2a0333ee322d608be3e7fccb958ea19a3c3fc368363597b99ff27bd54c929ab3e3afdb5d5f1dbe810d3ec04d9dd2c114bfc71c0f DIST ghex-45.2.tar.xz 902616 BLAKE2B 24e42b6d719280ab459d0ed7b96a502df7a5502e3d6cf385c0aa73b11808e40cac6112a3e0c3a228d5363578ccb875836efd8a13d6fc6c7e8ea4fe5a76bdb9c7 SHA512 2843b23a0673457ec72bd2aad20888fbc2ca890d3d859e6c2657af24cedc6185f6e11244574b603c0e32db2f54968e6584adf2c7e5abee84521c55148f536496 -EBUILD ghex-44.2.ebuild 1295 BLAKE2B fc97ee241141a3dd455806e94687a374e0f16f3e3319c38bff801de516522c0fb0ee14a7174c90fa542b525c693abfe2a3ba6c628267d06e2513d3bcc423715c SHA512 8fcfd49d84efcfe41b024c2d1e620990c746bd6ae83cec4f005a6d46bed0c69aada90c39472d953e3632923573ec19422fde84ba7c88fb8991c00bd01be3ff36 -EBUILD ghex-45.0.ebuild 1299 BLAKE2B f65d88bacf86e53502b051d73f098e5cafa8d79c027a4285ec3b49542cada65360240a6a7b0b479830ed94f251d962c6e8a183f28703b9835e154292f05354c7 SHA512 e869e16e5527b6cde6f449e47805dfbaba414c8ac4e0a20db5efe47922349980f66834f0eeb9f4814b9a3549a74bd5955aa7a1f066507261286996720e55b64e EBUILD ghex-45.2.ebuild 1310 BLAKE2B c3ebd59b4ed6a3281087987fdb7beabb50917a36746823e6b3eb317377ec4069da7013b1807883f565abaed2900d010afa4fd2fb8fd60dea858684fec36b9f27 SHA512 22cf7e8336ce0ce5b805a3be6eac11b42a9c5bd6b541fda634bdcb41157ec6cdec4fff352fbf3d6df565174518aa0d95c89f94787ae06f09715f413fc2be551e -EBUILD ghex-9999.ebuild 1292 BLAKE2B 590d545410f8eb1b863116b393a029c94233e2a5c09e46e16935ced912807b4572d0cd93284b35fb9bc8d4906268a6241e3d3e8937006f9f4270119f52479cfc SHA512 acb3bbf7b9e7cf26ce4985cb8fc4cde8bf7cc123da0faaf1647bf3654b3a062ab9da41e9079441900856aafcd24e42247d1ec350d399a554e4a5fad75d6d1fb8 +EBUILD ghex-9999.ebuild 1307 BLAKE2B 8d210c314e07d649f5f56b88076e83219b5af474e160ea8a32648736a08c8f42eb200f3982829dbe723f0d0671b49e17194b311f8cd77bcb28b4840957d64bf8 SHA512 6f194dc0640f18d0e9c09eadeb824795adfee9fe1590ce056a11622b8f57d8603be1ddfa245ac830587469c7262bdbe2644d86cf01d02127435041f5f837fe5e MISC metadata.xml 345 BLAKE2B 4c2385371bb42d47643f2a9d48ee5ed675267f812467fa03f69151bcdbeb996602be0a3995f976b61e0c018c8d69e3dcd37392f5927bbe24942f11c23794bac4 SHA512 c3f3cc3f436137299082ccdcaa57221d1b3f490b34febfcd6ca586769b0a8c76ce11cc5b8be823c8c88b942effc0b68d9c078ba3a28594c41419830dff04fcad diff --git a/app-editors/ghex/ghex-44.2.ebuild b/app-editors/ghex/ghex-44.2.ebuild deleted file mode 100644 index 3a7df523826b..000000000000 --- a/app-editors/ghex/ghex-44.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="GNOME hexadecimal editor" -HOMEPAGE="https://wiki.gnome.org/Apps/Ghex" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git" - SRC_URI="" -else - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2+ FDL-1.1+" -IUSE="gtk-doc test" -RESTRICT="!test? ( test )" -SLOT="4" - -RDEPEND=" - >=dev-libs/glib-2.68.0:2 - >=gui-libs/gtk-4.4.0:4 - gui-libs/libadwaita:1 - dev-libs/gobject-introspection - !app-editors/ghex:2 -" -DEPEND="${RDEPEND}" -BDEPEND=" - gtk-doc? ( dev-util/gi-docgen ) - test? ( - dev-util/desktop-file-utils - dev-libs/appstream-glib - ) - dev-util/gtk-update-icon-cache - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/gtk-doc/ - -Ddevelopment=false - -Dmmap-buffer-backend=true - -Ddirect-buffer-backend=true - -Dintrospection=enabled - $(meson_use gtk-doc gtk_doc) - -Dstatic-html-help=false - -Dvapi=false - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-editors/ghex/ghex-45.0.ebuild b/app-editors/ghex/ghex-45.0.ebuild deleted file mode 100644 index 4562fb2fe62e..000000000000 --- a/app-editors/ghex/ghex-45.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="GNOME hexadecimal editor" -HOMEPAGE="https://wiki.gnome.org/Apps/Ghex" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git" - SRC_URI="" -else - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2+ FDL-1.1+" -IUSE="gtk-doc test" -RESTRICT="!test? ( test )" -SLOT="4" - -RDEPEND=" - >=dev-libs/glib-2.68.0:2 - >=gui-libs/gtk-4.4.0:4 - gui-libs/libadwaita:1 - dev-libs/gobject-introspection - !app-editors/ghex:2 -" -DEPEND="${RDEPEND}" -BDEPEND=" - gtk-doc? ( dev-util/gi-docgen ) - test? ( - dev-util/desktop-file-utils - dev-libs/appstream-glib - ) - dev-util/gtk-update-icon-cache - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/gtk-doc/ - -Ddevelopment=false - -Dmmap-buffer-backend=true - -Ddirect-buffer-backend=true - -Dintrospection=enabled - $(meson_use gtk-doc gtk_doc) - -Dstatic-html-help=false - -Dvapi=false - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-editors/ghex/ghex-9999.ebuild b/app-editors/ghex/ghex-9999.ebuild index 7d5199d0588b..6bc800a0f081 100644 --- a/app-editors/ghex/ghex-9999.ebuild +++ b/app-editors/ghex/ghex-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ SLOT="4" RDEPEND=" >=dev-libs/glib-2.68.0:2 - >=gui-libs/gtk-4.4.0:4 + >=gui-libs/gtk-4.4.0:4[introspection] gui-libs/libadwaita:1 dev-libs/gobject-introspection !app-editors/ghex:2 diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest index 85636827365e..2025c171c546 100644 --- a/app-editors/gnome-text-editor/Manifest +++ b/app-editors/gnome-text-editor/Manifest @@ -1,5 +1,3 @@ -DIST gnome-text-editor-45.1.tar.xz 618116 BLAKE2B c847ebb7293f959912447491c423fd814cf4084d0f80d04c5933f883e07f826251e6b332f2d69f318e32fb81764d11d0e04dab2129a63a01394c9470d8cc81cd SHA512 8e16f0e9f2bc264a890eb9c648d74cc64bd487dae8a7e9d8198e16e8abc97f9fba3f3521d15777b681ee17b23a9e8032e382cd8a438eeddd857a28d8cb069c30 DIST gnome-text-editor-45.3.tar.xz 618756 BLAKE2B 45a6a78a665f833b0fb2e179125224e1d3757390deee5845b750bbc13368cd9b0b8521b290e42a2c5be82e2e7d78bab5e3aad256d1c87eade22547696807a8ba SHA512 d9fbdbb0dfbb5d10dc1b817f9ebf114a63e20724c3c230da683c8b7f1332371acf869c723a7067dbdafb5b4df23529944b40e5ec212e52a5a3220ca725388c95 -EBUILD gnome-text-editor-45.1.ebuild 1072 BLAKE2B e1562b655b253a1d4ce93a37a11af6a3682654d5c0da8738e67f7908ee6f3aef6d6be385430d2f673e424211578cebe4f24c446f771c97c7acbd749bee5a1e6e SHA512 512e455ad2d85d552c0cea41f5c6aff5b3b993dabfb15a0947a738a871c1bc0dd0f49860effac348038fce924889ba71a26dda72000c3fc94b079b7a0e30082c EBUILD gnome-text-editor-45.3.ebuild 1072 BLAKE2B e1562b655b253a1d4ce93a37a11af6a3682654d5c0da8738e67f7908ee6f3aef6d6be385430d2f673e424211578cebe4f24c446f771c97c7acbd749bee5a1e6e SHA512 512e455ad2d85d552c0cea41f5c6aff5b3b993dabfb15a0947a738a871c1bc0dd0f49860effac348038fce924889ba71a26dda72000c3fc94b079b7a0e30082c MISC metadata.xml 358 BLAKE2B 908c67ba226a7e65b72a1cbaea99350f05fe9f904644c99b9c4e1e0c81f795c1420a0ca9cba1d56f59fb1b841151ffcf7d088add9f36a0e88314f7f52da94fcf SHA512 5862fb965119f76e19ed997e53e651778458604f1f9b69a1ee04db8eac52bdb6352da84ecb92555b31d3b8c62aa544c57c6040ed358af3beddd35fe356744d85 diff --git a/app-editors/gnome-text-editor/gnome-text-editor-45.1.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-45.1.ebuild deleted file mode 100644 index 5c84d35e67dc..000000000000 --- a/app-editors/gnome-text-editor/gnome-text-editor-45.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="A simple text editor for the GNOME desktop" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-text-editor" -S="${WORKDIR}/gnome-text-editor-${PV/_/.}" - -LICENSE="GPL-3+ CC-BY-SA-3.0" -SLOT="0" - -IUSE="spell" - -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-libs/glib-2.73.0:2 - >=gui-libs/gtk-4.7:4 - >=gui-libs/gtksourceview-5.5.0:5 - >=gui-libs/libadwaita-1.4_alpha:1 - app-text/editorconfig-core-c - x11-libs/cairo - spell? ( - >=app-text/enchant-2.2.0:2 - dev-libs/icu:= - ) -" -RDEPEND="${DEPEND} - gnome-base/gsettings-desktop-schemas -" -BDEPEND=" - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.21 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - $(meson_feature spell enchant) - -Dbugreport_url="https://bugs.gentoo.org" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} -- cgit v1.2.3