7 files changed, 139 insertions, 29 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index c1e0fb4f38a9..f96b2291bc75 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index c3606c71dec0..3079f1078a49 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -3,6 +3,6 @@ DIST pixman-0.43.0.tar.xz 638236 BLAKE2B 1a807d4d5598a5fe6077d6bbc7786cba41a698a
 DIST pixman-0.43.2.tar.xz 637976 BLAKE2B 82734efb7cede5b1aeff3a865bfa2a81ff3176be50edc10deb1b5541f160b2dfd21303c1eccba53c0df83f471f3489084479a423dc2f818019af97d4b41dad68 SHA512 1a1d21b86b3c6784c4c2606b7069723b4dbb747eac9fce95bca86516787840379ffd49abc42d11e7143e85c32c85496f33c2562c7a910ca6f963599affdc3224
 EBUILD pixman-0.42.2.ebuild 2154 BLAKE2B a70bb012160d42a2161407b435c0f079fc6dae548042f2e3c6fde16a37dfccf0cfd2712c2fbfd03e8bd1c8de662efc36021f6fdb0e0846312257ea35e0213b01 SHA512 121d4e66a5a43a3c126cf486c15191827429c2f861aa44ab851c50f2ca5faf466668af36ff7500d54ff4089e01acc21a16baa405512c5bfd19962f742b20e123
 EBUILD pixman-0.43.0.ebuild 2165 BLAKE2B b4203fc7f0f7561d14f178809db7405c620d1582c8af2b2e0934a9de2a9e2bb0ff9c1261e1a27571e80d8fcf700634968b585c06732b466f60c7fa3cbab2b86b SHA512 f85c5ddd7a98c312c2045c77ebb0ed96b2915808a02faafe16313836da0e91acf2201a2c08dd66e96623c48ecd87a5f5c00856b8555d23510afd324aa45920cb
-EBUILD pixman-0.43.2.ebuild 2165 BLAKE2B b4203fc7f0f7561d14f178809db7405c620d1582c8af2b2e0934a9de2a9e2bb0ff9c1261e1a27571e80d8fcf700634968b585c06732b466f60c7fa3cbab2b86b SHA512 f85c5ddd7a98c312c2045c77ebb0ed96b2915808a02faafe16313836da0e91acf2201a2c08dd66e96623c48ecd87a5f5c00856b8555d23510afd324aa45920cb
+EBUILD pixman-0.43.2.ebuild 2161 BLAKE2B 517e5dba0c8a5d130f488c877c329ba8e9b4322e9d4a6cc92534c9c2d4b89612ebe0a83fd2d90e5fa0eaef78895ef55561f929a8b97a550aa466aeb81a6e115a SHA512 1369f83244271a4d2501a7c36a777a46121db3791c941777cd1db760787707f47801675d56145056365171f1f51f8a7545d58c686dcab93301fe36e8663c6448
 EBUILD pixman-9999.ebuild 2165 BLAKE2B b4203fc7f0f7561d14f178809db7405c620d1582c8af2b2e0934a9de2a9e2bb0ff9c1261e1a27571e80d8fcf700634968b585c06732b466f60c7fa3cbab2b86b SHA512 f85c5ddd7a98c312c2045c77ebb0ed96b2915808a02faafe16313836da0e91acf2201a2c08dd66e96623c48ecd87a5f5c00856b8555d23510afd324aa45920cb
 MISC metadata.xml 483 BLAKE2B 4302fc025e7ce3dfb1b2f099371f0b3263942203ffd50730c40afe491feb003d2ec17cbf8ddd4ad3c1c0d752c46b87dd944e907b6c31a6ffdcaab7b518c247fb SHA512 f4777b9c1ae7527be4f354836c51142b095ab27dd56b173a6e0b7146ad68257136f326ff7c0fa564706dcc53aebe9171d8f844bab026c139cab717c559bf2a5e
diff --git a/x11-libs/pixman/pixman-0.43.2.ebuild b/x11-libs/pixman/pixman-0.43.2.ebuild
index 64f5bc702b84..32f4dabe91df 100644
--- a/x11-libs/pixman/pixman-0.43.2.ebuild
+++ b/x11-libs/pixman/pixman-0.43.2.ebuild
@@ -14,7 +14,7 @@ inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-func
 DESCRIPTION="Low-level pixel manipulation routines"
 HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-libs/xapp/Manifest b/x11-libs/xapp/Manifest
index f518a201bf97..e9b18a816485 100644
--- a/x11-libs/xapp/Manifest
+++ b/x11-libs/xapp/Manifest
@@ -1,5 +1,6 @@
-DIST xapp-2.4.3.tar.gz 252180 BLAKE2B 49ebba445e04205f714fd4a16363674477e1156872ed1d26ac8450c32d688323971301ed97366e36141e91996f64401372dbe5ee4e36130ac4cf70e12e9fcdde SHA512 ecfe97b5a6de6ef06416b3220dc30856c590087c22b77ba2078194995650966e7811a91b3ce6335b363ea5066473d5c59a318232e40a2311341067dcee4719b2
+AUX xapp-optional-de-options.patch 3309 BLAKE2B 4760a70b3e5a5806925f0e33ead8282990069302f4b6c4ff1899804010c4dfea6c4d97983c5acf57d523bfee7a6b12ae4e2e8d7736ab2258f8159897c2df79b7 SHA512 d4b5c613ac2f630b5f105572605429b064cd824f6ebc2f354207cdf253a33811af2f2ac7e3c10e21638de9856c035816396a05c96a298da0777ac146b540ff73
 DIST xapp-2.6.1.tar.gz 270606 BLAKE2B 0f2572b2e9ec4056bea0fc532f5327bd6de4741719a49b68180d45ff00fcea9b760acb362fc39d3f2dc9d94001b7021267a8a84c067aa90c5a201a46be76e97c SHA512 f96006fffac67b312caba644e8da75209c443688b08254b9bb5b17eb9148e66b35a8b1fe336e8880c7b950f8fc696884d8f5d610092c2cb44357ad3bf3ef43c7
-EBUILD xapp-2.4.3.ebuild 2285 BLAKE2B 3539ccc5653ffd179942454dbda20bd72aec469a378842f54512656651cace7ddf3acc78db72f42185ce3e6f9109b768b79c787a33438cffad5a61b4c93aae0b SHA512 da38a4c6a0772a363048426c172cb91dde93862b0c8a1d460d5b3cad569dd8b974a748ea38e08f41d8d2a8a3ee233ececa9b91c1ad7ab9fb895da33d51eefaa5
+DIST xapp-2.8.2.tar.gz 272539 BLAKE2B 1e2fb92b976196c2e9f36e322656ee40252e4c358a13361a054ead88e6fa3df35a53f1b0ee594df4189a68c1739c4a040558fac533ace095536fcc1dca76954b SHA512 97d19b95626a37fc08a0a159be741de5d9bcc034484e977bd739b91bd37122fcf2f3479285d544282a92c8fa180b116db1ad5e96fe19284c62287d3c5b135163
 EBUILD xapp-2.6.1.ebuild 2279 BLAKE2B 7d758493c6c7cf1a2e62d2a878e3bad9e69c39936ab9712dc25506616226f2f957764ea6cac0e7de5712d544981cfe06c1b7a91be6d5421525622714ac1d9fb7 SHA512 3727448dcad306c21f8abc40f0c82bc0041457b3670b52c258e51080e5b28c8db6c7b53ec5e03cf074caadc062f6f1c6fa7a49463d031e7fc37d83b49cbd8e78
-MISC metadata.xml 578 BLAKE2B 6a52fabaa36a29f26e7128d47c6b3b21f0fe0996f37f1f787109345c2fd31c4f5689f2dfd6d6324412fcf03f8e2a227367278bb770e0a2ba39c41399a5fb898a SHA512 fda47e5862f660ee4a72653265f82d963e6cb06d6062024021df42ccb1035f51ea7b9eab6611a9152d32eb4ffc2728a880d05770fe9e9be4d5145a7d84527fa4
+EBUILD xapp-2.8.2.ebuild 2382 BLAKE2B 2467483964a41c1acffba8de96b770c08c2fb771c76be03f7763ec96b7d6056415423fcb916b89d0af72ca5a02a30c6da038041ff29852115c16bf52b0288576 SHA512 9000e73f7b9b3128829c7312d8465168ba08e4af809f6a8cd60201967bf6cba0594b691dc4978440db76c3866e151ed1ff8735f0c5881a6e184629bf4e48227e
+MISC metadata.xml 661 BLAKE2B aaf60791b7e8739d7418edd95ff2bfb7429de931c54ccd6c770e752f7f0b45b84a7720add07ecb9ae046064b12d14640b7fe1ab85f6f2a73dc0c0d80eaf13d43 SHA512 27f7fa4138c5d870f1299999711032d7a4c2f628efd8b73ef75d801645950ff9894f970b917501877ef845c0c6fa38ea24c6fa475f25a260f24a2925fcdc47e7
diff --git a/x11-libs/xapp/files/xapp-optional-de-options.patch b/x11-libs/xapp/files/xapp-optional-de-options.patch
new file mode 100644
index 000000000000..1d054f3dc663
--- /dev/null
+++ b/x11-libs/xapp/files/xapp-optional-de-options.patch
@@ -0,0 +1,106 @@
+From fda9544509c1b3c2c5417a4b27490e7a07e480ec Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Tue, 27 Jun 2023 21:54:08 -0400
+Subject: [PATCH 1/2] Remove unused meson scripts
+
+---
+ libxapp/install_generated_header.py       | 12 ------------
+ meson-scripts/install_generated_header.py | 12 ------------
+ 2 files changed, 24 deletions(-)
+ delete mode 100644 libxapp/install_generated_header.py
+ delete mode 100644 meson-scripts/install_generated_header.py
+
+diff --git a/libxapp/install_generated_header.py b/libxapp/install_generated_header.py
+deleted file mode 100644
+index d487ad9..0000000
+--- a/libxapp/install_generated_header.py
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#!/usr/bin/python3
+-
+-import os
+-import sys
+-import subprocess
+-
+-install_dir = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], 'include', 'xapp', 'libxapp')
+-header_path = os.path.join(os.environ['MESON_BUILD_ROOT'], 'libxapp', sys.argv[1])
+-
+-print("\nInstalling generated header '%s' to %s\n" % (sys.argv[1], install_dir))
+-
+-subprocess.call(['cp', header_path, install_dir])
+diff --git a/meson-scripts/install_generated_header.py b/meson-scripts/install_generated_header.py
+deleted file mode 100644
+index d487ad9..0000000
+--- a/meson-scripts/install_generated_header.py
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#!/usr/bin/python3
+-
+-import os
+-import sys
+-import subprocess
+-
+-install_dir = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], 'include', 'xapp', 'libxapp')
+-header_path = os.path.join(os.environ['MESON_BUILD_ROOT'], 'libxapp', sys.argv[1])
+-
+-print("\nInstalling generated header '%s' to %s\n" % (sys.argv[1], install_dir))
+-
+-subprocess.call(['cp', header_path, install_dir])
+
+From dac2e1ab74c3eb109b928ccba66b805e9a40aaee Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Tue, 2 Jan 2024 23:46:57 -0500
+Subject: [PATCH 2/2] Add confiure options for environment specific
+ integrations
+
+---
+ meson_options.txt          | 10 ++++++++++
+ scripts/meson.build        |  7 +++++--
+ status-applets/meson.build |  4 +++-
+ 3 files changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index a36933a..3ea5310 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -28,3 +28,13 @@ option('debian_derivative',
+     value: false,
+     description: 'Use paths specific to Debian and derivatives.'
+ )
++option('mate',
++    type: 'boolean',
++    value: true,
++    description: 'Install mate specific items.'
++)
++option('xfce',
++    type: 'boolean',
++    value: true,
++    description: 'Install xfce specific items.'
++)
+diff --git a/scripts/meson.build b/scripts/meson.build
+index b210f45..7b1c1bc 100644
+--- a/scripts/meson.build
++++ b/scripts/meson.build
+@@ -1,8 +1,11 @@
+ scripts = files(
+     'pastebin',
+     'upload-system-info',
+-    'xapp-gpu-offload',
+-    'xfce4-set-wallpaper')
++    'xapp-gpu-offload')
++
++if get_option('xfce')
++	scripts += files('xfce4-set-wallpaper')
++endif
+ 
+ install_data(scripts,
+     install_dir: join_paths(get_option('prefix'), get_option('bindir')),
+diff --git a/status-applets/meson.build b/status-applets/meson.build
+index 979682e..b464d49 100644
+--- a/status-applets/meson.build
++++ b/status-applets/meson.build
+@@ -1 +1,3 @@
+-subdir('mate')
++if get_option('mate')
++	subdir('mate')
++endif
diff --git a/x11-libs/xapp/metadata.xml b/x11-libs/xapp/metadata.xml
index 1aeced361cde..180583c82807 100644
--- a/x11-libs/xapp/metadata.xml
+++ b/x11-libs/xapp/metadata.xml
@@ -13,6 +13,7 @@
 		<remote-id type="github">linuxmint/xapp</remote-id>
 	</upstream>
 	<use>
-		<flag name="mate">Install status applet for <pkg>mate-base/mate</pkg></flag>
+		<flag name="mate">Install integrations for <pkg>mate-base/mate</pkg></flag>
+		<flag name="xfce">Install integrations for <pkg>xfce-base/xfce4-meta</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-libs/xapp/xapp-2.4.3.ebuild b/x11-libs/xapp/xapp-2.8.2.ebuild
index 969fb5138fbe..af9f0df86998 100644
--- a/x11-libs/xapp/xapp-2.4.3.ebuild
+++ b/x11-libs/xapp/xapp-2.8.2.ebuild
@@ -1,42 +1,39 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 VALA_USE_DEPEND="vapigen"
 
 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 xfce? ( GPL-3 )"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 SLOT="0"
-IUSE="gtk-doc introspection mate"
+IUSE="gtk-doc introspection mate xfce"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="
+DEPEND="
 	>=dev-libs/glib-2.44.0:2
 	dev-libs/libdbusmenu[gtk3]
 	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/gtk+-3.22.0:3[introspection?]
 	x11-libs/libxkbfile
 	x11-libs/libX11
 	x11-libs/pango
-
-	mate? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
 "
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -47,29 +44,34 @@ BDEPEND="
 	sys-apps/dbus
 	sys-devel/gettext
 
-	gtk-doc? ( dev-util/gtk-doc )
+	gtk-doc? (
+		dev-util/gtk-doc
+	)
 "
 
+PATCHES=(
+	# Make desktop environment integrations optional
+	# https://github.com/linuxmint/xapp/pull/176
+	"${FILESDIR}"/${PN}-optional-de-options.patch
+)
+
 src_prepare() {
 	vala_src_prepare
 	default
 
-	# don't install distro specific tools
-	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
+	# don't install pastebin upload wrapper
+	sed -iE "s/'(pastebin|upload-system-info)',//" scripts/meson.build || die
 
 	# Fix meson helpers
 	python_setup
-	python_fix_shebang meson-scripts
+	python_fix_shebang .
 }
 
 src_configure() {
 	local emesonargs=(
 		$(meson_use gtk-doc docs)
+		$(meson_use mate)
+		$(meson_use xfce)
 		-Dpy-overrides-dir="/pygobject"
 	)
 	meson_src_configure