gentoo Easter resync : 12.04.2020

3 files changed, 58 insertions, 45 deletions

diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index 0a08b22644dd..cf206564acd5 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,3 +1,3 @@
-DIST qdarkstyle-2.7.tar.gz 9156490 BLAKE2B 6c1c21c728725f391802b30acb6365dbd073328158fb3a60b4e2b5bb846337149c166ab447b1e84a404b01b4bc41e1292fff974b2a9756c6c42f4b40754c9a0b SHA512 6185cb85009d62a74021c3267039c6309757909903d67a1b67315877b84d4ffbc468f49cbe54ca4c7319710ea74652a3013e574698d2037cc4f2d83c9fb2b28e
-EBUILD qdarkstyle-2.7.ebuild 1010 BLAKE2B 9ce7130563f84ef439fc2cc7ee8fc4543df2b413f9d5ce62e906ae930b7695127d953e87cc113712e8655fbd294cf822471dd2c132a7101805b9ccd73da3436d SHA512 4cbc3b6f3405d406a822e5c7e0b28c42447cfe01502bf94b14080929ff8b06c4efa998e25e80e2b22eae6d39723b2b4eee9a99f277c5994a0389e1efc5e2fa1d
+DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
+EBUILD qdarkstyle-2.8.1.ebuild 1378 BLAKE2B ea48f645c3e9332a82869ec6aa545c6bbd62465e8d643f8bb0f394a65a08d24f44cc615d980500d2feb4e6b2bdf6c5aed5c16fa8754d710e121c4357b01d5066 SHA512 315816213eba0741eee55aa2923e8465672da1061b4e5220bc77600ad704dd483ab42ec7878f14521c74eb498360c0f7d2fc40b50a3ad2ebc5294dee3befe194
 MISC metadata.xml 376 BLAKE2B 66f5bc55ef2f40919601f4ed1fddd0bac47a7e42cf87f4a5fe085a90420d6d3ff21fb156319cb6c241b1241f7dfb261612ba0aa20d54dfbeb9801cbad34aeee2 SHA512 9741d92e63a63121645ec2c8f08a37850524b299cfdad5b4e70def0a8a50f35dde5c9417f4d4c067edee641b2050a128c7a792ed6d59137809e1b1a77fb469c9
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.7.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.7.ebuild
deleted file mode 100644
index ef8b2be9d963..000000000000
--- a/dev-python/qdarkstyle/qdarkstyle-2.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils distutils-r1
-
-MY_PN="QDarkStyleSheet"
-
-DESCRIPTION="A dark style sheet for QtWidgets application"
-HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
-SRC_URI="https://github.com/ColinDuquesnoy/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="examples test doc"
-
-RDEPEND=">=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
-	doc? ( dev-python/m2r[${PYTHON_USEDEP}] )
-	examples? ( >=dev-python/QtPy-1.7[${PYTHON_USEDEP}] )"
-
-DEPEND="test? ( dev-python/QtPy[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r example
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-		optfeature "qdarkstyle.utils" dev-python/qtsass
-}
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
new file mode 100644
index 000000000000..9e29ded805c9
--- /dev/null
+++ b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit eutils distutils-r1
+
+MY_PN="QDarkStyleSheet"
+
+DESCRIPTION="A dark style sheet for QtWidgets application"
+HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
+SRC_URI="https://github.com/ColinDuquesnoy/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples"
+
+RDEPEND=">=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.7[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/qtsass[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/m2r
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	#/var/tmp/portage/dev-python/qdarkstyle-2.8/temp/environment: line 2949:    66 Aborted  (core dumped) pytest -vv
+	sed -i -e 's:test_create_custom_qss:_&:' \
+		test/test_sass_compiler.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests look for a file in source dir that is not installed
+	PYTHONPATH="${S}"
+	cd "${S}" || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r example
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "qdarkstyle.utils" dev-python/qtsass
+}