[gentoo-commits] repo/gentoo:master commit in: sci-visualization/pyxplot/

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/pyxplot/

[Justin Lecher]

commit:     972046e5fc9ea9a6c844f1f8360f61e4f085bdf7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 10:50:42 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 10:50:42 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972046e5

sci-visualization/pyxplot: Clean old

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

 sci-visualization/pyxplot/Manifest             |  1 -
 sci-visualization/pyxplot/pyxplot-0.7.1.ebuild | 46 --------------------------
 sci-visualization/pyxplot/pyxplot-0.9.2.ebuild |  2 +-
 3 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/sci-visualization/pyxplot/Manifest b/sci-visualization/pyxplot/Manifest
index dd31f92..b2dd41e 100644
--- a/sci-visualization/pyxplot/Manifest
+++ b/sci-visualization/pyxplot/Manifest
@@ -1,2 +1 @@
-DIST pyxplot_0.7.1.tar.gz 2439857 SHA256 262b4337c1fdb8e54c11eb76415b814243f6dbab28163fd1e208378d860d2a84
 DIST pyxplot_0.9.2.tar.gz 4131841 SHA256 1c592a0bc77caec445a8d72534471c01d66ca1806309e6c983847c2e0b95e689 SHA512 34c43fec36dd579161c7adb9f0bab012c5d3e59c904526f82a70a31685b88a231c300ab4dbdff376b29fdd5698c376d55f7a2f2786d7960c4de7e6e0776fa844 WHIRLPOOL f380489231f01ad81f983bb7fe11fb0323ca3d5dedeb60c84739e122c567e3581bb04962ecf83f21751d49a773d129b2b332b0aed4e9192ec064b5ee14714881

diff --git a/sci-visualization/pyxplot/pyxplot-0.7.1.ebuild b/sci-visualization/pyxplot/pyxplot-0.7.1.ebuild
deleted file mode 100644
index e9a3039..0000000
--- a/sci-visualization/pyxplot/pyxplot-0.7.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="Gnuplot like graphing program publication-quality figures"
-HOMEPAGE="http://www.pyxplot.org.uk/"
-SRC_URI="http://www.pyxplot.org.uk/src/${PN}_${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/latex-base
-	sci-libs/scipy
-	app-text/gv
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e "s:^\(USRDIR=\).*:\1/usr:g" \
-		-e "s:^\(SRCDIR=\).*:\1$(python_get_sitedir)/${PN}:g" \
-		-e 's:^\(MANDIR=\).*:\1${USRDIR}/share/man/man1:g' \
-		-e "s:^\(DOCDIR=\).*:\1\${USRDIR}/share/doc/${PF}:g" \
-		-e '/install:/,$s:${\(SRC\|BIN\|DOC\|MAN\)DIR:${DESTDIR}/${\1DIR:g' \
-		-e "/pyc/d" \
-		-e 's/ex_\*/{ex_,fig}\*/' \
-		Makefile.skel || die "sed Makefile.skel failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS ChangeLog
-}

diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
index f65657e..b4cc6cf 100644
--- a/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
@@ -20,7 +20,7 @@ IUSE=""
 RDEPEND="
 	app-text/gv
 	dev-libs/libxml2:2
-	media-libs/libpng
+	media-libs/libpng:0
 	sci-libs/cfitsio
 	sci-libs/fftw:3.0
 	sci-libs/gsl

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/pyxplot/

[David Seifert]

commit:     d6ce208fe4df470a8e1bc3161a7bb1660722b230
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 19:21:55 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 19:46:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6ce208f

sci-visualization/pyxplot: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../pyxplot/{pyxplot-0.9.2.ebuild => pyxplot-0.9.2-r1.ebuild}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
similarity index 88%
rename from sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
rename to sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
index b4cc6cfe54..2360e44164 100644
--- a/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,7 @@ RDEPEND="
 	sci-libs/gsl
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	virtual/latex-base
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+	virtual/imagemagick-tools"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/pyxplot/

[David Seifert]

commit:     5a32cbeb9f1b35438d93db64eb4ba8a98b3ed7bc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 16:05:33 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 16:39:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a32cbeb

sci-visualization/pyxplot: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
index da940bdc1a6..61451371008 100644
--- a/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
@@ -15,23 +15,25 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	app-text/gv
 	dev-libs/libxml2:2
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	sci-libs/cfitsio
-	sci-libs/fftw:3.0
+	sci-libs/fftw:3.0=
 	sci-libs/gsl
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	virtual/latex-base
-	virtual/imagemagick-tools"
+	virtual/imagemagick-tools
+	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
 	sed \
-		-e "s:/usr/local:${EROOT}usr/:" \
+		-e "s:/usr/local:${EPREFIX}/usr/:" \
 		-e "s:/lib/:/$(get_libdir)/:" \
 		-e "s:/doc/${PN}:/doc/${PF}:" \
 		-i Makefile.skel || die "sed Makefile.skel failed"

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/pyxplot/

[Michał Górny]

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

sci-visualization/pyxplot: Permit scipy-python2

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

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

diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild
similarity index 87%
rename from sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
rename to sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild
index 61451371008..7ecda5c36f0 100644
--- a/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2-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
@@ -24,7 +24,10 @@ RDEPEND="
 	sci-libs/cfitsio
 	sci-libs/fftw:3.0=
 	sci-libs/gsl
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	|| (
+		sci-libs/scipy-python2[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
 	virtual/latex-base
 	virtual/imagemagick-tools
 	${PYTHON_DEPS}"

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/pyxplot/

[Michał Górny]

commit:     ce95489b3535a06db2f503055060d52bf48db30d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 19:13:09 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:35:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce95489b

sci-visualization/pyxplot: Switch to PYTHON_MULTI_USEDEP API

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

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

diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
similarity index 87%
rename from sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild
rename to sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
index 7ecda5c36f0..7cc957e134b 100644
--- a/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
@@ -24,10 +24,12 @@ RDEPEND="
 	sci-libs/cfitsio
 	sci-libs/fftw:3.0=
 	sci-libs/gsl
-	|| (
-		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}]
+		)
+	')
 	virtual/latex-base
 	virtual/imagemagick-tools
 	${PYTHON_DEPS}"