gentoo resync : 08.08.2018

4 files changed, 21 insertions, 83 deletions

diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index 5c9c6d542f99..aa40b9046dc6 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -1,9 +1,8 @@
+AUX fix_spline.patch 758 BLAKE2B a0d3af3bf186a6935a88e985931353085ce043e244fddecb7f9a5e0f71a812d0582218e4b544d320b6a380c9b6d2ff964e69799503cb08ab74451617fe1bc815 SHA512 9e0284b7dd879089dc16b28474060c2c53a8955645096e63e435129c237012b9cebcd666f10da4faa0c99b37512952961fa0f1f3d6c2747f3ab791bd8925c26b
 AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b80351accece2dcbcf11b39b26468d8c31e3feb9fc8422a1fe5051b00100743f263eba2558861236 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047
 AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e
-DIST veusz-2.1.1.tar.gz 2440253 BLAKE2B 1bfbe3bf6a026fbbd4acf5d722a1d2282331d71548650606c474c81399e8f0e8dcef643e0ab61a3eff62e111392a0668e1ae3d0bb2a76d7abc1f57e10a6e0506 SHA512 894dd12ea89671d71bd1abb2367c19d76c599c59edd302c29e5f99bbd1798fea8cb1489ca3446e8f88fedaf287fb48ee63617f928c77e4bd366a4f00a878b994
-DIST veusz-2.2.2.tar.gz 2451495 BLAKE2B 1d6672b932092c9645faaf0f081026963c99fdecb7844270fd674ee30e6257377e2e468cd4590efcaacb255035dfa2dfc61c1db6b4aff72366b374859e2e8601 SHA512 1851a4da9566498bc2eda65a2417e021e7089c0b73cad600c021be9f5561e66a084f92ad18a18d1bd0c0e5eae742500b9e8b313e10e7948ee6a434b40f430b49
+DIST veusz-3.0.1.tar.gz 2554401 BLAKE2B 6e5649eef94ce0bd7fcdfa8325b35de144aaecd792f32c149f5a6f16c7c35f10d29bebeb37531d726e1b87f6d46855d7cdb2af402ec8fd0a2c1af91844d12c03 SHA512 99766c0fee70c12bba7b2ee8434224649763323aa9278d2116159f18257e1e1c5a491d591efb779c1bbb9dba1fb524ad8185fa2e91429ba1cc594fd632cb6238
 DIST veusz-3.0.tar.gz 2550683 BLAKE2B 72f0da8d9b993d8a3252fbb93314a53832fbf319287946e9ebc9317ebdab3f10ef2071012b88a1ff3d31d4732f367ded0b217dfa9766f5a09abe90e96b769e45 SHA512 a740d5677e8f23245e54573de0faaa66b659b54e289b256dc344f5aa0cc2a05db26efce57ff31b19c1235e04a9aa22cfa12125a784d27b0e3725277cbfae1b06
-EBUILD veusz-2.1.1.ebuild 2106 BLAKE2B ed9b696f062a6ee7fd62f9d48867158eef884be820595609831c71f9ccd71e9d39eff5a1d61c783a2496bb7682559c3acf31ad218b076124719fd1a8eceb2c62 SHA512 b3c515b6d8050598d5539caa295e60f0a2656ebdfa41908070d2791816c1b0198799de44263aa3bc688399db2d06291a01348ca03309cc3f4b17e72ab22cf139
-EBUILD veusz-2.2.2.ebuild 2106 BLAKE2B ed9b696f062a6ee7fd62f9d48867158eef884be820595609831c71f9ccd71e9d39eff5a1d61c783a2496bb7682559c3acf31ad218b076124719fd1a8eceb2c62 SHA512 b3c515b6d8050598d5539caa295e60f0a2656ebdfa41908070d2791816c1b0198799de44263aa3bc688399db2d06291a01348ca03309cc3f4b17e72ab22cf139
+EBUILD veusz-3.0.1.ebuild 2148 BLAKE2B f1c5b6201ad123e5c24ff39377acdb1bc6b20a5b8dfdb4b56a5e8919f010c7371d631493d599253c64a53f55076da30fa30f4f8dc1397935ad576964269d3eba SHA512 a09739f15b8a80341b0ee00a949adf8c92cc2e28fdeb1277530ec1b7ba4243f179c9aff2f5b40700c77d6f735f4a0c9908e32a0fc5fd0106b9a8cf23731a95fc
 EBUILD veusz-3.0.ebuild 2106 BLAKE2B ed9b696f062a6ee7fd62f9d48867158eef884be820595609831c71f9ccd71e9d39eff5a1d61c783a2496bb7682559c3acf31ad218b076124719fd1a8eceb2c62 SHA512 b3c515b6d8050598d5539caa295e60f0a2656ebdfa41908070d2791816c1b0198799de44263aa3bc688399db2d06291a01348ca03309cc3f4b17e72ab22cf139
 MISC metadata.xml 885 BLAKE2B 90529e34d78f5225e62c2675e15fef6e0fa1898eca31df061f5438460be53f5bad3d1395d5dcb6e300f861c2c52689bca26fcf012ffbbdaf9cf579b9b252a697 SHA512 2e6838e7cc1a152af665c771950f5b53f942ceedb40b118511c2c9b9801a4a170dbc557e3fa389986b0edf2b12b4f008fbbab9c258c59a1b4acd2063c3ef79ac
diff --git a/sci-visualization/veusz/files/fix_spline.patch b/sci-visualization/veusz/files/fix_spline.patch
new file mode 100644
index 000000000000..a7d6bd85c48b
--- /dev/null
+++ b/sci-visualization/veusz/files/fix_spline.patch
@@ -0,0 +1,16 @@
+# Upstream patch that fixes spline interpolation:
+# https://github.com/veusz/veusz/commit/b4223800744034880fd1ca1165853636b31e576c
+diff -Naur old/veusz/helpers/src/qtloops/beziers.cpp new/veusz/helpers/src/qtloops/beziers.cpp
+--- old/veusz/helpers/src/qtloops/beziers.cpp	2017-09-23 11:10:46.000000000 +0300
++++ new/veusz/helpers/src/qtloops/beziers.cpp	2018-08-04 21:27:01.000000000 +0300
+@@ -1013,8 +1013,8 @@
+     return 0;
+   }
+ 
+-  // factor of 0.1 introduced by JSS to stop more hooks
+-  double const allowed = L2(b - a)*0.1 + tolerance;
++  // factor of 0.2 introduced by JSS to stop more hooks
++  double const allowed = L2(b - a)*0.2 + tolerance;
+   return dist / allowed;
+   /** \todo 
+    * effic: Hooks are very rare.  We could start by comparing 
diff --git a/sci-visualization/veusz/veusz-2.2.2.ebuild b/sci-visualization/veusz/veusz-2.2.2.ebuild
deleted file mode 100644
index 1526a285be19..000000000000
--- a/sci-visualization/veusz/veusz-2.2.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit eutils distutils-r1 virtualx xdg-utils gnome2-utils
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="https://veusz.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc emf fits hdf5 minuit"
-
-CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${S}" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
-	mkdir -p "${D}/$(python_get_sitedir)" || die
-	cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
-	Please visit
-
-	https://www.gnu.org/licenses/gpl-2.0.html
-
-	for the full license text.
-	EOF
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dodoc Documents/manual/pdf/${PN}.pdf
-		docinto html
-		dodoc -r Documents/manual/html
-	fi
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-visualization/veusz/veusz-2.1.1.ebuild b/sci-visualization/veusz/veusz-3.0.1.ebuild
index 1526a285be19..018f5fd55b23 100644
--- a/sci-visualization/veusz/veusz-2.1.1.ebuild
+++ b/sci-visualization/veusz/veusz-3.0.1.ebuild
@@ -29,6 +29,8 @@ DEPEND="${CDEPEND}
 	dev-python/sip[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
+PATCHES=("${FILESDIR}/fix_spline.patch")
+
 python_test() {
 	distutils_install_for_testing
 	cd tests || die