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 C56E4138334 for ; Sun, 17 Mar 2019 23:52:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5D5EE0905; Sun, 17 Mar 2019 23:52:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 7379DE0905 for ; Sun, 17 Mar 2019 23:52:56 +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 AD060335D45 for ; Sun, 17 Mar 2019 23:52:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B16B326 for ; Sun, 17 Mar 2019 23:52:53 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1552866767.e0690ffab43b375dd17e660562a5cb8c9e3107dc.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/putty/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/putty/metadata.xml net-misc/putty/putty-0.71.ebuild net-misc/putty/putty-9999.ebuild X-VCS-Directories: net-misc/putty/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: e0690ffab43b375dd17e660562a5cb8c9e3107dc X-VCS-Branch: master Date: Sun, 17 Mar 2019 23:52:53 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2cf1a5d3-d79b-47c6-b4ea-d81d80f1e841 X-Archives-Hash: c9f37bc3911aa3f5560fa619581bf07b commit: e0690ffab43b375dd17e660562a5cb8c9e3107dc Author: Jeroen Roovers gentoo org> AuthorDate: Sun Mar 17 23:51:54 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Mar 17 23:52:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0690ffa net-misc/putty: Add USE=gtk2 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Fixes: https://bugs.gentoo.org/616412 Signed-off-by: Jeroen Roovers gentoo.org> net-misc/putty/metadata.xml | 10 +++------- net-misc/putty/putty-0.71.ebuild | 7 ++++--- net-misc/putty/putty-9999.ebuild | 7 ++++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml index bff885218f3..6f7ffaa0c97 100644 --- a/net-misc/putty/metadata.xml +++ b/net-misc/putty/metadata.xml @@ -13,12 +13,8 @@ authentication protocols, and various other interesting things not provided by ssh in an xterm. - -Enable support for GSSAPI (virtual/krb5) - - -Build the PuTTY client which requires x11-libs/gtk+:3. If disabled -only the CLI tools puttygen, plink, pscp and psftp will be built. - +Enable support for GSSAPI (virtual/krb5) +Build the PuTTY client which requires x11-libs/gtk+. If disabled only the CLI tools puttygen, plink, pscp and psftp will be built +Build the PuTTY client with x11-libs/gtk+:2 instead of x11-libs/gtk+:3 diff --git a/net-misc/putty/putty-0.71.ebuild b/net-misc/putty/putty-0.71.ebuild index 888ed3b7bbb..06b7756af05 100644 --- a/net-misc/putty/putty-0.71.ebuild +++ b/net-misc/putty/putty-0.71.ebuild @@ -10,7 +10,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc +gtk ipv6 gssapi" +IUSE="doc +gtk gtk2 ipv6 gssapi" SRC_URI=" https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2 https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz @@ -21,9 +21,10 @@ RDEPEND=" gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf - x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 ) " @@ -48,7 +49,7 @@ src_configure() { cd "${S}"/unix || die econf \ $(use_with gssapi) \ - $(use_with gtk) + $(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) ) } src_compile() { diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild index 9d0477fe17e..00e78d96259 100644 --- a/net-misc/putty/putty-9999.ebuild +++ b/net-misc/putty/putty-9999.ebuild @@ -12,16 +12,17 @@ LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="doc +gtk ipv6 gssapi" +IUSE="doc +gtk gtk2 ipv6 gssapi" RDEPEND=" !net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf - x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 ) " @@ -54,7 +55,7 @@ src_configure() { cd "${S}"/unix || die econf \ $(use_with gssapi) \ - $(use_with gtk gtk=3) + $(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) ) } src_compile() {