gentoo resync : 04.05.2021

3 files changed, 63 insertions, 1 deletions

diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 10eb4df171e2..588facb5c0da 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,6 +1,8 @@
 DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9
 DIST xorgproto-2021.3.tar.gz 1130599 BLAKE2B 21aa84621984cd2635871c059ecbfe2c6290c74a3569f15cdce6080dd7e4106726ae9338112c075c8f64332ecb555a4ccb666bd7bf7e9bb1156b4591e5f37908 SHA512 0c2610551cc180b619611e0ad344e1a01cb0e5e83b3c8643cd6dbe19d8acc3a22e7c1522855923159dd753e4458c9f2d65b709bb045b27e17b83aa8c264e3d5a
+DIST xorgproto-2021.4.tar.gz 1141941 BLAKE2B 016a3c2f30ed064855de2a13d86a4b7bc9420ff10e8ac3ba97e08512fef6f0495a69dcaea7f12c7d8694a52284b500a38aee73de7bf2ff0a295715354d04eab0 SHA512 5f4c94d3ee20635f2358d7644be54d5e291bafba15a7713583acbb3564c2799da4ba33ffba625273fe015e4ab733cbaec146467804fd2174eb5fd1ff3bf21019
 EBUILD xorg-proto-2020.1.ebuild 761 BLAKE2B cf874501547f2e236e3f3774654b164fe1a518b8afd88df412840f3ef4c0f3f170749c837c84164c0ac54ea2e0a0916710387835f9001076390de26aa58bc769 SHA512 f6c42bff81e6c5ebcc0a7db0ab03ecdd194d6cb230d9b95ca12c17ad10e0e4e74f5f7ae4aaebb2c37fbf46042942438c6fc3d8c18419de3765ab5f10d9e3743f
 EBUILD xorg-proto-2021.3.ebuild 1102 BLAKE2B 1149ac256e9aafa4eec429bcacc7245fee6caf4a6ea6dbf78749f947b81c08720daede7f059b116252156df77ac15f624aa30ede7c702c7bc1550ca454f385f8 SHA512 a156a1e5d9cd148a6eab8128ebf13c1d1d3656fd523bf0704f0a58becd94d1d45147354bba2e27dffd469fb4bfc2f79f7c488104ba9e231915d22b7b699a8543
-EBUILD xorg-proto-9999.ebuild 1102 BLAKE2B 1149ac256e9aafa4eec429bcacc7245fee6caf4a6ea6dbf78749f947b81c08720daede7f059b116252156df77ac15f624aa30ede7c702c7bc1550ca454f385f8 SHA512 a156a1e5d9cd148a6eab8128ebf13c1d1d3656fd523bf0704f0a58becd94d1d45147354bba2e27dffd469fb4bfc2f79f7c488104ba9e231915d22b7b699a8543
+EBUILD xorg-proto-2021.4.ebuild 1191 BLAKE2B 3b074d900922af4633893e60fb07cff71a8868ed33ca7a7ef4c5d3dcf16853006e9978e82c77aec781225940e864a6e44e3ee73209d244ee0d98a98aca48d14e SHA512 f454d47c50d1caf590ae528829031abf416283eb51415ac80a2c1d90154830b9c0fc0dbdaa8aba151fb357807867a4b404563c2a4031bc5f95c6b643b68eb758
+EBUILD xorg-proto-9999.ebuild 1191 BLAKE2B 3b074d900922af4633893e60fb07cff71a8868ed33ca7a7ef4c5d3dcf16853006e9978e82c77aec781225940e864a6e44e3ee73209d244ee0d98a98aca48d14e SHA512 f454d47c50d1caf590ae528829031abf416283eb51415ac80a2c1d90154830b9c0fc0dbdaa8aba151fb357807867a4b404563c2a4031bc5f95c6b643b68eb758
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2021.4.ebuild b/x11-base/xorg-proto/xorg-proto-2021.4.ebuild
new file mode 100644
index 000000000000..3544d1e5d5eb
--- /dev/null
+++ b/x11-base/xorg-proto/xorg-proto-2021.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson python-any-r1
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND=""
+
+python_check_deps() {
+	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die
+}
diff --git a/x11-base/xorg-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild
index 2c391aa1de4d..3544d1e5d5eb 100644
--- a/x11-base/xorg-proto/xorg-proto-9999.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild
@@ -46,3 +46,9 @@ python_check_deps() {
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die
+}