app-editors/emacs: Drop xwidgets flag and dependency on webkit-gtk:3.

If you need this functionality, use app-editors/emacs-vcs:26 (which
uses webkit-gtk:4) as a replacement.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
index e5ff6db30523fa4176c625007ba05a6946b7eac1..6be10197694990d9ec45c3a681e8f47c30f79d9b 100644 (file)
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -54,14 +54,8 @@ RDEPEND="sys-libs/ncurses:0=
                        )
                )
                gtk? (
-                       xwidgets? (
-                               x11-libs/gtk+:3
-                               net-libs/webkit-gtk:3=
-                       )
-                       !xwidgets? (
-                               gtk3? ( x11-libs/gtk+:3 )
-                               !gtk3? ( x11-libs/gtk+:2 )
-                       )
+                       gtk3? ( x11-libs/gtk+:3 )
+                       !gtk3? ( x11-libs/gtk+:2 )
                )
                !gtk? (
                        motif? ( >=x11-libs/motif-2.3:0 )
@@ -161,12 +155,12 @@ src_configure() {
                                recommended that you compile Emacs with the Athena/Lucid or the
                                Motif toolkit instead.
                        EOF
-                       if use xwidgets; then
-                               myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
-                       else
+                       #if use xwidgets; then
+                       #       myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+                       #else
                                myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
                                myconf+=" --without-xwidgets"
-                       fi
+                       #fi
                        for f in motif Xaw3d athena; do
                                use ${f} && ewarn \
                                        "USE flag \"${f}\" has no effect if \"gtk\" is set."
@@ -185,8 +179,8 @@ 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."
+               #! use gtk && use xwidgets && ewarn \
+               #       "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
        elif use aqua; then
                einfo "Configuring to build with Nextstep (Cocoa) support"
                myconf+=" --with-ns --disable-ns-self-contained"

diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 61b88217833d25d900ba4ebee6db2a645f3b1431..64c34d30c315692e395f1e0f6ce4ff25121fdb56 100644 (file)
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -47,7 +47,7 @@
   <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>
+  <!--flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers
+    (requires GTK3)</flag-->
 </use>
 </pkgmetadata>