gentoo auto-resync : 15:02:2024 - 23:36:26

4 files changed, 95 insertions, 5 deletions

diff --git a/dev-python/python3-xapp/Manifest b/dev-python/python3-xapp/Manifest
index 7c374d32ec52..d8845c16854c 100644
--- a/dev-python/python3-xapp/Manifest
+++ b/dev-python/python3-xapp/Manifest
@@ -1,3 +1,5 @@
+AUX python3-xapp-configurable-python-target.patch 979 BLAKE2B a0595f7fe64a0053e17452e0e994e9c5bdbdf2b28312d77bf35e665fe32109a7c9695fa1ca89572fef1899682446b44a75c459ae39f271359a2afd3f09fcb7db SHA512 b3313ab174936471580203167220dce8f0a66e4b507ee19af2aefbc2ed8a52a38d747abd8f080db415a3e8ee64f7faf490b29f805c24ff1d7cd60491f6572672
 DIST python3-xapp-2.4.1.tar.gz 21181 BLAKE2B 460aba09d147d64c8102f66d059c6ab1f7c39893ce98844e59ab5954b690d81ab4b253cb6a17f9b3c781dfb5e965d1a4de859aaeff5ef65ab3f67a86a4c6e6c2 SHA512 97045061aa5965adcfe7301774dbd35a226fa9b846e31a7c097229cc417ff4008e518ebd5b600d4ce6a46daa39d51de70d391b6b0a7c78490419d3a96daca6a9
-EBUILD python3-xapp-2.4.1.ebuild 1168 BLAKE2B e714b60c0d1b40b0c997e5f3efeeb64006e965fdf73202a5d4d4cc398a7a44dd6d6f3bd4d1f1e217e501951c614d657e158dd0e11e2418400edf5a5b2825a7de SHA512 4903781e308a6cafe34fb3844d86145adeeb30bd5c0227ccb8b7997cd9ef83b054ace06fd6ff86c0fd6c6a6ee739e4abb0dd107ab7ee4aef3e8064aedf93d158
+EBUILD python3-xapp-2.4.1-r1.ebuild 1160 BLAKE2B 858f384f0c8cccffba4516338cd583a958dee04a7dd2198b423c900a6e20c02a98171c78bb8caaa3ab2ee0cdef313d7dbde04103b0af21501c2f699cd84ca738 SHA512 310ac48e070b6cf420d227eb2fcbeadd3080445aa56fd63952868bc66f5b2e2e62420d4edb83e46b0406c1f7ee04c3b1e350d5b70da19e6361c810a389388d0a
+EBUILD python3-xapp-2.4.1-r2.ebuild 1183 BLAKE2B 04f234a03847e0f75e0a491a3f2e9bf44ad2e436a83e073f98c2824f5c53eb01a8d4f17d010d3e8b1a99aefe63671d6200d45a4651c6be6ad79ae9f5d3c1c457 SHA512 6bf1407d731a8efd6fc24d38a64ef13669c1d09175b462b1c9e082de00b79737b1b14d256d0a24c23608cf9462495f42da66043312560c2a2cb637bc65024c8e
 MISC metadata.xml 516 BLAKE2B e9429fe1f541d1763f644fb18fbef2bef3e105e943a7099792951a63a38c0083ae35e64160233ab48a8556d5bba96ad9031dc09fcdcf24033494d222e25a9cfa SHA512 b23a2d82ecbdb03abce2b3c40579c6aec5caad09b556c513600ded65d21ab56949ffe1eae0b04238f79c9e3c5c95a66a263e23281fcc2d16978c6a787e53c813
diff --git a/dev-python/python3-xapp/files/python3-xapp-configurable-python-target.patch b/dev-python/python3-xapp/files/python3-xapp-configurable-python-target.patch
new file mode 100644
index 000000000000..cdc6988934b9
--- /dev/null
+++ b/dev-python/python3-xapp/files/python3-xapp-configurable-python-target.patch
@@ -0,0 +1,31 @@
+From 70966ad200bf2a5e5769a2ac5f1d4da0a4a3aa51 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Tue, 2 Jan 2024 22:19:46 -0500
+Subject: [PATCH] Make python installation configurable for distro packaging.
+
+---
+ meson.build       | 2 +-
+ meson_options.txt | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 meson_options.txt
+
+diff --git a/meson.build b/meson.build
+index a9b67ca..a930803 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,7 +1,7 @@
+ project('python-xapp', version: '2.4.1', meson_version: '>=0.47.0')
+ 
+ pymod = import('python')
+-python3 = pymod.find_installation('python3')
++python3 = pymod.find_installation(get_option('python_target'))
+ 
+ subdir('xapp')
+ 
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..689a9c9
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1 @@
++option('python_target', type: 'string', value: 'python3', description: 'Python installation to target')
diff --git a/dev-python/python3-xapp/python3-xapp-2.4.1.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.1-r1.ebuild
index 6492fcd562ef..f10dee3075c2 100644
--- a/dev-python/python3-xapp/python3-xapp-2.4.1.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# 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_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit meson python-r1
 
@@ -14,11 +14,10 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
-	>=x11-libs/xapp-2.4.1[introspection]
+	<x11-libs/xapp-2.8.0[introspection]
 "
 RDEPEND="
 	${DEPEND}
diff --git a/dev-python/python3-xapp/python3-xapp-2.4.1-r2.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..b031ce2f5d94
--- /dev/null
+++ b/dev-python/python3-xapp/python3-xapp-2.4.1-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-r1
+
+DESCRIPTION="Python bindings for x11-libs/xapp"
+HOMEPAGE="https://github.com/linuxmint/python3-xapp"
+SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		>=x11-libs/xapp-2.8.1[introspection,${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# Make python installation configurable for distro packaging
+	# https://github.com/linuxmint/python3-xapp/pull/23
+	"${FILESDIR}"/${PN}-configurable-python-target.patch
+)
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			-Dpython_target="${EPYTHON}"
+	}
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	python_foreach_impl meson_src_test
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+}