gentoo auto-resync : 09:04:2023 - 05:33:50

6 files changed, 48 insertions, 34 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 803b8b858399..2c4c2178be0e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/directx-headers/Manifest b/dev-util/directx-headers/Manifest
index 366e7c90f52a..7090ee414e09 100644
--- a/dev-util/directx-headers/Manifest
+++ b/dev-util/directx-headers/Manifest
@@ -1,6 +1,4 @@
-DIST directx-headers-1.606.4.tar.gz 352341 BLAKE2B 5b79e5fb0f807c7766708ac3467f0f8bbf82aa68e3aa71abc84c6791742ffe625a5fed4c36dceded9b372af5349e41e431266cadf21b173e4a659b39f840b41c SHA512 3fb4142f8ceedd8484f5f7dae5804a7a0012951de344936fbf22991d6ae659d4e5093e1627bfe51c3cb0859340b13171c4f6aa68377ec26ac05038acaad8c540
 DIST directx-headers-1.608.2b.tar.gz 395823 BLAKE2B 72bb71b75895afb0407af674d9877b680f77eb3133d2b23b833dff4b43230960f88fdc083d714fb09556d9babb530c34642dd3835b3fdc809473abb601ae8aab SHA512 d4e82615751d9ee46c456c676bfd6831c47d159ee58634531fc1acd09927f00c4e8d379cb233a1f89e3489a6a30d8edc0552b76945071badaed6a9c8591cbb0c
-EBUILD directx-headers-1.606.4.ebuild 648 BLAKE2B 881da74b9ed223cb65de3859fbbfed3b415e8eb9be047b1bc8ba9b98633a6f5c807f9b367052971e563137a60db7d0f45002f6465deca506a9c45de52fd5578f SHA512 47c3aecc72f40f86d25eb47fa4f6ac841bce837c9a1f8a55aae694d2745c607812568c1f9e44797a968f275f0dd8bca1ec0d713aad0af11d907f6c6f4c26f533
 EBUILD directx-headers-1.608.2b.ebuild 648 BLAKE2B 7fcac52125fbaf75766be571fe420ec032812e86bf146c835d4c73fa05bf94682eca1efbf468e33e0d2ece9cd2b3fd1f5b80c47c2e874eb16ae285e1a8b718a6 SHA512 3e4858d67e9dd7073b1df7e20200b2d22136c2caae862f708313139b21298623a267eb5441387b912742527cef2bb3b512de10712732db7ea9cf70aa28c2df21
 EBUILD directx-headers-9999.ebuild 650 BLAKE2B 9ba540c786a2d37cb6077cdd8ace5483c4cf042706afc262c09f6088946e4cf1186d6da31fd937d3d75f7953005cb54b274cf77335cb5818ed415f9e1987f104 SHA512 9cc4b43fc783d90679c17693afe5dfe51beeed88180c9a285f898bf608ede80164603333be6afb324116724131ca832c46382475154df5d2e6f16a59488cc5dc
 MISC metadata.xml 325 BLAKE2B 5f99ebc7e34bc34ed7ce7de68b4856195b45a4b482fa198972f3f054a4b945bb548a046b71e07ed2e89d3486b7259291bc1b5d09cfae739d0daa091d366a82e7 SHA512 f8ff1d6fafe3c2ed1837ab3db04a52351ccf851098046e0240c5619745682c2669aaa0791a792647d0af533cfc4f83b68171cc2afd05a30c532b918d42111216
diff --git a/dev-util/directx-headers/directx-headers-1.606.4.ebuild b/dev-util/directx-headers/directx-headers-1.606.4.ebuild
deleted file mode 100644
index 859631ad8fb0..000000000000
--- a/dev-util/directx-headers/directx-headers-1.606.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=DirectX-Headers
-inherit meson-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/microsoft/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/microsoft/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="DirectX header files and WSL stubs"
-HOMEPAGE="https://github.com/microsoft/DirectX-Headers"
-
-LICENSE="MIT"
-SLOT="0"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-test=false
-	)
-
-	meson_src_configure
-}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index ace05db2a949..0e3a569b601c 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
+DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
 EBUILD wayland-scanner-1.21.0.ebuild 1023 BLAKE2B f9dc1119418dd9e0c9b9b75386eb92b9c04d042e272cf51396b8518195d3a0393e73a1cadf920bd670c59409c6812501beec53c66f5e742aab31fa555b7b4b38 SHA512 53e6eb2afb669fd64310446a2233d1cdc5587319ac915a8c3d0d06923261a5231bce8290f70921fc3d7caa47b5a5027a00726c7e643044e9855c65bd0a3fbe37
-EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 69772afc5b2457fb4c2a3aa983a1b84776b94a03b220bc5d37dd76791188fb210d94c5299933737aa9e8d27c3cf7ef679c99bbff2f1daa7e9300241e9ca35041 SHA512 3e38ef866c22d8e8c4d125489577e4a72ef6e658b849714d7e79ef0c6092a86d66a6fda20b0043e83e52b30c96fbfd3eef6bb32a27918357d44f77c9ebda2349
+EBUILD wayland-scanner-1.22.0.ebuild 1030 BLAKE2B 6856e91cc7614f6aff2df4ed205982bc0e2cb3dea95cb66c748c99b3f951bc9d87c24357b4262f22f383258cab8cd0010baf3bcc7fc72034848ac31f33e997c2 SHA512 8c4fd3e3b841c06842a4d448e4ad521af84c4546939c00eb7083cf169ad3d843a6229b80519ca85dbebd78e00dbaa964bca5a2b2330be49f85b8af1bf04713f8
+EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 6856e91cc7614f6aff2df4ed205982bc0e2cb3dea95cb66c748c99b3f951bc9d87c24357b4262f22f383258cab8cd0010baf3bcc7fc72034848ac31f33e997c2 SHA512 8c4fd3e3b841c06842a4d448e4ad521af84c4546939c00eb7083cf169ad3d843a6229b80519ca85dbebd78e00dbaa964bca5a2b2330be49f85b8af1bf04713f8
 MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.22.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.22.0.ebuild
new file mode 100644
index 000000000000..10efdab1bcfc
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-1.22.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/wayland-${PV}"
+fi
+inherit meson
+
+DESCRIPTION="wayland-scanner tool"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	!<dev-libs/wayland-${PV}
+	>=dev-libs/expat-2.1.0-r3
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=false
+		-Ddtd_validation=false
+		-Dlibraries=false
+		-Dscanner=true
+		-Dtests=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/share/pkgconfig
+}
diff --git a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
index a71f5f47ad48..10efdab1bcfc 100644
--- a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8