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 58195138335 for ; Wed, 21 Aug 2019 07:55:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 640F7E07F9; Wed, 21 Aug 2019 07:55:57 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 403E8E07F9 for ; Wed, 21 Aug 2019 07:55:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B465C34A051 for ; Wed, 21 Aug 2019 07:55:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B5D273C for ; Wed, 21 Aug 2019 07:55:53 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1566374105.c5f52da183f75cb3fc2a1afdfadc7e1aa08109ba.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pscan/, dev-util/pscan/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/pscan/Manifest dev-util/pscan/files/pscan-20000721-fix-build-system.patch dev-util/pscan/pscan-20000721-r1.ebuild X-VCS-Directories: dev-util/pscan/files/ dev-util/pscan/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: c5f52da183f75cb3fc2a1afdfadc7e1aa08109ba X-VCS-Branch: master Date: Wed, 21 Aug 2019 07:55:53 +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: 81b42466-c88c-453b-8874-5f562bbc1dd3 X-Archives-Hash: cf9cff82a1d923af84d23ff9377ec62c commit: c5f52da183f75cb3fc2a1afdfadc7e1aa08109ba Author: David Seifert gentoo org> AuthorDate: Wed Aug 21 07:55:05 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Aug 21 07:55:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f52da1 dev-util/pscan: Port to EAPI 7 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> dev-util/pscan/Manifest | 2 +- .../files/pscan-20000721-fix-build-system.patch | 20 ++++++++++++++++++++ dev-util/pscan/pscan-20000721-r1.ebuild | 21 +++++++++------------ 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dev-util/pscan/Manifest b/dev-util/pscan/Manifest index 3b1dc0e4df0..8acbd564f99 100644 --- a/dev-util/pscan/Manifest +++ b/dev-util/pscan/Manifest @@ -1 +1 @@ -DIST pscan.tar.gz 14555 BLAKE2B 8e1a8ea91bc2a1b323dc607f703565579e596a3001151609e46a09160766b3b913610a15b64859dc88031a3acf2e3c147dcbd7b033517d3786976ab3cb1bc9f4 SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78 +DIST pscan-20000721.tar.gz 14555 BLAKE2B 8e1a8ea91bc2a1b323dc607f703565579e596a3001151609e46a09160766b3b913610a15b64859dc88031a3acf2e3c147dcbd7b033517d3786976ab3cb1bc9f4 SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78 diff --git a/dev-util/pscan/files/pscan-20000721-fix-build-system.patch b/dev-util/pscan/files/pscan-20000721-fix-build-system.patch new file mode 100644 index 00000000000..cd22fc2eb19 --- /dev/null +++ b/dev-util/pscan/files/pscan-20000721-fix-build-system.patch @@ -0,0 +1,20 @@ +--- a/Makefile ++++ b/Makefile +@@ -13,16 +13,10 @@ + #CC=gcc -Wall -g + #LEX=flex + +-pscan: scanner.yy.o pscan.o +- $(CC) scanner.yy.o pscan.o -o pscan +- +-scanner.yy.o: scanner.yy.c +- $(CC) -c scanner.yy.c -o scanner.yy.o ++pscan: scanner.yy.o + + scanner.yy.c: scanner.l + $(LEX) -t scanner.l > scanner.yy.c + +-pscan.o: pscan.c pscan.h +- + clean: + rm -f *.o *~ pscan scanner.yy.c core diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild index 11c078d3650..e63242af2bd 100644 --- a/dev-util/pscan/pscan-20000721-r1.ebuild +++ b/dev-util/pscan/pscan-20000721-r1.ebuild @@ -1,34 +1,31 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 inherit toolchain-funcs DESCRIPTION="A limited problem scanner for C source files" HOMEPAGE="http://www.striker.ottawa.on.ca/~aland/pscan/" -# I wish upstream would version their files, even if it's only with a date -SRC_URI="http://www.striker.ottawa.on.ca/~aland/pscan/pscan.tar.gz" +SRC_URI="mirror://gentoo/pscan.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" - # Does NOT contain a testsuite, but does contain a test.c that confuses src_test RESTRICT="test" -RDEPEND="" -DEPEND="${RDEPEND} - sys-devel/flex" +BDEPEND="sys-devel/flex" S="${WORKDIR}/${PN}" +PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch ) -src_compile() { - emake CC="$(tc-getCC) ${CFLAGS}" || die +src_configure() { + tc-export CC } src_install() { - newbin pscan printf-scan || die - dodoc README find_formats.sh test.c wu-ftpd.pscan || die + newbin pscan printf-scan + dodoc README find_formats.sh test.c wu-ftpd.pscan }