gentoo auto-resync : 26:08:2023 - 21:58:11

6 files changed, 70 insertions, 29 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 8848c2df3cb2..692f5b793d21 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index 2a165c524a78..90ddff38d010 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,4 +1,3 @@
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
-EBUILD fox-wrapper-3-r1.ebuild 519 BLAKE2B ff31d35258771310dd2234353b9ad46857deaf08acc0bb95b4d7e735135927b06bcae2fef3a0da193dac7405533bb504de5ca23cae9513c70cfccd0d1ab7b54e SHA512 0693162f754c5ddad1193f59d78cc1f83351f33a5c711c5abe0f76ef4fb475a4912253b52f6f8da5a824b23a512a6b272742048ce150724ef8a1dd4da3b552ea
-EBUILD fox-wrapper-3.ebuild 556 BLAKE2B 35f00daa8c8477ce3b9b01bd2049a2c92027c02fc575e71396880de8a7b2fa8ef5d000bace0618bc6c116d6e9b1baf3acfc95023dbcfa195d84403bfd4e2e5b7 SHA512 4333ee845aa965608f28411363c10f4799448123fd1e7053b870179b6fc607f24b297d2b4e4f1bc286291c7df8f6219f47337d4655d0e205b9ff2c3f6c890821
+EBUILD fox-wrapper-3-r1.ebuild 514 BLAKE2B 5e2da76ae82bc90c4b56826d9269da869cd882c82b04156db415627d7aeb1d2efa392e1299b3cc37db894a21a718a3599025c0e299160bfda18d3c1fb5c16e0e SHA512 564d6b4432124d923cb69a32a7c43d2c0e2debb8dd56f98952ac51abbb734630f8c803f53440e9651cd116a8b24b5dbbb1cc4c9bb28650d8cc7c6db8b7007f87
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3-r1.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3-r1.ebuild
index 351976723588..5385e9e5df7b 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-3-r1.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-3-r1.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 src_install() {
 	exeinto /usr/lib/misc
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
deleted file mode 100644
index e5cbdaa22c0f..000000000000
--- a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="wrapper for fox-config to manage multiple versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	exeinto /usr/lib/misc
-	newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh
-
-	dodir /usr/bin
-	dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
-}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index ac70c2165c8c..2b32ceff1eb0 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,6 @@
 DIST libdrm-2.4.115.tar.xz 469952 BLAKE2B d4f794823476ca9c2e0383c0505cd787adad52b6873ba0fee913a861ebc7970a51524902aa0a2685ce2c5939fc6f9a71c5d1ad24d1f93407385b09255f701c06 SHA512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd
+DIST libdrm-2.4.116.tar.xz 473560 BLAKE2B da393845a5af3aaf01592d1b56fcada587feed57fa48159d48c2b1f6aba36cc8cad22e0431a127cce92c15c006b97be59fe1895bb27f3d5b06c550ca40f45177 SHA512 1287d1896deeb8cfb4532c6750eb43493dcefbfaaa598a73bbb682aa749594eaad3ed1fa2fe73d06280350f365a92a0c20cad8be76f3da2ed59b04aa008de911
 EBUILD libdrm-2.4.115.ebuild 2035 BLAKE2B db52fff40d25e51e99eb5d80090201f32ea4575ec2a8d3c80c9fa1c7377a9737dd52430eb00fa59d9880a82aa3317e30cd78c27cbd3b7db55e512b6ed39ba21d SHA512 e7b5189467cb8ab6b7d25417bf5bba2d08e7a39991dd5ace75052d06a72993088f023036fe98d3a54bf2e70fcefe82314028008b82e24792e83e23d14909b1b0
+EBUILD libdrm-2.4.116.ebuild 2043 BLAKE2B f323f695c62a6c4cf8194ffd2311f6dea61263713bda67abc82de13301685628872ea9fcbfebf25542658a36b6f0f31624d50e824cb327ece8c23c0744f87de3 SHA512 e587fb0f369d2d46f393807155073abc84bf4986bbb93a514e198076095e9e15bb2c8b8de04f713f4bff4b6f3b4c92858504553245d8ebc68d0c607f755827db
 EBUILD libdrm-9999.ebuild 2080 BLAKE2B 5276d0b33df8ad0df95a9eb1aa7fdb9078c5d58e072e34a07c9c6c2a0cb8654b6554fae2438153a2b11b30832f09ced3c2ba7bd377a88aade1d5a200f0cfdeb8 SHA512 54e8289741e382f4da8c2d56c8a90edafe6994dd25d521b26718308651b12fbde1e50995af56efd01143d0ea3b44e747711a4f1fb9ee15be330a611b3ec9e55f
 MISC metadata.xml 330 BLAKE2B cffaa78a15d94e0bd3e1b3b58c5411f1c733358845df30772bfb6e32bd55e9139250e28203f06f886c1678469f227e390f238d1d0dae7b6bac5bcf25f80f3adc SHA512 f688c7d40f10f4c239a888c3587245d59358e7983feb336c2fe764f85560b2f012232c361f719010424c85b164f45a21e8139267211cf32dea94a1e64780d717
diff --git a/x11-libs/libdrm/libdrm-2.4.116.ebuild b/x11-libs/libdrm/libdrm-2.4.116.ebuild
new file mode 100644
index 000000000000..195dc7c55c2b
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.116.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+PYTHON_COMPAT=( python3_{9..12} )
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=disabled
+		$(meson_feature video_cards_amdgpu amdgpu)
+		$(meson_feature video_cards_exynos exynos)
+		$(meson_feature video_cards_freedreno freedreno)
+		$(meson_feature video_cards_intel intel)
+		$(meson_feature video_cards_nouveau nouveau)
+		$(meson_feature video_cards_omap omap)
+		$(meson_feature video_cards_radeon radeon)
+		$(meson_feature video_cards_tegra tegra)
+		$(meson_feature video_cards_vc4 vc4)
+		$(meson_feature video_cards_vivante etnaviv)
+		$(meson_feature video_cards_vmware vmwgfx)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dtests=false # Tests are restricted
+	)
+	meson_src_configure
+}