public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-biology/glimmerhmm/files/, sci-biology/glimmerhmm/
@ 2019-12-10 23:49 David Seifert
  0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2019-12-10 23:49 UTC (permalink / raw
  To: gentoo-commits

commit:     cc28b9f8549047216b17ff331deedda1141b337e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 23:48:09 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 23:48:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc28b9f8

sci-biology/glimmerhmm: Port to EAPI 7

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/glimmerhmm-3.0.1-fix-data-path.patch     | 20 ++++++++++++++
 sci-biology/glimmerhmm/glimmerhmm-3.0.1-r1.ebuild  | 31 ++++++++++------------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/sci-biology/glimmerhmm/files/glimmerhmm-3.0.1-fix-data-path.patch b/sci-biology/glimmerhmm/files/glimmerhmm-3.0.1-fix-data-path.patch
new file mode 100644
index 00000000000..3ad5090086e
--- /dev/null
+++ b/sci-biology/glimmerhmm/files/glimmerhmm-3.0.1-fix-data-path.patch
@@ -0,0 +1,20 @@
+--- a/train/trainGlimmerHMM
++++ b/train/trainGlimmerHMM
+@@ -12,7 +12,7 @@
+ use Cwd;
+ 
+ use FindBin;
+-use lib $FindBin::Bin;
++use lib "/usr/share/glimmerhmm/lib";
+ use orf;
+ use formtrain;
+ use dectree_allinfo;
+@@ -20,7 +20,7 @@
+ use splitiso;
+ 
+ my $workdir=cwd();
+-my $scriptdir=$FindBin::Bin; # directory where all training programs should be
++my $scriptdir="/usr/libexec/glimmerhmm/training_utils"; # directory where all training programs should be
+ 
+ #print "workdir=$workdir scriptdir=$scriptdir\n";exit;
+ 

diff --git a/sci-biology/glimmerhmm/glimmerhmm-3.0.1-r1.ebuild b/sci-biology/glimmerhmm/glimmerhmm-3.0.1-r1.ebuild
index 1d3cf1171d7..5424e942a7f 100644
--- a/sci-biology/glimmerhmm/glimmerhmm-3.0.1-r1.ebuild
+++ b/sci-biology/glimmerhmm/glimmerhmm-3.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=GlimmerHMM
 
@@ -13,27 +13,22 @@ SRC_URI="ftp://ftp.cbcb.umd.edu/pub/software/glimmerhmm/${MY_P}-${PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-IUSE=""
 KEYWORDS="amd64 x86"
 
-src_unpack() {
-	unpack ${A}
-	mv GlimmerHMM ${P}
-}
+S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	sed \
-		-e 's|\(my $scriptdir=\)$FindBin::Bin|\1"/usr/libexec/'${PN}'/training_utils"|' \
-		-e 's|\(use lib\) $FindBin::Bin|\1 "/usr/share/'${PN}'/lib"|' \
-		-i "${S}/train/trainGlimmerHMM" || die
+PATCHES=(
+	"${FILESDIR}"/${PV}-gentoo.patch
+	"${FILESDIR}"/${PN}-3.0.1-fix-data-path.patch
+)
 
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
+src_configure() {
 	tc-export CC CXX
 }
 
 src_compile() {
-	emake -C "${S}/sources"
-	emake -C "${S}/train"
+	emake -C sources
+	emake -C train
 }
 
 src_install() {
@@ -41,8 +36,10 @@ src_install() {
 
 	insinto /usr/share/${PN}/lib
 	doins train/*.pm
+
 	insinto /usr/share/${PN}/models
-	doins -r trained_dir/*
+	doins -r trained_dir/.
+
 	exeinto /usr/libexec/${PN}/training_utils
 	doexe train/{build{1,2,-icm,-icm-noframe},erfapp,falsecomp,findsites,karlin,score,score{2,ATG,ATG2,STOP,STOP2},splicescore}
 


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-biology/glimmerhmm/files/, sci-biology/glimmerhmm/
@ 2024-03-12  6:22 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-03-12  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     b7276d097d4681637d7b2dcc0514835e64d736a4
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 12 05:55:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 06:14:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7276d09

sci-biology/glimmerhmm: add 3.0.4

This is the 2015 release so about time we packaged it, I suppose.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-biology/glimmerhmm/Manifest                 |   1 +
 sci-biology/glimmerhmm/files/3.0.4-gentoo.patch | 153 ++++++++++++++++++++++++
 sci-biology/glimmerhmm/glimmerhmm-3.0.4.ebuild  |  48 ++++++++
 3 files changed, 202 insertions(+)

diff --git a/sci-biology/glimmerhmm/Manifest b/sci-biology/glimmerhmm/Manifest
index 4b994830e4b9..20a57a2ca4b6 100644
--- a/sci-biology/glimmerhmm/Manifest
+++ b/sci-biology/glimmerhmm/Manifest
@@ -1 +1,2 @@
 DIST GlimmerHMM-3.0.1.tar.gz 45475952 BLAKE2B 355f4e9f26c31167e0935de8012fa99a243838d0dd47e0e46ae4cb1df4eaf188a13fb365025bc4be82805c89f36f534a9907030515f96b9422340e9e966f4ea6 SHA512 15307d1982527bd83433882552cd3e12c76a65a2a119b6911a748dc801f80b1fc5732cb769a52e5c6281bdd48cf619a02edbd1b96ee40319fc620a3a7cdd82b7
+DIST GlimmerHMM-3.0.4.tar.gz 45692137 BLAKE2B e271ea506e77d0038e343030be1875de0c92265ac2808cf35b7ba872a2d2f9416d645cd373f2ba6816f8352b4367a3a7c878c4dea772fcadf8954aabd91fca64 SHA512 e10d89550c938faf4b1e2a259213ad88a7443b7597cf753c7041698ac78d468f4ed93e0f7736640cd2fe97abe227d54eb7feca1fe7450d72f83896a94ef7a70b

diff --git a/sci-biology/glimmerhmm/files/3.0.4-gentoo.patch b/sci-biology/glimmerhmm/files/3.0.4-gentoo.patch
new file mode 100644
index 000000000000..d3838b1dc9bc
--- /dev/null
+++ b/sci-biology/glimmerhmm/files/3.0.4-gentoo.patch
@@ -0,0 +1,153 @@
+diff --git a/sources/makefile b/sources/makefile
+index f287d71..c560f48 100644
+--- a/sources/makefile
++++ b/sources/makefile
+@@ -2,25 +2,22 @@
+ 
+ 
+ 
+-CC=g++
+-CFLAGS=-g
+-
+ all: glimmerhmm
+ 
+ glimmerhmm: glimmerhmm.o graph.o sites.o tree_util_prob.o util.o
+-	$(CC) $(CFLAGS) -o glimmerhmm glimmerhmm.o graph.o sites.o tree_util_prob.o util.o  -lm 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o glimmerhmm glimmerhmm.o graph.o sites.o tree_util_prob.o util.o  -lm 
+ 
+ glimmerhmm.o: glimmerhmm.c
+-	$(CC) $(CFLAGS) -c glimmerhmm.c
++	$(CXX) $(CXXFLAGS) -c glimmerhmm.c
+ 
+ graph.o: graph.c 
+-	$(CC) $(CFLAGS) -c graph.c
++	$(CXX) $(CXXFLAGS) -c graph.c
+ 
+ sites.o: sites.c
+-	$(CC) $(CFLAGS) -c sites.c
++	$(CXX) $(CXXFLAGS) -c sites.c
+ 
+ tree_util_prob.o: tree_util_prob.c
+-	$(CC) $(CFLAGS) -c tree_util_prob.c
++	$(CXX) $(CXXFLAGS) -c tree_util_prob.c
+ 
+ util.o: util.c
+-	$(CC) $(CFLAGS) -c util.c
++	$(CXX) $(CXXFLAGS) -c util.c
+diff --git a/train/makefile b/train/makefile
+index 56eaa13..d660cf1 100644
+--- a/train/makefile
++++ b/train/makefile
+@@ -2,11 +2,8 @@
+ 
+ # C compiler
+ 
+-C       = gcc 
+-CC      = g++ 
+ #CFLAGS  = -O1 ${SEARCHDIRS}
+ #CFLAGS  = -O3 -g -Wall
+-CFLAGS = -Wall -g
+ LIBS    = -lm
+ 
+ MAKEFILE= makefile
+@@ -16,67 +13,79 @@ all:    build-icm build-icm-noframe build1 build2 falsecomp findsites karlin sco
+ 
+ 
+ misc.o: misc.c
+-	${C} ${CFLAGS} -c misc.c
++	$(CC) $(CFLAGS) -c misc.c
+ 
+ build-icm.o: build-icm.c
+-	${C} ${CFLAGS} -c build-icm.c
++	$(CC) $(CFLAGS) -c build-icm.c
+ 
+ build-icm: build-icm.o misc.o
+-	$(C) ${CFLAGS} -o $@ build-icm.o misc.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ build-icm.o misc.o $(LIBS)
+ 
+ build-icm-noframe.o: build-icm-noframe.c
+-	${C} ${CFLAGS} -c build-icm-noframe.c
++	$(CC) $(CFLAGS) -c build-icm-noframe.c
+ 
+ build-icm-noframe: build-icm-noframe.o misc.o
+-	$(C) ${CFLAGS} -o $@ build-icm-noframe.o misc.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ build-icm-noframe.o misc.o $(LIBS)
+ 
+ build1: build1.o
+-	${CC} ${CFLAGS} build1.c -o build1 $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) build1.o -o build1 $(LIBS)
+ 
+ build2: build2.o
+-	${CC} ${CFLAGS} build2.c -o build2 $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) build2.o -o build2 $(LIBS)
+ 
+ falsecomp: falsecomp.o
+-	${CC} ${CFLAGS} falsecomp.c -o falsecomp $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) falsecomp.o -o falsecomp $(LIBS)
+ 
+ findsites: findsites.o
+-	${CC} ${CFLAGS} findsites.c -o findsites $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) findsites.o -o findsites $(LIBS)
+ 
+ karlin: karlin.o
+-	${CC} ${CFLAGS} karlin.c -o karlin $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) karlin.o -o karlin $(LIBS)
+ 
+ score: score.o
+-	${CC} ${CFLAGS} score.c -o score $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) score.o -o score $(LIBS)
+ 
+ score2: score2.o
+-	${CC} ${CFLAGS} score2.c -o score2 $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) score2.o -o score2 $(LIBS)
+ 
+ scoreATG: scoreATG.o
+-	${CC} ${CFLAGS} scoreATG.c -o scoreATG $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) scoreATG.o -o scoreATG $(LIBS)
+ 
+ scoreATG2: scoreATG2.o
+-	${CC} ${CFLAGS} scoreATG2.c -o scoreATG2 $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) scoreATG2.o -o scoreATG2 $(LIBS)
+ 
+ scoreSTOP: scoreSTOP.o
+-	${CC} ${CFLAGS} scoreSTOP.c -o scoreSTOP $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) scoreSTOP.o -o scoreSTOP $(LIBS)
+ 
+ escoreSTOP2: scoreSTOP2.o
+-	${CC} ${CFLAGS} scoreSTOP2.c -o scoreSTOP2 $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) scoreSTOP2.o -o scoreSTOP2 $(LIBS)
+ 
+ rfapp: erfapp.o
+-	${CC} ${CFLAGS} erfapp.c -o erfapp $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) erfapp.c -o erfapp $(LIBS)
+ 
+ sites.o: sites.c
+-	${CC} ${CFLAGS} -c sites.c
++	$(CXX) $(CXXFLAGS) -c sites.c
++
++scoreATG.o: scoreATG.c
++	$(CXX) $(CXXFLAGS) -c scoreATG.c
++       
++scoreSTOP.o: scoreSTOP.c
++	$(CXX) $(CXXFLAGS) -c scoreSTOP.c
++
++scoreSTOP2.o: scoreSTOP2.c
++	$(CXX) $(CXXFLAGS) -c scoreSTOP2.c
++
++scoreATG2.o: scoreATG2.c
++	$(CXX) $(CXXFLAGS) -c scoreATG2.c
+ 
+ utils.o: utils.c 
+-	${CC} ${CFLAGS} -c utils.c
++	$(CXX) $(CXXFLAGS) -c utils.c
+ 
+ splicescore.o: splicescore.c
+-	${CC} ${CFLAGS} -c splicescore.c
++	$(CXX) $(CXXFLAGS) -c splicescore.c
+ 
+ splicescore: splicescore.o sites.o utils.o
+-	${CC} splicescore.o sites.o utils.o -o splicescore $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) splicescore.o sites.o utils.o -o splicescore $(LIBS)
+ .PHONY : clean
+ clean::
+ 	/bin/rm -f core* splicescore *.o score build? build-icm \

diff --git a/sci-biology/glimmerhmm/glimmerhmm-3.0.4.ebuild b/sci-biology/glimmerhmm/glimmerhmm-3.0.4.ebuild
new file mode 100644
index 000000000000..cbbcd0ef1421
--- /dev/null
+++ b/sci-biology/glimmerhmm/glimmerhmm-3.0.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P=GlimmerHMM
+
+DESCRIPTION="A eukaryotic gene finding system from TIGR"
+HOMEPAGE="http://www.cbcb.umd.edu/software/GlimmerHMM/"
+SRC_URI="ftp://ftp.cbcb.umd.edu/pub/software/glimmerhmm/${MY_P}-${PV}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gentoo.patch
+	"${FILESDIR}"/${PN}-3.0.1-fix-data-path.patch
+	"${FILESDIR}"/0001-fix-ridiculous-ODR-violation.patch
+)
+
+src_configure() {
+	tc-export CC CXX
+}
+
+src_compile() {
+	emake -C sources
+	emake -C train
+}
+
+src_install() {
+	dobin sources/glimmerhmm train/trainGlimmerHMM
+
+	insinto /usr/share/${PN}/lib
+	doins train/*.pm
+
+	insinto /usr/share/${PN}/models
+	doins -r trained_dir/.
+
+	exeinto /usr/libexec/${PN}/training_utils
+	doexe train/{build{1,2,-icm,-icm-noframe},erfapp,falsecomp,findsites,karlin,score,score{2,ATG,ATG2,STOP,STOP2},splicescore}
+
+	dodoc README.first train/readme.train
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-03-12  6:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-10 23:49 [gentoo-commits] repo/gentoo:master commit in: sci-biology/glimmerhmm/files/, sci-biology/glimmerhmm/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2024-03-12  6:22 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox