gentoo resync : 22.01.2021

4 files changed, 10 insertions, 70 deletions

diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 04dff08c9cc2..aa0a10193abe 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,7 +1,5 @@
 DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
-DIST libxmlb-0.2.0.tar.gz 97521 BLAKE2B 7a47164503b5b682e2bb9d877622a7dcad06d40bf87d6a7cf9e21898d8444e610ba3985d6be8cf65068f0637ee44ef8678610315be2795476b2f5ccaacb098ea SHA512 cff4245a47a942dd37675921ba753858a3ee0572500a1cd7291d2a063fa7fa9d9157c167bf33694e4e0204504d7e88fbfd2873c4b9851247d6cdb338c2d587a8
 DIST libxmlb-0.2.1.tar.gz 98284 BLAKE2B b9bf02560a231837d7837b43f01d8f78c54a80319379a7bfa191f8303b77c35e82d1e2bb57722f1bfe56224d96bd1513cef702a0375eb85a137bff8ca3104c5c SHA512 4e082f036eb62626d1724ac5093ad625f9259e9e81aa40d5ca0589a3a72dadd669c0718ff64dcae094973b6c282b6c8f8ce7212b7e47211f320035bb639ec59d
-EBUILD libxmlb-0.1.15.ebuild 1228 BLAKE2B 8cfdb11b371d1c9b710147e5963003e47d48006b137b183ce8995a85d565df9fe681555000c366b4e944979400eb3306c903eacbf460b2615c52a4731b3a4611 SHA512 ae8f7237ca068cea6e17feb6aa0182a593d6d49a61cfd5a5b4a90aa013d4cb64109f983a728867450c4798aefce2dd1eaf0873c25bda356e431f770ead431a08
-EBUILD libxmlb-0.2.0.ebuild 1253 BLAKE2B 13704d38962eec15866858cc6de0044b5a2fafea7a8779b4944b7aff23b01ac092cb481bb1d84376fefeb984320c01ef023bb441afc97697422cec2eed7f6257 SHA512 d51b93170189a70b6de957a23241d2a58966a23845c7d02e76de26550e2ffd8c1ae9fe0cb8ef68a976dacdaa0fa8279a0863daaeafacac9232a93693d5c982ee
-EBUILD libxmlb-0.2.1.ebuild 1260 BLAKE2B 25c67b3396fdcea722a2263f25c4be5c5912f443edd717adc6646879e698b178b2188e38bfb58cca63040538854bf62c00a84b45e55c0da0fd7022ed86f9d873 SHA512 8710006775f27af03c84e5f0b950e76df91f2ca6b1e64f4ac048ea89dda764dbbfa727de1696283af501a145eef0198f363b0c97c018da43b7291fe5b397c065
+EBUILD libxmlb-0.1.15.ebuild 1205 BLAKE2B 6ae7459288a60acb506e4bb387f66a6527c15939fd5414688b85f50d9c5f2a7f49d3440779648b5e41f1cd27d35df1b86696fac793e0bce52d668d9a69af6c35 SHA512 40197234eac844929649c54b196db7a2a2a434d123819e6eecf1cdfbbbdc61a6a712220027a0d3c4feb821c83f9b10ab915e9525a082b81dcf431bd2c12628d2
+EBUILD libxmlb-0.2.1.ebuild 1237 BLAKE2B 71b492613dd2c3224a415d4ff2ba7149567b5ae9e4f1a10c1b9ea808cdeb6df165076d9a8a1e467f16aabb493f5c5a2b7428f2433ba220930e5ee894d27c896f SHA512 ea4db4ce81be03989daaf0d386518189199a244c702df6ef76fbc706221b6b80f44ada0de73a2387c5f3f4c5b471ef03ec8704d32cda123e53fda2beef5afb46
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
index 68409989938f..80a864311d25 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit meson python-any-r1
 
@@ -31,11 +31,11 @@ DEPEND="
 "
 
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-util/meson-0.47.0
 	virtual/pkgconfig
 	introspection? (
 		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-		${PYTHON_DEPS}
 	)
 "
 
@@ -44,7 +44,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/dev-libs/libxmlb/libxmlb-0.2.0.ebuild b/dev-libs/libxmlb/libxmlb-0.2.0.ebuild
deleted file mode 100644
index eef8b51f8641..000000000000
--- a/dev-libs/libxmlb/libxmlb-0.2.0.ebuild
+++ /dev/null
@@ -1,58 +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,8} )
-
-inherit meson python-any-r1
-
-DESCRIPTION="Library to help create and query binary XML blobs"
-HOMEPAGE="https://github.com/hughsie/libxmlb"
-SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # libxmlb.so version
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc introspection stemmer test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/util-linux
-	stemmer? ( dev-libs/snowball-stemmer )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-"
-
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-		${PYTHON_DEPS}
-	)
-"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgtkdoc="$(usex doc true false)"
-		-Dintrospection="$(usex introspection true false)"
-		-Dstemmer="$(usex stemmer true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
index 30f41ec4d836..03845174fc31 100644
--- a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit meson python-any-r1
 
@@ -31,11 +31,11 @@ DEPEND="
 "
 
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-util/meson-0.47.0
 	virtual/pkgconfig
 	introspection? (
 		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-		${PYTHON_DEPS}
 	)
 "
 
@@ -44,7 +44,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_configure() {