[gentoo-commits] repo/gentoo:master commit in: net-misc/putty/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/putty/
Date: Sun, 17 Mar 2019 23:52:53 +0000 (UTC)	[thread overview]
Message-ID: <1552866767.e0690ffab43b375dd17e660562a5cb8c9e3107dc.jer@gentoo> (raw)

commit:     e0690ffab43b375dd17e660562a5cb8c9e3107dc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 23:51:54 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> 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 <jer <AT> 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.
 </longdescription>
 <use>
-<flag name="gssapi">
-Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)
-</flag>
-<flag name="gtk">
-Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>:3. If disabled
-only the CLI tools puttygen, plink, pscp and psftp will be built.
-</flag>
+<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
+<flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>. If disabled only the CLI tools puttygen, plink, pscp and psftp will be built</flag>
+<flag name="gtk2">Build the PuTTY client with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3</flag>
 </use>
 </pkgmetadata>

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() {

next             reply	other threads:[~2019-03-17 23:52 UTC|newest]

Thread overview: 128+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-17 23:52 Jeroen Roovers [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-09  7:38 [gentoo-commits] repo/gentoo:master commit in: net-misc/putty/ Jakov Smolić
2024-07-31 17:51 Matthew Smith
2024-04-18 16:42 Matthew Smith
2024-04-18 16:42 Matthew Smith
2024-04-18  7:27 Matthew Smith
2024-04-17 22:01 Sam James
2024-04-17  6:54 Sam James
2024-04-16  1:25 Sam James
2024-04-15 23:08 Sam James
2024-04-15 23:08 Sam James
2024-04-15 20:54 Matthew Smith
2023-12-20  9:26 Matthew Smith
2023-12-20  6:23 Arthur Zamarin
2023-12-20  6:23 Arthur Zamarin
2023-12-20  3:44 Sam James
2023-12-20  1:40 Sam James
2023-12-20  1:40 Sam James
2023-12-19 19:59 Matthew Smith
2023-12-19 19:59 Matthew Smith
2022-12-03 18:12 Arthur Zamarin
2022-12-03 17:42 Arthur Zamarin
2022-12-03 14:59 Arthur Zamarin
2022-12-03 10:54 Sam James
2022-12-03 10:37 Arthur Zamarin
2022-11-04 19:00 Matthew Smith
2022-09-29  9:32 Matthew Smith
2022-09-29  8:44 Matthew Smith
2022-09-29  8:44 Matthew Smith
2022-09-29  8:44 Matthew Smith
2022-09-17  5:38 Arthur Zamarin
2022-09-10  4:46 Sam James
2022-09-10  0:48 Sam James
2022-09-09 22:26 Jakov Smolić
2022-08-25 16:32 Matthew Smith
2022-07-10  8:40 Matthew Smith
2022-07-10  8:40 Matthew Smith
2022-07-10  8:40 Matthew Smith
2022-05-27 10:11 Lars Wendler
2022-05-27 10:11 Lars Wendler
2022-03-26  0:01 Sam James
2021-07-26  6:59 Lars Wendler
2021-07-26  4:37 Sam James
2021-07-26  2:14 Sam James
2021-07-18  6:35 Agostino Sarubbo
2021-07-18  6:34 Agostino Sarubbo
2021-07-18  6:33 Agostino Sarubbo
2021-07-17 18:25 Lars Wendler
2021-07-12  7:38 Lars Wendler
2021-06-09  6:24 Agostino Sarubbo
2021-06-08  6:59 Agostino Sarubbo
2021-06-07 13:19 Agostino Sarubbo
2021-06-06 23:19 Sam James
2021-06-06 23:19 Sam James
2021-05-09  8:35 Lars Wendler
2021-04-19 20:56 Lars Wendler
2020-11-03 22:58 Lars Wendler
2020-07-23  9:19 Jeroen Roovers
2020-07-23  9:05 Jeroen Roovers
2020-07-23  8:56 Sergei Trofimovich
2020-07-22 15:43 Jeroen Roovers
2020-07-18 18:35 Sam James
2020-07-17 23:25 Sam James
2020-07-17 23:25 Sam James
2020-07-17  0:07 Sam James
2020-07-16 23:49 Sam James
2020-06-28  7:00 Jeroen Roovers
2020-01-13  3:09 Jeroen Roovers
2019-10-14  5:46 Jeroen Roovers
2019-10-14  2:41 Matt Turner
2019-10-07  9:53 Agostino Sarubbo
2019-10-07  9:47 Agostino Sarubbo
2019-10-07  8:42 Agostino Sarubbo
2019-10-06 21:18 Thomas Deutschmann
2019-09-30 14:55 Jeroen Roovers
2019-07-23 10:42 Jeroen Roovers
2019-05-11 12:40 Jeroen Roovers
2019-04-08 16:02 Jeroen Roovers
2019-04-08  6:46 Mikle Kolyada
2019-04-06 11:38 Jeroen Roovers
2019-04-05 19:03 Sergei Trofimovich
2019-04-02  9:09 Mikle Kolyada
2019-04-02  1:37 Thomas Deutschmann
2019-03-18 16:40 Jeroen Roovers
2019-03-18  0:26 Jeroen Roovers
2019-03-17 23:58 Jeroen Roovers
2019-03-17 23:35 Jeroen Roovers
2019-01-26 14:39 Jeroen Roovers
2019-01-21 11:39 Jeroen Roovers
2019-01-20 13:40 Jeroen Roovers
2019-01-20 12:24 Jeroen Roovers
2018-05-27 16:11 Aaron Bauman
2017-07-09  4:26 Jeroen Roovers
2017-05-03 12:09 Jeroen Roovers
2017-04-10 22:41 Jeroen Roovers
2017-03-01  6:12 Jeroen Roovers
2017-03-01  6:12 Jeroen Roovers
2017-03-01  6:12 Jeroen Roovers
2017-02-28 11:22 Tobias Klausmann
2017-02-25 10:03 Agostino Sarubbo
2017-02-24 14:07 Agostino Sarubbo
2017-02-23 16:30 Agostino Sarubbo
2017-02-23 15:55 Agostino Sarubbo
2017-02-23  9:16 Jeroen Roovers
2017-02-22 16:31 Jeroen Roovers
2016-04-19 13:12 Michał Górny
2016-04-18  9:43 Patrice Clement
2016-04-03  8:25 Jeroen Roovers
2016-03-15 20:50 Tobias Klausmann
2016-03-15 16:38 Agostino Sarubbo
2016-03-08 13:41 Jeroen Roovers
2016-03-07  8:04 Agostino Sarubbo
2016-03-06 18:10 Jeroen Roovers
2016-01-10 21:52 Jeroen Roovers
2015-12-25 20:00 Mikle Kolyada
2015-11-12 10:25 Agostino Sarubbo
2015-11-09  8:40 Agostino Sarubbo
2015-11-09  8:40 Agostino Sarubbo
2015-11-09  4:33 Jeroen Roovers
2015-11-08  6:57 Jeroen Roovers
2015-11-08  6:02 Jeroen Roovers
2015-10-12  3:48 Jeroen Roovers
2015-09-22  8:57 Agostino Sarubbo
2015-09-21 11:27 Agostino Sarubbo
2015-09-19 12:32 Agostino Sarubbo
2015-09-18 18:31 Tobias Klausmann
2015-09-18  5:33 Jeroen Roovers
2015-09-18  5:33 Jeroen Roovers

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:bff885218f dfblob:6f7ffaa0c9 dfblob:888ed3b7bb
dfblob:06b7756af0 dfblob:9d0477fe17 dfblob:00e78d9625 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-misc/putty/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1552866767.e0690ffab43b375dd17e660562a5cb8c9e3107dc.jer@gentoo \
    --to=jer@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox