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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3604158090 for ; Fri, 27 May 2022 10:11:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03D2AE07AE; Fri, 27 May 2022 10:11:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1282E07AE for ; Fri, 27 May 2022 10:11:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F4223411C8 for ; Fri, 27 May 2022 10:11:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16F89D3 for ; Fri, 27 May 2022 10:11:41 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1653646297.dbf8ebfd6937b455d0db78e4610aae748e5c6ed8.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/putty/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/putty/putty-9999.ebuild X-VCS-Directories: net-misc/putty/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: dbf8ebfd6937b455d0db78e4610aae748e5c6ed8 X-VCS-Branch: master Date: Fri, 27 May 2022 10:11:41 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 34393553-b4f1-4ef9-b1f6-9ae4443fdffd X-Archives-Hash: ea7ddd860500a380884be90305aa442e commit: dbf8ebfd6937b455d0db78e4610aae748e5c6ed8 Author: Lars Wendler gentoo org> AuthorDate: Fri May 27 10:04:14 2022 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri May 27 10:11:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf8ebfd net-misc/putty: Switched live ebuild to cmake Signed-off-by: Lars Wendler gentoo.org> net-misc/putty/putty-9999.ebuild | 70 +++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild index 97dbfaea150f..a09ae7ae4600 100644 --- a/net-misc/putty/putty-9999.ebuild +++ b/net-misc/putty/putty-9999.ebuild @@ -1,18 +1,23 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools desktop git-r3 toolchain-funcs xdg-utils +EAPI=8 +inherit cmake desktop 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/~polynomial-c/${PN}-icons.tar.bz2" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git" +else + SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="" -IUSE="doc +gtk gtk2 ipv6 gssapi" +IUSE="debug +gtk gtk2 ipv6 gssapi" RDEPEND=" !net-misc/pssh @@ -30,62 +35,47 @@ DEPEND=" ${RDEPEND} " BDEPEND=" - app-doc/halibut dev-lang/perl virtual/pkgconfig " +#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )" + REQUIRED_USE=" gtk2? ( gtk ) " src_unpack() { - git-r3_src_unpack - default -} - -src_prepare() { + [[ ${PV} == *9999 ]] && git-r3_src_unpack default - - sed -i \ - -e 's|-Werror||g' \ - configure.ac || die - - ./mkfiles.pl || 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_test() { - emake -C unix cgtest - unix/cgtest || die + local mycmakeargs=( + -DPUTTY_DEBUG="$(usex debug)" + -DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)" + -DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '') + -DPUTTY_IPV6="$(usex ipv6)" + ) + cmake_src_configure } src_install() { - dodoc doc/puttydoc.txt + cmake_src_install - if use doc; then - docinto html - dodoc doc/*.html - fi + doman "${BUILD_DIR}"/doc/*.1 - cd "${S}"/unix || die - default + #if use doc ; then + # docinto html + # dodoc "${BUILD_DIR}"/doc/html/*.html + #fi if use gtk ; then + local i for i in 16 22 24 32 48 64 128 256; do - newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png + newicon -s ${i} \ + "${WORKDIR}"/${PN}-icons/${PN}-${i}.png \ + ${PN}.png done # install desktop file provided by Gustav Schaffter in #49577