From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B67E8138ACF for ; Sun, 1 Feb 2015 15:51:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35224E088B; Sun, 1 Feb 2015 15:51:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEFEAE088B for ; Sun, 1 Feb 2015 15:51:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6CE1B340766 for ; Sun, 1 Feb 2015 15:51:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2475710D4F for ; Sun, 1 Feb 2015 15:51:08 +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: <1422805842.4b94cce821add353b6873cf0e2c1b8623fcf4336.ulm@gentoo> Subject: [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/ X-VCS-Repository: proj/emacs X-VCS-Files: app-editors/emacs-vcs/ChangeLog app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild app-editors/emacs-vcs/metadata.xml X-VCS-Directories: app-editors/emacs-vcs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 4b94cce821add353b6873cf0e2c1b8623fcf4336 X-VCS-Branch: master Date: Sun, 1 Feb 2015 15:51:08 +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-Archives-Salt: 1ff9822c-8cf4-48d9-9537-3fbe30f50595 X-Archives-Hash: 82b21872748a94d6baa09b003bd1823d commit: 4b94cce821add353b6873cf0e2c1b8623fcf4336 Author: Ulrich Müller gentoo org> AuthorDate: Sun Feb 1 15:50:42 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Feb 1 15:50:42 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=4b94cce8 app-editors/emacs-vcs: Update for upstream merge of the xwidget branch. Package-Manager: portage-2.2.15 --- 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, 28 insertions(+), 7 deletions(-) diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index a2367d2..0de398f 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 Feb 2015; Ulrich Müller 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 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 07daa6b..cf43f0a 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-2014 Gentoo Foundation +# Copyright 1999-2015 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 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 xwidgets zlib" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses @@ -67,7 +67,13 @@ RDEPEND="sys-libs/ncurses >=dev-libs/m17n-lib-1.5.1 ) ) - gtk3? ( x11-libs/gtk+:3 ) + gtk3? ( + x11-libs/gtk+:3 + xwidgets? ( + >=dev-libs/gobject-introspection-1.32.1 + net-libs/webkit-gtk:3 + ) + ) !gtk3? ( gtk? ( x11-libs/gtk+:2 ) !gtk? ( @@ -165,7 +171,7 @@ src_configure() { if use gtk3; then einfo "Configuring to build with GIMP Toolkit (GTK+) version 3" - myconf+=" --with-x-toolkit=gtk3" + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" elif use gtk; then einfo "Configuring to build with GIMP Toolkit (GTK+) version 2" myconf+=" --with-x-toolkit=gtk2" @@ -187,6 +193,8 @@ 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 b54dff7..ae63b36 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 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 xwidgets zlib" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses @@ -67,7 +67,13 @@ RDEPEND="sys-libs/ncurses >=dev-libs/m17n-lib-1.5.1 ) ) - gtk3? ( x11-libs/gtk+:3 ) + gtk3? ( + x11-libs/gtk+:3 + xwidgets? ( + >=dev-libs/gobject-introspection-1.32.1 + net-libs/webkit-gtk:3 + ) + ) !gtk3? ( gtk? ( x11-libs/gtk+:2 ) !gtk? ( @@ -165,7 +171,7 @@ src_configure() { if use gtk3; then einfo "Configuring to build with GIMP Toolkit (GTK+) version 3" - myconf+=" --with-x-toolkit=gtk3" + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" elif use gtk; then einfo "Configuring to build with GIMP Toolkit (GTK+) version 2" myconf+=" --with-x-toolkit=gtk2" @@ -187,6 +193,8 @@ 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 dd924f4..c2cefd0 100644 --- a/app-editors/emacs-vcs/metadata.xml +++ b/app-editors/emacs-vcs/metadata.xml @@ -44,5 +44,6 @@ Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size. + Enable use of some gtk widgets in Emacs buffers