commit: cdbfc6e884c17c9baae5ed2995a610b3cb85c431 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 1 21:37:10 2015 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Feb 1 21:37:10 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cdbfc6e8
Revert "app-editors/emacs-vcs: Update for upstream merge of the xwidget branch." This reverts commit 4b94cce821add353b6873cf0e2c1b8623fcf4336. --- app-editors/emacs-vcs/ChangeLog | 4 ---- app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild | 16 ++++------------ app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild | 14 +++----------- app-editors/emacs-vcs/metadata.xml | 1 - 4 files changed, 7 insertions(+), 28 deletions(-) diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 0de398f..a2367d2 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,10 +2,6 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ - 01 Feb 2015; Ulrich Müller <u...@gentoo.org> emacs-vcs-25.0.9999-r1.ebuild, - emacs-vcs-25.0.9999-r2.ebuild, metadata.xml: - Update for upstream merge of the xwidget branch. - 01 Feb 2015; Ulrich Müller <u...@gentoo.org> metadata.xml: Sync metadata.xml from Portage tree. diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild index cf43f0a..07daa6b 100644 --- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild,v 1.1 2014/10/02 07:13:42 ulm Exp $ @@ -27,7 +27,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" -IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses @@ -67,13 +67,7 @@ RDEPEND="sys-libs/ncurses >=dev-libs/m17n-lib-1.5.1 ) ) - gtk3? ( - x11-libs/gtk+:3 - xwidgets? ( - >=dev-libs/gobject-introspection-1.32.1 - net-libs/webkit-gtk:3 - ) - ) + gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( gtk? ( x11-libs/gtk+:2 ) !gtk? ( @@ -171,7 +165,7 @@ src_configure() { if use gtk3; then einfo "Configuring to build with GIMP Toolkit (GTK+) version 3" - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3" elif use gtk; then einfo "Configuring to build with GIMP Toolkit (GTK+) version 2" myconf+=" --with-x-toolkit=gtk2" @@ -193,8 +187,6 @@ src_configure() { && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" : ${tk:=${f}} done - ! use gtk3 && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk3\" 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-vcs/emacs-vcs-25.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild index ae63b36..b54dff7 100644 --- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild @@ -27,7 +27,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" -IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses @@ -67,13 +67,7 @@ RDEPEND="sys-libs/ncurses >=dev-libs/m17n-lib-1.5.1 ) ) - gtk3? ( - x11-libs/gtk+:3 - xwidgets? ( - >=dev-libs/gobject-introspection-1.32.1 - net-libs/webkit-gtk:3 - ) - ) + gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( gtk? ( x11-libs/gtk+:2 ) !gtk? ( @@ -171,7 +165,7 @@ src_configure() { if use gtk3; then einfo "Configuring to build with GIMP Toolkit (GTK+) version 3" - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3" elif use gtk; then einfo "Configuring to build with GIMP Toolkit (GTK+) version 2" myconf+=" --with-x-toolkit=gtk2" @@ -193,8 +187,6 @@ src_configure() { && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" : ${tk:=${f}} done - ! use gtk3 && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk3\" 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-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml index c2cefd0..dd924f4 100644 --- a/app-editors/emacs-vcs/metadata.xml +++ b/app-editors/emacs-vcs/metadata.xml @@ -44,6 +44,5 @@ <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 some gtk widgets in Emacs buffers</flag> </use> </pkgmetadata>
