From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 374AA1396DA for ; Mon, 16 Oct 2017 14:54:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 781102BC05C; Mon, 16 Oct 2017 14:54:56 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 495952BC05C for ; Mon, 16 Oct 2017 14:54:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C832933BEA7 for ; Mon, 16 Oct 2017 14:54:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4ADE230D for ; Mon, 16 Oct 2017 14:54:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1508165671.c3eb993546e9ebf478e25605fe92960f48cd949e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/QtPy/QtPy-1.2.1.ebuild dev-python/QtPy/QtPy-1.3.1.ebuild dev-python/QtPy/metadata.xml X-VCS-Directories: dev-python/QtPy/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c3eb993546e9ebf478e25605fe92960f48cd949e X-VCS-Branch: master Date: Mon, 16 Oct 2017 14:54:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 342bc102-6665-40eb-a874-d863bd98b2ba X-Archives-Hash: 7bebe03292e069b8e66052a58db1d800 commit: c3eb993546e9ebf478e25605fe92960f48cd949e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 14 22:21:46 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 16 14:54:31 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3eb9935 dev-python/QtPy: Drop PyQt4 and pyside[webkit] options Gentoo-bug: 620684 Package-Manager: Portage-2.3.11, Repoman-2.3.3 dev-python/QtPy/QtPy-1.2.1.ebuild | 26 ++++++++++++-------------- dev-python/QtPy/QtPy-1.3.1.ebuild | 17 +++++------------ dev-python/QtPy/metadata.xml | 1 - 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild index 86fa7592ebd..51f9d64960b 100644 --- a/dev-python/QtPy/QtPy-1.2.1.ebuild +++ b/dev-python/QtPy/QtPy-1.2.1.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit distutils-r1 -DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide" +DESCRIPTION="Abstraction layer for PyQt5/PySide" HOMEPAGE="https://github.com/spyder-ide/qtpy" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" @@ -18,20 +18,18 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="designer gui opengl svg testlib webkit" RDEPEND=" - || ( - dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] - dev-python/PyQt4[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] - dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] - ) gui? ( || ( - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] - dev-python/PyQt4[${PYTHON_USEDEP},X] - dev-python/pyside[${PYTHON_USEDEP},X] + dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] + dev-python/pyside[${PYTHON_USEDEP},X] ) ) testlib? ( || ( - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - dev-python/PyQt4[${PYTHON_USEDEP},testlib] - dev-python/pyside[${PYTHON_USEDEP},X] - ) )" - + dev-python/PyQt5[${PYTHON_USEDEP},testlib] + dev-python/pyside[${PYTHON_USEDEP},X] + ) ) + webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] ) + !webkit? ( || ( + dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=] + dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=] + ) ) +" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild index 5d5c3d3f23c..de40764e990 100644 --- a/dev-python/QtPy/QtPy-1.3.1.ebuild +++ b/dev-python/QtPy/QtPy-1.3.1.ebuild @@ -7,30 +7,25 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit distutils-r1 -DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide" +DESCRIPTION="Abstraction layer for PyQt5/PySide" HOMEPAGE="https://github.com/spyder-ide/qtpy" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="designer gui opengl pyqt4 +pyqt5 pyside svg testlib webkit" +IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit" -REQUIRED_USE="|| ( pyqt4 pyqt5 pyside )" +REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )" RDEPEND=" - pyqt4? ( - dev-python/PyQt4[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?] - gui? ( dev-python/PyQt4[${PYTHON_USEDEP},X] ) - testlib? ( dev-python/PyQt4[${PYTHON_USEDEP},testlib] ) - ) pyqt5? ( dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?] gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] ) testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] ) ) pyside? ( - dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?] + dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?] gui? ( dev-python/pyside[${PYTHON_USEDEP},X] ) testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] ) ) @@ -40,9 +35,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" src_prepare() { default - if ! use pyqt4; then - sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die - fi + sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die if ! use pyqt5; then sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml index 85ca2f8aaa3..58c106d8187 100644 --- a/dev-python/QtPy/metadata.xml +++ b/dev-python/QtPy/metadata.xml @@ -18,7 +18,6 @@ Build bindings for the QtDesigner module and enable the designer plugin Build bindings for the QtGui module - Enable the dev-python/PyQt4 backend Enable the dev-python/PyQt5 backend Enable the dev-python/pyside backend Build bindings for the QtSvg module