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 BCCC458973 for ; Sun, 31 Jan 2016 19:40:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E940B21C096; Sun, 31 Jan 2016 19:40:10 +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 7F4D821C096 for ; Sun, 31 Jan 2016 19:40: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 49CA8340806 for ; Sun, 31 Jan 2016 19:40:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 897538EC for ; Sun, 31 Jan 2016 19:40:07 +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: <1454269181.41c80d3d37be488e9b3b1d62da755715218e2e62.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs-vcs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild X-VCS-Directories: app-editors/emacs-vcs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 41c80d3d37be488e9b3b1d62da755715218e2e62 X-VCS-Branch: master Date: Sun, 31 Jan 2016 19:40:07 +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: 6f6cd124-f637-48cc-b3e8-b0a4d18d634c X-Archives-Hash: 117b10155dcc255fa3803c2b4f2eae57 commit: 41c80d3d37be488e9b3b1d62da755715218e2e62 Author: Ulrich Müller gentoo org> AuthorDate: Sun Jan 31 19:39:41 2016 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Jan 31 19:39:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c80d3d app-editors/emacs-vcs: Support xwidgets flag. Package-Manager: portage-2.2.27 ...1.9999.ebuild => emacs-vcs-25.1.9999-r1.ebuild} | 31 +++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild similarity index 94% rename from app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild rename to app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild index 4c02aba..c66d03f 100644 --- a/app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo +inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1 if [[ ${PV##*.} = 9999 ]]; then inherit git-r3 @@ -20,8 +20,8 @@ else # order to determine some path information correctly for copy/move # operations later on FULL_VERSION="${PV%%_*}" - #S="${WORKDIR}/emacs-${FULL_VERSION}" - S="${WORKDIR}/emacs" + S="${WORKDIR}/emacs-${FULL_VERSION}" + [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" @@ -29,7 +29,7 @@ HOMEPAGE="https://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 cairo 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 cairo 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:0 @@ -71,8 +71,14 @@ RDEPEND="sys-libs/ncurses:0 ) ) gtk? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) + xwidgets? ( + x11-libs/gtk+:3 + net-libs/webkit-gtk:3= + ) + !xwidgets? ( + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) @@ -111,7 +117,7 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi - epatch_user + eapply_user # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ @@ -182,7 +188,12 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" + if use xwidgets; then + myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" + else + myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" + myconf+=" --without-xwidgets" + fi for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -201,6 +212,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." elif use aqua; then einfo "Configuring to build with Nextstep (Cocoa) support" myconf+=" --with-ns --disable-ns-self-contained"