[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside2-tools/, dev-python/pyside2-tools/files/
commit: a99208aa49af5a8cdf556f710477db1671067af0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 6 12:19:18 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Nov 6 18:10:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a99208aa
dev-python/pyside2-tools: drop 5.15.10
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-python/pyside2-tools/Manifest | 1 -
.../pyside2-tools-5.15.1-dont-install-tools.patch | 58
.../pyside2-tools/pyside2-tools-5.15.10.ebuild | 77 --
3 files changed, 136 deletions(-)
diff --git a/dev-python/pyside2-tools/Manifest
b/dev-python/pyside2-tools/Manifest
index 5f19cf5fdc33..d7602001a4a7 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,2 +1 @@
-DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B
7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e9185e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56
SHA512
dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
DIST pyside-setup-opensource-src-5.15.11.tar.xz 3584760 BLAKE2B
c4d60439a218451eb0c505031524fe1e30a117b7e89a28b5cd7518c193a8d2de01a5db8cb3acdd97c81da6dddff99f786c6c763427f78cdd0af4031122ac2d24
SHA512
377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91
diff --git
a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
deleted file mode 100644
index 60de6aa07ee7..
---
a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 20a5e19..575c1df 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,38 +55,6 @@ else()
- set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
- endif()
-
--install(FILES "${UIC_PATH}"
--DESTINATION bin
--PERMISSIONS
--OWNER_EXECUTE OWNER_WRITE OWNER_READ
--GROUP_EXECUTE GROUP_READ
--WORLD_EXECUTE WORLD_READ)
--
--install(FILES "${RCC_PATH}"
--DESTINATION bin
--PERMISSIONS
--OWNER_EXECUTE OWNER_WRITE OWNER_READ
--GROUP_EXECUTE GROUP_READ
--WORLD_EXECUTE WORLD_READ)
--
--if (EXISTS ${DESIGNER_PATH})
--if (APPLE)
--install(DIRECTORY "${DESIGNER_PATH}"
--DESTINATION bin
--FILE_PERMISSIONS
--OWNER_EXECUTE OWNER_WRITE OWNER_READ
--GROUP_EXECUTE GROUP_READ
--WORLD_EXECUTE WORLD_READ)
--else()
--install(FILES "${DESIGNER_PATH}"
--DESTINATION bin
--PERMISSIONS
--OWNER_EXECUTE OWNER_WRITE OWNER_READ
--GROUP_EXECUTE GROUP_READ
--WORLD_EXECUTE WORLD_READ)
--endif()
--endif()
--
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
-"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-IMMEDIATE @ONLY)
-@@ -113,14 +81,6 @@ endif()
-
- add_subdirectory(pylupdate)
-
--# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate
entrypoints
--install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py
--DESTINATION bin
--PERMISSIONS
--OWNER_EXECUTE OWNER_WRITE OWNER_READ
--GROUP_EXECUTE GROUP_READ
--WORLD_EXECUTE WORLD_READ)
--
- if (BUILD_TESTS)
- enable_testing()
- add_subdirectory(tests)
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild
b/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild
deleted file mode 100644
index 24d169ccfa4f..
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.10.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_{10..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 ~riscv 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_prep
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside2-tools/, dev-python/pyside2-tools/files/
commit: 61f1c976ee026dab3cc8e8be9179f203a5002dd8
Author: Miroslav Šulc gentoo org>
AuthorDate: Mon Dec 28 04:47:03 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Dec 28 04:47:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f1c976
dev-python/pyside2-tools: removed tools keeping only pyside2-lupdate
Closes: https://bugs.gentoo.org/761748
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc gentoo.org>
.../pyside2-tools-5.15.1-dont-install-tools.patch | 58 +
dev-python/pyside2-tools/metadata.xml | 3 -
.../pyside2-tools/pyside2-tools-5.15.1.ebuild | 75 --
3 files changed, 70 insertions(+), 66 deletions(-)
diff --git
a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
new file mode 100644
index 000..60de6aa07ee
--- /dev/null
+++
b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20a5e19..575c1df 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -55,38 +55,6 @@ else()
+ set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
+ endif()
+
+-install(FILES "${UIC_PATH}"
+-DESTINATION bin
+-PERMISSIONS
+-OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-GROUP_EXECUTE GROUP_READ
+-WORLD_EXECUTE WORLD_READ)
+-
+-install(FILES "${RCC_PATH}"
+-DESTINATION bin
+-PERMISSIONS
+-OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-GROUP_EXECUTE GROUP_READ
+-WORLD_EXECUTE WORLD_READ)
+-
+-if (EXISTS ${DESIGNER_PATH})
+-if (APPLE)
+-install(DIRECTORY "${DESIGNER_PATH}"
+-DESTINATION bin
+-FILE_PERMISSIONS
+-OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-GROUP_EXECUTE GROUP_READ
+-WORLD_EXECUTE WORLD_READ)
+-else()
+-install(FILES "${DESIGNER_PATH}"
+-DESTINATION bin
+-PERMISSIONS
+-OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-GROUP_EXECUTE GROUP_READ
+-WORLD_EXECUTE WORLD_READ)
+-endif()
+-endif()
+-
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
+"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+IMMEDIATE @ONLY)
+@@ -113,14 +81,6 @@ endif()
+
+ add_subdirectory(pylupdate)
+
+-# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate
entrypoints
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py
+-DESTINATION bin
+-PERMISSIONS
+-OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-GROUP_EXECUTE GROUP_READ
+-WORLD_EXECUTE WORLD_READ)
+-
+ if (BUILD_TESTS)
+ enable_testing()
+ add_subdirectory(tests)
diff --git a/dev-python/pyside2-tools/metadata.xml
b/dev-python/pyside2-tools/metadata.xml
index e31c29a6f7d..11287d1296c 100644
--- a/dev-python/pyside2-tools/metadata.xml
+++ b/dev-python/pyside2-tools/metadata.xml
@@ -5,7 +5,4 @@
fordf...@gentoo.org
Miroslav Šulc
-
- Install supplementary tools (rcc, uic,
designer)
-
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
b/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
index 165134f5b6a..facd5629649 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
@@ -8,74 +8,42 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..8} )
CMAKE_IN_SOURCE_BUILD=1
-inherit cmake python-r1 virtualx
+inherit cmake python-r1
MY_P=pyside-setup-opensource-src-${PV}
-DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
+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";
-# Though "LICENSE-uic" suggests the "pyside2uic" directory to be dual-licensed
-# under the BSD 3-clause and GPL v2 licenses, this appears to be an oversight;
-# all files in this (and every) directory are licensed only under the GPL v2.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test tools"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# Note that:
-# * "pyside2uic" imports the "PySide2.QtGui" and "PySide2.QtWidgets" C
-# extensions and hence requires "widgets", which includes "gui" as well.
-# * "dev-qt/qtchooser" installs binaries conflicting with the "tools" USE flag.
-COMMON_DEPEND="${PYTHON_DEPS}
- >=dev-python/pyside2-${PV}[widgets,${PYTHON_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
- tools? ( !dev-qt/qtchooser )
-"
-DEPEND="${COMMON_DEPEND}
- test? ( virtual/pkgconfig )
+CDEPEND="${PYTHON_DEPS}
+ >=dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
"
+RDEPE
