aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>2022-05-30 21:53:12 +0500
committerAnna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>2022-05-30 22:46:56 +0500
commit5876888c66bbb7100ab1f6c8717c5112364d396b (patch)
tree2f25e04c8cb6b0bf62b458c97d80b27cb8f88c3d /sci-biology
parentsci-biology/geneathome: drop 1.10 (diff)
downloadguru-5876888c66bbb7100ab1f6c8717c5112364d396b.tar.gz
guru-5876888c66bbb7100ab1f6c8717c5112364d396b.tar.bz2
guru-5876888c66bbb7100ab1f6c8717c5112364d396b.zip
sci-biology/geneathome: update to new BOINC
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/geneathome/Manifest1
-rw-r--r--sci-biology/geneathome/files/makefile.patch2
-rw-r--r--sci-biology/geneathome/geneathome-1.10-r3.ebuild (renamed from sci-biology/geneathome/geneathome-1.10-r2.ebuild)17
3 files changed, 8 insertions, 12 deletions
diff --git a/sci-biology/geneathome/Manifest b/sci-biology/geneathome/Manifest
index 5a086b395..806447644 100644
--- a/sci-biology/geneathome/Manifest
+++ b/sci-biology/geneathome/Manifest
@@ -1,2 +1 @@
-DIST boinc-7.16.16.tar.gz 49599131 BLAKE2B 819ab85c19a684144711f77e669b892aa73c006b81c1d7ef7adbd9d580e1e8473ae27b52dc17953ee677c70fc78ed15df936afd740e629715f30f2b81d84ea6f SHA512 dd7042e176d6506c70de7866556ae73b2f45734df92038086d5b0414751f3da08dc571c49f0c26d747d3fb2577674d3ff8cdec7d3563861eaaaa5af9c1db0a0e
DIST geneathome-1.10.tar.gz 73686241 BLAKE2B 4a4e9930e3faeaf0b6d687d26adb3267af1a70096397e9e4001066a7029a854b95cd35b6779a0e6bcf6c9cb3ad662b5f9e6adf4ab9d608ed2d73c65d3dadc10b SHA512 c8c1bb65f0021d9c9d9f14375212c458694dbb21abbfa90f6b8fb958bc6d86a522bbe13846b5930f6df0a4e755256f2016c5edd4447ae147cb1381eccce06b9e
diff --git a/sci-biology/geneathome/files/makefile.patch b/sci-biology/geneathome/files/makefile.patch
index 236da461e..7025b694d 100644
--- a/sci-biology/geneathome/files/makefile.patch
+++ b/sci-biology/geneathome/files/makefile.patch
@@ -19,7 +19,7 @@
-CXXFLAGS += $(CFLAGS) -std=gnu++11
-LDFLAGS += $(ARCH) -L/usr/X11R6/lib -L. -static
-LIBS ?= -static-libgcc -static-libstdc++ -pthread -Wl,-Bstatic -lbz2
-+CPPFLAGS += -I$(BOINC_DIR) -I$(BOINC_LIB_DIR) -I$(BOINC_API_DIR) -Isimd
++CPPFLAGS += -I$(BOINC_DIR) -Isimd
+CXXFLAGS += -std=gnu++11
+LIBS ?= -pthread -lbz2
CXXSOURCES = BoincFile.cpp Graph.cpp boinc_functions.cpp utility.cpp pc.cpp main.cpp
diff --git a/sci-biology/geneathome/geneathome-1.10-r2.ebuild b/sci-biology/geneathome/geneathome-1.10-r3.ebuild
index 43ec78723..383549d5d 100644
--- a/sci-biology/geneathome/geneathome-1.10-r2.ebuild
+++ b/sci-biology/geneathome/geneathome-1.10-r3.ebuild
@@ -3,13 +3,12 @@
EAPI=8
-BOINC_SUBMODULE="samples/${PN}"
BOINC_MASTER_URL="https://gene.disi.unitn.it/test/"
BOINC_INVITATION_CODE="science@tn"
BOINC_HELPTEXT=\
"gene@home is a part of TN-Grid BOINC project."
-inherit boinc boinc-app toolchain-funcs
+inherit boinc-app edo toolchain-funcs
MY_PN="pc-boinc"
COMMIT="3186afba409a"
@@ -17,7 +16,7 @@ COMMIT="3186afba409a"
DESCRIPTION="BOINC application for expanding Gene Regulatory Networks (GRN)"
HOMEPAGE+=" https://bitbucket.org/francesco-asnicar/pc-boinc"
SRC_URI="https://bitbucket.org/francesco-asnicar/${MY_PN}/get/${COMMIT}.tar.gz -> ${P}.tar.gz"
-BOINC_S="francesco-asnicar-${MY_PN}-${COMMIT}"
+S="${WORKDIR}/francesco-asnicar-${MY_PN}-${COMMIT}"
LICENSE="sunpro public-domain"
SLOT="0"
@@ -32,11 +31,8 @@ DOCS=( Readme.md )
boinc-app_add_deps
-boinc_require_source 7.16.16
-boinc_enable_autotools
-
src_prepare() {
- boinc_src_prepare
+ default
# error: inlining failed in call to ‘always_inline’ ‘int fprintf(FILE*, const char*, ...)’: target specific option mismatch
sed -i src/main.cpp \
@@ -46,12 +42,13 @@ src_prepare() {
src_compile() {
tc-export CC CXX
- emake -C src
+
+ emake -C src BOINC_DIR="${ESYSROOT}"/usr/include/boinc
}
src_test() {
- bash ./test_run.sh || die
- bash ./test_run2.sh || die
+ edo bash ./test_run.sh
+ edo bash ./test_run2.sh
}
src_install() {