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 2B22113835A for ; Mon, 5 Apr 2021 14:15:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE17FE088F; Mon, 5 Apr 2021 14:15:06 +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 73684E086A for ; Mon, 5 Apr 2021 14:15:04 +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 67C05335DA3 for ; Mon, 5 Apr 2021 14:15:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5BFA640 for ; Mon, 5 Apr 2021 14:15:00 +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: <1617632075.2cb7d9aa5e80e00466947ae42c87844d2aea4fba.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/sibsim4/files/, sci-biology/sibsim4/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/sibsim4/files/sibsim4-0.20-makefile.patch sci-biology/sibsim4/sibsim4-0.20.ebuild X-VCS-Directories: sci-biology/sibsim4/ sci-biology/sibsim4/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 2cb7d9aa5e80e00466947ae42c87844d2aea4fba X-VCS-Branch: master Date: Mon, 5 Apr 2021 14:15:00 +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: ef03b1f8-83e0-487c-8c42-6ea9df38c878 X-Archives-Hash: 85780d27d2a69a1737e41942d777df23 commit: 2cb7d9aa5e80e00466947ae42c87844d2aea4fba Author: David Seifert gentoo org> AuthorDate: Mon Apr 5 14:14:35 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Apr 5 14:14:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb7d9aa sci-biology/sibsim4: Port to EAPI 7 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> .../sibsim4/files/sibsim4-0.20-makefile.patch | 26 ++++++++++++++++++++++ sci-biology/sibsim4/sibsim4-0.20.ebuild | 19 +++++----------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/sci-biology/sibsim4/files/sibsim4-0.20-makefile.patch b/sci-biology/sibsim4/files/sibsim4-0.20-makefile.patch new file mode 100644 index 00000000000..6436747e3dd --- /dev/null +++ b/sci-biology/sibsim4/files/sibsim4-0.20-makefile.patch @@ -0,0 +1,26 @@ +--- a/Makefile ++++ b/Makefile +@@ -21,13 +21,12 @@ + # to change it to this: + # CFLAGS = -Xc + +-CFLAGS = -std=gnu99 -W -Wall -Wconversion -pedantic $(DEBUG) $(OPT) ++CFLAGS += -std=gnu99 -Wall -Wconversion -pedantic + + + # The default is GCC. On Solaris, you might put: + # CC = /opt/SUNWspro/bin/cc + +-CC = gcc + + + # Depending on the compile flags you use, you might need to explicitly use the +@@ -42,7 +41,7 @@ + OBJS = sim4b1.o align.o misc.o sim4.init.o + + sim4: $(OBJS) +- $(CC) -o SIBsim4 $(CFLAGS) $(OBJS) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o SIBsim4 $(OBJS) $(LIBS) + + clean: + rm -f SIBsim4 *.o diff --git a/sci-biology/sibsim4/sibsim4-0.20.ebuild b/sci-biology/sibsim4/sibsim4-0.20.ebuild index bf431c66692..679cb462e04 100644 --- a/sci-biology/sibsim4/sibsim4-0.20.ebuild +++ b/sci-biology/sibsim4/sibsim4-0.20.ebuild @@ -1,31 +1,22 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs DESCRIPTION="A rewrite and improvement upon sim4, a DNA-mRNA aligner" HOMEPAGE="http://sibsim4.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/SIBsim4-${PV}.tar.gz" +S="${WORKDIR}/SIBsim4-${PV}" LICENSE="GPL-2" SLOT="0" -IUSE="" KEYWORDS="amd64 x86" -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/SIBsim4-${PV}" +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -src_prepare() { - sed \ - -e 's/CFLAGS = /CFLAGS +=/' \ - -e '/^CC/s:=:?=:' \ - -e '/^OPT/d' \ - -e "s:-o:${LDFLAGS} -o:g" \ - -i "${S}/Makefile" || die +src_configure() { tc-export CC }