gentoo resync 31.01.2019

4 files changed, 31 insertions, 25 deletions

diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index cc861a6b327b..6670d5f9170f 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -4,6 +4,6 @@ DIST putty-0.70.tar.gz 2386108 BLAKE2B 0780b94a1c7c1450cc3f46ec5fa5419ae8c618563
 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 1592 BLAKE2B 2bc48bc243ae9583395c8a57f7ff31aec4257eaffab663a49609bc66e60941f4fb55c0dfa093efd494ae7a4fb82ffc766da0f9caa38cab4312fb32a447e6b8e7 SHA512 61137d5b5fbd9ebef967392255d3ec0f1886a3460f4faf031e549880541819c7ca25e5a5c563ead5afee471d1bec25152f9b1ead5de212d833e36a3281034a6e
-EBUILD putty-9999.ebuild 1706 BLAKE2B e4c1400a23fb600e2baa5c0cbe762e1d7dd106e46c66138b8b6556271df601c501e1a23ed1e8dba429e2dc8e4bc0027e2f003f4f308fa1b4ccc6980df6f502d2 SHA512 7f4f8ed060c3efe04f45b080b1f830d424c9b9cd134a99bcb3b036a201bf67c7b9229827b65e436205ffb03914852d636efad683ebb4524cbd1dafce5bab8578
-MISC metadata.xml 803 BLAKE2B 39376a700c0d83be3cf6f3569882e3369273c166b1b910245ba942be8dd3c22f709815847c0f8adc90dcbf9aeb597ea8ed14b957e2133c9bb0176cf32843a0f3 SHA512 d350ca1ff3c8ab8ba1b13e098c6e0f215f31c8c4d673566d2e0befef1404cd3a8dafdf5c7f90ed78d7d06a113b2d9ca92014909257e638982ed7a73797113c1d
+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
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index f8db72350db4..bff885218f39 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
-	<longdescription lang="en">
-		PuTTY is a free implementation of Telnet and SSH for Windows and Unix
-		platforms, along with an xterm terminal emulator. It supports flexible
-		terminal setup, mid-session reconfiguration using Ctrl-rightclick,
-		multiple X11 authentication protocols, and various other interesting
-		things not provided by ssh in an xterm.
-	</longdescription>
-	<use>
-		<flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>:2. Otherwise only the CLI tools puttygen, plink, pscp and psftp will be built.</flag>
-	</use>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+<longdescription lang="en">
+PuTTY is a free implementation of Telnet and SSH for Windows and Unix
+platforms, along with an xterm terminal emulator. It supports flexible terminal
+setup, mid-session reconfiguration using Ctrl-rightclick, multiple X11
+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>
+</use>
 </pkgmetadata>
diff --git a/net-misc/putty/putty-0.70.ebuild b/net-misc/putty/putty-0.70.ebuild
index 1d6f330296b3..888ed3b7bbbb 100644
--- a/net-misc/putty/putty-0.70.ebuild
+++ b/net-misc/putty/putty-0.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ LICENSE="MIT"
 
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gtk ipv6 kerberos"
+IUSE="doc +gtk ipv6 gssapi"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
 	https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
@@ -25,7 +25,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/pango
 	)
-	kerberos? ( virtual/krb5 )
+	gssapi? ( virtual/krb5 )
 "
 DEPEND="
 	${RDEPEND}
@@ -47,7 +47,7 @@ src_prepare() {
 src_configure() {
 	cd "${S}"/unix || die
 	econf \
-		$(use_with kerberos gssapi) \
+		$(use_with gssapi) \
 		$(use_with gtk)
 }
 
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index c677a8a6686d..9d0477fe17e1 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -12,7 +12,7 @@ LICENSE="MIT"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +gtk ipv6 kerberos"
+IUSE="doc +gtk ipv6 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -23,7 +23,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/pango
 	)
-	kerberos? ( virtual/krb5 )
+	gssapi? ( virtual/krb5 )
 "
 DEPEND="
 	${RDEPEND}
@@ -53,8 +53,8 @@ src_prepare() {
 src_configure() {
 	cd "${S}"/unix || die
 	econf \
-		$(use_with kerberos gssapi) \
-		$(use_with gtk)
+		$(use_with gssapi) \
+		$(use_with gtk gtk=3)
 }
 
 src_compile() {