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 AEB3713835A for ; Sun, 21 Jun 2020 17:41:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB9D2E083B; Sun, 21 Jun 2020 17:41:32 +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 B89E1E083B for ; Sun, 21 Jun 2020 17:41:32 +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 4A22D34FE5E for ; Sun, 21 Jun 2020 17:41:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9E9529A for ; Sun, 21 Jun 2020 17:41:29 +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: <1592761252.162385507f481aee99dcb578b64138b10e261d22.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/poa/files/, sci-biology/poa/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/poa/files/2-respect-flags.patch sci-biology/poa/files/poa-2-respect-flags.patch sci-biology/poa/poa-2-r1.ebuild X-VCS-Directories: sci-biology/poa/files/ sci-biology/poa/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 162385507f481aee99dcb578b64138b10e261d22 X-VCS-Branch: master Date: Sun, 21 Jun 2020 17:41:29 +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: 0c26dd90-838b-47f4-9902-b525c687820f X-Archives-Hash: d49e39e3efeab58cf31e20a581efd89c commit: 162385507f481aee99dcb578b64138b10e261d22 Author: David Seifert gentoo org> AuthorDate: Sun Jun 21 17:40:52 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jun 21 17:40:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16238550 sci-biology/poa: [QA] Pass AR/RANLIB to build system Closes: https://bugs.gentoo.org/725324 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: David Seifert gentoo.org> ...spect-flags.patch => poa-2-respect-flags.patch} | 28 +++++++++++++++------ sci-biology/poa/poa-2-r1.ebuild | 29 +++++++++++----------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/sci-biology/poa/files/2-respect-flags.patch b/sci-biology/poa/files/poa-2-respect-flags.patch similarity index 52% rename from sci-biology/poa/files/2-respect-flags.patch rename to sci-biology/poa/files/poa-2-respect-flags.patch index bdd638cf64b..fb01f0b5f93 100644 --- a/sci-biology/poa/files/2-respect-flags.patch +++ b/sci-biology/poa/files/poa-2-respect-flags.patch @@ -1,26 +1,38 @@ -diff --git a/Makefile b/Makefile -index a65bed0..713a7ab 100644 --- a/Makefile +++ b/Makefile -@@ -26,9 +26,10 @@ LIBOBJECTS= \ +@@ -1,6 +1,3 @@ +- +-AR=ar rc +- + TARGETS=poa liblpo.a poa_doc libbflag.a + + # align_score.c CAN BE USED TO ADD CUSTOMIZED SCORING FUNCTIONS +@@ -26,9 +23,8 @@ stringptr.o -CC = gcc -+CC ?= gcc #CFLAGS= -g -ansi-strict -W -Wall -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I. -CFLAGS= -g -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I. -+OPT_CFLAGS = -g -+CFLAGS= $(OPT_CFLAGS) -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I. ++CPPFLAGS+= -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I. # -I$(HOME)/lib/include # -DREPORT_MAX_ALLOC -@@ -44,7 +45,7 @@ liblpo.a: $(LIBOBJECTS) +@@ -37,14 +33,14 @@ + + liblpo.a: $(LIBOBJECTS) + rm -f $@ +- $(AR) $@ $(LIBOBJECTS) +- ranlib $@ ++ $(AR) rc $@ $(LIBOBJECTS) ++ $(RANLIB) $@ + + # NB: LIBRARY MUST FOLLOW OBJECTS OR LINK FAILS WITH UNRESOLVED REFERENCES!! poa: $(OBJECTS) liblpo.a - $(CC) -o $@ $(OBJECTS) -lm liblpo.a -+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lm liblpo.a ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -lm liblpo.a what: @echo poa: partial-order based sequence alignment program diff --git a/sci-biology/poa/poa-2-r1.ebuild b/sci-biology/poa/poa-2-r1.ebuild index 126272f06c6..d87f2a63811 100644 --- a/sci-biology/poa/poa-2-r1.ebuild +++ b/sci-biology/poa/poa-2-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs MY_P="${PN}V${PV}" @@ -15,31 +15,30 @@ SRC_URI="mirror://sourceforge/poamsa/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="static-libs" S="${WORKDIR}/${MY_P}" -src_prepare() { - epatch "${FILESDIR}"/${PV}-respect-flags.patch - epatch "${FILESDIR}"/${P}-fno-common.patch +PATCHES=( + "${FILESDIR}"/${P}-respect-flags.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_configure() { + tc-export AR CC RANLIB } src_compile() { - emake \ - CC="$(tc-getCC)" \ - OPT_CFLAGS="${CFLAGS}" \ - poa + emake poa } src_install() { - dobin "${S}"/poa "${S}"/make_pscores.pl - use static-libs && dolib.a "${S}"/liblpo.a - dodoc "${S}"/README "${S}"/multidom.* + dobin poa make_pscores.pl + dodoc README multidom.* insinto /usr/share/poa - doins "${S}"/*.mat + doins *.mat } pkg_postinst() { elog "poa requires a score matrix as the first argument." - elog "This package installs two examples to ${EROOT}usr/share/poa/." + elog "This package installs two examples to ${EROOT}/usr/share/poa/." }