gentoo auto-resync : 18:07:2023 - 00:58:24

5 files changed, 30 insertions, 18 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 88ba070a281b..8f6b3d44f9fd 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 77aec22fd2ac..ac70c2165c8c 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,4 @@
 DIST libdrm-2.4.115.tar.xz 469952 BLAKE2B d4f794823476ca9c2e0383c0505cd787adad52b6873ba0fee913a861ebc7970a51524902aa0a2685ce2c5939fc6f9a71c5d1ad24d1f93407385b09255f701c06 SHA512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd
 EBUILD libdrm-2.4.115.ebuild 2035 BLAKE2B db52fff40d25e51e99eb5d80090201f32ea4575ec2a8d3c80c9fa1c7377a9737dd52430eb00fa59d9880a82aa3317e30cd78c27cbd3b7db55e512b6ed39ba21d SHA512 e7b5189467cb8ab6b7d25417bf5bba2d08e7a39991dd5ace75052d06a72993088f023036fe98d3a54bf2e70fcefe82314028008b82e24792e83e23d14909b1b0
-EBUILD libdrm-9999.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-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 195dc7c55c2b..592debf1d68d 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -26,15 +26,17 @@ for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
-IUSE="${IUSE_VIDEO_CARDS} valgrind"
+IUSE="${IUSE_VIDEO_CARDS} udev valgrind"
 RESTRICT="test" # see bug #236845
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="
+COMMON_DEPEND="
 	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	valgrind? ( dev-util/valgrind )"
+RDEPEND="${COMMON_DEPEND}
+	udev? ( virtual/udev )"
 BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
 
@@ -44,8 +46,7 @@ python_check_deps() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
+		$(meson_use udev)
 		-Dcairo-tests=disabled
 		$(meson_feature video_cards_amdgpu amdgpu)
 		$(meson_feature video_cards_exynos exynos)
diff --git a/x11-libs/xapp/Manifest b/x11-libs/xapp/Manifest
index d423dd177e38..a0ede5f43254 100644
--- a/x11-libs/xapp/Manifest
+++ b/x11-libs/xapp/Manifest
@@ -1,5 +1,5 @@
-DIST xapp-2.4.2.tar.gz 252031 BLAKE2B 184f8459c5fa8165054a6cc3f2aea6b01ab0c73ecb0f5a79a7ba78908e9a149b3b08c691fa1b0a0077d238dc144dd9068b0b49228d530e9684670974bbbe2a69 SHA512 4c8c0ee0c2c273e3b08b4746324ec55e6af0baaada2465b4a628dad21207bc0dc9fb609b2dd8d46284098a4bac6598893a984ff6e5891f2ddd5be6157774ae81
 DIST xapp-2.4.3.tar.gz 252180 BLAKE2B 49ebba445e04205f714fd4a16363674477e1156872ed1d26ac8450c32d688323971301ed97366e36141e91996f64401372dbe5ee4e36130ac4cf70e12e9fcdde SHA512 ecfe97b5a6de6ef06416b3220dc30856c590087c22b77ba2078194995650966e7811a91b3ce6335b363ea5066473d5c59a318232e40a2311341067dcee4719b2
-EBUILD xapp-2.4.2.ebuild 2099 BLAKE2B 8e1f0a52eeef0d6d1d105cc5172db6737dd137e0fb08bf184cd7d5ff1dfd4edc74b0430aac4a65261913a53870da7d3c743701f5d7a65c0af5c8647b13e27996 SHA512 729ce1a5654bf1b453ec6d00a7110a421f00188f4081f2ba24c68675f765aef76e6b65ebc0be9cb2d3c60be2a86af52c4af0913a899fccfb673b75d76baa7402
+DIST xapp-2.6.1.tar.gz 270606 BLAKE2B 0f2572b2e9ec4056bea0fc532f5327bd6de4741719a49b68180d45ff00fcea9b760acb362fc39d3f2dc9d94001b7021267a8a84c067aa90c5a201a46be76e97c SHA512 f96006fffac67b312caba644e8da75209c443688b08254b9bb5b17eb9148e66b35a8b1fe336e8880c7b950f8fc696884d8f5d610092c2cb44357ad3bf3ef43c7
 EBUILD xapp-2.4.3.ebuild 2285 BLAKE2B 3539ccc5653ffd179942454dbda20bd72aec469a378842f54512656651cace7ddf3acc78db72f42185ce3e6f9109b768b79c787a33438cffad5a61b4c93aae0b SHA512 da38a4c6a0772a363048426c172cb91dde93862b0c8a1d460d5b3cad569dd8b974a748ea38e08f41d8d2a8a3ee233ececa9b91c1ad7ab9fb895da33d51eefaa5
+EBUILD xapp-2.6.1.ebuild 2274 BLAKE2B c16a6b202e9a65017dc2f216bf0fcf618f96c7777b04a9164ea18e583051f20c4b9237c3e5d4867176d2e7866ac02d197edebcca5203274b714e21ec14d32c43 SHA512 002497565037eccaa4d30c39b6163472985f94edccc155c2fca4528f355bd9383b0997175d6133851576ac3a47ca7781870ac43115b291787631d5c3fc14f594
 MISC metadata.xml 578 BLAKE2B 6a52fabaa36a29f26e7128d47c6b3b21f0fe0996f37f1f787109345c2fd31c4f5689f2dfd6d6324412fcf03f8e2a227367278bb770e0a2ba39c41399a5fb898a SHA512 fda47e5862f660ee4a72653265f82d963e6cb06d6062024021df42ccb1035f51ea7b9eab6611a9152d32eb4ffc2728a880d05770fe9e9be4d5145a7d84527fa4
diff --git a/x11-libs/xapp/xapp-2.4.2.ebuild b/x11-libs/xapp/xapp-2.6.1.ebuild
index 00c0838e7237..36a2b7e8ce5a 100644
--- a/x11-libs/xapp/xapp-2.4.2.ebuild
+++ b/x11-libs/xapp/xapp-2.6.1.ebuild
@@ -3,32 +3,37 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2-utils vala meson python-r1 xdg-utils
+inherit gnome2-utils vala meson python-r1
 
 DESCRIPTION="Cross-desktop libraries and common resources"
 HOMEPAGE="https://github.com/linuxmint/xapp/"
-LICENSE="LGPL-3+"
+LICENSE="LGPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 SLOT="0"
-IUSE="gtk-doc introspection static-libs"
+IUSE="gtk-doc introspection mate"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	${PYTHON_DEPS}
 	>=dev-libs/glib-2.44.0:2
-	dev-libs/gobject-introspection:0=
 	dev-libs/libdbusmenu[gtk3]
-	gnome-base/libgnomekbd
+	gnome-base/libgnomekbd:=
 	x11-libs/cairo
 	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
 	>=x11-libs/gtk+-3.16.0:3[introspection?]
 	x11-libs/libxkbfile
+	x11-libs/libX11
+	x11-libs/pango
+
+	mate? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -39,6 +44,7 @@ BDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
+	sys-apps/dbus
 	sys-devel/gettext
 
 	gtk-doc? ( dev-util/gtk-doc )
@@ -49,11 +55,16 @@ src_prepare() {
 	default
 
 	# don't install distro specific tools
-	sed -i "/subdir('scripts')/d" meson.build || die
+	sed -i "s/subdir('scripts')/#&/" meson.build || die
+
+	# make mate integrations optional
+	if ! use mate; then
+		sed -i "s/subdir('mate')/#&/" status-applets/meson.build || die
+	fi
 
 	# Fix meson helpers
 	python_setup
-	python_fix_shebang meson-scripts
+	python_fix_shebang .
 }
 
 src_configure() {