* [gentoo-commits] repo/proj/guru:master commit in: sci-biology/cmdock/files/, sci-biology/cmdock/
@ 2021-05-21 14:10 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2021-05-21 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 1883f124c2d77a9648dae60406fb1e956186af04
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Thu May 20 12:26:42 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 20 12:47:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1883f124
sci-biology/cmdock: fixes in deps and app_info.xml
1) Python is only used by Sphinx to build documentation
2) Rename app_config.xml to app_info.xml:
https://boinc.berkeley.edu/wiki/Anonymous_platform
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>
sci-biology/cmdock/cmdock-0.1.2.ebuild | 7 ++++---
sci-biology/cmdock/files/{app_config.xml => app_info.xml} | 0
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sci-biology/cmdock/cmdock-0.1.2.ebuild b/sci-biology/cmdock/cmdock-0.1.2.ebuild
index 03f3d769e..aa5a4546b 100644
--- a/sci-biology/cmdock/cmdock-0.1.2.ebuild
+++ b/sci-biology/cmdock/cmdock-0.1.2.ebuild
@@ -19,12 +19,13 @@ SLOT="${PV}"
KEYWORDS="~amd64"
IUSE="boinc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="doc? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND="${PYTHON_DEPS}
+DEPEND="
dev-cpp/eigen
dev-libs/cxxopts
boinc? ( sci-misc/boinc-wrapper )
+ doc? ( ${PYTHON_DEPS} )
"
RDEPEND="${DEPEND}
dev-lang/perl
@@ -54,7 +55,7 @@ src_install() {
if use boinc ; then
insinto /var/lib/boinc/projects/www.sidock.si_sidock
- doins "${FILESDIR}/app_config.xml"
+ doins "${FILESDIR}/app_info.xml"
doins "${FILESDIR}/cmdock-boinc_job_${PV}.xml"
doins "${FILESDIR}/cmdock-boinc-zip_job_${PV}.xml"
diff --git a/sci-biology/cmdock/files/app_config.xml b/sci-biology/cmdock/files/app_info.xml
similarity index 100%
rename from sci-biology/cmdock/files/app_config.xml
rename to sci-biology/cmdock/files/app_info.xml
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-biology/cmdock/files/, sci-biology/cmdock/
@ 2021-05-30 14:47 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-05-30 14:47 UTC (permalink / raw
To: gentoo-commits
commit: aba20d3142c80878bbc1a3b045f14c849a63cb63
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat May 29 13:37:10 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat May 29 15:48:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aba20d31
sci-biology/cmdock: add 0.1.3
* revise deps
* fix symlinks
* replace slotting with subslotting
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
sci-biology/cmdock/Manifest | 1 +
sci-biology/cmdock/cmdock-0.1.2.ebuild | 29 +++----
.../{cmdock-0.1.2.ebuild => cmdock-0.1.3.ebuild} | 35 ++++----
.../files/{app_info.xml => app_info_0.1.2.xml} | 2 +-
sci-biology/cmdock/files/app_info_0.1.3.xml | 95 ++++++++++++++++++++++
.../cmdock/files/cmdock-boinc-zcp_job_0.1.3.xml | 15 ++++
.../cmdock/files/cmdock-boinc-zip_job_0.1.2.xml | 3 +-
.../cmdock/files/cmdock-boinc_job_0.1.3.xml | 10 +++
8 files changed, 155 insertions(+), 35 deletions(-)
diff --git a/sci-biology/cmdock/Manifest b/sci-biology/cmdock/Manifest
index 25663d438..c20f5e305 100644
--- a/sci-biology/cmdock/Manifest
+++ b/sci-biology/cmdock/Manifest
@@ -1 +1,2 @@
DIST cmdock-v0.1.2.tar.gz 13394195 BLAKE2B bd377b6a953d1e38b527da4eda36aee7a634e9f0c400487d4092ae1939589890038fc90052d8bddb25457dd027fa929acd50e836d65bd5994af89116f4c770a7 SHA512 90d4114a10dde99d34cd7ea4b28399da744cc295adebb10f1f9771b59841cd13e07cae5218643c90dd2847cdb014867ab795649a3d1883396a3609c3344b8226
+DIST cmdock-v0.1.3.tar.gz 13416412 BLAKE2B abd6382943fb2ca2459fa493f8025e335821b96a95b88267dd493c28cd3280481b41ec6480fd3514cff126ab1077e89f075e5311393b1cd366403419e9c47454 SHA512 d941b672d14bad4fda4eaeb7aa313da1ade213241a1aee392747943a03afb6c66b3e93b8fd7eb9b1d8095b0632bd48cb062879cf445e3b54ce07069ad3087b22
diff --git a/sci-biology/cmdock/cmdock-0.1.2.ebuild b/sci-biology/cmdock/cmdock-0.1.2.ebuild
index aa5a4546b..00934f81c 100644
--- a/sci-biology/cmdock/cmdock-0.1.2.ebuild
+++ b/sci-biology/cmdock/cmdock-0.1.2.ebuild
@@ -3,34 +3,31 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
DOCS_BUILDER="sphinx"
DOCS_AUTODOC=0
-inherit python-r1 docs meson
+DOCS_DIR="docs"
+inherit python-any-r1 docs meson
DESCRIPTION="Program for docking ligands to proteins and nucleic acids"
HOMEPAGE="https://gitlab.com/Jukic/cmdock"
SRC_URI="https://gitlab.com/Jukic/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
-DOCS_DIR="${S}/docs"
LICENSE="LGPL-3"
-SLOT="${PV}"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
-
IUSE="boinc"
-REQUIRED_USE="doc? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND="
- dev-cpp/eigen
- dev-libs/cxxopts
+RDEPEND="
+ dev-lang/perl
boinc? ( sci-misc/boinc-wrapper )
- doc? ( ${PYTHON_DEPS} )
"
-RDEPEND="${DEPEND}
- dev-lang/perl
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-cpp/pcg-cpp
+ dev-libs/cxxopts
"
-BDEPEND="dev-cpp/pcg-cpp"
src_prepare() {
default
@@ -55,12 +52,12 @@ src_install() {
if use boinc ; then
insinto /var/lib/boinc/projects/www.sidock.si_sidock
- doins "${FILESDIR}/app_info.xml"
+ newins "${FILESDIR}/app_info_${PV}.xml" app_info.xml
doins "${FILESDIR}/cmdock-boinc_job_${PV}.xml"
doins "${FILESDIR}/cmdock-boinc-zip_job_${PV}.xml"
- dosym "${EPREFIX}"/usr/bin/boinc-wrapper "/var/lib/boinc/projects/www.sidock.si_sidock/cmdock-wrapper_${PV}"
- dosym "${EPREFIX}"/usr/bin/boinc-wrapper "/var/lib/boinc/projects/www.sidock.si_sidock/cmdock-boinc-zip_wrapper_${PV}"
+ dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-wrapper_${PV}
+ dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-boinc-zip_wrapper_${PV}
fi
}
diff --git a/sci-biology/cmdock/cmdock-0.1.2.ebuild b/sci-biology/cmdock/cmdock-0.1.3.ebuild
similarity index 64%
copy from sci-biology/cmdock/cmdock-0.1.2.ebuild
copy to sci-biology/cmdock/cmdock-0.1.3.ebuild
index aa5a4546b..c4a2da7b4 100644
--- a/sci-biology/cmdock/cmdock-0.1.2.ebuild
+++ b/sci-biology/cmdock/cmdock-0.1.3.ebuild
@@ -3,37 +3,36 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
DOCS_BUILDER="sphinx"
DOCS_AUTODOC=0
-inherit python-r1 docs meson
+DOCS_DIR="docs"
+inherit python-any-r1 docs meson
DESCRIPTION="Program for docking ligands to proteins and nucleic acids"
HOMEPAGE="https://gitlab.com/Jukic/cmdock"
SRC_URI="https://gitlab.com/Jukic/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
-DOCS_DIR="${S}/docs"
LICENSE="LGPL-3"
-SLOT="${PV}"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
-
IUSE="boinc"
-REQUIRED_USE="doc? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND="
- dev-cpp/eigen
- dev-libs/cxxopts
+RDEPEND="
+ dev-lang/perl
boinc? ( sci-misc/boinc-wrapper )
- doc? ( ${PYTHON_DEPS} )
"
-RDEPEND="${DEPEND}
- dev-lang/perl
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-cpp/indicators
+ dev-cpp/pcg-cpp
+ dev-libs/cxxopts
"
-BDEPEND="dev-cpp/pcg-cpp"
src_prepare() {
default
+ rm -r include/indicators || die
sed "s|pcg_cpp_dep = dependency.*|pcg_cpp_dep = declare_dependency(include_directories: '/usr/include')|" -i meson.build || die
}
@@ -55,12 +54,14 @@ src_install() {
if use boinc ; then
insinto /var/lib/boinc/projects/www.sidock.si_sidock
- doins "${FILESDIR}/app_info.xml"
+ newins "${FILESDIR}/app_info_${PV}.xml" app_info.xml
doins "${FILESDIR}/cmdock-boinc_job_${PV}.xml"
- doins "${FILESDIR}/cmdock-boinc-zip_job_${PV}.xml"
+ doins "${FILESDIR}/cmdock-boinc-zcp_job_${PV}.xml"
+ newins "${FILESDIR}/cmdock-boinc-zcp_job_${PV}.xml" cmdock-boinc-zip_job_${PV}.xml
- dosym "${EPREFIX}"/usr/bin/boinc-wrapper "/var/lib/boinc/projects/www.sidock.si_sidock/cmdock-wrapper_${PV}"
- dosym "${EPREFIX}"/usr/bin/boinc-wrapper "/var/lib/boinc/projects/www.sidock.si_sidock/cmdock-boinc-zip_wrapper_${PV}"
+ dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-wrapper_${PV}
+ dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-boinc-zcp_wrapper_${PV}
+ dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-boinc-zip_wrapper_${PV}
fi
}
diff --git a/sci-biology/cmdock/files/app_info.xml b/sci-biology/cmdock/files/app_info_0.1.2.xml
similarity index 97%
rename from sci-biology/cmdock/files/app_info.xml
rename to sci-biology/cmdock/files/app_info_0.1.2.xml
index eb222052b..f7575656b 100644
--- a/sci-biology/cmdock/files/app_info.xml
+++ b/sci-biology/cmdock/files/app_info_0.1.2.xml
@@ -47,7 +47,7 @@
</app_version>
<app_version>
<app_name>cmdock-boinc-zip</app_name>
- <version_num>200</version_num>
+ <version_num>204</version_num>
<file_ref>
<file_name>cmdock-boinc-zip_wrapper_0.1.2</file_name>
<main_program/>
diff --git a/sci-biology/cmdock/files/app_info_0.1.3.xml b/sci-biology/cmdock/files/app_info_0.1.3.xml
new file mode 100644
index 000000000..5c901eba8
--- /dev/null
+++ b/sci-biology/cmdock/files/app_info_0.1.3.xml
@@ -0,0 +1,95 @@
+<app_info>
+<app>
+ <name>cmdock-boinc</name>
+ <user_friendly_name>CurieMarieDock on BOINC</user_friendly_name>
+</app>
+<app>
+ <name>cmdock-boinc-zip</name>
+ <user_friendly_name>CurieMarieDock on BOINC + zipped input</user_friendly_name>
+</app>
+<app>
+ <name>cmdock-boinc-zcp</name>
+ <user_friendly_name>CurieMarieDock on BOINC + zipped input, checkpoints and progress bar</user_friendly_name>
+</app>
+
+<file_info>
+ <name>cmdock-wrapper_0.1.3</name>
+ <executable/>
+</file_info>
+<file_info>
+ <name>cmdock-boinc-zcp_wrapper_0.1.3</name>
+ <executable/>
+</file_info>
+<file_info>
+ <name>cmdock-boinc-zip_wrapper_0.1.3</name>
+ <executable/>
+</file_info>
+
+<file_info>
+ <name>cmdock-boinc_job_0.1.3.xml</name>
+</file_info>
+<file_info>
+ <name>cmdock-boinc-zcp_job_0.1.3.xml</name>
+</file_info>
+<file_info>
+ <name>cmdock-boinc-zip_job_0.1.3.xml</name>
+</file_info>
+<file_info>
+ <name>docking_out.sd</name>
+</file_info>
+
+<app_version>
+ <app_name>cmdock-boinc</app_name>
+ <version_num>103</version_num>
+ <file_ref>
+ <file_name>cmdock-wrapper_0.1.3</file_name>
+ <main_program/>
+ </file_ref>
+ <file_ref>
+ <file_name>cmdock-boinc_job_0.1.3.xml</file_name>
+ <open_name>job.xml</open_name>
+ <copy_file/>
+ </file_ref>
+ <file_ref>
+ <file_name>docking_out.sd</file_name>
+ <open_name>docking_out.sd</open_name>
+ <copy_file/>
+ </file_ref>
+</app_version>
+<app_version>
+ <app_name>cmdock-boinc-zcp</app_name>
+ <version_num>100</version_num>
+ <file_ref>
+ <file_name>cmdock-boinc-zcp_wrapper_0.1.3</file_name>
+ <main_program/>
+ </file_ref>
+ <file_ref>
+ <file_name>cmdock-boinc-zcp_job_0.1.3.xml</file_name>
+ <open_name>job.xml</open_name>
+ <copy_file/>
+ </file_ref>
+ <file_ref>
+ <file_name>docking_out.sd</file_name>
+ <open_name>docking_out.sd</open_name>
+ <copy_file/>
+ </file_ref>
+</app_version>
+<app_version>
+ <app_name>cmdock-boinc-zip</app_name>
+ <version_num>300</version_num>
+ <file_ref>
+ <file_name>cmdock-boinc-zip_wrapper_0.1.3</file_name>
+ <main_program/>
+ </file_ref>
+ <file_ref>
+ <file_name>cmdock-boinc-zip_job_0.1.3.xml</file_name>
+ <open_name>job.xml</open_name>
+ <copy_file/>
+ </file_ref>
+ <file_ref>
+ <file_name>docking_out.sd</file_name>
+ <open_name>docking_out.sd</open_name>
+ <copy_file/>
+ </file_ref>
+</app_version>
+</app_info>
diff --git a/sci-biology/cmdock/files/cmdock-boinc-zcp_job_0.1.3.xml b/sci-biology/cmdock/files/cmdock-boinc-zcp_job_0.1.3.xml
new file mode 100644
index 000000000..3c7818151
--- /dev/null
+++ b/sci-biology/cmdock/files/cmdock-boinc-zcp_job_0.1.3.xml
@@ -0,0 +1,15 @@
+<job_desc>
+ <task>
+ <application>/opt/cmdock-0.1.3/build/cmdock</application>
+ <stdout_filename>docking_log</stdout_filename>
+ <command_line>-c -j 1 -r target.prm -p /opt/cmdock-0.1.3/data/scripts/dock.prm -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
+ <checkpoint_filename>docking_out.chk</checkpoint_filename>
+ <fraction_done_filename>docking_out.progress</fraction_done_filename>
+ <setenv>CMDOCK_ROOT=/opt/cmdock-0.1.3</setenv>
+ <setenv>LD_LIBRARY_PATH=/opt/cmdock-0.1.3/build:$LD_LIBRARY_PATH</setenv>
+ <setenv>PERL5LIB=/opt/cmdock-0.1.3/lib:$PERL5LIB</setenv>
+ </task>
+ <unzip_input>
+ <zipfilename>ligands.zip</zipfilename>
+ </unzip_input>
+</job_desc>
diff --git a/sci-biology/cmdock/files/cmdock-boinc-zip_job_0.1.2.xml b/sci-biology/cmdock/files/cmdock-boinc-zip_job_0.1.2.xml
index 2691d09ea..a11f1fe9b 100644
--- a/sci-biology/cmdock/files/cmdock-boinc-zip_job_0.1.2.xml
+++ b/sci-biology/cmdock/files/cmdock-boinc-zip_job_0.1.2.xml
@@ -2,7 +2,8 @@
<task>
<application>/opt/cmdock-0.1.2/build/cmdock</application>
<stdout_filename>docking_log</stdout_filename>
- <command_line>-r target.prm -p /opt/cmdock-0.1.2/data/scripts/dock.prm -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
+ <command_line>-c -r target.prm -p /opt/cmdock-0.1.2/data/scripts/dock.prm -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
+ <checkpoint_filename>docking_out.chk</checkpoint_filename>
<setenv>CMDOCK_ROOT=/opt/cmdock-0.1.2</setenv>
<setenv>LD_LIBRARY_PATH=/opt/cmdock-0.1.2/build:$LD_LIBRARY_PATH</setenv>
<setenv>PERL5LIB=/opt/cmdock-0.1.2/lib:$PERL5LIB</setenv>
diff --git a/sci-biology/cmdock/files/cmdock-boinc_job_0.1.3.xml b/sci-biology/cmdock/files/cmdock-boinc_job_0.1.3.xml
new file mode 100644
index 000000000..6082dc8fe
--- /dev/null
+++ b/sci-biology/cmdock/files/cmdock-boinc_job_0.1.3.xml
@@ -0,0 +1,10 @@
+<job_desc>
+ <task>
+ <application>/opt/cmdock-0.1.3/build/cmdock</application>
+ <stdout_filename>docking_log</stdout_filename>
+ <command_line>-r target.prm -p /opt/cmdock-0.1.3/data/scripts/dock.prm -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
+ <setenv>CMDOCK_ROOT=/opt/cmdock-0.1.3</setenv>
+ <setenv>LD_LIBRARY_PATH=/opt/cmdock-0.1.3/build:$LD_LIBRARY_PATH</setenv>
+ <setenv>PERL5LIB=/opt/cmdock-0.1.3/lib:$PERL5LIB</setenv>
+ </task>
+</job_desc>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-biology/cmdock/files/, sci-biology/cmdock/
@ 2021-07-01 5:20 Jian Lin
0 siblings, 0 replies; 6+ messages in thread
From: Jian Lin @ 2021-07-01 5:20 UTC (permalink / raw
To: gentoo-commits
commit: eb972dae4900efd571efe420cf683200a997d924
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Jun 27 08:51:43 2021 +0000
Commit: Jian Lin <jlin.gentoo <AT> outlook <DOT> com>
CommitDate: Thu Jul 1 04:58:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eb972dae
sci-biology/cmdock: drop obsolete
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
sci-biology/cmdock/Manifest | 1 -
sci-biology/cmdock/cmdock-0.1.2.ebuild | 74 ----------------------
sci-biology/cmdock/cmdock-0.1.3.ebuild | 13 ++--
sci-biology/cmdock/files/app_info_0.1.2.xml | 66 -------------------
sci-biology/cmdock/files/app_info_0.1.3.xml | 58 -----------------
.../cmdock/files/cmdock-boinc-zip_job_0.1.2.xml | 14 ----
.../cmdock/files/cmdock-boinc_job_0.1.2.xml | 10 ---
.../cmdock/files/cmdock-boinc_job_0.1.3.xml | 10 ---
8 files changed, 4 insertions(+), 242 deletions(-)
diff --git a/sci-biology/cmdock/Manifest b/sci-biology/cmdock/Manifest
index c20f5e305..84968a8f8 100644
--- a/sci-biology/cmdock/Manifest
+++ b/sci-biology/cmdock/Manifest
@@ -1,2 +1 @@
-DIST cmdock-v0.1.2.tar.gz 13394195 BLAKE2B bd377b6a953d1e38b527da4eda36aee7a634e9f0c400487d4092ae1939589890038fc90052d8bddb25457dd027fa929acd50e836d65bd5994af89116f4c770a7 SHA512 90d4114a10dde99d34cd7ea4b28399da744cc295adebb10f1f9771b59841cd13e07cae5218643c90dd2847cdb014867ab795649a3d1883396a3609c3344b8226
DIST cmdock-v0.1.3.tar.gz 13416412 BLAKE2B abd6382943fb2ca2459fa493f8025e335821b96a95b88267dd493c28cd3280481b41ec6480fd3514cff126ab1077e89f075e5311393b1cd366403419e9c47454 SHA512 d941b672d14bad4fda4eaeb7aa313da1ade213241a1aee392747943a03afb6c66b3e93b8fd7eb9b1d8095b0632bd48cb062879cf445e3b54ce07069ad3087b22
diff --git a/sci-biology/cmdock/cmdock-0.1.2.ebuild b/sci-biology/cmdock/cmdock-0.1.2.ebuild
deleted file mode 100644
index 00934f81c..000000000
--- a/sci-biology/cmdock/cmdock-0.1.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-DOCS_BUILDER="sphinx"
-DOCS_AUTODOC=0
-DOCS_DIR="docs"
-inherit python-any-r1 docs meson
-
-DESCRIPTION="Program for docking ligands to proteins and nucleic acids"
-HOMEPAGE="https://gitlab.com/Jukic/cmdock"
-SRC_URI="https://gitlab.com/Jukic/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="boinc"
-
-RDEPEND="
- dev-lang/perl
- boinc? ( sci-misc/boinc-wrapper )
-"
-BDEPEND="
- dev-cpp/eigen:3
- dev-cpp/pcg-cpp
- dev-libs/cxxopts
-"
-
-src_prepare() {
- default
- sed "s|pcg_cpp_dep = dependency.*|pcg_cpp_dep = declare_dependency(include_directories: '/usr/include')|" -i meson.build || die
-}
-
-src_configure() {
- # very weird directory layout
- local emesonargs=(
- --prefix="${EPREFIX}/opt/cmdock-${PV}"
- )
- meson_src_configure
-}
-
-src_compile() {
- meson_src_compile
- docs_compile
-}
-
-src_install() {
- meson_src_install
-
- if use boinc ; then
- insinto /var/lib/boinc/projects/www.sidock.si_sidock
- newins "${FILESDIR}/app_info_${PV}.xml" app_info.xml
- doins "${FILESDIR}/cmdock-boinc_job_${PV}.xml"
- doins "${FILESDIR}/cmdock-boinc-zip_job_${PV}.xml"
-
- dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-wrapper_${PV}
- dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-boinc-zip_wrapper_${PV}
- fi
-}
-
-pkg_postinst() {
- if use boinc ; then
- touch /var/lib/boinc/projects/www.sidock.si_sidock/docking_out.sd || die
- elog
- elog "The easiest way to do something useful with this application"
- elog "is to attach it to SiDock@home BOINC project."
- elog
- elog "- Master URL: https://sidock.si/sidock/"
- elog "- Invitation code: Crunch_4Science"
- fi
-}
diff --git a/sci-biology/cmdock/cmdock-0.1.3.ebuild b/sci-biology/cmdock/cmdock-0.1.3.ebuild
index c4a2da7b4..e42b1f253 100644
--- a/sci-biology/cmdock/cmdock-0.1.3.ebuild
+++ b/sci-biology/cmdock/cmdock-0.1.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
DOCS_BUILDER="sphinx"
DOCS_AUTODOC=0
DOCS_DIR="docs"
@@ -26,14 +26,13 @@ RDEPEND="
BDEPEND="
dev-cpp/eigen:3
dev-cpp/indicators
- dev-cpp/pcg-cpp
+ >=dev-cpp/pcg-cpp-0.98.1_p20210406-r1
dev-libs/cxxopts
"
src_prepare() {
default
rm -r include/indicators || die
- sed "s|pcg_cpp_dep = dependency.*|pcg_cpp_dep = declare_dependency(include_directories: '/usr/include')|" -i meson.build || die
}
src_configure() {
@@ -55,13 +54,9 @@ src_install() {
if use boinc ; then
insinto /var/lib/boinc/projects/www.sidock.si_sidock
newins "${FILESDIR}/app_info_${PV}.xml" app_info.xml
- doins "${FILESDIR}/cmdock-boinc_job_${PV}.xml"
doins "${FILESDIR}/cmdock-boinc-zcp_job_${PV}.xml"
- newins "${FILESDIR}/cmdock-boinc-zcp_job_${PV}.xml" cmdock-boinc-zip_job_${PV}.xml
- dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-wrapper_${PV}
- dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-boinc-zcp_wrapper_${PV}
- dosym ../../../../../usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-boinc-zip_wrapper_${PV}
+ dosym -r /usr/bin/boinc-wrapper /var/lib/boinc/projects/www.sidock.si_sidock/cmdock-boinc-zcp_wrapper_${PV}
fi
}
diff --git a/sci-biology/cmdock/files/app_info_0.1.2.xml b/sci-biology/cmdock/files/app_info_0.1.2.xml
deleted file mode 100644
index f7575656b..000000000
--- a/sci-biology/cmdock/files/app_info_0.1.2.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<app_info>
-<app>
- <name>cmdock-boinc</name>
- <user_friendly_name>CurieMarieDock on BOINC</user_friendly_name>
-</app>
-<app>
- <name>cmdock-boinc-zip</name>
- <user_friendly_name>CurieMarieDock on BOINC + zipped input</user_friendly_name>
-</app>
-
-<file_info>
- <name>cmdock-wrapper_0.1.2</name>
- <executable/>
-</file_info>
-<file_info>
- <name>cmdock-boinc-zip_wrapper_0.1.2</name>
- <executable/>
-</file_info>
-
-<file_info>
- <name>cmdock-boinc_job_0.1.2.xml</name>
-</file_info>
-<file_info>
- <name>cmdock-boinc-zip_job_0.1.2.xml</name>
-</file_info>
-<file_info>
- <name>docking_out.sd</name>
-</file_info>
-
-<app_version>
- <app_name>cmdock-boinc</app_name>
- <version_num>102</version_num>
- <file_ref>
- <file_name>cmdock-wrapper_0.1.2</file_name>
- <main_program/>
- </file_ref>
- <file_ref>
- <file_name>cmdock-boinc_job_0.1.2.xml</file_name>
- <open_name>job.xml</open_name>
- <copy_file/>
- </file_ref>
- <file_ref>
- <file_name>docking_out.sd</file_name>
- <open_name>docking_out.sd</open_name>
- <copy_file/>
- </file_ref>
-</app_version>
-<app_version>
- <app_name>cmdock-boinc-zip</app_name>
- <version_num>204</version_num>
- <file_ref>
- <file_name>cmdock-boinc-zip_wrapper_0.1.2</file_name>
- <main_program/>
- </file_ref>
- <file_ref>
- <file_name>cmdock-boinc-zip_job_0.1.2.xml</file_name>
- <open_name>job.xml</open_name>
- <copy_file/>
- </file_ref>
- <file_ref>
- <file_name>docking_out.sd</file_name>
- <open_name>docking_out.sd</open_name>
- <copy_file/>
- </file_ref>
-</app_version>
-</app_info>
diff --git a/sci-biology/cmdock/files/app_info_0.1.3.xml b/sci-biology/cmdock/files/app_info_0.1.3.xml
index 5c901eba8..162ad0c05 100644
--- a/sci-biology/cmdock/files/app_info_0.1.3.xml
+++ b/sci-biology/cmdock/files/app_info_0.1.3.xml
@@ -1,61 +1,21 @@
<app_info>
-<app>
- <name>cmdock-boinc</name>
- <user_friendly_name>CurieMarieDock on BOINC</user_friendly_name>
-</app>
-<app>
- <name>cmdock-boinc-zip</name>
- <user_friendly_name>CurieMarieDock on BOINC + zipped input</user_friendly_name>
-</app>
<app>
<name>cmdock-boinc-zcp</name>
<user_friendly_name>CurieMarieDock on BOINC + zipped input, checkpoints and progress bar</user_friendly_name>
</app>
-<file_info>
- <name>cmdock-wrapper_0.1.3</name>
- <executable/>
-</file_info>
<file_info>
<name>cmdock-boinc-zcp_wrapper_0.1.3</name>
<executable/>
</file_info>
-<file_info>
- <name>cmdock-boinc-zip_wrapper_0.1.3</name>
- <executable/>
-</file_info>
-<file_info>
- <name>cmdock-boinc_job_0.1.3.xml</name>
-</file_info>
<file_info>
<name>cmdock-boinc-zcp_job_0.1.3.xml</name>
</file_info>
-<file_info>
- <name>cmdock-boinc-zip_job_0.1.3.xml</name>
-</file_info>
<file_info>
<name>docking_out.sd</name>
</file_info>
-<app_version>
- <app_name>cmdock-boinc</app_name>
- <version_num>103</version_num>
- <file_ref>
- <file_name>cmdock-wrapper_0.1.3</file_name>
- <main_program/>
- </file_ref>
- <file_ref>
- <file_name>cmdock-boinc_job_0.1.3.xml</file_name>
- <open_name>job.xml</open_name>
- <copy_file/>
- </file_ref>
- <file_ref>
- <file_name>docking_out.sd</file_name>
- <open_name>docking_out.sd</open_name>
- <copy_file/>
- </file_ref>
-</app_version>
<app_version>
<app_name>cmdock-boinc-zcp</app_name>
<version_num>100</version_num>
@@ -74,22 +34,4 @@
<copy_file/>
</file_ref>
</app_version>
-<app_version>
- <app_name>cmdock-boinc-zip</app_name>
- <version_num>300</version_num>
- <file_ref>
- <file_name>cmdock-boinc-zip_wrapper_0.1.3</file_name>
- <main_program/>
- </file_ref>
- <file_ref>
- <file_name>cmdock-boinc-zip_job_0.1.3.xml</file_name>
- <open_name>job.xml</open_name>
- <copy_file/>
- </file_ref>
- <file_ref>
- <file_name>docking_out.sd</file_name>
- <open_name>docking_out.sd</open_name>
- <copy_file/>
- </file_ref>
-</app_version>
</app_info>
diff --git a/sci-biology/cmdock/files/cmdock-boinc-zip_job_0.1.2.xml b/sci-biology/cmdock/files/cmdock-boinc-zip_job_0.1.2.xml
deleted file mode 100644
index a11f1fe9b..000000000
--- a/sci-biology/cmdock/files/cmdock-boinc-zip_job_0.1.2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<job_desc>
- <task>
- <application>/opt/cmdock-0.1.2/build/cmdock</application>
- <stdout_filename>docking_log</stdout_filename>
- <command_line>-c -r target.prm -p /opt/cmdock-0.1.2/data/scripts/dock.prm -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
- <checkpoint_filename>docking_out.chk</checkpoint_filename>
- <setenv>CMDOCK_ROOT=/opt/cmdock-0.1.2</setenv>
- <setenv>LD_LIBRARY_PATH=/opt/cmdock-0.1.2/build:$LD_LIBRARY_PATH</setenv>
- <setenv>PERL5LIB=/opt/cmdock-0.1.2/lib:$PERL5LIB</setenv>
- </task>
- <unzip_input>
- <zipfilename>ligands.zip</zipfilename>
- </unzip_input>
-</job_desc>
diff --git a/sci-biology/cmdock/files/cmdock-boinc_job_0.1.2.xml b/sci-biology/cmdock/files/cmdock-boinc_job_0.1.2.xml
deleted file mode 100644
index c670b677e..000000000
--- a/sci-biology/cmdock/files/cmdock-boinc_job_0.1.2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<job_desc>
- <task>
- <application>/opt/cmdock-0.1.2/build/cmdock</application>
- <stdout_filename>docking_log</stdout_filename>
- <command_line>-r target.prm -p /opt/cmdock-0.1.2/data/scripts/dock.prm -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
- <setenv>CMDOCK_ROOT=/opt/cmdock-0.1.2</setenv>
- <setenv>LD_LIBRARY_PATH=/opt/cmdock-0.1.2/build:$LD_LIBRARY_PATH</setenv>
- <setenv>PERL5LIB=/opt/cmdock-0.1.2/lib:$PERL5LIB</setenv>
- </task>
-</job_desc>
diff --git a/sci-biology/cmdock/files/cmdock-boinc_job_0.1.3.xml b/sci-biology/cmdock/files/cmdock-boinc_job_0.1.3.xml
deleted file mode 100644
index 6082dc8fe..000000000
--- a/sci-biology/cmdock/files/cmdock-boinc_job_0.1.3.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<job_desc>
- <task>
- <application>/opt/cmdock-0.1.3/build/cmdock</application>
- <stdout_filename>docking_log</stdout_filename>
- <command_line>-r target.prm -p /opt/cmdock-0.1.3/data/scripts/dock.prm -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
- <setenv>CMDOCK_ROOT=/opt/cmdock-0.1.3</setenv>
- <setenv>LD_LIBRARY_PATH=/opt/cmdock-0.1.3/build:$LD_LIBRARY_PATH</setenv>
- <setenv>PERL5LIB=/opt/cmdock-0.1.3/lib:$PERL5LIB</setenv>
- </task>
-</job_desc>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-biology/cmdock/files/, sci-biology/cmdock/
@ 2023-01-08 10:27 Florian Schmaus
0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2023-01-08 10:27 UTC (permalink / raw
To: gentoo-commits
commit: 43200432ac81cfb799df3a1a62076920d42f8f5a
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Fri Jan 6 05:30:16 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 09:40:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=43200432
sci-biology/cmdock: add 0.2.0
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
sci-biology/cmdock/Manifest | 1 +
sci-biology/cmdock/cmdock-0.2.0.ebuild | 112 ++++++++++++++++++++++++
sci-biology/cmdock/files/app_info_0.2.0.xml | 50 +++++++++++
sci-biology/cmdock/files/cmdock-l_job_0.2.0.xml | 15 ++++
4 files changed, 178 insertions(+)
diff --git a/sci-biology/cmdock/Manifest b/sci-biology/cmdock/Manifest
index 5f5d12c7f..8757cee0d 100644
--- a/sci-biology/cmdock/Manifest
+++ b/sci-biology/cmdock/Manifest
@@ -1 +1,2 @@
DIST cmdock-v0.1.4.tar.bz2 14095825 BLAKE2B 80d5d86dc11e842689255d2b673545436404fb92815bb33b5ff15eba0cd3e8970a750dfeb657d018ef31024a2ecf591bcb5c6c1f427be1d0c86a0cfc017c8aa0 SHA512 d0d9a96ef0fad8cd4b320a2339a1889e481a825c5712259e04c9e91b34de597def3100c3c9f71fa63f3eef43892a17c0114d4cc93e99424bcdcc1fc97c25f51e
+DIST cmdock-v0.2.0.tar.bz2 14155812 BLAKE2B daf2f1ac137761bf24b2295dd025e81b29eefae23b5b33c7319f87cf6ea938bcb2ce619229d84dd2af9f31785b63bab4dda95bba3e7cd4de122f94f953913694 SHA512 67eda7e712650641219d7d4d4f9c455923bc6241aa687c5b3f489e251b9e838c3bcdcc7184540ab28f96ab8f573320599669e4b52989ce33a015bceec89717c5
diff --git a/sci-biology/cmdock/cmdock-0.2.0.ebuild b/sci-biology/cmdock/cmdock-0.2.0.ebuild
new file mode 100644
index 000000000..9a91c85df
--- /dev/null
+++ b/sci-biology/cmdock/cmdock-0.2.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+BOINC_APP_OPTIONAL="true"
+inherit boinc-app flag-o-matic meson optfeature python-any-r1
+
+DESCRIPTION="Program for docking ligands to proteins and nucleic acids"
+HOMEPAGE="https://gitlab.com/Jukic/cmdock"
+SRC_URI="https://gitlab.com/Jukic/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="LGPL-3 ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="apidoc boinc cpu_flags_x86_sse2 doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ boinc? ( sci-misc/boinc-wrapper )
+"
+DEPEND="
+ dev-cpp/eigen:3
+ dev-cpp/indicators
+ >=dev-cpp/pcg-cpp-0.98.1_p20210406-r1
+ dev-libs/cxxopts
+"
+BDEPEND="
+ apidoc? (
+ app-doc/doxygen
+ dev-texlive/texlive-fontutils
+ )
+ doc? (
+ $(python_gen_any_dep '
+ dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ ')
+ )
+ test? ( ${PYTHON_DEPS} )
+"
+
+DOCS=( README.md changelog.md )
+
+BOINC_MASTER_URL="https://www.sidock.si/sidock/"
+BOINC_INVITATION_CODE="Crunch_4Science"
+BOINC_APP_HELPTEXT=\
+"The easiest way to do something useful with this application
+is to attach it to SiDock@home BOINC project."
+
+INSTALL_PREFIX="${EPREFIX}/opt/${P}"
+
+python_check_deps() {
+ use doc || return 0
+
+ python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+ python_has_version "dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}]"
+}
+
+foreach_wrapper_job() {
+ sed -e "s:@PREFIX@:${INSTALL_PREFIX}:g" -i "${1}" || die
+}
+
+src_prepare() {
+ default
+ python_fix_shebang "${S}"/bin
+}
+
+src_configure() {
+ # very weird directory layout
+ local emesonargs=(
+ --prefix="${INSTALL_PREFIX}"
+ $(meson_use apidoc)
+ $(meson_use doc)
+ $(meson_use test tests)
+ -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+ )
+ meson_src_configure
+
+ use cpu_flags_x86_sse2 || append-cppflags "-DBUNDLE_NO_SSE"
+}
+
+src_install() {
+ meson_src_install
+ python_optimize "${D}${INSTALL_PREFIX}"/bin
+
+ if use boinc; then
+ doappinfo "${FILESDIR}"/app_info_${PV}.xml
+ dowrapper cmdock-l
+
+ # install cmdock executable
+ exeinto "$(get_project_root)"
+ exeopts --owner root --group boinc
+ newexe "${D}${INSTALL_PREFIX}"/bin/cmdock cmdock-${PV}
+
+ # install a blank file
+ touch "${T}"/docking_out || die
+ insinto "$(get_project_root)"
+ insopts --owner root --group boinc
+ doins "${T}"/docking_out
+ fi
+}
+
+pkg_postinst() {
+ optfeature "sdtether.py and sdrmsd.py scripts" "dev-python/numpy sci-chemistry/openbabel[python]"
+ use boinc && boinc-app_pkg_postinst
+}
+
+pkg_postrm() {
+ use boinc && boinc-app_pkg_postrm
+}
diff --git a/sci-biology/cmdock/files/app_info_0.2.0.xml b/sci-biology/cmdock/files/app_info_0.2.0.xml
new file mode 100644
index 000000000..ad23f7890
--- /dev/null
+++ b/sci-biology/cmdock/files/app_info_0.2.0.xml
@@ -0,0 +1,50 @@
+<app_info>
+<app>
+ <name>cmdock-l</name>
+ <user_friendly_name>CurieMarieDock 0.2.0 long tasks</user_friendly_name>
+</app>
+
+<file_info>
+ <name>cmdock-l_wrapper_@PV@</name>
+ <sticky/>
+ <executable/>
+</file_info>
+<file_info>
+ <name>cmdock-@PV@</name>
+ <sticky/>
+ <executable/>
+</file_info>
+
+<file_info>
+ <name>cmdock-l_job_@PV@.xml</name>
+ <sticky/>
+</file_info>
+<file_info>
+ <name>docking_out</name>
+ <sticky/>
+</file_info>
+
+<app_version>
+ <app_name>cmdock-l</app_name>
+ <version_num>100</version_num>
+ <file_ref>
+ <file_name>cmdock-l_wrapper_@PV@</file_name>
+ <main_program/>
+ </file_ref>
+ <file_ref>
+ <file_name>cmdock-@PV@</file_name>
+ <open_name>cmdock</open_name>
+ <copy_file/>
+ </file_ref>
+ <file_ref>
+ <file_name>cmdock-l_job_@PV@.xml</file_name>
+ <open_name>job.xml</open_name>
+ <copy_file/>
+ </file_ref>
+ <file_ref>
+ <file_name>docking_out</file_name>
+ <open_name>docking_out</open_name>
+ <copy_file/>
+ </file_ref>
+</app_version>
+</app_info>
diff --git a/sci-biology/cmdock/files/cmdock-l_job_0.2.0.xml b/sci-biology/cmdock/files/cmdock-l_job_0.2.0.xml
new file mode 100644
index 000000000..a163eb29c
--- /dev/null
+++ b/sci-biology/cmdock/files/cmdock-l_job_0.2.0.xml
@@ -0,0 +1,15 @@
+<job_desc>
+ <task>
+ <application>cmdock</application>
+ <stdout_filename>docking_log</stdout_filename>
+ <command_line>-c -j 1 -b 1 -x -r target.prm -p "@PREFIX@/data/scripts/dock.prm" -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
+ <checkpoint_filename>docking_out.chk</checkpoint_filename>
+ <fraction_done_filename>docking_out.progress</fraction_done_filename>
+ <setenv>CMDOCK_ROOT=@PREFIX@</setenv>
+ <setenv>LD_LIBRARY_PATH=@PREFIX@/lib:$LD_LIBRARY_PATH</setenv>
+ <setenv>PERL5LIB=@PREFIX@/lib:$PERL5LIB</setenv>
+ </task>
+ <unzip_input>
+ <zipfilename>ligands.zip</zipfilename>
+ </unzip_input>
+</job_desc>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-biology/cmdock/files/, sci-biology/cmdock/
@ 2024-01-09 12:03 David Roman
0 siblings, 0 replies; 6+ messages in thread
From: David Roman @ 2024-01-09 12:03 UTC (permalink / raw
To: gentoo-commits
commit: bf5dd7c748cd41b6fa540780d668045d1836db0b
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Jan 9 10:19:33 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Jan 9 10:19:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf5dd7c7
sci-biology/cmdock: fix build
Closes: https://bugs.gentoo.org/901345
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
sci-biology/cmdock/cmdock-0.2.0-r1.ebuild | 119 ++++++++++++++++++++
.../cmdock/files/cmdock-0.2.0-cxxopts.patch | 122 +++++++++++++++++++++
.../cmdock/files/cmdock-0.2.0-include.patch | 19 ++++
3 files changed, 260 insertions(+)
diff --git a/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild b/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild
new file mode 100644
index 0000000000..e01a7ecf70
--- /dev/null
+++ b/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+BOINC_APP_OPTIONAL="true"
+inherit boinc-app flag-o-matic meson optfeature python-any-r1
+
+DESCRIPTION="Program for docking ligands to proteins and nucleic acids"
+HOMEPAGE="https://gitlab.com/Jukic/cmdock"
+SRC_URI="https://gitlab.com/Jukic/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="LGPL-3 ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="apidoc boinc cpu_flags_x86_sse2 doc test"
+
+# Flaky tests
+RESTRICT="test"
+
+RDEPEND="
+ boinc? ( sci-misc/boinc-wrapper )
+"
+DEPEND="
+ dev-cpp/eigen:3
+ >=dev-cpp/indicators-2.3-r1
+ >=dev-cpp/pcg-cpp-0.98.1_p20210406-r1
+ >=dev-libs/cxxopts-3
+"
+BDEPEND="
+ apidoc? (
+ app-doc/doxygen
+ dev-texlive/texlive-fontutils
+ )
+ doc? (
+ $(python_gen_any_dep '
+ dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ ')
+ )
+ test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-include.patch
+ "${FILESDIR}"/${P}-cxxopts.patch
+)
+
+DOCS=( README.md changelog.md )
+
+BOINC_MASTER_URL="https://www.sidock.si/sidock/"
+BOINC_INVITATION_CODE="Crunch_4Science"
+BOINC_APP_HELPTEXT=\
+"The easiest way to do something useful with this application
+is to attach it to SiDock@home BOINC project."
+
+INSTALL_PREFIX="${EPREFIX}/opt/${P}"
+
+python_check_deps() {
+ use doc || return 0
+
+ python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+ python_has_version "dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}]"
+}
+
+foreach_wrapper_job() {
+ sed -e "s:@PREFIX@:${INSTALL_PREFIX}:g" -i "${1}" || die
+}
+
+src_prepare() {
+ default
+ python_fix_shebang "${S}"/bin
+}
+
+src_configure() {
+ # very weird directory layout
+ local emesonargs=(
+ --prefix="${INSTALL_PREFIX}"
+ $(meson_use apidoc)
+ $(meson_use doc)
+ $(meson_use test tests)
+ -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+ )
+ meson_src_configure
+
+ use cpu_flags_x86_sse2 || append-cppflags "-DBUNDLE_NO_SSE"
+}
+
+src_install() {
+ meson_src_install
+ python_optimize "${D}${INSTALL_PREFIX}"/bin
+
+ if use boinc; then
+ doappinfo "${FILESDIR}"/app_info_${PV}.xml
+ dowrapper cmdock-l
+
+ # install cmdock executable
+ exeinto "$(get_project_root)"
+ exeopts --owner root --group boinc
+ newexe "${D}${INSTALL_PREFIX}"/bin/cmdock cmdock-${PV}
+
+ # install a blank file
+ touch "${T}"/docking_out || die
+ insinto "$(get_project_root)"
+ insopts --owner root --group boinc
+ doins "${T}"/docking_out
+ fi
+}
+
+pkg_postinst() {
+ optfeature "sdtether.py and sdrmsd.py scripts" "dev-python/numpy sci-chemistry/openbabel[python]"
+ use boinc && boinc-app_pkg_postinst
+}
+
+pkg_postrm() {
+ use boinc && boinc-app_pkg_postrm
+}
diff --git a/sci-biology/cmdock/files/cmdock-0.2.0-cxxopts.patch b/sci-biology/cmdock/files/cmdock-0.2.0-cxxopts.patch
new file mode 100644
index 0000000000..4d7f227957
--- /dev/null
+++ b/sci-biology/cmdock/files/cmdock-0.2.0-cxxopts.patch
@@ -0,0 +1,122 @@
+Update to cxxopts 3.0
+
+--- a/meson.build
++++ b/meson.build
+@@ -40,7 +40,7 @@ if cpp_compiler.get_id() == 'msvc'
+ message('Applying workaround for MSVC by adding flag /Zc:twoPhase-: https://stackoverflow.com/questions/56782470/why-do-i-have-warning-c4199-two-phase-name-lookup-is-not-supported-for-c-cli')
+ endif
+
+-cxxopts_dep = dependency('cxxopts', fallback : ['cxxopts', 'cxxopts_dep'])
++cxxopts_dep = dependency('cxxopts', version : '>=3.0', fallback : ['cxxopts', 'cxxopts_dep'])
+ eigen3_dep = dependency('eigen3', fallback : ['eigen', 'eigen_dep'])
+ openmp_dep = dependency('openmp', required : false)
+
+diff --git a/src/exe/cmcavity.cxx b/src/exe/cmcavity.cxx
+index 427d3c0..3a5c747 100644
+--- a/src/exe/cmcavity.cxx
++++ b/src/exe/cmcavity.cxx
+@@ -41,7 +41,7 @@ void PrintHeaderAddon(std::ostream &outputStream) {
+ // MAIN PROGRAM STARTS HERE
+ /////////////////////////////////////////////////////////////////////
+
+-int main(int argc, char *argv[]) {
++int main(const int argc, const char *argv[]) {
+ // Handle obsolete arguments, if any
+ for (int i = 0; i < argc; i++) {
+ std::string opt = argv[i];
+@@ -451,7 +451,7 @@ int main(int argc, char *argv[]) {
+
+ logFile.close();
+ }
+- } catch (const cxxopts::OptionException &e) {
++ } catch (const cxxopts::exceptions::exception &e) {
+ std::cout << "Error parsing options: " << e.what() << std::endl;
+ return 1;
+ } catch (RbtError &e) {
+@@ -463,4 +463,4 @@ int main(int argc, char *argv[]) {
+ _RBTOBJECTCOUNTER_DUMP_(std::cout)
+
+ return 0;
+-}
+\ No newline at end of file
++}
+diff --git a/src/exe/cmdock.cxx b/src/exe/cmdock.cxx
+index 10e18ca..86bbff1 100644
+--- a/src/exe/cmdock.cxx
++++ b/src/exe/cmdock.cxx
+@@ -80,7 +80,7 @@ void printHelpFooter() {
+ // MAIN PROGRAM STARTS HERE
+ /////////////////////////////////////////////////////////////////////
+
+-int main(int argc, char *argv[]) {
++int main(const int argc, const char *argv[]) {
+ // Handle premature termination
+ signal (SIGINT, terminator);
+
+@@ -941,7 +941,7 @@ int main(int argc, char *argv[]) {
+ log << "Thank you for using " << Rbt::GetProgramName() << " "
+ << Rbt::GetVersion() << "." << std::endl;
+ logFile.close();
+- } catch (const cxxopts::OptionException &e) {
++ } catch (const cxxopts::exceptions::exception &e) {
+ std::cout << "Error parsing options: " << e.what() << std::endl;
+ return 1;
+ } catch (RbtError &e) {
+@@ -953,4 +953,4 @@ int main(int argc, char *argv[]) {
+ _RBTOBJECTCOUNTER_DUMP_(std::cout)
+
+ return 0;
+-}
+\ No newline at end of file
++}
+diff --git a/src/exe/cmmoegrid.cxx b/src/exe/cmmoegrid.cxx
+index 4bff8f3..bf74b52 100644
+--- a/src/exe/cmmoegrid.cxx
++++ b/src/exe/cmmoegrid.cxx
+@@ -57,7 +57,7 @@ RbtModelList CreateProbes(std::string anAtomTypeStr) {
+ // MAIN PROGRAM STARTS HERE
+ /////////////////////////////////////////////////////////////////////
+
+-int main(int argc, char *argv[]) {
++int main(const int argc, const char *argv[]) {
+ std::cout.setf(std::ios_base::left, std::ios_base::adjustfield);
+
+ // Strip off the path to the executable, leaving just the file name
+@@ -268,7 +268,7 @@ int main(int argc, char *argv[]) {
+ }
+ std::cout << "done." << std::endl;
+ }
+- } catch (const cxxopts::OptionException &e) {
++ } catch (const cxxopts::exceptions::exception &e) {
+ std::cout << "Error parsing options: " << e.what() << std::endl;
+ return 1;
+ } catch (RbtError &e) {
+diff --git a/src/exe/cmzip.cxx b/src/exe/cmzip.cxx
+index 1d1f69a..043d7be 100644
+--- a/src/exe/cmzip.cxx
++++ b/src/exe/cmzip.cxx
+@@ -504,7 +504,7 @@ void rescue(cxxopts::ParseResult result){
+ }
+
+ // ENTRY POINT
+-int main(int argc, char *argv[]) {
++int main(const int argc, const char *argv[]) {
+ // Handle premature termination
+ signal (SIGINT, terminator);
+
+@@ -580,7 +580,7 @@ Use this if CmDock terminates prematurely. CmZIP will search for records in the
+ return 0;
+ }
+
+- } catch (const cxxopts::OptionException &e) {
++ } catch (const cxxopts::exceptions::exception &e) {
+ std::cout << "Error parsing options: " << e.what() << std::endl;
+ return 1;
+ } catch (const std::exception &exc) {
+@@ -589,4 +589,4 @@ Use this if CmDock terminates prematurely. CmZIP will search for records in the
+ /*} catch (...) {
+ std::cout << "Unknown exception" << std::endl;
+ }*/
+-}
+\ No newline at end of file
++}
diff --git a/sci-biology/cmdock/files/cmdock-0.2.0-include.patch b/sci-biology/cmdock/files/cmdock-0.2.0-include.patch
new file mode 100644
index 0000000000..b4a6e80bb0
--- /dev/null
+++ b/sci-biology/cmdock/files/cmdock-0.2.0-include.patch
@@ -0,0 +1,19 @@
+Rbt.cxx: Add missing include
+
+--- a/src/lib/Rbt.cxx
++++ b/src/lib/Rbt.cxx
+@@ -15,6 +15,7 @@
+ #include <algorithm> //For sort
+ #include <climits> //For PATH_MAX
+ #include <cstdlib> //For getenv
++#include <cstdint> //For int types
+ #include <ctime> //For time functions
+ #include <dirent.h> //For directory handling
+ #include <fstream> //For ifstream
+@@ -581,4 +582,4 @@ bool Rbt::endsWith (std::string const &fullString, std::string const &ending) {
+ } else {
+ return false;
+ }
+-}
+\ No newline at end of file
++}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-biology/cmdock/files/, sci-biology/cmdock/
@ 2024-07-14 15:27 Haelwenn Monnier
0 siblings, 0 replies; 6+ messages in thread
From: Haelwenn Monnier @ 2024-07-14 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 1a76004eaaa74e01bdbe8f2afacac8306fbe6d6f
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Jul 9 15:56:46 2024 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sun Jul 14 07:27:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a76004e
sci-biology/cmdock: boinc fixes
* Update cmdline to the upstream current. Particularly, the option that
causes CmDock to get stuck in an infinite loop in 1-5% of runs is
removed.
* Sync with boinc-app.eclass updates.
Closes: https://bugs.gentoo.org/935231
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
...dock-0.2.0-r1.ebuild => cmdock-0.2.0-r2.ebuild} | 25 +++++++++++-----------
.../{app_info_0.2.0.xml => app_info_0.2.0-r1.xml} | 14 ++++++------
...k-l_job_0.2.0.xml => cmdock-l_job_0.2.0-r1.xml} | 2 +-
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild b/sci-biology/cmdock/cmdock-0.2.0-r2.ebuild
similarity index 83%
rename from sci-biology/cmdock/cmdock-0.2.0-r1.ebuild
rename to sci-biology/cmdock/cmdock-0.2.0-r2.ebuild
index f46747447..55e83bffb 100644
--- a/sci-biology/cmdock/cmdock-0.2.0-r1.ebuild
+++ b/sci-biology/cmdock/cmdock-0.2.0-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-BOINC_APP_OPTIONAL="true"
+BOINC_APP_OPTIONAL=1
inherit boinc-app flag-o-matic meson optfeature python-any-r1
DESCRIPTION="Program for docking ligands to proteins and nucleic acids"
@@ -15,14 +15,11 @@ S="${WORKDIR}/${PN}-v${PV}"
LICENSE="LGPL-3 ZLIB"
SLOT="0/${PV}"
KEYWORDS="~amd64"
-IUSE="apidoc boinc cpu_flags_x86_sse2 doc test"
+IUSE="apidoc cpu_flags_x86_sse2 doc test"
# Flaky tests
RESTRICT="test"
-RDEPEND="
- boinc? ( sci-misc/boinc-wrapper )
-"
DEPEND="
dev-cpp/eigen:3
>=dev-cpp/indicators-2.3-r1
@@ -58,6 +55,8 @@ is to attach it to SiDock@home BOINC project."
INSTALL_PREFIX="${EPREFIX}/opt/${P}"
+boinc-app_add_deps
+
python_check_deps() {
use doc || return 0
@@ -77,7 +76,7 @@ src_prepare() {
src_configure() {
# very weird directory layout
local emesonargs=(
- --prefix="${INSTALL_PREFIX}"
+ --prefix="${INSTALL_PREFIX:?}"
$(meson_use apidoc)
$(meson_use doc)
$(meson_use test tests)
@@ -90,22 +89,22 @@ src_configure() {
src_install() {
meson_src_install
- python_optimize "${D}${INSTALL_PREFIX}"/bin
+ python_optimize "${D}${INSTALL_PREFIX:?}"/bin
if use boinc; then
- doappinfo "${FILESDIR}"/app_info_${PV}.xml
- dowrapper cmdock-l
+ boinc_install_appinfo "${FILESDIR}"/app_info_0.2.0-r1.xml
+ boinc_install_wrapper cmdock-l_wrapper \
+ "${FILESDIR}"/cmdock-l_job_0.2.0-r1.xml cmdock-l_job.xml
# install cmdock executable
exeinto "$(get_project_root)"
exeopts --owner root --group boinc
- newexe "${D}${INSTALL_PREFIX}"/bin/cmdock cmdock-${PV}
+ doexe "${D}${INSTALL_PREFIX:?}"/bin/cmdock
# install a blank file
- touch "${T}"/docking_out || die
insinto "$(get_project_root)"
- insopts --owner root --group boinc
- doins "${T}"/docking_out
+ insopts -m 0644 --owner root --group boinc
+ newins - docking_out
fi
}
diff --git a/sci-biology/cmdock/files/app_info_0.2.0.xml b/sci-biology/cmdock/files/app_info_0.2.0-r1.xml
similarity index 68%
rename from sci-biology/cmdock/files/app_info_0.2.0.xml
rename to sci-biology/cmdock/files/app_info_0.2.0-r1.xml
index ad23f7890..b9eb040fb 100644
--- a/sci-biology/cmdock/files/app_info_0.2.0.xml
+++ b/sci-biology/cmdock/files/app_info_0.2.0-r1.xml
@@ -1,22 +1,22 @@
<app_info>
<app>
<name>cmdock-l</name>
- <user_friendly_name>CurieMarieDock 0.2.0 long tasks</user_friendly_name>
+ <user_friendly_name>CurieMarieDock @PV@ long tasks</user_friendly_name>
</app>
<file_info>
- <name>cmdock-l_wrapper_@PV@</name>
+ <name>cmdock-l_wrapper</name>
<sticky/>
<executable/>
</file_info>
<file_info>
- <name>cmdock-@PV@</name>
+ <name>cmdock</name>
<sticky/>
<executable/>
</file_info>
<file_info>
- <name>cmdock-l_job_@PV@.xml</name>
+ <name>cmdock-l_job.xml</name>
<sticky/>
</file_info>
<file_info>
@@ -28,16 +28,16 @@
<app_name>cmdock-l</app_name>
<version_num>100</version_num>
<file_ref>
- <file_name>cmdock-l_wrapper_@PV@</file_name>
+ <file_name>cmdock-l_wrapper</file_name>
<main_program/>
</file_ref>
<file_ref>
- <file_name>cmdock-@PV@</file_name>
+ <file_name>cmdock</file_name>
<open_name>cmdock</open_name>
<copy_file/>
</file_ref>
<file_ref>
- <file_name>cmdock-l_job_@PV@.xml</file_name>
+ <file_name>cmdock-l_job.xml</file_name>
<open_name>job.xml</open_name>
<copy_file/>
</file_ref>
diff --git a/sci-biology/cmdock/files/cmdock-l_job_0.2.0.xml b/sci-biology/cmdock/files/cmdock-l_job_0.2.0-r1.xml
similarity index 77%
rename from sci-biology/cmdock/files/cmdock-l_job_0.2.0.xml
rename to sci-biology/cmdock/files/cmdock-l_job_0.2.0-r1.xml
index a163eb29c..6d626fb82 100644
--- a/sci-biology/cmdock/files/cmdock-l_job_0.2.0.xml
+++ b/sci-biology/cmdock/files/cmdock-l_job_0.2.0-r1.xml
@@ -2,7 +2,7 @@
<task>
<application>cmdock</application>
<stdout_filename>docking_log</stdout_filename>
- <command_line>-c -j 1 -b 1 -x -r target.prm -p "@PREFIX@/data/scripts/dock.prm" -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
+ <command_line>-c -j 1 -b 1 -r target.prm -p "@PREFIX@/data/scripts/dock.prm" -f htvs.ptc -i ligands.sdf -o docking_out</command_line>
<checkpoint_filename>docking_out.chk</checkpoint_filename>
<fraction_done_filename>docking_out.progress</fraction_done_filename>
<setenv>CMDOCK_ROOT=@PREFIX@</setenv>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-14 15:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-09 12:03 [gentoo-commits] repo/proj/guru:master commit in: sci-biology/cmdock/files/, sci-biology/cmdock/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-07-14 15:27 Haelwenn Monnier
2023-01-08 10:27 Florian Schmaus
2021-07-01 5:20 Jian Lin
2021-05-30 14:47 Andrew Ammerlaan
2021-05-21 14:10 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox