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 A7BCF138E20 for ; Wed, 19 Feb 2014 21:49:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EB98E0AAF; Wed, 19 Feb 2014 21:49:52 +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 EEE3EE0AAF for ; Wed, 19 Feb 2014 21:49:51 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A143E33FB3B for ; Wed, 19 Feb 2014 21:49:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 26ECB18875 for ; Wed, 19 Feb 2014 21:49:49 +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: <1392846529.193bbdfde5d1ab4bcd46dcc26c960238781df929.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-24.3.9999.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: 193bbdfde5d1ab4bcd46dcc26c960238781df929 X-VCS-Branch: master Date: Wed, 19 Feb 2014 21:49:49 +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: b52251f1-2316-432c-a267-f500fba3a0de X-Archives-Hash: b427c802da5c24a6b857240a9ebae340 commit: 193bbdfde5d1ab4bcd46dcc26c960238781df929 Author: Ulrich Müller gentoo org> AuthorDate: Wed Feb 19 21:48:49 2014 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Feb 19 21:48:49 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=193bbdfd Follow QA policy on gtk and gtk3 USE flags. Package-Manager: portage-2.2.8-r1 --- app-editors/emacs-vcs/ChangeLog | 4 +++ app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 46 ++++++++++++------------ app-editors/emacs-vcs/metadata.xml | 6 ++-- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 6acbfeb..2c2498e 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Feb 2014; Ulrich Müller emacs-vcs-24.3.9999.ebuild, + metadata.xml: + Follow QA policy on gtk and gtk3 USE flags. + 19 Feb 2014; Ulrich Müller emacs-vcs-24.3.9999.ebuild: Merge changes from Portage tree. diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild index 159111d..5f89968 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild @@ -31,7 +31,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24" -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 zlib" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses @@ -71,15 +71,15 @@ RDEPEND="sys-libs/ncurses >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( athena? ( x11-libs/libXaw ) ) + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( + gtk? ( x11-libs/gtk+:2 ) + !gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + Xaw3d? ( x11-libs/libXaw3d ) + !Xaw3d? ( athena? ( x11-libs/libXaw ) ) + ) ) ) )" @@ -168,21 +168,15 @@ src_configure() { "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." fi - local f - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" - for f in motif Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"gtk\" is set." - done + if use gtk3; then + einfo "Configuring to build with GIMP Toolkit (GTK+) version 3" + myconf+=" --with-x-toolkit=gtk3" + elif use gtk; then + einfo "Configuring to build with GIMP Toolkit (GTK+) version 2" + myconf+=" --with-x-toolkit=gtk2" elif use motif; then einfo "Configuring to build with Motif toolkit" myconf+=" --with-x-toolkit=motif" - for f in Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"motif\" is set." - done elif use athena || use Xaw3d; then einfo "Configuring to build with Athena/Lucid toolkit" myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" @@ -190,6 +184,14 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi + + local f tk + for f in gtk3 gtk motif Xaw3d athena; do + use ${f} || continue + [[ ${tk} = gtk* || ${tk} = motif ]] \ + && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" + : ${tk:=${f}} + done 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 358a70c..b648feb 100644 --- a/app-editors/emacs-vcs/metadata.xml +++ b/app-editors/emacs-vcs/metadata.xml @@ -26,8 +26,10 @@ notification Use gsettings (dev-libs/glib) to read the system font name - Link against version 3 of the GIMP Toolkit instead of - version 2 (x11-libs/gtk+) + Add support for x11-libs/gtk+ + (the GIMP Toolkit) version 2 + Add support for x11-libs/gtk+ + (the GIMP Toolkit) version 3 Compress bundled Emacs Lisp source Enable support for net-dns/hesiod Use media-gfx/imagemagick for image