[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/, dev-python/pyside/files/, dev-python/pyside-tools/, ...
commit: f32efbb9a1b9a78d84bf5fc897e34e65d2a396b5 Author: Davide Pesavento gentoo org> AuthorDate: Thu Nov 28 19:07:45 2019 + Commit: Davide Pesavento gentoo org> CommitDate: Thu Nov 28 19:28:16 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f32efbb9 dev-python: drop broken and unmaintained pyside2 ebuilds See https://bugs.gentoo.org/624682#c63 Signed-off-by: Davide Pesavento gentoo.org> dev-python/pyside-tools/metadata.xml | 8 -- dev-python/pyside-tools/pyside-tools-.ebuild | 110 dev-python/pyside/files/rpath.cmake | 10 -- dev-python/pyside/metadata.xml | 33 - dev-python/pyside/pyside-.ebuild | 153 --- dev-python/shiboken/Manifest | 1 - dev-python/shiboken/metadata.xml | 15 --- dev-python/shiboken/shiboken-5.12.4.ebuild | 104 --- 8 files changed, 434 deletions(-) diff --git a/dev-python/pyside-tools/metadata.xml b/dev-python/pyside-tools/metadata.xml deleted file mode 100644 index 17237689.. --- a/dev-python/pyside-tools/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd";> - - - q...@gentoo.org - Gentoo Qt Project - - diff --git a/dev-python/pyside-tools/pyside-tools-.ebuild b/dev-python/pyside-tools/pyside-tools-.ebuild deleted file mode 100644 index 98a451e5.. --- a/dev-python/pyside-tools/pyside-tools-.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 2009-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CMAKE_IN_SOURCE_BUILD="1" -PYTHON_COMPAT=( python2_7 python3_{5,6} ) - -inherit cmake-utils python-r1 virtualx git-r3 - -DESCRIPTION="PySide development tools (lupdate, rcc, uic)" -HOMEPAGE="https://wiki.qt.io/PySide2"; -EGIT_REPO_URI="https://code.qt.io/pyside/pyside-tools.git"; -EGIT_BRANCH="5.9" - -# Although "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="2" -KEYWORDS="" -IUSE="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# The "pyside2uic" package imports both the "PySide2.QtGui" and -# "PySide2.QtWidgets" C extensions and hence requires "gui" and "widgets". -RDEPEND=" - ${PYTHON_DEPS} - >=dev-python/pyside-${PV}:${SLOT}[gui,widgets,${PYTHON_USEDEP}] - >=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}] - dev-qt/qtcore:5 -" -DEPEND="${RDEPEND} - test? ( virtual/pkgconfig ) -" - -src_prepare() { - cmake-utils_src_prepare - - python_copy_sources - - preparation() { - pushd "${BUILD_DIR}" >/dev/null || die - - if python_is_python3; then - # Remove Python 2-specific paths. - rm -rf pyside2uic/port_v2 || die - - # Generate proper Python 3 test interfaces with the "-py3" option. - sed -i -e 's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \ - tests/rcc/CMakeLists.txt || die - else - # Remove Python 3-specific paths. - rm -rf pyside2uic/port_v3 || die - fi - - # Force testing against the current Python version. - sed -i -e "/pkg-config/ s:shiboken2:&-${EPYTHON}:" \ - tests/rcc/run_test.sh || die - - popd >/dev/null || die - } - python_foreach_impl preparation -} - -src_configure() { - configuration() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - ) - - # Find the previously installed "Shiboken2Config.*.cmake" and - # "PySide2Config.*.cmake" files specific to this Python version. - if python_is_python3; then - # Extension tag unique to the current Python 3.x version (e.g., - # ".cpython-34m" for CPython 3.4). - local EXTENSION_TAG="$("$(python_get_PYTHON_CONFIG)" --extension-suffix)" - EXTENSION_TAG="${EXTENSION_TAG%.so}" - - mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX="${EXTENSION_TAG}" ) - else - mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX="-python2.7" ) - fi - - CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_configure - } - python_foreach_impl configuration -} - -src_compile() { - compilation() { - CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_compile - } - python_foreach_impl compilation -} - -src_test() { - testing() { - local -x PYTHONDONTW
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: 797554b39dce8fdec55d6094445afd1144996c44 Author: Davide Pesavento gentoo org> AuthorDate: Sat Jul 13 19:17:20 2019 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Jul 13 19:17:20 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=797554b3 dev-python/shiboken: relax Qt version requirements Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Davide Pesavento gentoo.org> dev-python/shiboken/shiboken-5.12.4.ebuild | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dev-python/shiboken/shiboken-5.12.4.ebuild b/dev-python/shiboken/shiboken-5.12.4.ebuild index 6df0fb8d..d1aac88a 100644 --- a/dev-python/shiboken/shiboken-5.12.4.ebuild +++ b/dev-python/shiboken/shiboken-5.12.4.ebuild @@ -31,19 +31,22 @@ KEYWORDS="~amd64" IUSE="+docstrings numpy test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-2):5" + RDEPEND="${PYTHON_DEPS} - >=dev-qt/qtcore-${PV}:5 + >=dev-qt/qtcore-${QT_PV} >=sys-devel/clang-6:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 - >=dev-qt/qtxml-${PV}:5 - >=dev-qt/qtxmlpatterns-${PV}:5 + >=dev-qt/qtxml-${QT_PV} + >=dev-qt/qtxmlpatterns-${QT_PV} ) numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) " DEPEND="${RDEPEND} - test? ( >=dev-qt/qttest-${PV}:5 ) + test? ( >=dev-qt/qttest-${QT_PV} ) " S=${WORKDIR}/${MY_P}/sources/shiboken2
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/files/, dev-python/shiboken/
commit: 6a795b4d1b8d10228a84f3ffb3a18d259c3660f1 Author: leycec gmail com> AuthorDate: Sat Jul 13 17:09:03 2019 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Jul 13 17:10:06 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a795b4d dev-python/shiboken: add 5.12.4, EAPI 7 Drop unmaintained live ebuild Bug: https://bugs.gentoo.org/624682 Package-Manager: Portage-2.3.69, Repoman-2.3.16 dev-python/shiboken/Manifest | 1 + dev-python/shiboken/files/rpath.cmake | 10 --- dev-python/shiboken/metadata.xml | 4 ++ dev-python/shiboken/shiboken-5.12.4.ebuild | 101 + dev-python/shiboken/shiboken-.ebuild | 95 --- 5 files changed, 106 insertions(+), 105 deletions(-) diff --git a/dev-python/shiboken/Manifest b/dev-python/shiboken/Manifest new file mode 100644 index ..bb7247a6 --- /dev/null +++ b/dev-python/shiboken/Manifest @@ -0,0 +1 @@ +DIST pyside-setup-everywhere-src-5.12.4.tar.xz 5481172 BLAKE2B e4572cde99efebde20395c13f49a6ffd0b89a0044822e3cc4034ef0316e9a359749817bcc8f2069b4a401d70c03a0ab60a3907ac1628776203db0e349e053e06 SHA512 cf836a73980dce7e1f66f061351426fbf9ede773ef94608d7ee90b2185554f333550c74c14ac572c7d0465c6aea2f793d9c6f1fe6278a73deb40e1fd6fb88076 diff --git a/dev-python/shiboken/files/rpath.cmake b/dev-python/shiboken/files/rpath.cmake deleted file mode 100644 index b896c878.. --- a/dev-python/shiboken/files/rpath.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# use, i.e. don't skip the full RPATH for the build tree -SET(CMAKE_SKIP_BUILD_RPATH FALSE) - -# when building, don't use the install RPATH already -# (but later on when installing) -SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - -# add the automatically determined parts of the RPATH -# which point to directories outside the build tree to the install RPATH -SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) diff --git a/dev-python/shiboken/metadata.xml b/dev-python/shiboken/metadata.xml index d199c54b..27da5503 100644 --- a/dev-python/shiboken/metadata.xml +++ b/dev-python/shiboken/metadata.xml @@ -1,11 +1,15 @@ http://www.gentoo.org/dtd/metadata.dtd";> + + ley...@gmail.com + q...@gentoo.org Gentoo Qt Project + Expose documentation as Python docstrings (recommended) Enable NumPy-based 2D array support diff --git a/dev-python/shiboken/shiboken-5.12.4.ebuild b/dev-python/shiboken/shiboken-5.12.4.ebuild new file mode 100644 index ..6df0fb8d --- /dev/null +++ b/dev-python/shiboken/shiboken-5.12.4.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# TODO: Split the "/usr/bin/shiboken2" binding generator from the +# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former +# requires everything (including Clang) at runtime; the latter only requires +# Qt and Python at runtime. Note that "pip" separates these two as well. See: +# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding +# Once split, the PySide2 ebuild should be revised to require +# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime. + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit cmake-utils llvm python-r1 + +MY_P=pyside-setup-everywhere-src-${PV} + +DESCRIPTION="Python binding generator for C++ libraries" +HOMEPAGE="https://wiki.qt.io/PySide2"; +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"; + +# The "sources/shiboken2/libshiboken" directory is triple-licensed under the +# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 +# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be +# arbitrarily relicensed. (TODO) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" +SLOT="2" +KEYWORDS="~amd64" +IUSE="+docstrings numpy test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-qt/qtcore-${PV}:5 + >=sys-devel/clang-6:= + docstrings? ( + >=dev-libs/libxml2-2.6.32 + >=dev-libs/libxslt-1.1.19 + >=dev-qt/qtxml-${PV}:5 + >=dev-qt/qtxmlpatterns-${PV}:5 + ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qttest-${PV}:5 ) +" + +S=${WORKDIR}/${MY_P}/sources/shiboken2 +DOCS=( AUTHORS ) + +# Ensure the path returned by get_llvm_prefix() contains clang as well. +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +src_prepare() { + #FIXME: File an upstream issue requesting a sane way to disable NumPy support. + if ! use numpy; then + sed -i -e '/print(os\.path\.realpath(numpy))/d' \ + libshiboken/CMakeLists.t
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: 1c4b5030fc575bc2a7ed66b59e42c6dce9599543 Author: Davide Pesavento gentoo org> AuthorDate: Sat Dec 30 21:24:49 2017 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Dec 30 21:25:21 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1c4b5030 dev-python/shiboken: fix detection of clang builtin includes Bug: https://bugs.gentoo.org/624682 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-python/shiboken/shiboken-.ebuild | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index bc1ee479..0192869d 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -50,8 +50,7 @@ llvm_check_deps() { src_prepare() { #FIXME: File an upstream issue requesting a sane way to disable NumPy support. if ! use numpy; then - sed -i -e '/print(os\.path\.realpath(numpy))/d' \ - libshiboken/CMakeLists.txt || die + sed -i -e '/print(os\.path\.realpath(numpy))/d' libshiboken/CMakeLists.txt || die fi if use prefix; then @@ -59,6 +58,10 @@ src_prepare() { sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die fi + # CMakeLists.txt assumes clang builtin includes are installed + # under LLVM_INSTALL_DIR. They are not on Gentoo. See bug 624682. + sed -i -e "/set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX /s:\${CLANG_DIR}:${EPREFIX}/usr:" CMakeLists.txt || die + cmake-utils_src_prepare } @@ -67,6 +70,7 @@ src_configure() { local mycmakeargs=( -DBUILD_TESTS=$(usex test) -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" ) # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake-utils_src_configure
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: ebd4191bab4126ea9c5aa14b9f454def43919966 Author: bug2...@wolke7.net wolke7 net> AuthorDate: Sat Dec 30 18:34:39 2017 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Dec 30 18:36:55 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ebd4191b dev-python/shiboken: allow qt > 5.9 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-python/shiboken/shiboken-.ebuild | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index 1f5a91b9..bc1ee479 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -24,17 +24,15 @@ IUSE="numpy test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Minimum version of Qt required. -QT_PV="5.9*:5" +QT_PV="5.9.0:5" -#FIXME: Determine the maximum supported version of clang. -#FIXME: Determine exactly which versions of numpy are supported. DEPEND=" ${PYTHON_DEPS} dev-libs/libxml2 dev-libs/libxslt - =dev-qt/qtcore-${QT_PV} - =dev-qt/qtxml-${QT_PV} - =dev-qt/qtxmlpatterns-${QT_PV} + >=dev-qt/qtcore-${QT_PV} + >=dev-qt/qtxml-${QT_PV} + >=dev-qt/qtxmlpatterns-${QT_PV} >=sys-devel/clang-3.9.1:= numpy? ( dev-python/numpy ) "
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/, dev-python/pyside/, dev-python/pyside-tools/
commit: fa7ed68675611c76a2df33dfa2ddb97b9c2ce8ea Author: leycec gmail com> AuthorDate: Fri Sep 29 06:44:39 2017 + Commit: Davide Pesavento gentoo org> CommitDate: Sun Oct 22 04:17:07 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa7ed686 dev-python/pyside: enable Qt 5.9 support - Shiboken2, pyside2, and pyside2-tools are built against the "5.9" branches of their respective repositories requiring Qt 5.9.x - Shiboken2 conditionally supports NumPy - Pyside2 conditionally supports Qt5Charts and Qt5DataVisualization - Pyside2-tools supports Python 2.7 dev-python/pyside-tools/pyside-tools-.ebuild | 38 +++--- dev-python/pyside/metadata.xml | 2 ++ dev-python/pyside/pyside-.ebuild | 22 - dev-python/shiboken/metadata.xml | 3 ++ dev-python/shiboken/shiboken-.ebuild | 41 ++-- 5 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dev-python/pyside-tools/pyside-tools-.ebuild b/dev-python/pyside-tools/pyside-tools-.ebuild index 02b8a105..95fa3e0d 100644 --- a/dev-python/pyside-tools/pyside-tools-.ebuild +++ b/dev-python/pyside-tools/pyside-tools-.ebuild @@ -4,26 +4,19 @@ EAPI=6 CMAKE_IN_SOURCE_BUILD="1" - -#FIXME: Restore Python 2.7 support after this upstream issue is resolved: -#https://bugreports.qt.io/browse/PYSIDE-508 -#Even after this issue is resolved, further ebuild changes will probably be -#needed to fully support Python 2.7. Unlike PySide2 and Shiboken2, the root -#"CMakeLists.txt" file in pyside2-tools provides no ${PYTHON_EXECUTABLE} option. -#Instead, the ${PYTHON_EXTENSION_SUFFIX} and ${PYTHON_BASENAME} options must be -#passed with values specific to Python 2.7. Additionally, note that the -#"python2.7-config" command provides no "--extension-suffix" option. -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit cmake-utils python-r1 virtualx git-r3 DESCRIPTION="PySide development tools (lupdate, rcc, uic)" HOMEPAGE="https://wiki.qt.io/PySide2"; -EGIT_REPO_URI="https://code.qt.io/pyside/${PN}.git"; -#FIXME: Switch to the clang-enabled "dev" branch once stable. -EGIT_BRANCH="5.6" +EGIT_REPO_URI="https://code.qt.io/pyside/pyside-tools.git"; +EGIT_BRANCH="5.9" -LICENSE="BSD GPL-2" +# Although "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="2" KEYWORDS="" IUSE="test" @@ -76,26 +69,17 @@ src_configure() { -DBUILD_TESTS=$(usex test) ) + # Find the previously installed "Shiboken2Config.*.cmake" and + # "PySide2Config.*.cmake" files specific to this Python version. if python_is_python3; then # Extension tag unique to the current Python 3.x version (e.g., # ".cpython-34m" for CPython 3.4). local EXTENSION_TAG="$("$(python_get_PYTHON_CONFIG)" --extension-suffix)" EXTENSION_TAG="${EXTENSION_TAG%.so}" - mycmakeargs+=( - #FIXME: Submit an upstream PySide2 issue requesting that the - #"PySide2Config.cmake" file use the same - #${PYTHON_EXTENSION_SUFFIX} variable as the - #"Shiboken2Config.cmake" file. - - # Find the previously installed "Shiboken2Config.*.cmake" and - # "PySide2Config.*.cmake" files specific to this Python 3.x - # version. - -DPYTHON_EXTENSION_SUFFIX="${EXTENSION_TAG}" - -DPYTHON_BASENAME="${EXTENSION_TAG}" - ) + mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX="${EXTENSION_TAG}" ) else - die "Python 2.7 currently unsupported." + mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX="-python2.7" ) fi CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_configure diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml index a4b07195..9c049859 100644 --- a/dev-python/pyside/metadata.xml +++ b/dev-python/pyside/metadata.xml @@ -6,7 +6,9 @@ Gentoo Qt Project + Build QtCharts module Build QtConcurrent module + Build QtDataVisualization module Build QtQml, QtQuick, and QtQuickWidgets modules Build QtDesigner and QtUiTools modules Build QtGui module diff --git a/dev-python/pyside/pyside-.ebuild b/dev-python/pyside/pyside-.
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: 9bc42542f34ee8de0a15ab319a75c2e0e750e53e Author: Davide Pesavento gentoo org> AuthorDate: Sun Sep 3 00:33:05 2017 + Commit: Davide Pesavento gentoo org> CommitDate: Sun Sep 3 00:33:05 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9bc42542 dev-python/shiboken: drop insecure git:// repo URI Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-python/shiboken/shiboken-.ebuild | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index db5f67f6..8993de01 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -9,10 +9,7 @@ inherit cmake-utils llvm python-r1 git-r3 DESCRIPTION="Tool for creating Python bindings for C++ libraries" HOMEPAGE="https://wiki.qt.io/PySide2"; -EGIT_REPO_URI=( - "git://code.qt.io/pyside/pyside-setup.git" - "https://code.qt.io/git/pyside/pyside-setup.git"; -) +EGIT_REPO_URI="https://code.qt.io/pyside/pyside-setup.git"; #FIXME: Switch to the clang-enabled "dev" branch once stable. EGIT_BRANCH="5.6"
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/, dev-python/pyside/
commit: c73c5e142b217215f6e4802266d850c8aa0adc9b Author: leycec gmail com> AuthorDate: Tue Jun 13 05:51:07 2017 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Jun 17 01:38:08 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c73c5e14 dev-python/pyside: Fix upstream repo URIs. The live PySide2 and shiboken2 ebuilds now pull from the same "pyside-setup.git" repository. The old separate "pyside.git" and "shiboken.git" repositories still exist but are no longer maintained. Since upstream has resolved PYSIDE-502, the prior patch for optional dependencies in the live PySide2 ebuild has been removed. dev-python/pyside/pyside-.ebuild | 19 +-- dev-python/shiboken/shiboken-.ebuild | 6 -- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dev-python/pyside/pyside-.ebuild b/dev-python/pyside/pyside-.ebuild index 36134162..0ed4aa4c 100644 --- a/dev-python/pyside/pyside-.ebuild +++ b/dev-python/pyside/pyside-.ebuild @@ -10,8 +10,8 @@ inherit cmake-utils python-r1 virtualx git-r3 DESCRIPTION="Python bindings for the Qt framework" HOMEPAGE="https://wiki.qt.io/PySide2"; EGIT_REPO_URI=( - "git://code.qt.io/pyside/${PN}.git" - "https://code.qt.io/git/pyside/${PN}.git"; + "git://code.qt.io/pyside/pyside-setup.git" + "https://code.qt.io/git/pyside/pyside-setup.git"; ) #FIXME: Switch to the clang-enabled "dev" branch once stable. EGIT_BRANCH="5.6" @@ -77,15 +77,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - #FIXME: Remove the following "sed" patch after this upstream issue is closed: - #https://bugreports.qt.io/browse/PYSIDE-502 - # Force the optional "Qt5Concurrent", "Qt5Gui", "Qt5Network", - # "Qt5PrintSupport", "Qt5Sql", "Qt5Test", and "Qt5Widgets" packages - # erroneously marked as mandatory to be optional. - sed -i -e 's/^\(CHECK_PACKAGE_FOUND(Qt5\(Concurrent\|Gui\|Network\|PrintSupport\|Sql\|Test\|Widgets\)\))$/\1 opt)/' \ - PySide2/CMakeLists.txt || die +S=${WORKDIR}/${P}/sources/pyside2 +src_prepare() { if use prefix; then cp "${FILESDIR}"/rpath.cmake . || die sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die @@ -95,10 +89,7 @@ src_prepare() { } src_configure() { - # For each line of the form "CHECK_PACKAGE_FOUND(${PACKAGE_NAME} opt)" in - # PySide2/CMakeLists.txt defining an optional dependency, an option of the - # form "-DCMAKE_DISABLE_FIND_PACKAGE_${PACKAGE_NAME}=$(usex !${USE_FLAG})" - # is passed to cmake here conditionally disabling this dependency. + # See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt local mycmakeargs=( -DBUILD_TESTS=$(usex test) -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index 6eb6cdd8..db5f67f6 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -10,8 +10,8 @@ inherit cmake-utils llvm python-r1 git-r3 DESCRIPTION="Tool for creating Python bindings for C++ libraries" HOMEPAGE="https://wiki.qt.io/PySide2"; EGIT_REPO_URI=( - "git://code.qt.io/pyside/${PN}.git" - "https://code.qt.io/git/pyside/${PN}.git"; + "git://code.qt.io/pyside/pyside-setup.git" + "https://code.qt.io/git/pyside/pyside-setup.git"; ) #FIXME: Switch to the clang-enabled "dev" branch once stable. EGIT_BRANCH="5.6" @@ -36,6 +36,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +S=${WORKDIR}/${P}/sources/shiboken2 + DOCS=( AUTHORS ) src_prepare() {
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: c4ab11d8c0f3469148e6d3db11633d459e8be7a5 Author: Davide Pesavento gentoo org> AuthorDate: Thu May 4 14:14:27 2017 + Commit: Davide Pesavento gentoo org> CommitDate: Thu May 4 14:14:27 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c4ab11d8 dev-python/shiboken: simplify Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-python/shiboken/shiboken-.ebuild | 16 ++-- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index a0b130fe..6eb6cdd8 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -26,7 +26,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" QT_PV="5.6*:5" #FIXME: Add "sys-devel/clang:*" after switching to the "dev" branch. -RDEPEND=" +DEPEND=" ${PYTHON_DEPS} dev-libs/libxml2 dev-libs/libxslt @@ -34,12 +34,7 @@ RDEPEND=" =dev-qt/qtxml-${QT_PV} =dev-qt/qtxmlpatterns-${QT_PV} " -DEPEND="${RDEPEND} - test? ( - =dev-qt/qtgui-${QT_PV} - =dev-qt/qttest-${QT_PV} - ) -" +RDEPEND="${DEPEND}" DOCS=( AUTHORS ) @@ -60,15 +55,8 @@ src_configure() { local mycmakeargs=( -DBUILD_TESTS=$(usex test) -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" ) - if [[ ${EPYTHON} == python3* ]]; then - mycmakeargs+=( - -DUSE_PYTHON_VERSION=3 - ) - fi - #FIXME: Uncomment after switching to the "dev" branch. #FIXME: "CMakeLists.txt" currently requires that callers manually set #this environment variable to the absolute path of the directory
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: ca191eebe4ba022498f3edb0dc665fad8efc1bb3 Author: Davide Pesavento gentoo org> AuthorDate: Sun Apr 30 20:10:16 2017 + Commit: Davide Pesavento gentoo org> CommitDate: Sun Apr 30 20:10:16 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ca191eeb dev-python/shiboken: update LICENSE Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-python/shiboken/shiboken-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index 721c08d3..a0b130fe 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit cmake-utils llvm python-r1 git-r3 @@ -16,7 +16,7 @@ EGIT_REPO_URI=( #FIXME: Switch to the clang-enabled "dev" branch once stable. EGIT_BRANCH="5.6" -LICENSE="LGPL-2.1" +LICENSE="|| ( GPL-2+ LGPL-3 ) GPL-3" SLOT="2" KEYWORDS="" IUSE="test"
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: 3e8f92f3984df2929fb4595cf7680c60693c7ac8 Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 28 15:47:42 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 28 16:12:44 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3e8f92f3 dev-python/shiboken: follow upstream changes Package-Manager: portage-2.3.2 dev-python/shiboken/shiboken-.ebuild | 37 +--- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index fd339bd..d04a967 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -2,11 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) -inherit cmake-utils multilib python-r1 git-r3 +inherit cmake-utils python-r1 git-r3 DESCRIPTION="A tool for creating Python bindings for C++ libraries" HOMEPAGE="https://wiki.qt.io/Pyside"; @@ -18,31 +18,28 @@ EGIT_REPO_URI=( LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" - IUSE="test" + REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} dev-libs/libxml2 dev-libs/libxslt - dev-qt/qtcore:4 - dev-qt/qtxmlpatterns:4 + dev-qt/qtcore:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 " DEPEND="${RDEPEND} test? ( - dev-qt/qtgui:4 - dev-qt/qttest:4 - )" + dev-qt/qtgui:5 + dev-qt/qttest:5 + ) +" -DOCS=( AUTHORS ChangeLog ) +DOCS=( AUTHORS ) src_prepare() { - # Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake, - # caused by the usage of a different version suffix with python >= 3.2 - sed -i -e "/get_config_var('SOABI')/d" \ - cmake/Modules/FindPython3InterpWithDebug.cmake || die - if use prefix; then cp "${FILESDIR}"/rpath.cmake . || die sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die @@ -54,18 +51,14 @@ src_prepare() { src_configure() { configuration() { local mycmakeargs=( - $(cmake-utils_use_build test TESTS) + -DBUILD_TESTS=$(usex test) -DPYTHON_EXECUTABLE="${PYTHON}" -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" - -DPYTHON_SUFFIX="-${EPYTHON}" ) if [[ ${EPYTHON} == python3* ]]; then mycmakeargs+=( - -DUSE_PYTHON3=ON - -DPYTHON3_EXECUTABLE="${PYTHON}" - -DPYTHON3_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON3_LIBRARY="$(python_get_library_path)" + -DUSE_PYTHON_VERSION=3 ) fi @@ -85,7 +78,7 @@ src_test() { src_install() { installation() { cmake-utils_src_install - mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}2{,-${EPYTHON}}.pc || die } python_foreach_impl installation }
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/, dev-qt/qtbearer/, media-sound/qtmpc/, ...
commit: 6a9529abd08e159d1fbd6ca2fb8dfd69e51e2645 Author: Davide Pesavento gentoo org> AuthorDate: Mon Aug 24 18:54:11 2015 + Commit: Davide Pesavento gentoo org> CommitDate: Mon Aug 24 18:54:11 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a9529ab Use https in metadata.xml Signed-off-by: Davide Pesavento gentoo.org> app-admin/keepassx/metadata.xml | 2 +- app-admin/qgrubeditor/metadata.xml | 2 +- app-crypt/pinentry/metadata.xml | 2 +- app-crypt/qca/metadata.xml | 2 +- app-editors/vim-qt/metadata.xml | 2 +- app-emulation/q4wine/metadata.xml | 2 +- app-laptop/batterymeter/metadata.xml| 2 +- app-text/coolreader3/metadata.xml | 2 +- app-text/goldendict/metadata.xml| 2 +- dev-games/tiled/metadata.xml| 2 +- dev-libs/libqtxdg/metadata.xml | 2 +- dev-libs/libsystemd-qt/metadata.xml | 2 +- dev-libs/qjson/metadata.xml | 2 +- dev-libs/qjsonrpc/metadata.xml | 2 +- dev-libs/qoauth/metadata.xml| 2 +- dev-libs/quazip/metadata.xml| 2 +- dev-python/pyside/metadata.xml | 2 +- dev-python/shiboken/metadata.xml| 2 +- dev-qt/assistant/metadata.xml | 2 +- dev-qt/designer/metadata.xml| 2 +- dev-qt/linguist-tools/metadata.xml | 2 +- dev-qt/linguist/metadata.xml| 2 +- dev-qt/pixeltool/metadata.xml | 2 +- dev-qt/qdbus/metadata.xml | 2 +- dev-qt/qdbusviewer/metadata.xml | 2 +- dev-qt/qdoc/metadata.xml| 2 +- dev-qt/qt-creator/metadata.xml | 2 +- dev-qt/qt3d/metadata.xml| 2 +- dev-qt/qt3support/metadata.xml | 2 +- dev-qt/qtbearer/metadata.xml| 2 +- dev-qt/qtbluetooth/metadata.xml | 2 +- dev-qt/qtchooser/metadata.xml | 2 +- dev-qt/qtconcurrent/metadata.xml| 2 +- dev-qt/qtcore/metadata.xml | 2 +- dev-qt/qtdbus/metadata.xml | 2 +- dev-qt/qtdeclarative/metadata.xml | 2 +- dev-qt/qtdemo/metadata.xml | 2 +- dev-qt/qtdiag/metadata.xml | 2 +- dev-qt/qtgraphicaleffects/metadata.xml | 2 +- dev-qt/qtgui/metadata.xml | 2 +- dev-qt/qthelp/metadata.xml | 2 +- dev-qt/qtimageformats/metadata.xml | 2 +- dev-qt/qtlocation/metadata.xml | 2 +- dev-qt/qtmultimedia/metadata.xml| 2 +- dev-qt/qtnetwork/metadata.xml | 2 +- dev-qt/qtopengl/metadata.xml| 2 +- dev-qt/qtopenvg/metadata.xml| 2 +- dev-qt/qtpaths/metadata.xml | 2 +- dev-qt/qtphonon/metadata.xml| 2 +- dev-qt/qtpositioning/metadata.xml | 2 +- dev-qt/qtprintsupport/metadata.xml | 2 +- dev-qt/qtquick1/metadata.xml| 2 +- dev-qt/qtquickcontrols/metadata.xml | 2 +- dev-qt/qtscript/metadata.xml| 2 +- dev-qt/qtsensors/metadata.xml | 2 +- dev-qt/qtserialport/metadata.xml| 2 +- dev-qt/qtsql/metadata.xml | 2 +- dev-qt/qtsvg/metadata.xml | 2 +- dev-qt/qttest/metadata.xml | 2 +- dev-qt/qttranslations/metadata.xml | 2 +- dev-qt/qtwayland/metadata.xml | 2 +- dev-qt/qtwebchannel/metadata.xml| 2 +- dev-qt/qtwebkit/metadata.xml| 2 +- dev-qt/qtwebsockets/metadata.xml| 2 +- dev-qt/qtwidgets/metadata.xml | 2 +- dev-qt/qtx11extras/metadata.xml | 2 +- dev-qt/qtxml/metadata.xml | 2 +- dev-qt/qtxmlpatterns/metadata.xml | 2 +- dev-vcs/qgit/metadata.xml | 2 +- lxde-base/lxmenu-data/metadata.xml | 2 +- lxde-base/menu-cache/metadata.xml | 2 +- lxqt-base/liblxqt-mount/metadata.xml| 2 +- lxqt-base/liblxqt/metadata.xml | 2 +- lxqt-base/libsysstat/metadata.xml | 2 +- lxqt-base/lxqt-about/metadata.xml | 2 +- lxqt-base/lxqt-admin/metadata.xml | 2 +- lxqt-base/lxqt-appswitcher/metadata.xml | 2 +- lxqt-base/lxqt-common/metadata.xml | 2 +- lxqt-base/lxqt-config-randr/metadata.xml| 2 +- lxqt-base/lxqt-config/metadata.xml | 2 +- lxqt-base/lxqt-globalkeys/metadata.xml | 2 +- lxqt-base/lxqt-meta/metadata.xml| 2 +- lxqt-base/lxqt-notificationd/metadata.xml | 2 +- lxqt-base/lxqt-openssh-askpass/metadata.xml | 2 +- lxqt-base/lxqt-panel/metadata.xml | 2 +- lxqt-base/lxqt-policykit/metadata.xml | 2 +- lxqt-base/lxqt-power/metadata.xml | 2 +- lxqt-base/lxqt-powermanagement/metadata.xml | 2 +- lxqt-base/lxqt-qtplugin/metadata.xml| 2 +- l
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: 0e3ea2a7ec94d67a23860a2bbd4450565608261f Author: Davide Pesavento gentoo org> AuthorDate: Sun Sep 21 00:01:34 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Sun Sep 21 00:01:34 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0e3ea2a7 [dev-python/shiboken] Sync again. Package-Manager: portage-2.2.13 --- dev-python/shiboken/shiboken-.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index 6723d94..bfb016a 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.2.2.ebuild,v 1.4 2014/09/20 23:15:39 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.2.2.ebuild,v 1.5 2014/09/20 23:58:11 pesa Exp $ EAPI=5 @@ -18,9 +18,12 @@ EGIT_REPO_URI=( LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" + IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" + ${PYTHON_DEPS} dev-libs/libxml2 dev-libs/libxslt dev-qt/qtcore:4
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: e61dde13d2615267e9ab53945c7abd1d02d8edb3 Author: Davide Pesavento gentoo org> AuthorDate: Sat Sep 20 23:32:39 2014 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Sep 20 23:32:39 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e61dde13 [dev-python/shiboken] Sync with portage. Package-Manager: portage-2.2.13 --- dev-python/shiboken/shiboken-.ebuild | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index dff6cf9..6723d94 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.2.1-r1.ebuild,v 1.2 2013/12/25 17:44:15 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.2.2.ebuild,v 1.4 2014/09/20 23:15:39 pesa Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -inherit multilib cmake-utils python-r1 git-r3 +inherit cmake-utils multilib python-r1 git-r3 DESCRIPTION="A tool for creating Python bindings for C++ libraries" HOMEPAGE="http://qt-project.org/wiki/PySide"; @@ -21,17 +21,15 @@ KEYWORDS="" IUSE="test" RDEPEND=" - >=dev-libs/libxml2-2.6.32 - >=dev-libs/libxslt-1.1.19 - >=dev-qt/qtcore-4.7.0:4 - >=dev-qt/qtxmlpatterns-4.7.0:4 - !dev-python/apiextractor - !dev-python/generatorrunner + dev-libs/libxml2 + dev-libs/libxslt + dev-qt/qtcore:4 + dev-qt/qtxmlpatterns:4 " DEPEND="${RDEPEND} test? ( - >=dev-qt/qtgui-4.7.0:4 - >=dev-qt/qttest-4.7.0:4 + dev-qt/qtgui:4 + dev-qt/qttest:4 )" DOCS=( AUTHORS ChangeLog ) @@ -46,6 +44,8 @@ src_prepare() { cp "${FILESDIR}"/rpath.cmake . || die sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die fi + + cmake-utils_src_prepare } src_configure() { @@ -72,7 +72,7 @@ src_configure() { } src_compile() { - python_foreach_impl cmake-utils_src_make + python_foreach_impl cmake-utils_src_compile } src_test() {
[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/
commit: 1996892a3b7acbe7fef6689c8609e792b2264321 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jun 10 08:01:35 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jun 10 08:01:35 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1996892a [dev-python/shiboken] Remove Python 2.6 support. Package-Manager: portage-2.2.10 --- dev-python/shiboken/shiboken-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/shiboken/shiboken-.ebuild b/dev-python/shiboken/shiboken-.ebuild index 1d6bb13..8ca5d37 100644 --- a/dev-python/shiboken/shiboken-.ebuild +++ b/dev-python/shiboken/shiboken-.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) +PYTHON_COMPAT=( python{2_7,3_2,3_3} ) inherit multilib cmake-utils python-r1 git-r3