[gentoo-commits] proj/sci:master commit in: sci-chemistry/MotionCor2/
commit: 3d865fde19acb3ed4feb3c9373b668aa975d7bbd Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun Jan 23 13:11:55 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Jan 23 13:11:55 2022 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3d865fde sci-chemistry/MotionCor2: fix metadata Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> sci-chemistry/MotionCor2/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/sci-chemistry/MotionCor2/metadata.xml b/sci-chemistry/MotionCor2/metadata.xml index 8571bf1df..7e9e870fd 100644 --- a/sci-chemistry/MotionCor2/metadata.xml +++ b/sci-chemistry/MotionCor2/metadata.xml @@ -9,7 +9,4 @@ ale...@gentoo.org Alexey Shvetsov - - Install cuda-10.2 version -
[gentoo-commits] proj/sci:master commit in: sci-chemistry/MotionCor2/
commit: 4cdd05c69d06fdf4400b6a19703652af2ada88c3
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Tue Jun 1 08:59:34 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Tue Jun 1 08:59:34 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4cdd05c6
sci-chemistry/MotionCor2: fix cuda flag
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
index c4d991410..7507ca26f 100644
--- a/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
+++ b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
@@ -36,7 +36,7 @@ src_install() {
# package also has 10.0 10.1 11.0 versions
# but these cuda versions are not in ::gentoo
local mcbin
- mcbin="${PN}_${PV}_Cuda102"
+ use cuda102 && mcbin="${PN}_${PV}_Cuda102"
dobin "${mcbin}"
dosym "${mcbin}" /usr/bin/MotionCor2
}
[gentoo-commits] proj/sci:master commit in: sci-chemistry/MotionCor2/
commit: 717464e1e4f838443a39d2bd22f786daf0fbd176
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Tue Jun 1 08:56:46 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Tue Jun 1 08:56:46 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=717464e1
sci-chemistry/MotionCor2: drop support for cuda 9.2
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild | 10 ++
sci-chemistry/MotionCor2/metadata.xml| 1 -
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
index 7092e39a7..c4d991410 100644
--- a/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
+++ b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
@@ -11,12 +11,10 @@ S="${WORKDIR}"/${PN}_${PV}
LICENSE="UCSF-Motioncor2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda92 +cuda102"
-REQUIRED_USE="^^ ( cuda92 cuda102 )"
+IUSE="+cuda102"
RESTRICT="fetch"
RDEPEND="
- cuda92? ( =dev-util/nvidia-cuda-toolkit-9.2* )
cuda102? ( =dev-util/nvidia-cuda-toolkit-10.2* )
media-libs/tiff
app-arch/xz-utils
@@ -38,11 +36,7 @@ src_install() {
# package also has 10.0 10.1 11.0 versions
# but these cuda versions are not in ::gentoo
local mcbin
- if use cuda92; then
- mcbin="${PN}_${PV}_Cuda92"
- elif use cuda102; then
- mcbin="${PN}_${PV}_Cuda102"
- fi
+ mcbin="${PN}_${PV}_Cuda102"
dobin "${mcbin}"
dosym "${mcbin}" /usr/bin/MotionCor2
}
diff --git a/sci-chemistry/MotionCor2/metadata.xml
b/sci-chemistry/MotionCor2/metadata.xml
index 5035d4d85..8571bf1df 100644
--- a/sci-chemistry/MotionCor2/metadata.xml
+++ b/sci-chemistry/MotionCor2/metadata.xml
@@ -10,7 +10,6 @@
Alexey Shvetsov
- Install cuda-9.2 version
Install cuda-10.2 version
[gentoo-commits] proj/sci:master commit in: sci-chemistry/MotionCor2/
commit: cb22310f695170caf0820ca126ed20831d4239d7
Author: Andrew Ammerlaan riseup net>
AuthorDate: Fri Mar 19 11:02:19 2021 +
Commit: Andrew Ammerlaan riseup net>
CommitDate: Fri Mar 19 11:02:19 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cb22310f
sci-chemistry/MotionCor2: fix MisplacedVariable
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan riseup.net>
sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
index e1f880d28..7092e39a7 100644
--- a/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
+++ b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,7 +27,7 @@ BDEPEND="app-arch/unzip"
pkg_nofetch() {
elog "Please download ${PN}_${PV}.zip from:"
elog "\t ${HOMEPAGE}"
- elog "and place it into ${DISTDIR}"
+ elog "and place it into your DISTDIR folder"
}
src_install() {
[gentoo-commits] proj/sci:master commit in: sci-chemistry/MotionCor2/
commit: c3cb98a6a4ee1d7fad29a906f2e7fda3db04526a
Author: Aisha Tammy aisha cc>
AuthorDate: Thu Dec 31 04:46:37 2020 +
Commit: Aisha Tammy aisha cc>
CommitDate: Thu Dec 31 04:46:37 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c3cb98a6
sci-chemistry/MotionCor2: add symlink to binary
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Aisha Tammy aisha.cc>
sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
index 99b3b14cd..e1f880d28 100644
--- a/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
+++ b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${PN}_${PV}
LICENSE="UCSF-Motioncor2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cuda92 cuda102"
+IUSE="cuda92 +cuda102"
REQUIRED_USE="^^ ( cuda92 cuda102 )"
RESTRICT="fetch"
@@ -37,9 +37,12 @@ src_install() {
# package also has 10.0 10.1 11.0 versions
# but these cuda versions are not in ::gentoo
+ local mcbin
if use cuda92; then
- dobin ${PN}_${PV}-Cuda92 ${PN}
+ mcbin="${PN}_${PV}_Cuda92"
elif use cuda102; then
- dobin ${PN}_${PV}-Cuda102 ${PN}
+ mcbin="${PN}_${PV}_Cuda102"
fi
+ dobin "${mcbin}"
+ dosym "${mcbin}" /usr/bin/MotionCor2
}
[gentoo-commits] proj/sci:master commit in: sci-chemistry/MotionCor2/
commit: 4f0dc74b37fd027e08f1834dc1d1604bf09716d0
Author: Aisha Tammy aisha cc>
AuthorDate: Thu Dec 31 04:41:11 2020 +
Commit: Aisha Tammy aisha cc>
CommitDate: Thu Dec 31 04:41:11 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4f0dc74b
sci-chemistry/MotionCor2: drop old version
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Aisha Tammy aisha.cc>
sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild | 49
sci-chemistry/MotionCor2/metadata.xml| 1 -
2 files changed, 50 deletions(-)
diff --git a/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
b/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
deleted file mode 100644
index 006c06b64..0
--- a/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Correction of electron beam-induced sample motion"
-HOMEPAGE="https://emcore.ucsf.edu/ucsf-motioncor2";
-SRC_URI="${PN}_${PV}.zip"
-
-LICENSE="UCSF-Motioncor2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda92 +cuda101"
-
-DEPEND="
- cuda92? ( =dev-util/nvidia-cuda-toolkit-9.2* )
- cuda101? ( =dev-util/nvidia-cuda-toolkit-10.1* )
- media-libs/tiff
- app-arch/xz-utils
- || ( media-libs/jpeg:62 media-libs/libjpeg-turbo )
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-REQUIRED_USE="^^ ( cuda92 cuda101 )"
-
-RESTRICT="fetch"
-VERSION="MotionCor2 v1.2.6 (05-22.2019, Linux) now Cuda v8.0,9.2,10.1"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
- echo
- elog "Please download ${PN}_${PV}.zip from"
- elog "${HOMEPAGE}."
- elog "Be sure to select the version ${VERSION} tarball!!"
- elog "Then move the tarball to"
- elog "${DISTDIR}/${PN}_${PV}.zip"
- echo
-}
-
-src_install() {
- dodoc MotionCor2-UserManual-09-13-2018.pdf
- if use cuda92; then
- newbin MotionCor2_1.2.6-Cuda92 ${PN}
- elif use cuda101; then
- newbin MotionCor2_1.2.6-Cuda101 ${PN}
- fi
-}
diff --git a/sci-chemistry/MotionCor2/metadata.xml
b/sci-chemistry/MotionCor2/metadata.xml
index 0cc6baff1..5035d4d85 100644
--- a/sci-chemistry/MotionCor2/metadata.xml
+++ b/sci-chemistry/MotionCor2/metadata.xml
@@ -11,7 +11,6 @@
Install cuda-9.2 version
- Install cuda-10.1 version
Install cuda-10.2 version
[gentoo-commits] proj/sci:master commit in: sci-chemistry/MotionCor2/
commit: 23e59ba220dd5688d6e61f94e6522df06c5210a1
Author: Aisha Tammy aisha cc>
AuthorDate: Thu Dec 31 04:40:32 2020 +
Commit: Aisha Tammy aisha cc>
CommitDate: Thu Dec 31 04:40:32 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=23e59ba2
sci-chemistry/MotionCor2: version bump to 1.4.6
with comments from @AndrewAmmerlaan
Closes: https://github.com/gentoo/sci/pull/1002
Package-Manager: Portage-3.0.12, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Aisha Tammy aisha.cc>
sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild | 45
sci-chemistry/MotionCor2/metadata.xml| 1 +
2 files changed, 46 insertions(+)
diff --git a/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
new file mode 100644
index 0..99b3b14cd
--- /dev/null
+++ b/sci-chemistry/MotionCor2/MotionCor2-1.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Correction of electron beam-induced sample motion"
+HOMEPAGE="https://emcore.ucsf.edu/ucsf-motioncor2";
+SRC_URI="${PN}_${PV}.zip"
+S="${WORKDIR}"/${PN}_${PV}
+
+LICENSE="UCSF-Motioncor2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda92 cuda102"
+REQUIRED_USE="^^ ( cuda92 cuda102 )"
+RESTRICT="fetch"
+
+RDEPEND="
+ cuda92? ( =dev-util/nvidia-cuda-toolkit-9.2* )
+ cuda102? ( =dev-util/nvidia-cuda-toolkit-10.2* )
+ media-libs/tiff
+ app-arch/xz-utils
+ media-libs/libjpeg-turbo
+"
+BDEPEND="app-arch/unzip"
+
+pkg_nofetch() {
+ elog "Please download ${PN}_${PV}.zip from:"
+ elog "\t ${HOMEPAGE}"
+ elog "and place it into ${DISTDIR}"
+}
+
+src_install() {
+ dodoc MotionCor2-UserManual-10-08-2020.pdf \
+ MotionCor2_1.4.0_ReleaseIntro-10-14-2020.docx
+ docompress -x /usr/share/doc/${PF}
+
+ # package also has 10.0 10.1 11.0 versions
+ # but these cuda versions are not in ::gentoo
+ if use cuda92; then
+ dobin ${PN}_${PV}-Cuda92 ${PN}
+ elif use cuda102; then
+ dobin ${PN}_${PV}-Cuda102 ${PN}
+ fi
+}
diff --git a/sci-chemistry/MotionCor2/metadata.xml
b/sci-chemistry/MotionCor2/metadata.xml
index 75c4f5d9f..0cc6baff1 100644
--- a/sci-chemistry/MotionCor2/metadata.xml
+++ b/sci-chemistry/MotionCor2/metadata.xml
@@ -12,5 +12,6 @@
Install cuda-9.2 version
Install cuda-10.1 version
+ Install cuda-10.2 version
[gentoo-commits] proj/sci:master commit in: sci-chemistry/MotionCor2/
commit: eef4f1a7c1d719e56401ae0f687b0a7e8df42317
Author: Alexey Shvetsov gentoo org>
AuthorDate: Wed Oct 30 08:43:56 2019 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Wed Oct 30 08:43:56 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=eef4f1a7
sci-chemistry/MotionCor2: Fix tarboll name
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Alexey Shvetsov gentoo.org>
sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
b/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
index 8fae639a3..006c06b64 100644
--- a/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
+++ b/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
@@ -35,7 +35,7 @@ pkg_nofetch() {
elog "${HOMEPAGE}."
elog "Be sure to select the version ${VERSION} tarball!!"
elog "Then move the tarball to"
- elog "${DISTDIR}/${P}.tar.gz"
+ elog "${DISTDIR}/${PN}_${PV}.zip"
echo
}
[gentoo-commits] proj/sci:master commit in: sci-chemistry/MotionCor2/
commit: d0ba0e33274628d86bfa3ace5efc31c0821487cd
Author: Alexey Shvetsov gentoo org>
AuthorDate: Tue Oct 29 09:09:25 2019 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Tue Oct 29 09:09:25 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d0ba0e33
sci-chemistry/MotionCor2: Add motioncor2
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Alexey Shvetsov gentoo.org>
sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild | 49
sci-chemistry/MotionCor2/metadata.xml| 16
2 files changed, 65 insertions(+)
diff --git a/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
b/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
new file mode 100644
index 0..8fae639a3
--- /dev/null
+++ b/sci-chemistry/MotionCor2/MotionCor2-1.2.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Correction of electron beam-induced sample motion"
+HOMEPAGE="https://emcore.ucsf.edu/ucsf-motioncor2";
+SRC_URI="${PN}_${PV}.zip"
+
+LICENSE="UCSF-Motioncor2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda92 +cuda101"
+
+DEPEND="
+ cuda92? ( =dev-util/nvidia-cuda-toolkit-9.2* )
+ cuda101? ( =dev-util/nvidia-cuda-toolkit-10.1* )
+ media-libs/tiff
+ app-arch/xz-utils
+ || ( media-libs/jpeg:62 media-libs/libjpeg-turbo )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+REQUIRED_USE="^^ ( cuda92 cuda101 )"
+
+RESTRICT="fetch"
+VERSION="MotionCor2 v1.2.6 (05-22.2019, Linux) now Cuda v8.0,9.2,10.1"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+ echo
+ elog "Please download ${PN}_${PV}.zip from"
+ elog "${HOMEPAGE}."
+ elog "Be sure to select the version ${VERSION} tarball!!"
+ elog "Then move the tarball to"
+ elog "${DISTDIR}/${P}.tar.gz"
+ echo
+}
+
+src_install() {
+ dodoc MotionCor2-UserManual-09-13-2018.pdf
+ if use cuda92; then
+ newbin MotionCor2_1.2.6-Cuda92 ${PN}
+ elif use cuda101; then
+ newbin MotionCor2_1.2.6-Cuda101 ${PN}
+ fi
+}
diff --git a/sci-chemistry/MotionCor2/metadata.xml
b/sci-chemistry/MotionCor2/metadata.xml
new file mode 100644
index 0..75c4f5d9f
--- /dev/null
+++ b/sci-chemistry/MotionCor2/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ sci-chemis...@gentoo.org
+ Gentoo Chemistry Project
+
+
+ ale...@gentoo.org
+ Alexey Shvetsov
+
+
+ Install cuda-9.2 version
+ Install cuda-10.1 version
+
+
