gentoo resync : 16.01.2020

9 files changed, 12 insertions, 167 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 7dd8fe57bdb9..2cd83f74696c 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 78fe6c6d3976..66277da6475b 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,7 +1,3 @@
-DIST gpxsee-7.15.tar.gz 4696645 BLAKE2B 92b88c95f83cc769b54204451fd6b0ed03144e2db3711672062e586ef3b97ca5cec9bdcdf6ed2b764d14e76d4efa387ffd6ad9d8f2c588f972c8cf5ee50e06a6 SHA512 9a9c1f577cdb1d2b4008f2e3ff00da801373bd8bac89d1aef3198e0a640191d4c9dd64f4e2483e3c536ad1a51b6389d10a8b1cb8224ec5baab79a8f92a1c2bf1
-DIST gpxsee-7.17.tar.gz 4996230 BLAKE2B e6f267466837ad16793b99b14c535d005154e10dc5ebe35a242ce766eff6f63c4476add36f67c4e4b3ad7604272d5b283b898b35bfdc09bb51be2e66e017331a SHA512 93be78863c96b82a49ae4eab742ab5e075b5fee9372bb016cfbb9b74941217c348a4d7834934e72641a2e474f16bc0d5e51927420e171e454b7bebffea5fcecb
 DIST gpxsee-7.18.tar.gz 5006604 BLAKE2B b7568a677e3cff08903d862921ace01374a594e216b1bd9eda457a92f700ef232b5804dff24696ee0574bcbe1d4e8a103dac6b5db33482cb0139f73b21852883 SHA512 562944a14ac2af4ec6837e77a6610b8ad7d254ffada4202e589c05a4306c0410e815212d7a7847708c50de72fa21a02d41bf5152f5d5f313c96da5b2516138fd
-EBUILD gpxsee-7.15.ebuild 1383 BLAKE2B 66f291c8833ec14210cc81295557cd0694f4aa42f8473cb587bc93255f0a7fddab00daf4e263ee98d7dd73292e185dd13efceb54f9927bd6a512a74a32d477dc SHA512 f606c24b11b61f69325a5c76c6c4489856f9d3cd210292302bc9445fb398b7ecbbd7fffa75ca56a12d6ca0aa8f384c2fa4ccba3e7cba90cb9741b629827088c2
-EBUILD gpxsee-7.17.ebuild 1332 BLAKE2B d81beb7c3324c754a348375791307dc8fd0fe97a43d7df280e6e2c49889248a40709f865129df067821cd63429852419f7396536df2514e8d4c3ccb2e9c8b639 SHA512 67cc7da60184ee62d7b7050c3e9fb11c754ff616fa064d86db2316adfe792f89213a44a3fac26b3db60a62c918aad89f56f20667c39fb5540297b85d7775c9c7
 EBUILD gpxsee-7.18.ebuild 1330 BLAKE2B 55fbeb2d5ec0f423be33378c5a30b1aad457f8a39cc70d1466db18f8bdc0a9b530ecb54273721dabbe9423198dbcba67c5b6bebdd86e51ab36d8fec516398a28 SHA512 fedc7457011576ce608610be5f97507ddb7465508f001151ca30f8aef469b06832ccb62d687b7521f7dd88e5e82d0e830cf6e1d6bece6b887a47a1dadd902313
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.15.ebuild b/sci-geosciences/gpxsee/gpxsee-7.15.ebuild
deleted file mode 100644
index 3b81f7fe5b94..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.15.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en es fi fr nb pl pt_BR pt_PT ru sv tr"
-inherit qmake-utils l10n xdg
-
-MY_PN="GPXSee"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="https://www.gpxsee.org/"
-SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	l10n_find_plocales_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	l10n_for_each_disabled_locale_do rm_ts
-}
-
-src_compile() {
-	lrelease gpxsee.pro
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	local lang
-	dobin ${PN}
-	dodoc README.md
-	insinto /usr/share/${PN}
-	doins -r pkg/maps pkg/csv
-
-	insinto /usr/share/${PN}/translations
-	for lang in lang/*.qm; do
-		[ -f "${lang}" ] && doins "${lang}"
-	done
-
-	insinto /usr/share/applications
-	doins pkg/${PN}.desktop
-	insinto /usr/share/mime/packages
-	doins pkg/${PN}.xml
-	insinto /usr/share/pixmaps
-	doins icons/${PN}.png
-}
diff --git a/sci-geosciences/gpxsee/gpxsee-7.17.ebuild b/sci-geosciences/gpxsee/gpxsee-7.17.ebuild
deleted file mode 100644
index b7ebc18f0f55..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.17.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en es fi fr nb pl pt_BR pt_PT ru sv tr"
-inherit desktop qmake-utils l10n xdg
-
-MY_PN="GPXSee"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="https://www.gpxsee.org/"
-SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	l10n_find_plocales_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	l10n_for_each_disabled_locale_do rm_ts
-}
-
-src_compile() {
-	lrelease gpxsee.pro
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	local lang
-	dobin ${PN}
-	dodoc README.md
-	insinto /usr/share/${PN}
-	doins -r pkg/maps pkg/csv
-
-	insinto /usr/share/${PN}/translations
-	for lang in lang/*.qm; do
-		[ -f "${lang}" ] && doins "${lang}"
-	done
-
-	domenu pkg/${PN}.desktop
-	insinto /usr/share/mime/packages
-	doins pkg/${PN}.xml
-	doicon icons/${PN}.png
-}
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index b4d2e6c06c37..620ea85817f6 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +1,5 @@
 AUX grass-7.0.1-declare-inespg.patch 647 BLAKE2B ec303cc88965ff24d9521a3d2fdec3cd62f14bb9830a37942aa3373acc5351b07022f782c8f22f560bbf1f794fd46fa524b7ddab07a360c3e6f34cf3c1258972 SHA512 9206619090c0f138c734f7fe48467cd343cd01120ac4d7eaec3d822b7cac1cbc6e4630bfedd68e7bdd6966716116a1d6714faf373a1eceb08726acd16ca34bb4
 DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83
-EBUILD grass-7.4.4-r1.ebuild 7322 BLAKE2B 8bd30457804762af01629060e8bf5320f7749d2fb65f11a9e3d66d1debcc9cb0915841b8cb970ccb1dbdeacd1d2ba5f6c157a4cb12a5e7f60dd4830671cae43c SHA512 31221c1d9cfebf0bc02afd838a905b0042b7b9f3fb8d4f7f581868098da1a578046ca6234f8adfb2bdddeb097706906166dae5193910c564736f3c2254fbd8e4
-EBUILD grass-7.4.4.ebuild 7333 BLAKE2B b42f1776211b07f341982bad5f2153e30d67a8e7f7d30171795cda9fc3880212f7762e621359df049d550cd0f64c659f8a8cbcc085f4848eaf8c360a36f716a9 SHA512 0343ff9a4e7451c9c074b10cb4f10e559ab613172d4c4eca41e48e17ad55ef085a925b04e84746c5c4d39bc62ddb032be55a4f2d62b04811e79d20f8dc5ef83b
+EBUILD grass-7.4.4-r1.ebuild 7377 BLAKE2B 9a57d8e09c6a00371569730cbf81d80005de31f053f9818d50b2dafe755ef6b047cba59d513c2cb7a568bba4bb49162842017ca3349bf8646fb2a8691b745e09 SHA512 f7ee0cb8a850bcb6318962197123f5ea0f2f4e8c347386a400e8905556ab5a9ecb152cb1f7ba16ba07252667af22258ce3ad0396933f13f4c5548fcc51390c2b
+EBUILD grass-7.4.4.ebuild 7388 BLAKE2B aa8f400ff439b80be56b82c143d66839d28ce107183f6041e6d40af21205cd12d028598280567777f2a8842c41027a5da888226e94dbfc1077560a12723f5606 SHA512 811b4d33adec006ff2c9d40682d6e7e04953a0225101fadeb8292df4327c2c4b2b305cf131455dd6119c615c5b3b83d8afe6808e06bfb581f401ae324213db14
 MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635
diff --git a/sci-geosciences/grass/grass-7.4.4-r1.ebuild b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
index 5c87d32bf2ab..4fc916183868 100644
--- a/sci-geosciences/grass/grass-7.4.4-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,10 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm
 
 RDEPEND="${PYTHON_DEPS}
 	>=app-admin/eselect-1.2
-	dev-python/numpy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	media-libs/libprojectm
 	sci-libs/gdal
 	sys-libs/gdbm
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
index e067fbf0aaa6..e875e74c7586 100644
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,10 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm
 
 RDEPEND="${PYTHON_DEPS}
 	>=app-admin/eselect-1.2
-	dev-python/numpy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	media-libs/libprojectm
 	sci-libs/gdal
 	sys-libs/gdbm
diff --git a/sci-geosciences/seawater/Manifest b/sci-geosciences/seawater/Manifest
index c81b1181c57a..9e6f3310b21e 100644
--- a/sci-geosciences/seawater/Manifest
+++ b/sci-geosciences/seawater/Manifest
@@ -1,5 +1,3 @@
-DIST seawater-2.0.1.tar.gz 2680741 BLAKE2B 5c1e8f5bd3cdc7a093732657d8d774f13d9a00785ea736617b8837076e740eab384caa61ae11b6f429db7bcf57f0ee1af8fd0c6dc917f3c3b50b25ee93a88920 SHA512 9d59d5c41f46311240934e18b8727514babc4e714553ba595017a17b95edf040c10ac7161f607c7e262c751e238a909d55a639a94fab4d4ce004a4c297af1e79
 DIST seawater-3.3.4.tar.gz 22899 BLAKE2B 1f3af9e1d592b2c7075711f0431dc9198c41047e46cefcbc2466eaad92bad1e9894e63e6d3846d08df00ad21df8dc773cd1822915896658fe06e298ed36b83ef SHA512 1e448c0473809ae5022eda6b695d67db85a22767d068d7a025bdb1ad49a09f0f336e5f43b6a2fd869d39082895e45e7fa4ae2af98c1f2d613d28393f88ef27af
-EBUILD seawater-2.0.1.ebuild 520 BLAKE2B b87325fd786d4e96daf1d6eb719c42819131be62214453bfb1b85baf6a94542eaaeb21f70f0b9ec00782343aad93c262955a3b6c453056e210d241940dd6f53f SHA512 db55bd174ef4eb586674c53abdeef1b2bdbb339a9cd190c0de1fda345438b9c8f72e5b8c8a3274690a2fe92662c2312dbeec01bbd24a6e6ace6994fccc2dbcc9
 EBUILD seawater-3.3.4.ebuild 705 BLAKE2B 16955bce2a350a13d8cff521ae4b7763319be13335d1adb844d3051d87283a7ce8f459e44a06b76989ca65e601026eed7db032224429f513c794987f3e1c49fb SHA512 b64c1bd107baf5f62bcab1ee796ea226097f8f1163708b54a893643e23e7282584e67474ed6b05a3890784d656ab0825e89acecc2364cfa17bb3aeb6d84bdefb
 MISC metadata.xml 243 BLAKE2B 511a8c3d7ae43c1e12c29835e6e64860728fa8446694b8e48b9c817e7efdb1fcd732ef7bfb231f86ae975836d402a9aece805234cba7c65efbe2f24d29558e53 SHA512 8dd5436eaded32c4c5bbf8bd6026ec0089cdf1ed92d43acbf535a8a711d1ce07a4d9650efe4bbdb9c5fa355b2aca45b4e40cbf94c34e14213adb2cbfbc9ec140
diff --git a/sci-geosciences/seawater/seawater-2.0.1.ebuild b/sci-geosciences/seawater/seawater-2.0.1.ebuild
deleted file mode 100644
index 324d8ac5d09c..000000000000
--- a/sci-geosciences/seawater/seawater-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Calculate properties of sea water. Similar to SEAWATER 3.2 for MATLAB"
-HOMEPAGE="https://pypi.org/project/seawater/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-
-DOCS=( "${S}"/docs/. )