gentoo resync : 05.12.2021

4 files changed, 2 insertions, 90 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 3805e9b471e4..b62b37326fad 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,8 +1,4 @@
-DIST xkeyboard-config-2.32.tar.bz2 1742570 BLAKE2B 98374e1bbbeaf24268754df8f050c663f8d07cec770c8bb86cb11bc434f6463acc9221b75b8f5dec79c8e47ac9e77deeb919a8bd3377ba712aac1fe1ce64ccc8 SHA512 c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea
-DIST xkeyboard-config-2.33.tar.bz2 1755990 BLAKE2B 63d5d789609711fb92acc69319efc64337cf512b3a47d3b8d24a9afbc5c57e45d6c1a7f4a283ae274b6534bb6667964248ef8dd320a24861a50580bfe2a29350 SHA512 084f79350d5dc7f9ebd5b5333d386459b0ab587f6cec27ee2d8d5c3a56b08993f9fafb9d893307f4d43cfeaf2e225c5295ad6297ae8287c68efc48a82638feb1
 DIST xkeyboard-config-2.34.tar.bz2 1763558 BLAKE2B 4417ab66f476de9914113296437b6a1b558c57561169353f533695bbe95831e73045c87bb3a072d1e3c103d2f69aedc3a73e5290c90ecaa8a131419d0d8ca3aa SHA512 cf3bdb658349b2db9db44ea1a0f7060b890b95520319101d83ba5aefeb0b1e2fd578b6f72a90758438f04bffbe7536cf112b76297fd47c95e02029fd203c51fb
-EBUILD xkeyboard-config-2.32.ebuild 1012 BLAKE2B badc44dbcf680de7aa91a2b639f117fde7f799be42804179f99b86bc016dc66135689caebb93f6e504abeb49fd2c2d77bf19ed2ef805fb5ffc1430d7654a2ac8 SHA512 f063fa916ee24bd293037ca460d33d2725f1afc636e626a0db7f5e5d26a2e26d5f6e5832938e9bcf071376525c14c999fe5fcb204bdf76206fef6f983ec7199b
-EBUILD xkeyboard-config-2.33.ebuild 1011 BLAKE2B df66a9172b6565a1a3d748f3c84d2cf4944521b528303099104f2b4fa5e76f99d164746369c36afddda29262cc94b0cda5d98ef6f9cf4fdd078503edcdf71a8f SHA512 19be925fc2d86c10f8e4523890a7e793e20f180955e419d6e10b54311f17d42c314e7d373df5d397db26a9de3dfb29ce762b77130044788cf6e10dea0a88bc1b
-EBUILD xkeyboard-config-2.34.ebuild 1016 BLAKE2B 86245275be2efbe06530576effd62888b7c3b49a665244561fa3ea8f0aa48b24c5105d318ac25067c06fb08e28c1f1072e2c9eb6a87f2be6996619dc72527531 SHA512 6b042e849e6b37925b5ff981701876ffa23dfa57977f881c7a13024115c1f9ea3a01dda90cbeb870f237b90f9b96cdae8f88a7fe3de3f9959aac2d7640714922
+EBUILD xkeyboard-config-2.34.ebuild 1011 BLAKE2B a18f5ebc3054b726a5eb66d8da910753b920b3eb3964df863cd7bbe7f66c13bb063a4efbeeb9f5bd27b8ad8fa3df8833a9f721c2029a5e269ab2ec6b519edbf5 SHA512 e74f84bf6488adc3fb3f1805dcddefe60c4b27c1056f3fdd70a27b250f1ee13cd1d6bc7f1791aca2aad0080dd2d281e8640b139205c3de99251cdfdb66b925b5
 EBUILD xkeyboard-config-9999.ebuild 1019 BLAKE2B 15e28c63f89ae1238f0f8c5c6c56b5cdffb8d66ca0d70124867012f3b4e8fbc9ba73c9c93af74c7185909a6811f5a4dea2fe6ac77b6bb3c9e3b37c84c877d884 SHA512 57d5933cfa0f30d80dfeae2b9c12594929c1e60f72cd18beda86e0846ba46311d4ef4d8d199687942ecd4f35239e7e06967cf95c1b38358276e47cb99973615a
 MISC metadata.xml 338 BLAKE2B 0abfc9e29fc629961ecbcc525a18185afd4b08cee4b68d35d1e2f863b898b1881b68e53f26079d1dfacbcd1f6961433dddf316435f421ec9f8b7a2e669c89eab SHA512 d1df4e20e9260892555393fddfeac0c9190c13cbf2a654ece211faab0c180ecdf592939992d5abf20a432a68a1ac0400e9e65241a9d3c7a04093c11b13123d75
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
deleted file mode 100644
index 45904724f424..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit meson python-any-r1
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
-		-Dcompat-rules=true
-	)
-	meson_src_configure
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.33.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.33.ebuild
deleted file mode 100644
index 860b45b83ff3..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.33.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit meson python-any-r1
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
-		-Dcompat-rules=true
-	)
-	meson_src_configure
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
index 647145209db7..8e66ef95b6d0 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"