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 B1884138334 for ; Fri, 24 Aug 2018 06:52:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8BE5E088B; Fri, 24 Aug 2018 06:52:28 +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 65317E088B for ; Fri, 24 Aug 2018 06:52:28 +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 2DFE4335CA0 for ; Fri, 24 Aug 2018 06:52:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D478C2A9 for ; Fri, 24 Aug 2018 06:52:23 +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: <1535093503.2121e950ff40bd58a313c2e3f6b7bd7f079771e2.ulm@gentoo> Subject: [gentoo-commits] repo/proj/emacs:master commit in: app-editors/emacs/ X-VCS-Repository: repo/proj/emacs X-VCS-Files: app-editors/emacs/emacs-24.3-r7.ebuild app-editors/emacs/metadata.xml X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 2121e950ff40bd58a313c2e3f6b7bd7f079771e2 X-VCS-Branch: master Date: Fri, 24 Aug 2018 06:52:23 +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: 8d37fc03-532a-413b-b64b-dce586820a88 X-Archives-Hash: 34322d2dd946b622c4ac8c1059f8e5ba commit: 2121e950ff40bd58a313c2e3f6b7bd7f079771e2 Author: Ulrich Müller gentoo org> AuthorDate: Fri Aug 24 06:51:43 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Aug 24 06:51:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=2121e950 app-editors/emacs: Sync from gentoo repo. Package-Manager: Portage-2.3.47, Repoman-2.3.10 app-editors/emacs/emacs-24.3-r7.ebuild | 10 ++++++---- app-editors/emacs/metadata.xml | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app-editors/emacs/emacs-24.3-r7.ebuild b/app-editors/emacs/emacs-24.3-r7.ebuild index b013715..ed89687 100644 --- a/app-editors/emacs/emacs-24.3-r7.ebuild +++ b/app-editors/emacs/emacs-24.3-r7.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24.3" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="alsa aqua athena dbus gconf gif gpm gsettings gtk +gtk3 gzip-el imagemagick jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" +IUSE="alsa aqua athena dbus gconf gif gpm gsettings gtk gtk2 gzip-el imagemagick jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses:0= @@ -58,8 +58,8 @@ RDEPEND="sys-libs/ncurses:0= ) ) gtk? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( @@ -204,7 +204,7 @@ 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)" + myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -223,6 +223,8 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi + ! use gtk && use gtk2 && ewarn \ + "USE flag \"gtk2\" 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" diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index 720733b..61ab502 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -26,7 +26,7 @@ font name 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