From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C50F139694 for ; Wed, 22 Feb 2017 16:31:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92ECBE0C4C; Wed, 22 Feb 2017 16:31:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 634FCE0C4C for ; Wed, 22 Feb 2017 16:31:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 063C534112A for ; Wed, 22 Feb 2017 16:31:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7408850D8 for ; Wed, 22 Feb 2017 16:31:22 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1487781080.f908edaf43a53196cde126b7614ef3c01eb3f123.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/putty/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/putty/Manifest net-misc/putty/putty-0.68.ebuild net-misc/putty/putty-9999.ebuild X-VCS-Directories: net-misc/putty/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: f908edaf43a53196cde126b7614ef3c01eb3f123 X-VCS-Branch: master Date: Wed, 22 Feb 2017 16:31:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: abf539d0-a6a9-4bcf-ae59-c08d25d1e880 X-Archives-Hash: 3b401346178f5d0e7a1bedbb3df8a458 commit: f908edaf43a53196cde126b7614ef3c01eb3f123 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Feb 22 16:30:59 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Feb 22 16:31:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f908edaf net-misc/putty: Version bump. Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-misc/putty/Manifest | 1 + .../putty/{putty-9999.ebuild => putty-0.68.ebuild} | 31 ++++++++++------------ net-misc/putty/putty-9999.ebuild | 11 +++++--- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest index 2c1e1f83f3..af4fb319ec 100644 --- a/net-misc/putty/Manifest +++ b/net-misc/putty/Manifest @@ -1,2 +1,3 @@ DIST putty-0.67.tar.gz 1955547 SHA256 80192458e8a46229de512afeca5c757dd8fce09606b3c992fbaeeee29b994a47 SHA512 c2b17da46b8db3fe3837a10cb9cf5dd4b3ef6bfa15cadab83f3b87cf1479ed31fced90b774297ae53bdcbbdf230fc80d5c73d5ff3be6916fb591fd7ce3d35eca WHIRLPOOL c1410a655cecfdbf49153f2fa12f39e4e1e0b1c1078293be2ce21f147baba404bcfed285d8da3cba460ae52b1bdbd526e4110d2a3c68dc4bb8dbb859751656fe +DIST putty-0.68.tar.gz 2114499 SHA256 7ba256f46e5a353cafe811ce7914d0e22a52bdfc0e6e2d183ad28b5af44cd09c SHA512 e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3 WHIRLPOOL d24ceb3ed62eca52bb3a8f4fae08256269002265650e6fc42af10fc10a7b85b677b70c68e6b0a98915371921eabfbcbfa8a9b64b6be1a51cff418aef2feb6650 DIST putty-icons.tar.bz2 4878 SHA256 960b189069dbfb20a1f49e378ab88bed716c6457593815e414d51ad7a3fa93a7 SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 WHIRLPOOL ec96fe682582bfa58ce73c3e5cb7bb61d2363b7a5e9d3259dfd11cd6396512b5b9ed954f6a431baab36b1f17963714b30c239cdf4c08191d27b5abb858f54a57 diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-0.68.ebuild similarity index 73% copy from net-misc/putty/putty-9999.ebuild copy to net-misc/putty/putty-0.68.ebuild index 5d552be32d..d1db63a86c 100644 --- a/net-misc/putty/putty-9999.ebuild +++ b/net-misc/putty/putty-0.68.ebuild @@ -1,26 +1,28 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit autotools eutils gnome2-utils git-r3 toolchain-funcs +EAPI=6 +inherit autotools eutils gnome2-utils toolchain-funcs DESCRIPTION="A Free Telnet/SSH Client" HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/" -EGIT_REPO_URI="git://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 ipv6 kerberos" +SRC_URI=" + https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2 + http://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+:2 + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) @@ -28,24 +30,18 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - app-doc/halibut dev-lang/perl virtual/pkgconfig " -src_unpack() { - git-r3_src_unpack +src_prepare() { default -} -src_prepare() { sed -i \ -e '/AM_PATH_GTK(/d' \ -e 's|-Werror||g' \ configure.ac || die - ./mkfiles.pl || die - eautoreconf } @@ -57,15 +53,16 @@ src_configure() { } src_compile() { - emake -C "${S}"/doc - emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) + cd "${S}"/unix || die + emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) } src_install() { dodoc doc/puttydoc.txt if use doc; then - dohtml doc/*.html + docinto html + dodoc doc/*.html fi cd "${S}"/unix || die diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild index 5d552be32d..fbced904a6 100644 --- a/net-misc/putty/putty-9999.ebuild +++ b/net-misc/putty/putty-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit autotools eutils gnome2-utils git-r3 toolchain-funcs DESCRIPTION="A Free Telnet/SSH Client" @@ -20,7 +20,7 @@ RDEPEND=" gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf - x11-libs/gtk+:2 + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) @@ -39,6 +39,8 @@ src_unpack() { } src_prepare() { + default + sed -i \ -e '/AM_PATH_GTK(/d' \ -e 's|-Werror||g' \ @@ -65,7 +67,8 @@ src_install() { dodoc doc/puttydoc.txt if use doc; then - dohtml doc/*.html + docinto html + dodoc doc/*.html fi cd "${S}"/unix || die