From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 432601581F3 for ; Mon, 25 Nov 2024 20:05:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62455E082F; Mon, 25 Nov 2024 20:05:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98DBBE082F for ; Mon, 25 Nov 2024 20:05:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DCC0335C03 for ; Mon, 25 Nov 2024 20:05:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB80511DF for ; Mon, 25 Nov 2024 20:05:14 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1732565108.438582e97488bba94549b5a8d62a24af499def48.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-26.3-r21.ebuild app-editors/emacs/emacs-27.2-r19.ebuild app-editors/emacs/emacs-28.2-r15.ebuild app-editors/emacs/emacs-29.4-r1.ebuild app-editors/emacs/emacs-30.0.91.ebuild app-editors/emacs/emacs-30.0.92.ebuild app-editors/emacs/emacs-30.0.9999-r1.ebuild app-editors/emacs/emacs-31.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 438582e97488bba94549b5a8d62a24af499def48 X-VCS-Branch: master Date: Mon, 25 Nov 2024 20:05:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0ebf60d0-b983-4cc4-a742-29c67f72910a X-Archives-Hash: dbbc70f8f21d769fe1f4bee69e46f93f commit: 438582e97488bba94549b5a8d62a24af499def48 Author: Ulrich Müller gentoo org> AuthorDate: Mon Nov 25 20:04:26 2024 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Nov 25 20:05:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438582e9 app-editors/emacs: Convert the myconf variable to an array myconf had existed as a regular variable in src_compile/src_configure since inception of the first app-editors/emacs ebuild in 2001. Convert it to an array which allows to remove some redundancy. Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-26.3-r21.ebuild | 118 +++++++++++--------- app-editors/emacs/emacs-27.2-r19.ebuild | 132 +++++++++++----------- app-editors/emacs/emacs-28.2-r15.ebuild | 138 ++++++++++++----------- app-editors/emacs/emacs-29.4-r1.ebuild | 164 +++++++++++++++------------- app-editors/emacs/emacs-30.0.91.ebuild | 164 +++++++++++++++------------- app-editors/emacs/emacs-30.0.92.ebuild | 164 +++++++++++++++------------- app-editors/emacs/emacs-30.0.9999-r1.ebuild | 164 +++++++++++++++------------- app-editors/emacs/emacs-31.0.9999.ebuild | 164 +++++++++++++++------------- 8 files changed, 654 insertions(+), 554 deletions(-) diff --git a/app-editors/emacs/emacs-26.3-r21.ebuild b/app-editors/emacs/emacs-26.3-r21.ebuild index a0ed4c9895fa..082ee958b14b 100644 --- a/app-editors/emacs/emacs-26.3-r21.ebuild +++ b/app-editors/emacs/emacs-26.3-r21.ebuild @@ -125,45 +125,80 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf + local myconf=( + --program-suffix="-${EMACS_SUFFIX}" + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} + --localstatedir="${EPREFIX}"/var + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" + --without-compress-install + --without-hesiod + --without-pop + --with-file-notification=$(usev inotify || usev gfile || echo no) + $(use_enable acl) + $(use_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gpm) + $(use_with kerberos) $(use_with kerberos kerberos5) + $(use_with lcms lcms2) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with wide-int) + $(use_with zlib) + ) if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-ns" + myconf+=( + --without-x --without-ns + ) elif use aqua; then einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x + ) else - myconf+=" --with-x --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" + myconf+=( + --with-x --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with xpm) + $(use_with imagemagick) + ) if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -183,53 +218,28 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-xwidgets ) for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done elif use motif; then einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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) \ - $(use_enable acl) \ - $(use_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with games gameuser ":gamestat") \ - $(use_with gpm) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-27.2-r19.ebuild b/app-editors/emacs/emacs-27.2-r19.ebuild index 7b92be2c5fa7..9057ada871ab 100644 --- a/app-editors/emacs/emacs-27.2-r19.ebuild +++ b/app-editors/emacs/emacs-27.2-r19.ebuild @@ -166,46 +166,84 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf + local myconf=( + --program-suffix="-${EMACS_SUFFIX}" + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} + --localstatedir="${EPREFIX}"/var + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" + --without-compress-install + --without-hesiod + --without-pop + --with-file-notification=$(usev inotify || usev gfile || echo no) + --with-pdumper + $(use_enable acl) + $(use_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gmp libgmp) + $(use_with gpm) + $(use_with json) + $(use_with kerberos) $(use_with kerberos kerberos5) + $(use_with lcms lcms2) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with wide-int) + $(use_with zlib) + ) if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-ns" + myconf+=( + --without-x --without-ns + ) elif use aqua; then einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x + ) else - myconf+=" --with-x --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" + myconf+=( + --with-x --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with xpm) + $(use_with imagemagick) + ) if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -225,24 +263,24 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-xwidgets ) for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done elif use motif; then einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi fi @@ -252,43 +290,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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 json) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-28.2-r15.ebuild b/app-editors/emacs/emacs-28.2-r15.ebuild index 55534cd81160..7b5d0c431e99 100644 --- a/app-editors/emacs/emacs-28.2-r15.ebuild +++ b/app-editors/emacs/emacs-28.2-r15.ebuild @@ -190,57 +190,95 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --program-suffix="-${EMACS_SUFFIX}" + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} + --localstatedir="${EPREFIX}"/var + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" + --without-compress-install + --without-hesiod + --without-pop + --with-file-notification=$(usev inotify || usev gfile || echo no) + --with-pdumper + $(use_enable acl) + $(use_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gmp libgmp) + $(use_with gpm) + $(use_with jit native-compilation) + $(use_with json) + $(use_with kerberos) $(use_with kerberos kerberos5) + $(use_with lcms lcms2) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with wide-int) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-ns" + myconf+=( + --without-x --without-ns + ) elif use aqua; then einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x + ) else - myconf+=" --with-x --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" + myconf+=( + --with-x --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with xpm) + $(use_with imagemagick) + ) if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -260,24 +298,24 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-xwidgets ) for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done elif use motif; then einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi fi @@ -287,43 +325,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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) \ - $(use_with json) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with wide-int) \ - ${myconf} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-29.4-r1.ebuild b/app-editors/emacs/emacs-29.4-r1.ebuild index 2ff9989a9764..13447ae2ea93 100644 --- a/app-editors/emacs/emacs-29.4-r1.ebuild +++ b/app-editors/emacs/emacs-29.4-r1.ebuild @@ -222,25 +222,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --program-suffix="-${EMACS_SUFFIX}" + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} + --localstatedir="${EPREFIX}"/var + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" + --without-compress-install + --without-hesiod + --without-pop + --with-file-notification=$(usev inotify || usev gfile || echo no) + --with-pdumper + $(use_enable acl) + $(use_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) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -256,39 +286,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x --without-pgtk + ) elif use gtk && ! use X; then einfo "Configuring to build with pure GTK (without X11) support" - myconf+=" --with-pgtk --without-x --without-ns" - myconf+=" --with-toolkit-scroll-bars" #836392 - myconf+=" --without-gconf" - myconf+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else # X11 - myconf+=" --with-x --without-pgtk --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with xpm)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with xpm) + ) if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -308,36 +350,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-xwidgets ) for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done elif use motif; then einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -346,45 +390,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-30.0.91.ebuild b/app-editors/emacs/emacs-30.0.91.ebuild index 7058569f30e2..0cd4d0582c91 100644 --- a/app-editors/emacs/emacs-30.0.91.ebuild +++ b/app-editors/emacs/emacs-30.0.91.ebuild @@ -219,25 +219,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --program-suffix="-${EMACS_SUFFIX}" + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} + --localstatedir="${EPREFIX}"/var + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" + --without-compress-install + --without-hesiod + --without-pop + --with-file-notification=$(usev inotify || usev gfile || echo no) + --with-pdumper + $(use_enable acl) + $(use_enable xattr) + $(use_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gmp libgmp) + $(use_with gpm) + $(use_with jit native-compilation aot) + $(use_with kerberos) $(use_with kerberos kerberos5) + $(use_with lcms lcms2) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with sqlite sqlite3) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with tree-sitter) + $(use_with wide-int) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -253,39 +283,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x --without-pgtk + ) elif use gtk && ! use X; then einfo "Configuring to build with pure GTK (without X11) support" - myconf+=" --with-pgtk --without-x --without-ns" - myconf+=" --with-toolkit-scroll-bars" #836392 - myconf+=" --without-gconf" - myconf+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else # X11 - myconf+=" --with-x --without-pgtk --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with xpm)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with xpm) + ) if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -305,36 +347,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-xwidgets ) for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done elif use motif; then einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -343,45 +387,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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_enable xattr) \ - $(use_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with games gameuser ":gamestat") \ - $(use_with gmp libgmp) \ - $(use_with gpm) \ - $(use_with jit native-compilation aot) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with tree-sitter) \ - $(use_with wide-int) \ - ${myconf} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-30.0.92.ebuild b/app-editors/emacs/emacs-30.0.92.ebuild index 7058569f30e2..0cd4d0582c91 100644 --- a/app-editors/emacs/emacs-30.0.92.ebuild +++ b/app-editors/emacs/emacs-30.0.92.ebuild @@ -219,25 +219,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --program-suffix="-${EMACS_SUFFIX}" + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} + --localstatedir="${EPREFIX}"/var + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" + --without-compress-install + --without-hesiod + --without-pop + --with-file-notification=$(usev inotify || usev gfile || echo no) + --with-pdumper + $(use_enable acl) + $(use_enable xattr) + $(use_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gmp libgmp) + $(use_with gpm) + $(use_with jit native-compilation aot) + $(use_with kerberos) $(use_with kerberos kerberos5) + $(use_with lcms lcms2) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with sqlite sqlite3) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with tree-sitter) + $(use_with wide-int) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -253,39 +283,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x --without-pgtk + ) elif use gtk && ! use X; then einfo "Configuring to build with pure GTK (without X11) support" - myconf+=" --with-pgtk --without-x --without-ns" - myconf+=" --with-toolkit-scroll-bars" #836392 - myconf+=" --without-gconf" - myconf+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else # X11 - myconf+=" --with-x --without-pgtk --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with xpm)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with xpm) + ) if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -305,36 +347,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-xwidgets ) for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done elif use motif; then einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -343,45 +387,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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_enable xattr) \ - $(use_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with games gameuser ":gamestat") \ - $(use_with gmp libgmp) \ - $(use_with gpm) \ - $(use_with jit native-compilation aot) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with tree-sitter) \ - $(use_with wide-int) \ - ${myconf} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild index 7058569f30e2..0cd4d0582c91 100644 --- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild @@ -219,25 +219,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --program-suffix="-${EMACS_SUFFIX}" + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} + --localstatedir="${EPREFIX}"/var + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" + --without-compress-install + --without-hesiod + --without-pop + --with-file-notification=$(usev inotify || usev gfile || echo no) + --with-pdumper + $(use_enable acl) + $(use_enable xattr) + $(use_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gmp libgmp) + $(use_with gpm) + $(use_with jit native-compilation aot) + $(use_with kerberos) $(use_with kerberos kerberos5) + $(use_with lcms lcms2) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with sqlite sqlite3) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with tree-sitter) + $(use_with wide-int) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -253,39 +283,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x --without-pgtk + ) elif use gtk && ! use X; then einfo "Configuring to build with pure GTK (without X11) support" - myconf+=" --with-pgtk --without-x --without-ns" - myconf+=" --with-toolkit-scroll-bars" #836392 - myconf+=" --without-gconf" - myconf+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else # X11 - myconf+=" --with-x --without-pgtk --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with xpm)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with xpm) + ) if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -305,36 +347,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-xwidgets ) for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done elif use motif; then einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -343,45 +387,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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_enable xattr) \ - $(use_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with games gameuser ":gamestat") \ - $(use_with gmp libgmp) \ - $(use_with gpm) \ - $(use_with jit native-compilation aot) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with tree-sitter) \ - $(use_with wide-int) \ - ${myconf} + econf "${myconf[@]}" } src_compile() { diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild index 22cbd35f4139..d1f3581d8ccd 100644 --- a/app-editors/emacs/emacs-31.0.9999.ebuild +++ b/app-editors/emacs/emacs-31.0.9999.ebuild @@ -219,25 +219,55 @@ src_configure() { replace-flags -Ofast -O2 append-flags -fno-fast-math -ffp-contract=off - local myconf - # Prevents e.g. tests interfering with running Emacs. unset EMACS_SOCKET_NAME + local myconf=( + --program-suffix="-${EMACS_SUFFIX}" + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} + --localstatedir="${EPREFIX}"/var + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" + --without-compress-install + --without-hesiod + --without-pop + --with-file-notification=$(usev inotify || usev gfile || echo no) + --with-pdumper + $(use_enable acl) + $(use_enable xattr) + $(use_with dbus) + $(use_with dynamic-loading modules) + $(use_with games gameuser ":gamestat") + $(use_with gmp libgmp) + $(use_with gpm) + $(use_with jit native-compilation aot) + $(use_with kerberos) $(use_with kerberos kerberos5) + $(use_with lcms lcms2) + $(use_with libxml2 xml2) + $(use_with mailutils) + $(use_with selinux) + $(use_with sqlite sqlite3) + $(use_with ssl gnutls) + $(use_with systemd libsystemd) + $(use_with threads) + $(use_with tree-sitter) + $(use_with wide-int) + ) + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" + myconf+=( --with-sound=alsa ) else - myconf+=" --with-sound=$(usex sound oss)" + myconf+=( --with-sound=$(usex sound oss no) ) fi if use jit; then use zlib || ewarn \ "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." - myconf+=" --with-zlib" + myconf+=( --with-zlib ) else - myconf+=" $(use_with zlib)" + myconf+=( $(use_with zlib) ) fi # Emacs supports these window systems: @@ -253,39 +283,51 @@ src_configure() { if ! use gui; then einfo "Configuring to build without window system support" - myconf+=" --without-x --without-pgtk --without-ns" + 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" + myconf+=( + --with-ns --disable-ns-self-contained + --without-x --without-pgtk + ) elif use gtk && ! use X; then einfo "Configuring to build with pure GTK (without X11) support" - myconf+=" --with-pgtk --without-x --without-ns" - myconf+=" --with-toolkit-scroll-bars" #836392 - myconf+=" --without-gconf" - myconf+=" --without-xwidgets" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-pgtk --without-x --without-ns + --with-toolkit-scroll-bars #836392 + --without-gconf + --without-xwidgets + $(use_with gsettings) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else # X11 - myconf+=" --with-x --without-pgtk --without-ns" - myconf+=" --without-gconf" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with xpm)" + myconf+=( + --with-x --without-pgtk --without-ns + --without-gconf + $(use_with gsettings) + $(use_with toolkit-scroll-bars) + $(use_with xpm) + ) if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=( + --with-xft + $(use_with cairo) + $(use_with harfbuzz) + $(use_with m17n-lib libotf) + $(use_with m17n-lib m17n-flt) + ) else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" + myconf+=( + --without-xft + --without-cairo + --without-libotf --without-m17n-flt + ) use cairo && ewarn \ "USE flag \"cairo\" has no effect if \"xft\" is not set." use m17n-lib && ewarn \ @@ -305,36 +347,38 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" + myconf+=( --with-x-toolkit=gtk3 --without-xwidgets ) for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done elif use motif; then einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" + 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)" + myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) ) else einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" + myconf+=( --with-x-toolkit=no ) fi 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)" + myconf+=( + $(use_with gif) + $(use_with jpeg) + $(use_with png) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with imagemagick) + ) fi if tc-is-cross-compiler; then @@ -343,45 +387,15 @@ src_configure() { 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" + myconf+=( --with-dumping=none ) elif use m68k; then # Workaround for https://debbugs.gnu.org/44531 - myconf+=" --with-dumping=unexec" + myconf+=( --with-dumping=unexec ) else - myconf+=" --with-dumping=pdumper" + 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_enable xattr) \ - $(use_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with games gameuser ":gamestat") \ - $(use_with gmp libgmp) \ - $(use_with gpm) \ - $(use_with jit native-compilation aot) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with tree-sitter) \ - $(use_with wide-int) \ - ${myconf} + econf "${myconf[@]}" } src_compile() {