| 1 |
commit: 5876888c66bbb7100ab1f6c8717c5112364d396b |
| 2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Mon May 30 16:53:12 2022 +0000 |
| 4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 5 |
CommitDate: Mon May 30 17:46:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5876888c |
| 7 |
|
| 8 |
sci-biology/geneathome: update to new BOINC |
| 9 |
|
| 10 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
| 11 |
|
| 12 |
sci-biology/geneathome/Manifest | 1 - |
| 13 |
sci-biology/geneathome/files/makefile.patch | 2 +- |
| 14 |
...eathome-1.10-r2.ebuild => geneathome-1.10-r3.ebuild} | 17 +++++++---------- |
| 15 |
3 files changed, 8 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-biology/geneathome/Manifest b/sci-biology/geneathome/Manifest |
| 18 |
index 5a086b395..806447644 100644 |
| 19 |
--- a/sci-biology/geneathome/Manifest |
| 20 |
+++ b/sci-biology/geneathome/Manifest |
| 21 |
@@ -1,2 +1 @@ |
| 22 |
-DIST boinc-7.16.16.tar.gz 49599131 BLAKE2B 819ab85c19a684144711f77e669b892aa73c006b81c1d7ef7adbd9d580e1e8473ae27b52dc17953ee677c70fc78ed15df936afd740e629715f30f2b81d84ea6f SHA512 dd7042e176d6506c70de7866556ae73b2f45734df92038086d5b0414751f3da08dc571c49f0c26d747d3fb2577674d3ff8cdec7d3563861eaaaa5af9c1db0a0e |
| 23 |
DIST geneathome-1.10.tar.gz 73686241 BLAKE2B 4a4e9930e3faeaf0b6d687d26adb3267af1a70096397e9e4001066a7029a854b95cd35b6779a0e6bcf6c9cb3ad662b5f9e6adf4ab9d608ed2d73c65d3dadc10b SHA512 c8c1bb65f0021d9c9d9f14375212c458694dbb21abbfa90f6b8fb958bc6d86a522bbe13846b5930f6df0a4e755256f2016c5edd4447ae147cb1381eccce06b9e |
| 24 |
|
| 25 |
diff --git a/sci-biology/geneathome/files/makefile.patch b/sci-biology/geneathome/files/makefile.patch |
| 26 |
index 236da461e..7025b694d 100644 |
| 27 |
--- a/sci-biology/geneathome/files/makefile.patch |
| 28 |
+++ b/sci-biology/geneathome/files/makefile.patch |
| 29 |
@@ -19,7 +19,7 @@ |
| 30 |
-CXXFLAGS += $(CFLAGS) -std=gnu++11 |
| 31 |
-LDFLAGS += $(ARCH) -L/usr/X11R6/lib -L. -static |
| 32 |
-LIBS ?= -static-libgcc -static-libstdc++ -pthread -Wl,-Bstatic -lbz2 |
| 33 |
-+CPPFLAGS += -I$(BOINC_DIR) -I$(BOINC_LIB_DIR) -I$(BOINC_API_DIR) -Isimd |
| 34 |
++CPPFLAGS += -I$(BOINC_DIR) -Isimd |
| 35 |
+CXXFLAGS += -std=gnu++11 |
| 36 |
+LIBS ?= -pthread -lbz2 |
| 37 |
CXXSOURCES = BoincFile.cpp Graph.cpp boinc_functions.cpp utility.cpp pc.cpp main.cpp |
| 38 |
|
| 39 |
diff --git a/sci-biology/geneathome/geneathome-1.10-r2.ebuild b/sci-biology/geneathome/geneathome-1.10-r3.ebuild |
| 40 |
similarity index 82% |
| 41 |
rename from sci-biology/geneathome/geneathome-1.10-r2.ebuild |
| 42 |
rename to sci-biology/geneathome/geneathome-1.10-r3.ebuild |
| 43 |
index 43ec78723..383549d5d 100644 |
| 44 |
--- a/sci-biology/geneathome/geneathome-1.10-r2.ebuild |
| 45 |
+++ b/sci-biology/geneathome/geneathome-1.10-r3.ebuild |
| 46 |
@@ -3,13 +3,12 @@ |
| 47 |
|
| 48 |
EAPI=8 |
| 49 |
|
| 50 |
-BOINC_SUBMODULE="samples/${PN}" |
| 51 |
BOINC_MASTER_URL="https://gene.disi.unitn.it/test/" |
| 52 |
BOINC_INVITATION_CODE="science@tn" |
| 53 |
BOINC_HELPTEXT=\ |
| 54 |
"gene@home is a part of TN-Grid BOINC project." |
| 55 |
|
| 56 |
-inherit boinc boinc-app toolchain-funcs |
| 57 |
+inherit boinc-app edo toolchain-funcs |
| 58 |
|
| 59 |
MY_PN="pc-boinc" |
| 60 |
COMMIT="3186afba409a" |
| 61 |
@@ -17,7 +16,7 @@ COMMIT="3186afba409a" |
| 62 |
DESCRIPTION="BOINC application for expanding Gene Regulatory Networks (GRN)" |
| 63 |
HOMEPAGE+=" https://bitbucket.org/francesco-asnicar/pc-boinc" |
| 64 |
SRC_URI="https://bitbucket.org/francesco-asnicar/${MY_PN}/get/${COMMIT}.tar.gz -> ${P}.tar.gz" |
| 65 |
-BOINC_S="francesco-asnicar-${MY_PN}-${COMMIT}" |
| 66 |
+S="${WORKDIR}/francesco-asnicar-${MY_PN}-${COMMIT}" |
| 67 |
|
| 68 |
LICENSE="sunpro public-domain" |
| 69 |
SLOT="0" |
| 70 |
@@ -32,11 +31,8 @@ DOCS=( Readme.md ) |
| 71 |
|
| 72 |
boinc-app_add_deps |
| 73 |
|
| 74 |
-boinc_require_source 7.16.16 |
| 75 |
-boinc_enable_autotools |
| 76 |
- |
| 77 |
src_prepare() { |
| 78 |
- boinc_src_prepare |
| 79 |
+ default |
| 80 |
|
| 81 |
# error: inlining failed in call to ‘always_inline’ ‘int fprintf(FILE*, const char*, ...)’: target specific option mismatch |
| 82 |
sed -i src/main.cpp \ |
| 83 |
@@ -46,12 +42,13 @@ src_prepare() { |
| 84 |
|
| 85 |
src_compile() { |
| 86 |
tc-export CC CXX |
| 87 |
- emake -C src |
| 88 |
+ |
| 89 |
+ emake -C src BOINC_DIR="${ESYSROOT}"/usr/include/boinc |
| 90 |
} |
| 91 |
|
| 92 |
src_test() { |
| 93 |
- bash ./test_run.sh || die |
| 94 |
- bash ./test_run2.sh || die |
| 95 |
+ edo bash ./test_run.sh |
| 96 |
+ edo bash ./test_run2.sh |
| 97 |
} |
| 98 |
|
| 99 |
src_install() { |
Archives