commit: 20abbf2ecbe03997b8cd2aaf231fac8a883c5d9d Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Fri Sep 27 07:02:26 2024 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Fri Sep 27 07:15:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20abbf2e
app-editors/emacs: Drop xwidgets flag WebKitGTK upstream dropped support for off-screen rendering in webkit2gtk version 2.41.92 and newer. This breaks xwidget support and causes Emacs to crash. See https://debbugs.gnu.org/66068#47 for a more detailed explanation. Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> app-editors/emacs/emacs-26.3-r18.ebuild | 14 +++----------- app-editors/emacs/emacs-26.3-r19.ebuild | 14 +++----------- app-editors/emacs/emacs-27.2-r16.ebuild | 14 +++----------- app-editors/emacs/emacs-27.2-r17.ebuild | 14 +++----------- app-editors/emacs/emacs-28.2-r12.ebuild | 14 +++----------- app-editors/emacs/emacs-28.2-r13.ebuild | 14 +++----------- app-editors/emacs/emacs-29.3-r2.ebuild | 17 ++++------------- app-editors/emacs/emacs-29.3-r3.ebuild | 17 ++++------------- app-editors/emacs/emacs-29.4.ebuild | 17 ++++------------- app-editors/emacs/emacs-30.0.91.ebuild | 17 ++++------------- app-editors/emacs/emacs-30.0.9999-r1.ebuild | 17 ++++------------- app-editors/emacs/emacs-31.0.9999.ebuild | 17 ++++------------- app-editors/emacs/metadata.xml | 2 -- 13 files changed, 42 insertions(+), 146 deletions(-) diff --git a/app-editors/emacs/emacs-26.3-r18.ebuild b/app-editors/emacs/emacs-26.3-r18.ebuild index a6495367c009..c5236bfa6e76 100644 --- a/app-editors/emacs/emacs-26.3-r18.ebuild +++ b/app-editors/emacs/emacs-26.3-r18.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -67,13 +67,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -188,7 +182,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -207,8 +201,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi econf \ diff --git a/app-editors/emacs/emacs-26.3-r19.ebuild b/app-editors/emacs/emacs-26.3-r19.ebuild index 56ce5683b767..1fb9cb7f2f7f 100644 --- a/app-editors/emacs/emacs-26.3-r19.ebuild +++ b/app-editors/emacs/emacs-26.3-r19.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -67,13 +67,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -188,7 +182,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -207,8 +201,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi econf \ diff --git a/app-editors/emacs/emacs-27.2-r16.ebuild b/app-editors/emacs/emacs-27.2-r16.ebuild index 2348c2a77186..b78252ea516d 100644 --- a/app-editors/emacs/emacs-27.2-r16.ebuild +++ b/app-editors/emacs/emacs-27.2-r16.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -96,13 +96,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -229,7 +223,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -248,8 +242,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then diff --git a/app-editors/emacs/emacs-27.2-r17.ebuild b/app-editors/emacs/emacs-27.2-r17.ebuild index 5ed69ced9cd6..db9b0cc4c050 100644 --- a/app-editors/emacs/emacs-27.2-r17.ebuild +++ b/app-editors/emacs/emacs-27.2-r17.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -96,13 +96,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -229,7 +223,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -248,8 +242,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then diff --git a/app-editors/emacs/emacs-28.2-r12.ebuild b/app-editors/emacs/emacs-28.2-r12.ebuild index 232777219287..8549d9fba405 100644 --- a/app-editors/emacs/emacs-28.2-r12.ebuild +++ b/app-editors/emacs/emacs-28.2-r12.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -99,13 +99,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -264,7 +258,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -283,8 +277,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then diff --git a/app-editors/emacs/emacs-28.2-r13.ebuild b/app-editors/emacs/emacs-28.2-r13.ebuild index 3db92bfdf018..f7e8fa9848ff 100644 --- a/app-editors/emacs/emacs-28.2-r13.ebuild +++ b/app-editors/emacs/emacs-28.2-r13.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -99,13 +99,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -264,7 +258,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -283,8 +277,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then diff --git a/app-editors/emacs/emacs-29.3-r2.ebuild b/app-editors/emacs/emacs-29.3-r2.ebuild index 58067c63963b..1aadd5af2cdc 100644 --- a/app-editors/emacs/emacs-29.3-r2.ebuild +++ b/app-editors/emacs/emacs-29.3-r2.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg 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" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -70,13 +70,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -147,7 +141,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=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} ) @@ -271,11 +264,11 @@ src_configure() { 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+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -313,7 +306,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -332,8 +325,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-29.3-r3.ebuild b/app-editors/emacs/emacs-29.3-r3.ebuild index 517cd3ebfb7b..b38be4ee9a2d 100644 --- a/app-editors/emacs/emacs-29.3-r3.ebuild +++ b/app-editors/emacs/emacs-29.3-r3.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg 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" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -70,13 +70,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -147,7 +141,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=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} ) @@ -271,11 +264,11 @@ src_configure() { 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+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -313,7 +306,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -332,8 +325,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-29.4.ebuild b/app-editors/emacs/emacs-29.4.ebuild index efc0e74f926c..e5cacab45886 100644 --- a/app-editors/emacs/emacs-29.4.ebuild +++ b/app-editors/emacs/emacs-29.4.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg 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" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -70,13 +70,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -147,7 +141,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=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} ) @@ -271,11 +264,11 @@ src_configure() { 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+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -313,7 +306,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -332,8 +325,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-30.0.91.ebuild b/app-editors/emacs/emacs-30.0.91.ebuild index 7d7e32e39e10..b151a0271ab1 100644 --- a/app-editors/emacs/emacs-30.0.91.ebuild +++ b/app-editors/emacs/emacs-30.0.91.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -67,13 +67,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -144,7 +138,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=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} ) @@ -268,11 +261,11 @@ src_configure() { 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+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -310,7 +303,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -329,8 +322,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild index 7d7e32e39e10..b151a0271ab1 100644 --- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -67,13 +67,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -144,7 +138,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=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} ) @@ -268,11 +261,11 @@ src_configure() { 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+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -310,7 +303,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -329,8 +322,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild index d20867938cb9..37f94d0002ec 100644 --- a/app-editors/emacs/emacs-31.0.9999.ebuild +++ b/app-editors/emacs/emacs-31.0.9999.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -67,13 +67,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -144,7 +138,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=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} ) @@ -268,11 +261,11 @@ src_configure() { 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+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -310,7 +303,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -329,8 +322,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index 95c39fd0d0a7..cd54973be312 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -54,8 +54,6 @@ <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size.</flag> - <flag name="xwidgets">Enable use of GTK widgets in Emacs buffers - (requires GTK3)</flag> </use> <upstream> <remote-id type="savannah">emacs</remote-id>
