gentoo resync : 31.05.2021

3 files changed, 2 insertions, 62 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 7858b525db5c..ac28b65e4ca1 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-DIST xkeyboard-config-2.31.tar.bz2 1705328 BLAKE2B a6fe680a8f32f1ca58363faeb0955ae621712f045570f66ce1c211093f0021f60e7fa29076b9dac80ee6c07ef1e4abb738ad64fd01a75ad776e582e2dbcc286e SHA512 f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669
 DIST xkeyboard-config-2.32.tar.bz2 1742570 BLAKE2B 98374e1bbbeaf24268754df8f050c663f8d07cec770c8bb86cb11bc434f6463acc9221b75b8f5dec79c8e47ac9e77deeb919a8bd3377ba712aac1fe1ce64ccc8 SHA512 c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea
-EBUILD xkeyboard-config-2.31.ebuild 1333 BLAKE2B c6bf1fb0084586a9d95df72346513dff5ed4f3d592bd44b7cfa9ea07305bd7a2583860d9d8b6da5dc8981566a0b18d351414b2364413445007a68fa2c9136019 SHA512 2d7aa022a267c5d660f92840d7d967d2b81481d031098ad42f8bb8c74cd215610ee8efd8408354d6b58d9871aaab01f851f4e5dc90a690ea93992c843c8db266
-EBUILD xkeyboard-config-2.32.ebuild 1019 BLAKE2B 4cea9fc1bf4b48d3ee25918ada095687ad96ab80b3d2f82dde1145694a36740e0d1b2e027e4b176ab9baa7f1cf6d4260f7fe7ba6bca5ccf5ea1f86ea20e9b3fd SHA512 c7def2f71bd13f087315d8d855008d8cb62b7e4356c032b8ea159fb4a29554a413eff9ac2a8607510ae2dbe9a0f0d48b8a759fd28c34866039c7fe32b1144f86
+EBUILD xkeyboard-config-2.32.ebuild 1012 BLAKE2B badc44dbcf680de7aa91a2b639f117fde7f799be42804179f99b86bc016dc66135689caebb93f6e504abeb49fd2c2d77bf19ed2ef805fb5ffc1430d7654a2ac8 SHA512 f063fa916ee24bd293037ca460d33d2725f1afc636e626a0db7f5e5d26a2e26d5f6e5832938e9bcf071376525c14c999fe5fcb204bdf76206fef6f983ec7199b
 EBUILD xkeyboard-config-9999.ebuild 1019 BLAKE2B 4cea9fc1bf4b48d3ee25918ada095687ad96ab80b3d2f82dde1145694a36740e0d1b2e027e4b176ab9baa7f1cf6d4260f7fe7ba6bca5ccf5ea1f86ea20e9b3fd SHA512 c7def2f71bd13f087315d8d855008d8cb62b7e4356c032b8ea159fb4a29554a413eff9ac2a8607510ae2dbe9a0f0d48b8a759fd28c34866039c7fe32b1144f86
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
deleted file mode 100644
index fd5be0d85601..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
+++ /dev/null
@@ -1,58 +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 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 autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-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=""
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="${LIVE_DEPEND}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
-	)
-
-	econf "${econfargs[@]}"
-}
-
-src_test() {
-	:;
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
index 268d593d98c2..45904724f424 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.32.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"