* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/tappy/
@ 2020-01-28 20:40 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-01-28 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 65c88e96e21db31b4636fed1d122dd1dbab54e61
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 20:22:50 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 20:40:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c88e96
sci-geosciences/tappy: Permit matplotlib-python2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-geosciences/tappy/tappy-0.9.0.ebuild | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/tappy/tappy-0.9.0.ebuild b/sci-geosciences/tappy/tappy-0.9.0.ebuild
index cf6423bcefa..eccc53a46c4 100644
--- a/sci-geosciences/tappy/tappy-0.9.0.ebuild
+++ b/sci-geosciences/tappy/tappy-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,6 +17,10 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
+RDEPEND="
+ || (
+ dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ )
dev-python/pywavelets
sci-libs/scipy[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/tappy/
@ 2020-01-28 21:30 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-01-28 21:30 UTC (permalink / raw
To: gentoo-commits
commit: f72e2eef382e12190f9e9cd5449a3b03b89b1bff
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 20:58:10 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 21:30:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72e2eef
sci-geosciences/tappy: PYTHON_USEDEP, anyone?!
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-geosciences/tappy/{tappy-0.9.0.ebuild => tappy-0.9.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/tappy/tappy-0.9.0.ebuild b/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild
similarity index 94%
rename from sci-geosciences/tappy/tappy-0.9.0.ebuild
rename to sci-geosciences/tappy/tappy-0.9.0-r1.ebuild
index 94e543028fc..8f6ed281d6c 100644
--- a/sci-geosciences/tappy/tappy-0.9.0.ebuild
+++ b/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
dev-python/matplotlib-python2[${PYTHON_USEDEP}]
dev-python/matplotlib[${PYTHON_USEDEP}]
)
- dev-python/pywavelets
+ dev-python/pywavelets[${PYTHON_USEDEP}]
|| (
sci-libs/scipy-python2[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/tappy/
@ 2020-01-28 21:30 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-01-28 21:30 UTC (permalink / raw
To: gentoo-commits
commit: f77515265f3fb4309d7d22e9a174c613100e0db1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 20:57:58 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 21:30:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7751526
sci-geosciences/tappy: Permit scipy-python2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-geosciences/tappy/tappy-0.9.0.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-geosciences/tappy/tappy-0.9.0.ebuild b/sci-geosciences/tappy/tappy-0.9.0.ebuild
index eccc53a46c4..94e543028fc 100644
--- a/sci-geosciences/tappy/tappy-0.9.0.ebuild
+++ b/sci-geosciences/tappy/tappy-0.9.0.ebuild
@@ -23,4 +23,7 @@ RDEPEND="
dev-python/matplotlib[${PYTHON_USEDEP}]
)
dev-python/pywavelets
- sci-libs/scipy[${PYTHON_USEDEP}]"
+ || (
+ sci-libs/scipy-python2[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ )"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/tappy/
@ 2020-03-19 7:40 Mikle Kolyada
0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2020-03-19 7:40 UTC (permalink / raw
To: gentoo-commits
commit: 21aac68f9c1b6138c3d303c3c7c79e7e86d3f128
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 19 07:40:42 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 07:40:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21aac68f
sci-geosciences/tappy: remove last-rited pkg
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
sci-geosciences/tappy/Manifest | 1 -
sci-geosciences/tappy/metadata.xml | 8 --------
sci-geosciences/tappy/tappy-0.9.0-r1.ebuild | 29 -----------------------------
3 files changed, 38 deletions(-)
diff --git a/sci-geosciences/tappy/Manifest b/sci-geosciences/tappy/Manifest
deleted file mode 100644
index cc6b620242a..00000000000
--- a/sci-geosciences/tappy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tappy-0.9.0.tar.gz 1250867 BLAKE2B e88a4744d29dfbf8f225b0167e845e9df57ad9f81d4edb840d59f05d28f99f26df7d9feb278d0ad6eedcc538fee112aae266c52aca27a3c8c780c8b1b43f1a3c SHA512 2f3c7676c166dbfe88436cac9a0c4e3d3d4c027e17c39617c45eb02c1c2eda9276afb1ceaa16afd54bb6de130248f83c8c66aeb3509483cce642d2eb631fb9df
diff --git a/sci-geosciences/tappy/metadata.xml b/sci-geosciences/tappy/metadata.xml
deleted file mode 100644
index 77c02458b0a..00000000000
--- a/sci-geosciences/tappy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">tappy</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild b/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild
deleted file mode 100644
index 8f6ed281d6c..00000000000
--- a/sci-geosciences/tappy/tappy-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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="xml"
-inherit distutils-r1
-
-DESCRIPTION="Tidal Analysis in Python breaks hourly water level into tidal components"
-HOMEPAGE="http://tappy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- || (
- dev-python/matplotlib-python2[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- )
- dev-python/pywavelets[${PYTHON_USEDEP}]
- || (
- sci-libs/scipy-python2[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- )"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-19 7:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-28 21:30 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/tappy/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-03-19 7:40 Mikle Kolyada
2020-01-28 21:30 Michał Górny
2020-01-28 20:40 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