gentoo resync : 20.03.2022

3 files changed, 3 insertions, 41 deletions

diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 84b4ddc274ab..102bea1b73f1 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,5 +1,3 @@
-DIST yelp-tools-40.0.tar.xz 38708 BLAKE2B d9533fefc6a9416ed6f887971db62a7db6baed4f65aaf1e03d20c98fa23efb3af9f10189af0284bde3837f58f662f4ca4be8275d597a7c799a14585c87e6ec10 SHA512 b89e514cdc2c6ff96097af0cab5694e9f1dfd2a125e08f99a69c0e7dd51e1e1a859c2e6eec656ecea6103bfc65733e1256a77ef992454db4a554567b46fa2628
 DIST yelp-tools-41.0.tar.xz 38696 BLAKE2B 6e742e0a5c05c07fb3eb80fc10201650597fb36702edb1d9fc022895daf2837daed15a2b69b8bed7aaf0106139c7138e8f13b65b63cf18971e14eaeb0068b061 SHA512 76b8f9568942426698716d655bc2e7a614a26e40a820d1f4ce5021a54c6baa081d494bda06657cfc1c11999e14a8601c97ae51bb3519555b8ee1111489c0e10e
-EBUILD yelp-tools-40.0.ebuild 938 BLAKE2B 72ba4da0112a0d1d13e720332060301b315576315977fc03038f41908fea2c4a515e2dd7e5d4d475c6d23a3154ead23c72dcdd844f1688acbe89fed419a4adbc SHA512 1032d3a2b1a705bac569c14561caaa60a92afa306453b9772871c45277234c4c983f33bce75e432be9ec884938da7c1d27a46c490d965087ab8ebd856cee25eb
-EBUILD yelp-tools-41.0.ebuild 945 BLAKE2B 3ca6b1c1c0ba50745f8fbcb0202409ac1c01029a5e2253fdbc4b91b1b618232e114141a8e48f8e18961efce99fd33c14bdcdf8a5a4a2e1e682b277bafe5f9503 SHA512 298ef364d6569e4fde1f56a58cf335f681800997d9e8f602fca6e462c712c196d16efe0f0e1c1ba664799cd330011a716998683a3c0cf3ff8751b7f9bfc7bb12
+EBUILD yelp-tools-41.0.ebuild 938 BLAKE2B fcf0fe7e317d01bebcb1367f6b4fc2a6634031bf699b6f1b3f1dd4466904214f026e12a81cf5090c72ce0593715f1ba8dea4ee597161258c38f1cd46cde3dbb5 SHA512 b510ec02125d500cd606cab89f52230ecbb1339d71c97d4287f66e0583ad7584034cc39af7d987a8d01bb5357819f3dee918ef11f0a303853852f47369d72d8a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/yelp-tools/yelp-tools-40.0.ebuild b/app-text/yelp-tools/yelp-tools-40.0.ebuild
deleted file mode 100644
index df5d518f592c..000000000000
--- a/app-text/yelp-tools/yelp-tools-40.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-inherit gnome2 meson python-single-r1
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	>=gnome-extra/yelp-xsl-3.38
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/yelp-{build,check,new}
-}
diff --git a/app-text/yelp-tools/yelp-tools-41.0.ebuild b/app-text/yelp-tools/yelp-tools-41.0.ebuild
index 5ecbd011540a..4e78eaca75ea 100644
--- a/app-text/yelp-tools/yelp-tools-41.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="