From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 24649138334 for ; Thu, 23 Aug 2018 17:08:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40982E096B; Thu, 23 Aug 2018 17:08:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1203E096B for ; Thu, 23 Aug 2018 17:08:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C7DD335CA0 for ; Thu, 23 Aug 2018 17:08:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92EE13B5 for ; Thu, 23 Aug 2018 17:08:48 +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: <1535044118.400e53e8538ed494cd0f12661abe0e40b95f3b58.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-26.1.9999.ebuild app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild app-editors/emacs-vcs/emacs-vcs-27.0.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: 400e53e8538ed494cd0f12661abe0e40b95f3b58 X-VCS-Branch: master Date: Thu, 23 Aug 2018 17:08:48 +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: c00e3cfd-fd47-42fd-89ad-863b521cf7db X-Archives-Hash: bdde9457c027c5d670f8392fefe5826d commit: 400e53e8538ed494cd0f12661abe0e40b95f3b58 Author: Ulrich Müller gentoo org> AuthorDate: Thu Aug 23 17:07:20 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Aug 23 17:08:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400e53e8 app-editors/emacs-vcs: Reorganise gtk* flags. As discussed with leio in #gentoo-dev and in #gentoo-qa. - USE="gtk -gtk2" for GTK+ version 3, - USE="gtk gtk2" for GTK+ version 2, - USE="-gtk" for no GTK+ (the "gtk2" flag has no effect). Package-Manager: Portage-2.3.48, Repoman-2.3.10 app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild | 24 +++++++++++----------- .../emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild | 24 +++++++++++----------- app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 24 +++++++++++----------- app-editors/emacs-vcs/metadata.xml | 2 +- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild index 79e76df1347..1f69edf59ad 100644 --- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads 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 gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" REQUIRED_USE="?? ( aqua X )" RESTRICT="test" @@ -80,14 +80,13 @@ RDEPEND="sys-libs/ncurses:0= ) ) gtk? ( - xwidgets? ( - net-libs/webkit-gtk:4= + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 - x11-libs/libXcomposite - ) - !xwidgets? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) + xwidgets? ( + net-libs/webkit-gtk:4= + x11-libs/libXcomposite + ) ) ) !gtk? ( @@ -210,11 +209,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" + if use gtk2; then + myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" + use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." else - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" - myconf+=" --without-xwidgets" + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" fi for f in motif Xaw3d athena; do use ${f} && ewarn \ diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild index ee8f5f2ac3c..c5898b1c2dd 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="27" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads 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 gtk2 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" REQUIRED_USE="?? ( aqua X )" RESTRICT="test" @@ -81,14 +81,13 @@ RDEPEND="sys-libs/ncurses:0= ) ) gtk? ( - xwidgets? ( - net-libs/webkit-gtk:4= + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 - x11-libs/libXcomposite - ) - !xwidgets? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) + xwidgets? ( + net-libs/webkit-gtk:4= + x11-libs/libXcomposite + ) ) ) !gtk? ( @@ -211,11 +210,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" + if use gtk2; then + myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" + use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." else - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" - myconf+=" --without-xwidgets" + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" fi for f in motif Xaw3d athena; do use ${f} && ewarn \ diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild index 2fef204a390..3cb2cdf754a 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="27" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads 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 +gmp gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" REQUIRED_USE="?? ( aqua X )" RESTRICT="test" @@ -82,14 +82,13 @@ RDEPEND="sys-libs/ncurses:0= ) ) gtk? ( - xwidgets? ( - net-libs/webkit-gtk:4= + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 - x11-libs/libXcomposite - ) - !xwidgets? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) + xwidgets? ( + net-libs/webkit-gtk:4= + x11-libs/libXcomposite + ) ) ) !gtk? ( @@ -213,11 +212,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" + if use gtk2; then + myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" + use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." else - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" - myconf+=" --without-xwidgets" + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" fi for f in motif Xaw3d athena; do use ${f} && ewarn \ diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml index 3562545ef0a..d60762a414d 100644 --- a/app-editors/emacs-vcs/metadata.xml +++ b/app-editors/emacs-vcs/metadata.xml @@ -31,7 +31,7 @@ notification Use gsettings (dev-libs/glib) to read the system font name - Prefer version 3 of the GIMP Toolkit to version 2 + Prefer version 2 of the GIMP Toolkit to version 3 (x11-libs/gtk+) Compress bundled Emacs Lisp source Use media-gfx/imagemagick for image