summaryrefslogtreecommitdiff
path: root/dev-python/python3-xapp
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/python3-xapp')
-rw-r--r--dev-python/python3-xapp/Manifest5
-rw-r--r--dev-python/python3-xapp/files/python3-xapp-configurable-python-target.patch31
-rw-r--r--dev-python/python3-xapp/python3-xapp-2.4.1-r2.ebuild58
-rw-r--r--dev-python/python3-xapp/python3-xapp-2.4.2.ebuild2
4 files changed, 2 insertions, 94 deletions
diff --git a/dev-python/python3-xapp/Manifest b/dev-python/python3-xapp/Manifest
index 42e2756774b7..91d6c3a42837 100644
--- a/dev-python/python3-xapp/Manifest
+++ b/dev-python/python3-xapp/Manifest
@@ -1,6 +1,3 @@
-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
DIST python3-xapp-2.4.2.tar.gz 21482 BLAKE2B bacea6a626efa8ee60a4f91923e48e0e9e49d08ca0c9a5998b724284edc353912099f2deafc6eb7cf6a42a983f97f8cc03fe86c18338c89823f103e413685637 SHA512 04f995986eabaf613d166ae31bd36eda2b3563ea58aded64b132940430db9d59f9525eb562b0ad8d7649844adbaf28332c4f51fa633610b102feae97bc1bfc9f
-EBUILD python3-xapp-2.4.1-r2.ebuild 1181 BLAKE2B a71a364e658a37fa5fe3347cc95f9ca39893df9ddee81f0cea06b4a838ea277ae4def807f639e8fc5ad8f3319a48069cdadfbb23fc0d30493f027bf013ffe660 SHA512 a029c6cfc959ced0b6c48012227d3e0702f01c4e9127dd3753052e230d03e30b7a28753daee4592693b9054163a89bb6e7b7c0b5db46a83b32e11c2fad8acf34
-EBUILD python3-xapp-2.4.2.ebuild 1000 BLAKE2B 41faf7b8fcc15b92c018ad8cd285ed5044367dde07e6c717e663abda2429634b0c7fde1f7ec103f76aec322f098fb915e6bf3bccb5fb88f9ecd588a8acc3edec SHA512 0296967b5c7a167675ff31dcddb7485b4302160b06cb04b2e9275a6c8429324470955ba7217826ae42ca9de7a8ad7451209f6e85c8d621727776fcbcc4b43884
+EBUILD python3-xapp-2.4.2.ebuild 999 BLAKE2B a9e3e5dc13c7b8b13657e39c456aa208590bb14c3b6b0cc7cfba6d7a8ded2f492457d56b56d599e2e6d05ef2ab974be8ba9e5f940da703fe89858447c0c24a09 SHA512 87c2a18d0b380b6afebcda24111af633c35943a39a3b7c5d382e3202e86e88d13159c1aad0f2618a2c2eec5e2548580765654b00d40b3a35926d13ec4b8b13a1
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
deleted file mode 100644
index cdc6988934b9..000000000000
--- a/dev-python/python3-xapp/files/python3-xapp-configurable-python-target.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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-r2.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.1-r2.ebuild
deleted file mode 100644
index 46d9df3aeab8..000000000000
--- a/dev-python/python3-xapp/python3-xapp-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
-}
diff --git a/dev-python/python3-xapp/python3-xapp-2.4.2.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.2.ebuild
index 65b840cd40a9..cb18f9836057 100644
--- a/dev-python/python3-xapp/python3-xapp-2.4.2.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.4.2.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="