gentoo resync : 31.08.2021

5 files changed, 58 insertions, 7 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index f5a09a8a07ad..6922ff034457 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index ddbd1ec98cf6..4a9e1a9bf35b 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,6 @@
+DIST xorgproto-2021.4.99.2.tar.gz 1143087 BLAKE2B eabdbc903a058a9be919192ac71fc95cedc2ff58e131a0eae6454be1e03714fb592d020ce8d9a4915a620de2a4d1c7cf2c5939c53ba96199f2a2ea579c450606 SHA512 34c4cb2aa97568be5ac5480c86122e9733afab3d17d48d170636aa10b39a99d6d637864d872ab78040a468ee3896a1aa42f5124bc8a4901dbb4b543eada7a607
 DIST xorgproto-2021.4.tar.gz 1141941 BLAKE2B 016a3c2f30ed064855de2a13d86a4b7bc9420ff10e8ac3ba97e08512fef6f0495a69dcaea7f12c7d8694a52284b500a38aee73de7bf2ff0a295715354d04eab0 SHA512 5f4c94d3ee20635f2358d7644be54d5e291bafba15a7713583acbb3564c2799da4ba33ffba625273fe015e4ab733cbaec146467804fd2174eb5fd1ff3bf21019
+EBUILD xorg-proto-2021.4.99.2.ebuild 1191 BLAKE2B 3b074d900922af4633893e60fb07cff71a8868ed33ca7a7ef4c5d3dcf16853006e9978e82c77aec781225940e864a6e44e3ee73209d244ee0d98a98aca48d14e SHA512 f454d47c50d1caf590ae528829031abf416283eb51415ac80a2c1d90154830b9c0fc0dbdaa8aba151fb357807867a4b404563c2a4031bc5f95c6b643b68eb758
 EBUILD xorg-proto-2021.4.ebuild 1183 BLAKE2B a546eb4286819d9699dc04ca7f8e9f4114cfabcd8dc7e5d214278e1cb8ac71f4b1dda561c23f6114ab6afd78ac910029b36fd468746b098e4eec80c94e84f5c4 SHA512 ecbacd72b45f800b16c8e72a17dd60e868376fd9ba19368a99760ebbf0ebf104ffbde15affec7ed56a3d7012ca0ca725262c758a08ef70b2781d20a847fb2c9c
 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.99.2.ebuild b/x11-base/xorg-proto/xorg-proto-2021.4.99.2.ebuild
new file mode 100644
index 000000000000..3544d1e5d5eb
--- /dev/null
+++ b/x11-base/xorg-proto/xorg-proto-2021.4.99.2.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-server/Manifest b/x11-base/xorg-server/Manifest
index 3d9f7ad82191..63429614eadd 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -9,5 +9,5 @@ EBUILD xorg-server-1.20.11-r4.ebuild 5232 BLAKE2B f11f0744e455d8b4fa241a26c7bc4b
 EBUILD xorg-server-1.20.11.ebuild 5574 BLAKE2B 9e1a53aab7fc913898e01728057bb121f68e41d3f50ad022328474e6b2fcea48502d5d64c2116faa8417db174259146420171cb77f1d10328a9951bb67de6b4b SHA512 b209f1dbbcdb8cacac4b638b2ad9db0527b535c5111535a99f6965124dba0e77fec890c292b07e5cdfef8f3a5f8e5a5f4e53464061b9936c8b391dbd0a23e635
 EBUILD xorg-server-1.20.12.ebuild 5320 BLAKE2B 73f6cc91d34fef4b897a2fe4fe68bf6f2a8de588a8821e283efb8f6b44f9038834e8495acae877f74f29920a0bb022d34b164eeb2f5db246a7169a14232a5045 SHA512 451311224e15acc480e43e4cfb986661fb84c17604b22f53a5c5d0d7adc742690deac89075b0a3f735feb07439a9fa0e2ce823bdb55b43837818884498b74c5c
 EBUILD xorg-server-1.20.13-r1.ebuild 5256 BLAKE2B e81f0c59278010b508f9f575e9a12d8b832c6db48ee60a866c1380b436985a62cf3937d1d110e340c1dfbebbb43a5c296e2b3ced81491aac67ba2283d85c3ba5 SHA512 9166032b9faa1d6f7478be1dfabdfa2507beffa50497af0fbeaedf3c1a073ec21c57f3919013b3c1c55ac6139d2a9de520c21712e39085f114a9f8c5dc6a39ab
-EBUILD xorg-server-9999.ebuild 5263 BLAKE2B 29bf1bd18ed5b65fdfc76071167cc4650a84fcdc55ed03bfa7fd0fa526880e263ba70f5b1a131e1e8925f5031b40edf64fff49cfe574b30558e42be0bc2b7b3c SHA512 b0cc8ac3574d4376dbdf2fe38dec763419fb6a53f6af8529457aa24c1648c7e9d78dfa30d2d2042040ab77dcfde274aa8ad4145c14ccdd2ca0c2f50c25e6ffe7
+EBUILD xorg-server-9999.ebuild 5166 BLAKE2B 6689578c8ef8162b7fef1c5cafd49f49dfc844314bc23a2a7415f1008e6697b0891ce04e3cf71112093ae17f10e4da89caf368de6e7334d98d4eb928f0a15ca6 SHA512 6bf5757e9397468ebcddf8ce4139d44b7044ff4b1bc7589b5d817d7fcc26a5607314f31fa462208478179be61bdfe749701ea8d7f8e7f50cc07141c424cb3fd0
 MISC metadata.xml 895 BLAKE2B 03b64d8a77f70c326650f17775d8c605c1dad44529330d26daee4136bd36e0f53d79212a7038d943795dbc5772dbcd52208b762aad42ed832ebabd848e5fa15f SHA512 fcee97e4ee4b1f972c4bea7626a719aa4d18b75b4475554327369349d5f42c0b1a3b8fb513727751b9703cfb9afc34fdb073cf19e116e7c5f6fad9b204574a5c
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 93c416de7606..2e5d0c1a2d4d 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -81,7 +81,7 @@ CDEPEND="
 	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
 "
 DEPEND="${CDEPEND}
-	>=x11-base/xorg-proto-2018.4
+	>=x11-base/xorg-proto-2021.4.99.2
 	>=x11-libs/xtrans-1.3.5
 	dmx? (
 		doc? (
@@ -159,7 +159,6 @@ src_configure() {
 		--disable-linux-acpi
 		--without-dtrace
 		--without-fop
-		--with-os-vendor=Gentoo
 		--with-sha1=libcrypto
 		CPP="$(tc-getPROG CPP cpp)"
 	)
@@ -198,10 +197,6 @@ src_install() {
 	if ! use minimal && use xorg; then
 		# Install xorg.conf.example into docs
 		dodoc "${S}"/hw/xfree86/xorg.conf.example
-
-		rm \
-			"${ED}"/usr/bin/cvt \
-			"${ED}"/usr/share/man/man1/cvt.1 || die
 	fi
 
 	# install the @x11-module-rebuild set for Portage