[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/prodecomp/

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/prodecomp/

[Justin Lecher]

commit:     633d3227d5b301fe91c7ffb775789db38fa7e952
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 16:29:16 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 16:29:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633d3227

sci-chemistry/prodecomp: Fix launcher and double Prefix

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../prodecomp/{prodecomp-3.0.ebuild => prodecomp-3.0-r1.ebuild}      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/prodecomp/prodecomp-3.0.ebuild b/sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
similarity index 83%
rename from sci-chemistry/prodecomp/prodecomp-3.0.ebuild
rename to sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
index 28791c9..a424245 100644
--- a/sci-chemistry/prodecomp/prodecomp-3.0.ebuild
+++ b/sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
@@ -24,6 +24,7 @@ DEPEND=""
 S="${WORKDIR}"/NMRProjAnalys
 
 src_install() {
+	python_export
 	if use examples; then
 		insinto /usr/share/${PN}
 		doins -r ExampleData Results
@@ -38,9 +39,9 @@ src_install() {
 
 	cat >> "${T}"/${PN} <<- EOF
 	#!/bin/bash
-	${PYTHON} -O "${EPREFIX}"/$(python_get_sitedir)/${PN}/ProjAnalys.py $@
+	${PYTHON} -O $(python_get_sitedir)/${PN}/ProjAnalys.py \$@
 	EOF
 	dobin "${T}"/${PN}
 
-	dosym ../../../../share/doc/${PF}/Manual.pdf $(python_get_sitedir)/${PN}/Manual.pdf
+	dosym ../../../../share/doc/${PF}/Manual.pdf "${PYTHON_SITEDIR##${EPREFIX}}"/${PN}/Manual.pdf
 }

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/prodecomp/

[Michał Górny]

commit:     db75bd2e8c3456b678a59f48d37385b04d554f69
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 20:57:21 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 21:30:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db75bd2e

sci-chemistry/prodecomp: Permit scipy-python2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../prodecomp/{prodecomp-3.0-r1.ebuild => prodecomp-3.0-r2.ebuild} | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild b/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
similarity index 89%
rename from sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
rename to sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
index ad5fb6271a2..e66cac2b0b4 100644
--- a/sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
+++ b/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	|| (
+		sci-libs/scipy-python2[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
 
 S="${WORKDIR}"/NMRProjAnalys
 

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/prodecomp/

[Michał Górny]

commit:     378c73b1361f7381c3d99d637d485669149b5f48
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 18:00:06 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:35:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378c73b1

sci-chemistry/prodecomp: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{prodecomp-3.0-r2.ebuild => prodecomp-3.0-r3.ebuild}       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild b/sci-chemistry/prodecomp/prodecomp-3.0-r3.ebuild
similarity index 88%
rename from sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
rename to sci-chemistry/prodecomp/prodecomp-3.0-r3.ebuild
index e66cac2b0b4..65683c21b0f 100644
--- a/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
+++ b/sci-chemistry/prodecomp/prodecomp-3.0-r3.ebuild
@@ -20,10 +20,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	|| (
-		sci-libs/scipy-python2[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
+	$(python_gen_cond_dep '
+		|| (
+			sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+			sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
 
 S="${WORKDIR}"/NMRProjAnalys