gentoo resync : 03.11.2019

5 files changed, 2 insertions, 449 deletions

diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 01301140e5d0..7d98bf973045 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,10 +1,5 @@
-AUX putty-0.71-no-gssapi.patch 10370 BLAKE2B 785e3710f175f01cde6c236b719d7e7b410036758980ad41e7703dcb169b0ea4518682ba8eb196800ebe04ac68c1ffa12febe407b447f1abf1469bfea226e655 SHA512 c2bd2480605e9a52fc429463eee53c5850cc2e81fbc486f059aa759aee22ba5f18e3e27d052c3b549aa0e6f2ce2a8ef8b4172d8e4d5bb4cde5ec74ef7fd9ddf5
-DIST putty-0.71.tar.gz 2423752 BLAKE2B fa4202d76d3b96e016a62c805db3835a6f61b05e7f63900919ffcd5bbec5159ef0e06b643398ed33aef5cd9ecf04eb9a981828683de7d565b88abbd4552237f6 SHA512 f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07
-DIST putty-0.72.tar.gz 2449516 BLAKE2B 8d5b2e812bb7bb0bfabf210b2bd6f9e0858cb80b9f7edc241a1426f4a520896c9acc214fb732cb169c88914c89461968afdf73a7b9392e85113e6653902f3221 SHA512 a963985e55dcd589c08ef51085808a6364629edd8ce6708ebdf516e0339a41b7f186f91d7d7f26b1fec03d60767f365246e6fa06e9ef042898355c2f90f355dd
 DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7c9c5e750da8a57b08367b5c94a9d1439d6a42862e7e7b7a7d7c0dea285e9197fa45651d9eb12757b57e82a7 SHA512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.71-r2.ebuild 1708 BLAKE2B c7521ebc45c975bb5d739697c507aa5ffbcbdc84f1afbbc63dd86f4f6fb6e9489ef919439d6730c2eeef769874416b28f1dbdf20e6fadd2f2ab41f8865b94702 SHA512 82082ad7b56f404719468fe34aa6caf3774f323252d00bf87b437703e38061b33877519f01771641a954465f1ae0b1e23c1824bf3271bf40175b05e989a19525
-EBUILD putty-0.72.ebuild 1589 BLAKE2B eee910bf44a2c60ecfab2b7ca453d3c9dc67685341873efb28c25c80f19a21c0873625b82a85db42fb9937929fce8cd39e2d92c7b41080eb8589719f2c09cde8 SHA512 68d0b707f2af6c3efec730dd65f675d2eaaf95cfdbf9f7b1480e13b051acd326fade352ddfb31fcaad602b9af56136bcded04984348860a3ed5363aacb739925
-EBUILD putty-0.73.ebuild 1585 BLAKE2B 20bd2592ebcf6ab65e7a448be49b192f48e054db1d5c0190c54fab6e48e1696f05bc0958efed82b1fbcbccd26fb8ea48a3934fe63352f6092a44a211d917aa63 SHA512 268405b23671d841e82db78bdfd9fcd70e5d06a9f29b2a41588adc8f7ccebb9e21e9693ffdfc31d81c7b83de6420fd785a48a13295b0eea09439124f9cb7c70c
+EBUILD putty-0.73.ebuild 1583 BLAKE2B 33f94b46afa426085333e04c748567713f0ddf617ef826bc96629b80e496d3378e4a43af6a06ef9056d22782d7dfd4c22f3574367125aa7df740d6c6fad4c1e9 SHA512 189cc8a9bc35da3115389bd1b79427973158eed6a96d33f2aa4a251543bf43976563bef7529660045cb16ad53d1337a63e52da81586ade49333598afc9d12e63
 EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505
 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
deleted file mode 100644
index 33a3f226851f..000000000000
--- a/net-misc/putty/files/putty-0.71-no-gssapi.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From 7ad08649a223a4cd61e67d8334a147f55c79399d Mon Sep 17 00:00:00 2001
-From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
-Date: Mon, 25 Mar 2019 23:46:59 +0000
-Subject: [PATCH] Fix compilation with NO_GSSAPI.
-
-This is a fairly shallow patch, which removes the UI and interactions
-with external libraries. Some other machinery (which is dead code in
-this configuration) is left in place.
-
-Adapted by me from a patch by Jeroen Roovers.
----
- config.c        |  4 ++++
- settings.c      | 12 ++++++++++--
- ssh.c           | 16 +++++++++++++++-
- ssh2transport.c |  3 +--
- ssh2userauth.c  |  8 ++++++--
- sshserver.c     | 13 ++++++++++++-
- 6 files changed, 48 insertions(+), 8 deletions(-)
-
-diff --git a/config.c b/config.c
-index 9c299fee..6528a969 100644
---- a/config.c
-+++ b/config.c
-@@ -2442,10 +2442,12 @@ void setup_config_box(struct controlbox *b, bool midsession,
- 			      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 @@ void setup_config_box(struct controlbox *b, bool midsession,
- 			 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,
-diff --git a/settings.c b/settings.c
-index 8d563026..54f5ab7b 100644
---- a/settings.c
-+++ b/settings.c
-@@ -592,21 +592,25 @@ void save_open_settings(settings_w *sesskey, Conf *conf)
-     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 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
-     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 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
-     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 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
-     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);
-diff --git a/ssh.c b/ssh.c
-index e35ebc64..e8ad61b8 100644
---- a/ssh.c
-+++ b/ssh.c
-@@ -50,7 +50,9 @@ struct Ssh {
-     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,18 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
-                     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);
-+                    &ssh->gss_state
-+#else
-+                    false,
-+                    false,
-+                    false,
-+                    NULL
-+#endif
-+                    );
-                 ssh_connect_ppl(ssh, userauth_layer);
-                 transport_child_layer = userauth_layer;
- 
-@@ -267,7 +277,11 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
-                 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);
- 
-diff --git a/ssh2transport.c b/ssh2transport.c
-index 8640d89d..5e8955a0 100644
---- a/ssh2transport.c
-+++ b/ssh2transport.c
-@@ -1781,6 +1781,7 @@ static void ssh2_transport_gss_update(struct ssh2_transport_state *s,
-     if (mins > 0 && s->gss_ctxt_lifetime <= mins * 60)
-         s->gss_status |= GSS_CTXT_EXPIRES;
- }
-+#endif /* NO_GSSAPI */
- 
- ptrlen ssh2_transport_get_session_id(PacketProtocolLayer *ppl)
- {
-@@ -1805,8 +1806,6 @@ void ssh2_transport_notify_auth_done(PacketProtocolLayer *ppl)
-     queue_idempotent_callback(&s->ppl.ic_process_queue);
- }
- 
--#endif /* NO_GSSAPI */
--
- static bool ssh2_transport_get_specials(
-     PacketProtocolLayer *ppl, add_special_fn_t add_special, void *ctx)
- {
-diff --git a/ssh2userauth.c b/ssh2userauth.c
-index fc413923..7f5a1292 100644
---- a/ssh2userauth.c
-+++ b/ssh2userauth.c
-@@ -613,8 +613,10 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
-                  * Scan it for method identifiers we know about.
-                  */
-                 bool srv_pubkey = false, srv_passwd = false;
--                bool srv_keyb_inter = false, srv_gssapi = false;
--                bool srv_gssapi_keyex_auth = false;
-+                bool srv_keyb_inter = false;
-+#ifndef NO_GSSAPI
-+                bool srv_gssapi = false, srv_gssapi_keyex_auth = false;
-+#endif
- 
-                 for (ptrlen method; get_commasep_word(&methods, &method) ;) {
-                     if (ptrlen_eq_string(method, "publickey"))
-@@ -623,10 +625,12 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
-                         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
-                 }
- 
-                 /*
-diff --git a/sshserver.c b/sshserver.c
-index 5f6e7dde..5c34bb35 100644
---- a/sshserver.c
-+++ b/sshserver.c
-@@ -50,7 +50,9 @@ struct server {
-     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);
-@@ -245,9 +247,11 @@ Plug *ssh_server_plug(
-     bufchain_init(&srv->out_raw);
-     bufchain_init(&srv->dummy_user_input);
- 
-+#ifndef NO_GSSAPI
-     /* FIXME: replace with sensible */
-     srv->gss_state.libs = snew(struct ssh_gss_liblist);
-     srv->gss_state.libs->nlibraries = 0;
-+#endif
- 
-     return &srv->plug;
- }
-@@ -297,7 +301,9 @@ static void ssh_server_free_callback(void *vsrv)
-     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,12 @@ static void server_got_ssh_version(struct ssh_version_receiver *rcv,
-             srv->conf, NULL, 0, NULL,
-             ssh_verstring_get_remote(old_bpp),
-             ssh_verstring_get_local(old_bpp),
--            &srv->gss_state, &srv->stats, transport_child_layer, true);
-+#ifndef NO_GSSAPI
-+            &srv->gss_state,
-+#else
-+            NULL,
-+#endif
-+            &srv->stats, transport_child_layer, true);
-         ssh2_transport_provide_hostkeys(
-             srv->base_layer, srv->hostkeys, srv->nhostkeys);
-         if (userauth_layer)
--- 
-2.11.0
-
diff --git a/net-misc/putty/putty-0.71-r2.ebuild b/net-misc/putty/putty-0.71-r2.ebuild
deleted file mode 100644
index 1974742b0e61..000000000000
--- a/net-misc/putty/putty-0.71-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 gtk2 ipv6 gssapi"
-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/libX11
-		x11-libs/pango
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3[X] )
-	)
-	gssapi? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.71-no-gssapi.patch
-)
-
-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 gssapi) \
-		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
-}
-
-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.72.ebuild b/net-misc/putty/putty-0.72.ebuild
deleted file mode 100644
index ca57ab5f550e..000000000000
--- a/net-misc/putty/putty-0.72.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop toolchain-funcs xdg-utils
-
-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 gtk2 ipv6 gssapi"
-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/libX11
-		x11-libs/pango
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3[X] )
-	)
-	gssapi? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	econf \
-		$(use_with gssapi) \
-		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
-}
-
-src_compile() {
-	emake -C "${S}"/doc
-	emake -C "${S}"/unix 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_postinst() {
-	use gtk && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && xdg_icon_cache_update
-}
diff --git a/net-misc/putty/putty-0.73.ebuild b/net-misc/putty/putty-0.73.ebuild
index 5d214b3163c0..7205f7c6c6ac 100644
--- a/net-misc/putty/putty-0.73.ebuild
+++ b/net-misc/putty/putty-0.73.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="doc +gtk gtk2 ipv6 gssapi"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2