gentoo resync : 28.04.2019

3 files changed, 2 insertions, 94 deletions

diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 2954ab9bb4f6..74e711cc09ce 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,8 +1,6 @@
 AUX putty-0.71-no-gssapi.patch 10370 BLAKE2B 785e3710f175f01cde6c236b719d7e7b410036758980ad41e7703dcb169b0ea4518682ba8eb196800ebe04ac68c1ffa12febe407b447f1abf1469bfea226e655 SHA512 c2bd2480605e9a52fc429463eee53c5850cc2e81fbc486f059aa759aee22ba5f18e3e27d052c3b549aa0e6f2ce2a8ef8b4172d8e4d5bb4cde5ec74ef7fd9ddf5
-DIST putty-0.68.tar.gz 2114499 BLAKE2B b7f2f216bbeaea3fa175810defd546b3b94bb7f2e182b46d05a11db1e4841266674a71f6ce2d30edeefe98e3e0093e379abf736a34fb742d60dcdfd20593afec SHA512 e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3
 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.71-r2.ebuild 1712 BLAKE2B 1027379f8e23ec3132c89e3fee5251b1b4a2407e034794b5ccb24f58a6bab3b205c92277cc55d7625ad31b3912ac2845ab32fcf817c5a9c4db67b584318a65c5 SHA512 d1e13059b70667a936f2e336dce81bd5921e34d9a64638dc046312cf0762715a11e39c0c4a28a00ca11ea7cb5883f80caeaa3928be50729114b19ff86c56cb2f
+EBUILD putty-0.71-r2.ebuild 1708 BLAKE2B c7521ebc45c975bb5d739697c507aa5ffbcbdc84f1afbbc63dd86f4f6fb6e9489ef919439d6730c2eeef769874416b28f1dbdf20e6fadd2f2ab41f8865b94702 SHA512 82082ad7b56f404719468fe34aa6caf3774f323252d00bf87b437703e38061b33877519f01771641a954465f1ae0b1e23c1824bf3271bf40175b05e989a19525
 EBUILD putty-9999.ebuild 1778 BLAKE2B d84806c66abe03ce824f8d7c9dc54cf07f49da77d4bd29ac590465e85cc4019cef2a4af8f4d39c81443c0b0c4c643afc17ce45897e6855aa0677f295b71baba5 SHA512 8d702ecce91b4a8e98171e97424cde8eac4a54144ca9c39d178490950c66a300889690eb0c19c35af5faf5b63e3c18ee93525cd3b1c670e6307aedf2128d5ede
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/putty-0.68.ebuild b/net-misc/putty/putty-0.68.ebuild
deleted file mode 100644
index f0ff385a5003..000000000000
--- a/net-misc/putty/putty-0.68.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.71-r2.ebuild b/net-misc/putty/putty-0.71-r2.ebuild
index e8860e799793..1974742b0e61 100644
--- a/net-misc/putty/putty-0.71-r2.ebuild
+++ b/net-misc/putty/putty-0.71-r2.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