gentoo resync : 19.03.2019

6 files changed, 255 insertions, 109 deletions

diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 6670d5f9170f..09ee1ee4a037 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,9 +1,8 @@
+AUX putty-0.71-no-gssapi.patch 8533 BLAKE2B 8877d15eb81d846343ff7bd198bbf67ebf82145ff149f4844fd3625c4a4b025374e30c450f49bb6c044c9b096c37018f96e2014247f1181fc80a1241e344b04a SHA512 d82647f6c212502a710c47536b61ed152c53ccbcbe6792142d831f62601ff8377b927b26a0bc364bc48ad033732088afd3bff2926d5cb8da83a4ed2d1f9cbfab
 DIST putty-0.68.tar.gz 2114499 BLAKE2B b7f2f216bbeaea3fa175810defd546b3b94bb7f2e182b46d05a11db1e4841266674a71f6ce2d30edeefe98e3e0093e379abf736a34fb742d60dcdfd20593afec SHA512 e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3
-DIST putty-0.69.tar.gz 2122306 BLAKE2B 25e8d5aedd214d14e0bc51aaebde2289b822cbd6b2fbfc48fb7e7409424d362f3912cb04dd4513500600fbd07cedd7c85ecfabc083eec63a6c567650610e7b05 SHA512 2739829adec60df5658709d61f8539d431f6b5d71b9b893fcefb2a04ac52bf2ace26f9ca784156d6540fa3f3e5858a86eb2921002b4cc05f9fbf22da7931ec2a
-DIST putty-0.70.tar.gz 2386108 BLAKE2B 0780b94a1c7c1450cc3f46ec5fa5419ae8c618563e2e949ab123da826e7ca5da74b8e4d009c45228e552fbee747d33ed7367b943f0e56987556e679ed3ac0277 SHA512 2aaf4fa2b4ad2d82eb5cdc4419ade79e0c5d8bd3c093db92b3c048e6107f85a5f1647f9d8203cda0906ce2b926725a75319f981cb32e6f1ebf50b1f738564fed
+DIST putty-0.71.tar.gz 2423752 BLAKE2B fa4202d76d3b96e016a62c805db3835a6f61b05e7f63900919ffcd5bbec5159ef0e06b643398ed33aef5cd9ecf04eb9a981828683de7d565b88abbd4552237f6 SHA512 f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.68.ebuild 1585 BLAKE2B c5cf6d298348b950e62eaad33054fef6d2740aa148afd3d0b9f1411dfc38162c22919f71829ebb5bdc77a3e758045aad5fa751f8f084dcd8bbdc7f6afee781fc SHA512 2d4188d5cd77f4335990b5e67d516b6cd6b5c34efc1d8253e5c3ac28f03995f24646b29a6de180d9a8957d10d30d76ec60b185cbda5bb889edad83894b1ecfd4
-EBUILD putty-0.69.ebuild 1592 BLAKE2B 2bc48bc243ae9583395c8a57f7ff31aec4257eaffab663a49609bc66e60941f4fb55c0dfa093efd494ae7a4fb82ffc766da0f9caa38cab4312fb32a447e6b8e7 SHA512 61137d5b5fbd9ebef967392255d3ec0f1886a3460f4faf031e549880541819c7ca25e5a5c563ead5afee471d1bec25152f9b1ead5de212d833e36a3281034a6e
-EBUILD putty-0.70.ebuild 1576 BLAKE2B 463404e2b72702b60f0a1ef7a346b9cc59cb4761de889b30c767e61b02817ef5833a7663fb6753f5539dfebf34de3aebd0f2b20739f870a6e3994c0703d8ffef SHA512 3ea16c4e3d1c34e8e284334294a8bedd9ed32ef60e907fc8c6b501183fa1a7a95854faf9ec565822ad6caf1a60ddac215677ca13acc8300691b08f581882612c
-EBUILD putty-9999.ebuild 1699 BLAKE2B 89ed0fb7e47ae19a6ae0232dffd0fc1dac87c2f4e99247aea3fc985e19eac4d259cd11f87706ff4a4356e015e7a9288d48649a51d88b1fed8df5cd6394545eb4 SHA512 e3fe328f67e0e927b768651dc5f24a24eb09be9537603dd3881f54a2d59cea6618b77f328bc97cfe085fc012cf529a3d9b0f58660f729efa846e4a4433215510
-MISC metadata.xml 866 BLAKE2B 1d1ed9fe125d0800bd0fb868a44e29444a5a2555fc08f63e0ce764b6255a026441a011a03a8499578ded4063e3f0ab44a455ceb88d0340a6f5e22db6085578e5 SHA512 bc182c0e67bdfd300ab3c25d0457bf7502fc9fbc62d5253a8df4671b5d1c59a95fc5432688277f6a2b2328969f7b58bdd7ea5478b8d4a19bb48381aeed8582d9
+EBUILD putty-0.71-r1.ebuild 1715 BLAKE2B 2d06f04e11ae6cec185097d874d9221bf970bd71f28fdbc158bd5989db0578d9892b9cd48d59fdb3ab17e900e95e7c1f48b3a8fecefd558eb07c2e830d3e58ab SHA512 f13898e24aca15efdd68372e49c78984c26859d1262ba0e3967c81c14417b716f099bb2a2f6c8e1e70fc8e3a161bcafeb370292e2d5cca0747d66511c604fdbe
+EBUILD putty-9999.ebuild 1778 BLAKE2B d84806c66abe03ce824f8d7c9dc54cf07f49da77d4bd29ac590465e85cc4019cef2a4af8f4d39c81443c0b0c4c643afc17ce45897e6855aa0677f295b71baba5 SHA512 8d702ecce91b4a8e98171e97424cde8eac4a54144ca9c39d178490950c66a300889690eb0c19c35af5faf5b63e3c18ee93525cd3b1c670e6307aedf2128d5ede
+MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/files/putty-0.71-no-gssapi.patch b/net-misc/putty/files/putty-0.71-no-gssapi.patch
new file mode 100644
index 000000000000..75add0687d28
--- /dev/null
+++ b/net-misc/putty/files/putty-0.71-no-gssapi.patch
@@ -0,0 +1,236 @@
+--- a/config.c
++++ b/config.c
+@@ -2442,10 +2442,12 @@
+ 			      HELPCTX(ssh_kexlist),
+ 			      kexlist_handler, P(NULL));
+             c->listbox.height = KEX_MAX;
++#ifndef NO_GSSAPI
+ 	    ctrl_checkbox(s, "Attempt GSSAPI key exchange",
+ 			  'k', HELPCTX(ssh_gssapi),
+ 			  conf_checkbox_handler,
+ 			  I(CONF_try_gssapi_kex));
++#endif
+ 
+ 	    s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
+ 			    "Options controlling key re-exchange");
+@@ -2455,11 +2457,13 @@
+ 			 conf_editbox_handler,
+ 			 I(CONF_ssh_rekey_time),
+ 			 I(-1));
++#ifndef NO_GSSAPI
+             ctrl_editbox(s, "Minutes between GSS checks (0 for never)", NO_SHORTCUT, 20,
+                          HELPCTX(ssh_kex_repeat),
+                          conf_editbox_handler,
+                          I(CONF_gssapirekey),
+                          I(-1));
++#endif
+ 	    ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
+ 			 HELPCTX(ssh_kex_repeat),
+ 			 conf_editbox_handler,
+--- a/settings.c
++++ b/settings.c
+@@ -592,21 +592,25 @@
+     write_setting_b(sesskey, "Compression", conf_get_bool(conf, CONF_compression));
+     write_setting_b(sesskey, "TryAgent", conf_get_bool(conf, CONF_tryagent));
+     write_setting_b(sesskey, "AgentFwd", conf_get_bool(conf, CONF_agentfwd));
++#ifndef NO_GSSAPI
+     write_setting_b(sesskey, "GssapiFwd", conf_get_bool(conf, CONF_gssapifwd));
++#endif
+     write_setting_b(sesskey, "ChangeUsername", conf_get_bool(conf, CONF_change_username));
+     wprefs(sesskey, "Cipher", ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist);
+     wprefs(sesskey, "KEX", kexnames, KEX_MAX, conf, CONF_ssh_kexlist);
+     wprefs(sesskey, "HostKey", hknames, HK_MAX, conf, CONF_ssh_hklist);
+     write_setting_i(sesskey, "RekeyTime", conf_get_int(conf, CONF_ssh_rekey_time));
++#ifndef NO_GSSAPI
+     write_setting_i(sesskey, "GssapiRekey", conf_get_int(conf, CONF_gssapirekey));
++#endif
+     write_setting_s(sesskey, "RekeyBytes", conf_get_str(conf, CONF_ssh_rekey_data));
+     write_setting_b(sesskey, "SshNoAuth", conf_get_bool(conf, CONF_ssh_no_userauth));
+     write_setting_b(sesskey, "SshBanner", conf_get_bool(conf, CONF_ssh_show_banner));
+     write_setting_b(sesskey, "AuthTIS", conf_get_bool(conf, CONF_try_tis_auth));
+     write_setting_b(sesskey, "AuthKI", conf_get_bool(conf, CONF_try_ki_auth));
++#ifndef NO_GSSAPI
+     write_setting_b(sesskey, "AuthGSSAPI", conf_get_bool(conf, CONF_try_gssapi_auth));
+     write_setting_b(sesskey, "AuthGSSAPIKEX", conf_get_bool(conf, CONF_try_gssapi_kex));
+-#ifndef NO_GSSAPI
+     wprefs(sesskey, "GSSLibs", gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
+     write_setting_filename(sesskey, "GSSCustom", conf_get_filename(conf, CONF_ssh_gss_custom));
+ #endif
+@@ -937,7 +941,9 @@
+     gppb(sesskey, "TryAgent", true, conf, CONF_tryagent);
+     gppb(sesskey, "AgentFwd", false, conf, CONF_agentfwd);
+     gppb(sesskey, "ChangeUsername", false, conf, CONF_change_username);
++#ifndef NO_GSSAPI
+     gppb(sesskey, "GssapiFwd", false, conf, CONF_gssapifwd);
++#endif
+     gprefs(sesskey, "Cipher", "\0",
+ 	   ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist);
+     {
+@@ -990,7 +996,9 @@
+     gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN",
+            hknames, HK_MAX, conf, CONF_ssh_hklist);
+     gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time);
++#ifndef NO_GSSAPI
+     gppi(sesskey, "GssapiRekey", GSS_DEF_REKEY_MINS, conf, CONF_gssapirekey);
++#endif
+     gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data);
+     {
+ 	/* SSH-2 only by default */
+@@ -1007,9 +1015,9 @@
+     gppb(sesskey, "SshBanner", true, conf, CONF_ssh_show_banner);
+     gppb(sesskey, "AuthTIS", false, conf, CONF_try_tis_auth);
+     gppb(sesskey, "AuthKI", true, conf, CONF_try_ki_auth);
++#ifndef NO_GSSAPI
+     gppb(sesskey, "AuthGSSAPI", true, conf, CONF_try_gssapi_auth);
+     gppb(sesskey, "AuthGSSAPIKEX", true, conf, CONF_try_gssapi_kex);
+-#ifndef NO_GSSAPI
+     gprefs(sesskey, "GSSLibs", "\0",
+ 	   gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
+     gppfile(sesskey, "GSSCustom", conf, CONF_ssh_gss_custom);
+--- a/ssh.c
++++ b/ssh.c
+@@ -50,7 +50,9 @@
+     ssh_sharing_state *connshare;
+     bool attempting_connshare;
+ 
++#ifndef NO_GSSAPI
+     struct ssh_connection_shared_gss_state gss_state;
++#endif
+ 
+     char *savedhost;
+     int savedport;
+@@ -252,10 +254,17 @@
+                     conf_get_bool(ssh->conf, CONF_tryagent), username,
+                     conf_get_bool(ssh->conf, CONF_change_username),
+                     conf_get_bool(ssh->conf, CONF_try_ki_auth),
++#ifndef NO_GSSAPI
+                     conf_get_bool(ssh->conf, CONF_try_gssapi_auth),
+                     conf_get_bool(ssh->conf, CONF_try_gssapi_kex),
+                     conf_get_bool(ssh->conf, CONF_gssapifwd),
+                     &ssh->gss_state);
++#else
++                    NULL,
++                    NULL,
++                    NULL,
++                    NULL);
++#endif
+                 ssh_connect_ppl(ssh, userauth_layer);
+                 transport_child_layer = userauth_layer;
+ 
+@@ -267,7 +276,11 @@
+                 ssh->fullhostname,
+                 ssh_verstring_get_local(old_bpp),
+                 ssh_verstring_get_remote(old_bpp),
++#ifndef NO_GSSAPI
+                 &ssh->gss_state,
++#else
++				NULL,
++#endif
+                 &ssh->stats, transport_child_layer, false);
+             ssh_connect_ppl(ssh, ssh->base_layer);
+ 
+--- a/sshserver.c
++++ b/sshserver.c
+@@ -50,7 +50,9 @@
+     PacketProtocolLayer *base_layer;
+     ConnectionLayer *cl;
+ 
++#ifndef NO_GSSAPI
+     struct ssh_connection_shared_gss_state gss_state;
++#endif
+ };
+ 
+ static void ssh_server_free_callback(void *vsrv);
+@@ -246,8 +248,10 @@
+     bufchain_init(&srv->dummy_user_input);
+ 
+     /* FIXME: replace with sensible */
++#ifndef NO_GSSAPI
+     srv->gss_state.libs = snew(struct ssh_gss_liblist);
+     srv->gss_state.libs->nlibraries = 0;
++#endif
+ 
+     return &srv->plug;
+ }
+@@ -297,7 +301,9 @@
+     conf_free(srv->conf);
+     log_free(srv->logctx);
+ 
++#ifndef NO_GSSAPI
+     sfree(srv->gss_state.libs);        /* FIXME: replace with sensible */
++#endif
+ 
+     sfree(srv);
+ 
+@@ -442,7 +448,11 @@
+             srv->conf, NULL, 0, NULL,
+             ssh_verstring_get_remote(old_bpp),
+             ssh_verstring_get_local(old_bpp),
++#ifndef NO_GSSAPI
+             &srv->gss_state, &srv->stats, transport_child_layer, true);
++#else
++            NULL, &srv->stats, transport_child_layer, true);
++#endif
+         ssh2_transport_provide_hostkeys(
+             srv->base_layer, srv->hostkeys, srv->nhostkeys);
+         if (userauth_layer)
+--- a/ssh2userauth.c
++++ b/ssh2userauth.c
+@@ -241,7 +241,9 @@
+      * Misc one-time setup for authentication.
+      */
+     s->publickey_blob = NULL;
++#ifndef NO_GSSAPI
+     s->session_id = ssh2_transport_get_session_id(s->transport_layer);
++#endif
+ 
+     /*
+      * Load the public half of any configured public key file for
+@@ -613,8 +615,12 @@
+                  * Scan it for method identifiers we know about.
+                  */
+                 bool srv_pubkey = false, srv_passwd = false;
++#ifndef NO_GSSAPI
+                 bool srv_keyb_inter = false, srv_gssapi = false;
+                 bool srv_gssapi_keyex_auth = false;
++#else
++                bool srv_keyb_inter = false;
++#endif
+ 
+                 for (ptrlen method; get_commasep_word(&methods, &method) ;) {
+                     if (ptrlen_eq_string(method, "publickey"))
+@@ -623,10 +629,12 @@
+                         srv_passwd = true;
+                     else if (ptrlen_eq_string(method, "keyboard-interactive"))
+                         srv_keyb_inter = true;
++#ifndef NO_GSSAPI
+                     else if (ptrlen_eq_string(method, "gssapi-with-mic"))
+                         srv_gssapi = true;
+                     else if (ptrlen_eq_string(method, "gssapi-keyex"))
+                         srv_gssapi_keyex_auth = true;
++#endif
+                 }
+ 
+                 /*
+@@ -1640,7 +1648,9 @@
+      * any packets since. Signal the transport layer to consider
+      * doing an immediate rekey, if it has any reason to want to.
+      */
++#ifndef NO_GSSAPI
+     ssh2_transport_notify_auth_done(s->transport_layer);
++#endif
+ 
+     /*
+      * Finally, hand over to our successor layer, and return
+--- a/ssh2userauth-server.c
++++ b/ssh2userauth-server.c
+@@ -122,7 +122,9 @@
+ 
+     crBegin(s->crState);
+ 
++#ifndef NO_GSSAPI
+     s->session_id = ssh2_transport_get_session_id(s->transport_layer);
++#endif
+ 
+     while (1) {
+         crMaybeWaitUntilV((pktin = ssh2_userauth_server_pop(s)) != NULL);
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index bff885218f39..6f7ffaa0c972 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.69.ebuild b/net-misc/putty/putty-0.69.ebuild
deleted file mode 100644
index 1d6f330296b3..000000000000
--- a/net-misc/putty/putty-0.69.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils toolchain-funcs
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gtk ipv6 kerberos"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
-	https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
-"
-
-RDEPEND="
-	!net-misc/pssh
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/AM_PATH_GTK(/d' \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	econf \
-		$(use_with kerberos gssapi) \
-		$(use_with gtk)
-}
-
-src_compile() {
-	cd "${S}"/unix || die
-	emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_install() {
-	dodoc doc/puttydoc.txt
-
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	cd "${S}"/unix || die
-	default
-
-	if use gtk ; then
-		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
-		done
-
-		# install desktop file provided by Gustav Schaffter in #49577
-		make_desktop_entry ${PN} PuTTY ${PN} Network
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/net-misc/putty/putty-0.70.ebuild b/net-misc/putty/putty-0.71-r1.ebuild
index 888ed3b7bbbb..3cb7948531d8 100644
--- a/net-misc/putty/putty-0.70.ebuild
+++ b/net-misc/putty/putty-0.71-r1.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 )
 "
@@ -32,6 +33,9 @@ DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.71-no-gssapi.patch
+)
 
 src_prepare() {
 	default
@@ -48,7 +52,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 9d0477fe17e1..00e78d96259b 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() {