From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 5 Feb 2020 18:44:56 +0000
Subject: gentoo resync : 05.02.2020

---
 sci-chemistry/prodecomp/Manifest                |  2 +-
 sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild | 48 -----------------------
 sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild | 51 +++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 49 deletions(-)
 delete mode 100644 sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
 create mode 100644 sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild

(limited to 'sci-chemistry/prodecomp')

diff --git a/sci-chemistry/prodecomp/Manifest b/sci-chemistry/prodecomp/Manifest
index e19bbf5f4bc4..fe180d2bdaba 100644
--- a/sci-chemistry/prodecomp/Manifest
+++ b/sci-chemistry/prodecomp/Manifest
@@ -1,3 +1,3 @@
 DIST prodecomp-3.0.tar.bz2 18377446 BLAKE2B c6b4acf20a76029fc34eaea7a0adf1a04fb727b2e246fbcad27e2fa2bea606b2e712fb986fdd3e534534b32a22acae58a00bc2a3c6bde893d5befe91696523d3 SHA512 8d23f174e125d4c7776432a37b063d2f39af8497050bd7f7ff358c67d509b1eef2c2865596efae632855fd583fb52c233b67d0e667c6c2a03ba6f5a2f2ac9b0d
-EBUILD prodecomp-3.0-r1.ebuild 1096 BLAKE2B ea880fff06ebdfc68c51aececf5064f63a6ec2fc1d183f2041d73f633c592d73282ee0635dff24a903be2e62ce2bc1307d3d6e35001d9b41009f57d1db9222fb SHA512 163404741f8cdfcc6e8c550850f79470d9a7c0accf73386351c5ce9ad2068fe0aed5316b346144b888cd5726f2b80312d1d5bcf3476c13b6009279e0c71b3362
+EBUILD prodecomp-3.0-r2.ebuild 1146 BLAKE2B fd477a14bd9e47bc8857446fc072633301f6114f30dfcc27997fc7b3d58c52a384ae8b7391bcb58f6bc23db1bbc24e0be0c7b010c971fb4d4e27c34355a38abb SHA512 b914399f357dfd514f55a82c1fb65b752725f62f0025ecdbe6524c6f0191ede74c629852d80e3c4998928649168702aa91361258c22473f499f76c3a3c4ebfc7
 MISC metadata.xml 825 BLAKE2B 6874942c301b7d68f9184de8eb7482b790d2bd51c3a853132da3ed7bb0eacf54f608f816965bbfb27b81b90fecc3eee77596d73a78f5ec67703c53ad2bc2556d SHA512 94e41d5648ac93257f11f305bf2aaf926cc103240beec884142cda42c3d4e4fae5629e26b43cd945c945af706d5b5172fcd2c30ec6cb9067b152a22cd09bddcf
diff --git a/sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild b/sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
deleted file mode 100644
index ad5fb6271a2b..000000000000
--- a/sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit python-single-r1
-
-DESCRIPTION="Decomposition-based analysis of NMR projections"
-HOMEPAGE="http://www.lundberg.gu.se/nmr/software.php?program=PRODECOMP"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sci-libs/scipy[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/NMRProjAnalys
-
-src_install() {
-	python_export
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r ExampleData Results
-	fi
-
-	dodoc ProjTools/Manual.pdf
-	rm -rf ProjTools/Manual.pdf ProdecompOutput || die
-
-	python_moduleinto ${PN}
-	python_domodule ProjTools/.
-	python_optimize
-
-	cat >> "${T}"/${PN} <<- EOF
-	#!/bin/bash
-	${PYTHON} -O $(python_get_sitedir)/${PN}/ProjAnalys.py \$@
-	EOF
-	dobin "${T}"/${PN}
-
-	dosym ../../../../share/doc/${PF}/Manual.pdf "${PYTHON_SITEDIR##${EPREFIX}}"/${PN}/Manual.pdf
-}
diff --git a/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild b/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
new file mode 100644
index 000000000000..e66cac2b0b4f
--- /dev/null
+++ b/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1
+
+DESCRIPTION="Decomposition-based analysis of NMR projections"
+HOMEPAGE="http://www.lundberg.gu.se/nmr/software.php?program=PRODECOMP"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	|| (
+		sci-libs/scipy-python2[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/NMRProjAnalys
+
+src_install() {
+	python_export
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r ExampleData Results
+	fi
+
+	dodoc ProjTools/Manual.pdf
+	rm -rf ProjTools/Manual.pdf ProdecompOutput || die
+
+	python_moduleinto ${PN}
+	python_domodule ProjTools/.
+	python_optimize
+
+	cat >> "${T}"/${PN} <<- EOF
+	#!/bin/bash
+	${PYTHON} -O $(python_get_sitedir)/${PN}/ProjAnalys.py \$@
+	EOF
+	dobin "${T}"/${PN}
+
+	dosym ../../../../share/doc/${PF}/Manual.pdf "${PYTHON_SITEDIR##${EPREFIX}}"/${PN}/Manual.pdf
+}
-- 
cgit v1.2.3