[gentoo-commits] repo/gentoo:master commit in: net-misc/putty/

[Jeroen Roovers]

commit:     b39c8a170556213022b7c966989e38560f6201e7
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 10:42:26 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 10:42:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39c8a17

net-misc/putty: Version 0.72

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-misc/putty/Manifest                            |  1 +
 .../putty/{putty-9999.ebuild => putty-0.72.ebuild} | 33 ++++++----------------
 net-misc/putty/putty-9999.ebuild                   | 12 +++-----
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index f6384a55695..ab6270aef2f 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,2 +1,3 @@
 DIST putty-0.71.tar.gz 2423752 BLAKE2B 
fa4202d76d3b96e016a62c805db3835a6f61b05e7f63900919ffcd5bbec5159ef0e06b643398ed33aef5cd9ecf04eb9a981828683de7d565b88abbd4552237f6
 SHA512 
f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07
+DIST putty-0.72.tar.gz 2449516 BLAKE2B 
8d5b2e812bb7bb0bfabf210b2bd6f9e0858cb80b9f7edc241a1426f4a520896c9acc214fb732cb169c88914c89461968afdf73a7b9392e85113e6653902f3221
 SHA512 
a963985e55dcd589c08ef51085808a6364629edd8ce6708ebdf516e0339a41b7f186f91d7d7f26b1fec03d60767f365246e6fa06e9ef042898355c2f90f355dd
 DIST putty-icons.tar.bz2 4878 BLAKE2B 
589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff
 SHA512 
4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71

diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-0.72.ebuild
similarity index 73%
copy from net-misc/putty/putty-9999.ebuild
copy to net-misc/putty/putty-0.72.ebuild
index 4a4ba0e3776..ca57ab5f550 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-0.72.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils gnome2-utils git-r3 toolchain-funcs
+EAPI=7
+inherit autotools desktop toolchain-funcs xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/";
-EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git";
-SRC_URI="https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2";
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS=""
+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
@@ -28,16 +30,10 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       app-doc/halibut
        dev-lang/perl
        virtual/pkgconfig
 "
 
-src_unpack() {
-       git-r3_src_unpack
-       default
-}
-
 src_prepare() {
        default
 
@@ -45,8 +41,6 @@ src_prepare() {
                -e 's|-Werror||g' \
                configure.ac || die
 
-       ./mkfiles.pl || die
-
        eautoreconf
 }
 
@@ -62,11 +56,6 @@ 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
 
@@ -88,14 +77,10 @@ src_install() {
        fi
 }
 
-pkg_preinst() {
-       use gtk && gnome2_icon_savelist
-}
-
 pkg_postinst() {
-       use gtk && gnome2_icon_cache_update
+       use gtk && xdg_icon_cache_update
 }
 
 pkg_postrm() {
-       use gtk && gnome2_icon_cache_update
+       use gtk && xdg_icon_cache_update
 }

diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index 4a4ba0e3776..88def03e4bf 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils gnome2-utils git-r3 toolchain-funcs
+EAPI=7
+inherit autotools desktop git-r3 toolchain-funcs xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/";
@@ -88,14 +88,10 @@ src_install() {
        fi
 }
 
-pkg_preinst() {
-       use gtk && gnome2_icon_savelist
-}
-
 pkg_postinst() {
-       use gtk && gnome2_icon_cache_update
+       use gtk && xdg_icon_cache_update
 }
 
 pkg_postrm() {
-       use gtk && gnome2_icon_cache_update
+       use gtk && xdg_icon_cache_update
 }