Merge updates from master

2026-07-17 19:13:13 -04:00 · 2020-03-31 09:36:25 +00:00
parent 599ddd6d60 082c3c68b5
commit 0d2d4ac719
12 changed files with 27 additions and 12 deletions
--- a/app-misc/mat2/Manifest
+++ b/app-misc/mat2/Manifest
@@ -1 +1 @@
-DIST mat2-0.10.1.tar.gz 5780327 BLAKE2B d8ffeb1c10409aa4fb93849e641c13bb65508441fb847db2a46f289becd33a160ac711c3c3fb302bfbacd5704acc9b15876a182916cf3d34bf8bb867836fe6b4 SHA512 ee6ec621b3e98cfcf2f341364f60d853be8aedbee88fd41d2cc97888ba7ee33f7610f165cdf140e0169fbdabd41ecafe80a30dab44dc9f2b1cb501973a8e403a
+DIST mat2-0.11.0.tar.gz 10151787 BLAKE2B c55d04fe7d49e8515bc5bc3ebfad4c71ddec670e5efed9855545bc32374661bb92501fb5910a599f27d97a3089a44f983c983cb82572ab153602d38e39682164 SHA512 8396a32b409b83cc4158546f92d458bc8a62e5aabd2c452402ac6185c2efdeff8794a7e1e45a8e39e9eaba31e256a303ca0be38b65fd43f11e7b07d1ea8b2f06
--- a/app-misc/mat2/mat2-0.11.0.ebuild
+++ b/app-misc/mat2/mat2-0.11.0.ebuild
--- a/dev-python/aspectlib/aspectlib-1.4.2.ebuild
+++ b/dev-python/aspectlib/aspectlib-1.4.2.ebuild
@@ -33,6 +33,7 @@ DEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/process-tests[${PYTHON_USEDEP}]
+		<dev-python/pytest-4[${PYTHON_USEDEP}]
 		dev-python/pytest-travis-fold[${PYTHON_USEDEP}]
 		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
 		www-servers/tornado[${PYTHON_USEDEP}]
--- a/dev-python/backrefs/backrefs-4.3.0.ebuild
+++ b/dev-python/backrefs/backrefs-4.3.0.ebuild
@@ -23,6 +23,7 @@ IUSE="doc"
 DEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
 	)
 "
 BDEPEND="
--- a/dev-python/pyspelling/pyspelling-2.6.0.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
+#not sure about adding aspell and hunspell useflags
 #IUSE="doc"

 # Need mkdocs-1.1 for this
@@ -29,6 +29,8 @@ KEYWORDS="~amd64 ~x86"
 #"

 RDEPEND="
+	|| ( app-text/aspell app-text/hunspell )
+
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/html5lib[${PYTHON_USEDEP}]
--- a/dev-python/pytest-instafail/pytest-instafail-0.4.1.ebuild
+++ b/dev-python/pytest-instafail/pytest-instafail-0.4.1.ebuild
@@ -20,8 +20,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-RESTRICT="test"
-
 RDEPEND="
 	>=dev-python/pytest-2.9[${PYTHON_USEDEP}]
 "
--- a/dev-python/pytest-subtests/pytest-subtests-0.3.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.3.0.ebuild
@@ -17,7 +17,13 @@ LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"

-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+#https://github.com/pytest-dev/pytest-subtests/issues/21
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
+	>=dev-python/pytest-xdist-1.28[${PYTHON_USEDEP}]
+"

 distutils_enable_tests pytest

--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,3 +1,7 @@
-DFSG @FREE lablgtk-examples meschach VOSTROM
+FSF-APPROVED EUPL-1.2
+OSI-APPROVED EUPL-1.2
 MISC-FREE noweb i3lock-color
-Non-free technic
+FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
+FREE @FREE-SOFTWARE
+DFSG @FREE lablgtk-examples meschach VOSTROM
+EULA technic
--- a/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"

+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
@@ -29,8 +31,7 @@ RDEPEND="
 	net-libs/http-parser"

 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+	dev-qt/linguist-tools:5"

 src_configure() {
 	local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
--- a/www-client/badwolf/Manifest
+++ b/www-client/badwolf/Manifest
@@ -1,2 +1,2 @@
-DIST badwolf-0.3.0.tar.gz 11843 BLAKE2B 2d6e3efa7a91e5c68fed47832a8701f4450238e5cf3daafafe2c231fb774cf79859175351a2efc7c1cea9577e2316d03a0460edd74a8d0f40c158635b2c42cb5 SHA512 6775fc673d3c985d2420e017bdefb0b0106c395eada04f54415e901e40779ebc427ab1b3135e1489077b9fbf5529be9e5d4d81a9b87001a55dfe6c15efa0b8c6
 DIST badwolf-0.4.0.tar.gz 13646 BLAKE2B 1269fc361eb9c3ae45379e019b808e67f6e915f8f7fc00c757d939f15c02ccdb08083ba64c6ebfc97d7337293d4125a35337c0e8d908a3e3704cd2029d24212e SHA512 572e1c18223ded5989da9c47e42c9dcbf66903e38b672e33b098cc3f84965d9da8e0a8b71e5ec88f17879c8d2f931d9625ca26a9c5ae81cc925d62fbf2abd4f1
+DIST badwolf-0.5.1.tar.gz 20992 BLAKE2B f1c31ba3f1b485adcc134a1e14e7eac1bd7ec2c3c3a48b09e245cfec4adacceeba5a9f477fd74ce85e5e8453fa660779248e1d6987281f850cb35b652aaa98f3 SHA512 75cd50bba4aaa458341b3ce0a6f70b4432e7a708901a19780457661b5275a15ad275a8b53f00b482be1e9a3eaa2565b39d9bbd40f5e6ec2551ae7fc1c7840ed2
--- a/www-client/badwolf/badwolf-0.5.1.ebuild
+++ b/www-client/badwolf/badwolf-0.5.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+inherit xdg
+
 if [[ "${PV}" == "9999" ]]
 then
 	EGIT_REPO_URI="https://hacktivis.me/git/badwolf.git"
--- a/www-client/badwolf/badwolf-9999.ebuild
+++ b/www-client/badwolf/badwolf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7