gentoo auto-resync : 28:01:2023 - 20:52:36

3 files changed, 2 insertions, 81 deletions

diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 8811e92a1b21..3b4ab0bb975b 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,8 +1,6 @@
 AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
-DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4
 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
-EBUILD pyside2-tools-5.15.6.ebuild 1654 BLAKE2B cc13386c1aa638361f3e17b71d9276fd5d4f03cb9750f5b30f9cbf17bad1db233add5acf57a390fc7594dc1fbcf966ff0413ad3500b83c0aabaeea5a0db9e073 SHA512 b081905c3d0b7655b57b2923550d92b7f61111bd051fcf80e03b85a6645dee051d69e22894353ad3e96700f1ce1e353b769133e29ef571b707707bbe37936590
-EBUILD pyside2-tools-5.15.7.ebuild 1654 BLAKE2B 171ee43cb5228b8b6c86d5f57b5a2fefee72e152ccdc4ea24f45aa2b9595540285f217aeaef764b055e8e4a258779897dbbfd5c50ad96cad3e5959595cde83b3 SHA512 c3a9ff5f33d1f81d1f574422cd004a73bd40d1aba09523fe4217ecbee826cef5f56ef2db7459d5aad523273bf21a08265c410b81f28dc9797a5bdb267e30bce6
+EBUILD pyside2-tools-5.15.7.ebuild 1653 BLAKE2B adbbbd888e4785543ae175f285f32b34a6d392b6d8f85ef9576968a700cb7284859e13f3b4b75e6e77a8544676ba0779870bab3c33f8ae9f66bad285dcb2a6f2 SHA512 6016c3ab4144ea89672e8981a337ea8a83f892ad5b713b6a79d2a08bf1137de240ad9193b8d1a07b9ccbfd83587f0304579e2fe308d158cea065f1700fb160dc
 EBUILD pyside2-tools-5.15.8.ebuild 1656 BLAKE2B 473740bc6392674185a1ce05176cd37d7a534a5ca4cf6418587d8297f0598c27ddcb823f774ca5ce1fa89cd393e7ebdce572596baa59275f250576da2b23689b SHA512 a3bac308f16fdcb61116aafdea5d74894e93cd62ffe041acbe2a2e7125dff3924f30579a54f45c94e8f0e20c1ba7f178583948d6e3d94fc5ce9b2a12ca23e7ca
 MISC metadata.xml 512 BLAKE2B e06bacf79750f6cc22b41ade8840a01636793100a85cc469c19af1b4273ef33adb3dec755947057a892e88de4ac68e665fa0ccb265457dd09a502964bd991749 SHA512 d201e34b2d73fb308c6b5f14b2d0d292b453b5ef05c820efe429fcfa7259b23f17bc015c08b8f938a2df75f5b654cc1357632a786abfb555479e3f172feee3fd
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild
deleted file mode 100644
index 50c6f5e04b3f..000000000000
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake python-r1
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-# the tools conflict with tools from QT
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.1-dont-install-tools.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	# The tests are only related to the tools that we don't install
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-	)
-
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	doman pylupdate/pyside2-lupdate.1
-	einstalldocs
-}
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
index 2f7089c3147a..bc841956419f 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/sources/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}