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 C15A0138359 for ; Mon, 14 Sep 2020 22:27:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D965EE0957; Mon, 14 Sep 2020 22:27:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD147E0957 for ; Mon, 14 Sep 2020 22:27:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 327B7335C78 for ; Mon, 14 Sep 2020 22:27:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A08E9339 for ; Mon, 14 Sep 2020 22:27:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1600122418.bc7f74e1dff8f3dd67bb1167e768909636dfb86d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/vncsnapshot/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild X-VCS-Directories: net-misc/vncsnapshot/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bc7f74e1dff8f3dd67bb1167e768909636dfb86d X-VCS-Branch: master Date: Mon, 14 Sep 2020 22:27:20 +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: fd77f34b-15e5-482a-9b0a-ec2a19eff2a5 X-Archives-Hash: d540c1c98297ef1aed73dfe43b5f1679 commit: bc7f74e1dff8f3dd67bb1167e768909636dfb86d Author: Sam James gentoo org> AuthorDate: Mon Sep 14 22:26:58 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Sep 14 22:26:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7f74e1 net-misc/vncsnapshot: EAPI 7, respect tc variables * EAPI 4->7 * Respect AR, RANLIB * Don't clobber make (call $(MAKE) so jobserver persists) Closes: https://bugs.gentoo.org/742149 Closes: https://bugs.gentoo.org/725208 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild | 34 +++++++++++++++++++++------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild index 221b1344f24..41283434b79 100644 --- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild +++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers" HOMEPAGE="http://vncsnapshot.sourceforge.net/" @@ -12,32 +12,50 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ppc x86" -IUSE="" DEPEND=" virtual/jpeg >=sys-libs/zlib-1.1.4" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-amd64grey.patch" +) + src_prepare() { - epatch "${FILESDIR}/${P}-amd64grey.patch" + default + sed \ -e 's:-I/usr/local/include::g' \ -e 's:-L/usr/local/lib::g' \ -e '/^all:/s|$(SUBDIRS:.dir=.all)||g' \ -e '/^vnc/s|$| $(SUBDIRS:.dir=.all)|g' \ -i Makefile || die + + # Preserve make instance + sed -i -e 's/make/$(MAKE)/' Makefile || die + + # Respect RANLIB + sed -i -e 's/ranlib/$(RANLIB)/' rdr/Makefile || die } src_compile() { - #note: We override CDEBUGFLAGS instead of CFLAGS because otherwise - # we lost the INCLUDES in the makefile. + # Note: We override CDEBUGFLAGS instead of CFLAGS because otherwise + # we lose the INCLUDES in the makefile. # bug #295741 - emake CDEBUGFLAGS="${CXXFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" + local args=( + AR="$(tc-getAR)" + CDEBUGFLAGS="${CXXFLAGS}" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + RANLIB="$(tc-getRANLIB)" + ) + emake "${args[@]}" } src_install() { dobin vncsnapshot - cp vncsnapshot.man1 vncsnapshot.1 + + cp vncsnapshot.man1 vncsnapshot.1 || die doman vncsnapshot.1 }