gentoo resync : 25.08.2020

4 files changed, 20 insertions, 94 deletions

diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 41ba145e4a98..1a5f49e1ccec 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,7 +1,5 @@
-DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7c9c5e750da8a57b08367b5c94a9d1439d6a42862e7e7b7a7d7c0dea285e9197fa45651d9eb12757b57e82a7 SHA512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5
 DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.73.ebuild 1582 BLAKE2B 922b7caec11440dc2a07706c8bfd26de95cb91295311736a12df3135aec50873ed1d8d76a0d6dcb447747062b936bff790591a000e24c88dfff1fb895ccc727e SHA512 4275e021f15f898346445fd97563486b6489c478b39a67e106fd2d8d166b6a6036386158c5b42656390dc4743b4b58ec1396c4f76650ae9f83c4182b1d827aa3
-EBUILD putty-0.74.ebuild 1588 BLAKE2B 8945b86e6aeaad3e5c8d0ed2228a4acb873192e0c08727f11037f8ec6f81fdbd0d75c08a19a2bb722f9a90281b926e710a358400f737610b397614c12392daa9 SHA512 b245a8a467f4ede02ed71c185f2c6923bd12cc67db71ea234f982e907441491436c6bdc4d112f7224bb4728359c08071ccd91fc0197e35f91a1d0e24e847385b
-EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505
+EBUILD putty-0.74.ebuild 1683 BLAKE2B f2e694377eaa8ae5dad4c136ce82ea3a1f8707bef3b9a7527228a2b49c382e2ade8e2215ea1d93a0bafd74fff4360369578a8eb85af94157cb90bc3352b67bb0 SHA512 2fde3aaa7af3b725e5d61deb410f26e32dc7230b11ec524e8ed768543bb69691d623a7e10ba97f2df59cabf4c26bd823c7800ee9c705a5fd5312454d311c7243
+EBUILD putty-9999.ebuild 1737 BLAKE2B 7e09d4cbf3e219f2452f535ef15a1733c77b72fedf8336968b88cb4adbc6e7ab13fb4dd3bfea9150a23198d1e5d649a1a099d65da0263e8942f39ea02001e1ad SHA512 30577a60f28a9ef6fcb6e763a93d4ce624d4ba23708181eef42d8c20afc303f1c42af598808957caa80759a40d02c294eb19b16eea369ff801ef57b74d00fbe4
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/putty-0.73.ebuild b/net-misc/putty/putty-0.73.ebuild
deleted file mode 100644
index 5cf6ea3e9126..000000000000
--- a/net-misc/putty/putty-0.73.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 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}/${PV}/${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.74.ebuild b/net-misc/putty/putty-0.74.ebuild
index 07d0f147a344..518c228a1d8c 100644
--- a/net-misc/putty/putty-0.74.ebuild
+++ b/net-misc/putty/putty-0.74.ebuild
@@ -9,13 +9,12 @@ 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"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
 	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
 "
-
+IUSE="doc +gtk gtk2 ipv6 gssapi"
 RDEPEND="
 	!net-misc/pssh
 	gtk? (
@@ -30,9 +29,14 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
+REQUIRED_USE="
+	gtk2? ( gtk )
+"
 
 src_prepare() {
 	default
@@ -56,6 +60,11 @@ src_compile() {
 	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
 }
 
+src_test() {
+	emake -C unix cgtest
+	unix/cgtest || die
+}
+
 src_install() {
 	dodoc doc/puttydoc.txt
 
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index 88def03e4bf1..5fd210bd12d5 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,10 +28,15 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	app-doc/halibut
 	dev-lang/perl
 	virtual/pkgconfig
 "
+REQUIRED_USE="
+	gtk2? ( gtk )
+"
 
 src_unpack() {
 	git-r3_src_unpack