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 E2C9C1382C5 for ; Sat, 20 Feb 2021 23:26:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E6D8E0891; Sat, 20 Feb 2021 23:26:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 16EE2E0891 for ; Sat, 20 Feb 2021 23:26:39 +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 1826D340EC8 for ; Sat, 20 Feb 2021 23:26:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA9D3495 for ; Sat, 20 Feb 2021 23:26:17 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1613858261.f8b429d596992ff8426674833a582610562d198e.jakov.smolic@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/erpin/, sci-biology/erpin/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/erpin/erpin-5.5b.ebuild sci-biology/erpin/files/erpin-5.5b-fno-common.patch X-VCS-Directories: sci-biology/erpin/ sci-biology/erpin/files/ X-VCS-Committer: jakov.smolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: f8b429d596992ff8426674833a582610562d198e X-VCS-Branch: master Date: Sat, 20 Feb 2021 23:26:17 +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: f80d1e04-acf8-458c-a274-f2b4709477df X-Archives-Hash: 92eb68922cae77418434992fb8018bc2 commit: f8b429d596992ff8426674833a582610562d198e Author: Jakov Smolic sartura hr> AuthorDate: Sat Feb 20 21:17:59 2021 +0000 Commit: Jakov Smolić sartura hr> CommitDate: Sat Feb 20 21:57:41 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8b429d5 sci-biology/erpin: Port to EAPI 7 Closes: https://bugs.gentoo.org/755092 Signed-off-by: Jakov Smolic sartura.hr> sci-biology/erpin/erpin-5.5b.ebuild | 14 +++--- .../erpin/files/erpin-5.5b-fno-common.patch | 55 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/sci-biology/erpin/erpin-5.5b.ebuild b/sci-biology/erpin/erpin-5.5b.ebuild index be821cf62..448e5d3aa 100644 --- a/sci-biology/erpin/erpin-5.5b.ebuild +++ b/sci-biology/erpin/erpin-5.5b.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs @@ -15,17 +15,19 @@ SRC_URI=" LICENSE="all-rights-reserved" SLOT="0" -IUSE="" KEYWORDS="~amd64 ~x86" DEPEND="!sys-cluster/maui" # file collision -RDEPEND="" +RDEPEND="${DEPEND}" S="${WORKDIR}" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + src_prepare() { - rm -f erpin${PV}.serv/{bin,lib}/* || die - rm -f ErpinBatch.${ERPIN_BATCH_V}/erpin* || die + default + rm erpin${PV}.serv/{bin,lib}/* || die + rm ErpinBatch.${ERPIN_BATCH_V}/erpin* || die find -name '*.mk' | xargs sed -i \ -e 's/strip $@/echo skipping strip $@/' \ -e '/CFLAGS =/ d' \ @@ -44,6 +46,6 @@ src_install() { insinto /usr/share/${PN} doins -r erpin${PV}.serv/scripts ErpinBatch.${ERPIN_BATCH_V} exeinto /usr/share/${PN} - newexe "${FILESDIR}/erpincommand-${PV}.pl" erpincommand + newexe "${FILESDIR}"/erpincommand-${PV}.pl erpincommand dodoc erpin${PV}.serv/doc/doc*.pdf } diff --git a/sci-biology/erpin/files/erpin-5.5b-fno-common.patch b/sci-biology/erpin/files/erpin-5.5b-fno-common.patch new file mode 100644 index 000000000..bd38aacca --- /dev/null +++ b/sci-biology/erpin/files/erpin-5.5b-fno-common.patch @@ -0,0 +1,55 @@ +--- a/erpin5.5b.serv/include/rnaIV.h ++++ b/erpin5.5b.serv/include/rnaIV.h +@@ -178,10 +178,10 @@ typedef struct { + double *vals; + } Histo; + +-Histo MainMaskEvals; /* histogramme des E-values des detections */ ++extern Histo MainMaskEvals; /* histogramme des E-values des detections */ + /* du masque principal */ +-Histo MainMaskDetects; /* histogramme des detections du masque principal */ +-Map MainMaskMap; /* pour l'etalonnage de l'axe de 'MainMaskDetects' */ ++extern Histo MainMaskDetects; /* histogramme des detections du masque principal */ ++extern Map MainMaskMap; /* pour l'etalonnage de l'axe de 'MainMaskDetects' */ + + /* + ------------------------------------------------------------------------------- +--- a/erpin5.5b.serv/libsrc/dhisto.c ++++ b/erpin5.5b.serv/libsrc/dhisto.c +@@ -36,6 +36,9 @@ void AddToDetectsHisto(double x); + void PrintHisto(Histo hist, char *filename); + Histo ReadHisto(char *filename); + void PrintScoresHisto(Context *ctxt); ++Histo MainMaskDetects; ++Histo MainMaskEvals; ++Map MainMaskMap; + + /*============================================================================= + InitDetectsHisto(): Initialise l'histogramme des detections gerees par 'ctxt'. +@@ -44,9 +47,6 @@ void PrintScoresHisto(Context *ctxt); + + void InitDetectsHisto(Context *ctxt) + { +- extern Histo MainMaskDetects; +- extern Histo MainMaskEvals; +- extern Map MainMaskMap; + + MainMaskDetects = SetupHist(ctxt->mask->threshold, MainMaskEvals.hmax, + DELTA_H, 0); +@@ -63,8 +63,6 @@ void InitDetectsHisto(Context *ctxt) + + void AddToDetectsHisto(double x) + { +- extern Histo MainMaskDetects; +- extern Map MainMaskMap; + int index; + + if (x > MainMaskDetects.hmin && x < MainMaskDetects.hmax) +@@ -132,7 +130,6 @@ Histo ReadHisto(char *filename) + + void PrintScoresHisto(Context *ctxt) + { +- extern Histo MainMaskDetects; + + if (ctxt->hist == ON) + {