gentoo resync : 31.12.2018

4 files changed, 27 insertions, 25 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 9bd3fab9bb31..2a9e073f4d85 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest
index b5edd26bc3d5..1541d358807a 100644
--- a/sci-visualization/spyview/Manifest
+++ b/sci-visualization/spyview/Manifest
@@ -1,5 +1,4 @@
-DIST spyview-20150124-patchset.tar.bz2 8268 BLAKE2B db7a710e2d61ad4f68e9dd31834f855b122b57fa532eb047a5efd7dd02423974f47652e4770144d02a317bf5a50c0ff852fd752ab331bad0c9efe237905916e0 SHA512 615465056df3786e18d5916dea0ad8ebd31c37ddf6531b85c080f53e0d9776c4f7519bd160ca8a0f29343b2f9fad40abef8d6b7194c4e54d6e2e14557562cc49
-DIST spyview-20150124.tgz 14772947 BLAKE2B 18d3298e0498c4be91065c8651d379428541f3156ec7f2f0a6970ce5caafaa81da2ff6fbfcca42d77cfffedd293484aad19c7240ab9500e0cf7764cdb5e6ee4c SHA512 63c58c7729ceab9e1bfbb14b5d257a1d4ca51e43f7b014caffc8adf66767c17b47794b34cfc2f754c2905ff926302d66d438a582fe359a6c8d3e04b072993f5b
-EBUILD spyview-20150124-r1.ebuild 1421 BLAKE2B 5c1b6ac0940164f0faaffe8fb56bf3b969227b1833b491ef4ca2b7a691dc4c9f8458a565c732b45b5295d446e298f73797196ecf0295f056343c0864b41a57ee SHA512 f1b5e9674ee69540807b12f55dd53ff9b286d6ed78de0a42f8fe10ce65fb6ca364b89bd22b14e4b03c4396b77e8e9d9c9b8b91ffd390d5695fc83062acfd56c7
-EBUILD spyview-9999.ebuild 1680 BLAKE2B 92cc57325bf732a7f03360eb549efa7741e40fcb013356e30854174f5799dd8efe1dcb02a55eef91bb9cb2b94d3e84b81030339f84629f9d9ca84f1154a27820 SHA512 d70eedf2c7a17d3b18959dd014dcbb26e76fa9421149894c3c2e66d1b9c6e22bcc9cdda880c59cbfd996b749c733293508c70a1ee2e5884208c12bc3f29233c0
+DIST spyview-2018.12.24.tgz 15461336 BLAKE2B d88cea7a91b51a695bdc6eb4146b010b196cf24c2f21f16ef47782ed99f6f3b79d2950c35267ea71ac7a14705cb8ed8a4d1e12c03be0d5d8f6ad2f816c197c77 SHA512 b73837491650ccb9cc8f70e5a80700d33c05bbbf6914c778508ba1848db67b28cca0013e142def1f47755fb1370abfd850a55e4b69cca442ba43323029fb6d05
+EBUILD spyview-2018.12.24.ebuild 1497 BLAKE2B 5b05fba80266c0b3f5d780ebe52726123c9906b705c28bf1432e111e9e5fd797cd0675100439115df00c6488896bd3d72441137523e8c102ae7df6e6d68f1148 SHA512 55f530164e34e493a9983aef846a1f44c11fcecb899044bfadd1f75403cb4f4c369ad10cdd395354a8dbf9fbc9b4a65a144e6dbd3d6975ace6afeb7dba34970b
+EBUILD spyview-9999.ebuild 1497 BLAKE2B 5b05fba80266c0b3f5d780ebe52726123c9906b705c28bf1432e111e9e5fd797cd0675100439115df00c6488896bd3d72441137523e8c102ae7df6e6d68f1148 SHA512 55f530164e34e493a9983aef846a1f44c11fcecb899044bfadd1f75403cb4f4c369ad10cdd395354a8dbf9fbc9b4a65a144e6dbd3d6975ace6afeb7dba34970b
 MISC metadata.xml 346 BLAKE2B 9e4069b3bc88206f33580deed7736d12cb6de27ef3a4fc88d7e4a82758eb4e683a3bb4c4f42954a426a7d9ee3707b4e4a04f1779616393cf53830d15c667bedb SHA512 51dd8374cf0d0a3e18fc12a8a549a553ea9bc0a66b18fdadf39e5f0102e4ac5ddfe403de35372d95d8e2ab06b9b530118b5977ff466952e905fe7facbf23b52f
diff --git a/sci-visualization/spyview/spyview-20150124-r1.ebuild b/sci-visualization/spyview/spyview-2018.12.24.ebuild
index e031660d4b12..d43c86369ebe 100644
--- a/sci-visualization/spyview/spyview-20150124-r1.ebuild
+++ b/sci-visualization/spyview/spyview-2018.12.24.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools flag-o-matic
 
 DESCRIPTION="2D and 3D data visualization and analysis program"
-HOMEPAGE="http://nsweb.tn.tudelft.nl/~gsteele/spyview/"
-SRC_URI="https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> $P.tgz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+HOMEPAGE="https://github.com/gsteele13/spyview"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gsteele13/spyview.git"
+else
+	SRC_URI="https://github.com/gsteele13/spyview/archive/710b9ddb6aa00fada1a758d42b57b75f92bb32a7.tar.gz -> ${P}.tgz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -29,14 +34,14 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sci-visualization/gnuplot"
 
-PATCHES=(
-	"${WORKDIR}/${P}-patchset/${P}"-gnuplot_interface_fix.patch
-	"${WORKDIR}/${P}-patchset/${P}"-gcc6cxx14-9.patch
-)
-
 src_unpack() {
-	default
-	mv -v "${WORKDIR}"/spyview-*/source "${S}" || die
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+		S="${WORKDIR}/${P}/source"
+	else
+		default
+		mv -v "${WORKDIR}"/spyview-*/source "${S}" || die
+	fi
 }
 
 src_prepare() {
@@ -55,6 +60,10 @@ src_prepare() {
 		sed -i -e 's:-mwindows -mconsole::g' "$file" || die
 	done < <(find "${S}" -name Makefile.am -print0)
 
-	default
+	if [[ ${PV} == *9999* ]] ; then
+		eapply_user
+	else
+		default
+	fi
 	eautoreconf
 }
diff --git a/sci-visualization/spyview/spyview-9999.ebuild b/sci-visualization/spyview/spyview-9999.ebuild
index 8250f9599d4a..d43c86369ebe 100644
--- a/sci-visualization/spyview/spyview-9999.ebuild
+++ b/sci-visualization/spyview/spyview-9999.ebuild
@@ -12,8 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gsteele13/spyview.git"
 else
-	SRC_URI="https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e530e81b0ed3b90.tar.gz -> $P.tgz
-		https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+	SRC_URI="https://github.com/gsteele13/spyview/archive/710b9ddb6aa00fada1a758d42b57b75f92bb32a7.tar.gz -> ${P}.tgz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -35,11 +34,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sci-visualization/gnuplot"
 
-PATCHES=(
-	"${WORKDIR}/${P}-patchset/${P}"-gnuplot_interface_fix.patch
-	"${WORKDIR}/${P}-patchset/${P}"-gcc6cxx14-9.patch
-)
-
 src_unpack() {
 	if [[ ${PV} == *9999* ]] ; then
 		git-r3_src_unpack