[gentoo-commits] repo/gentoo:master commit in: dev-python/pyqwt/

[Michael Palimaka]

commit:     05ce29a2b8bb9a1b9cb67e417448372da73e0603
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 17:47:02 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 17:47:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ce29a2

dev-python/pyqwt: fix build with >=dev-python/PyQt4-4.11.2-r1

Gentoo-bug: 536948

Package-Manager: portage-2.3.0

 dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
index fc2b162..5990d2f 100644
--- a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
+++ b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit flag-o-matic python-r1
+inherit flag-o-matic python-r1 qmake-utils
 
 MY_P="PyQwt-${PV}"
 DESCRIPTION="Python bindings for the Qwt library"
@@ -20,16 +20,16 @@ IUSE="debug doc examples svg"
 
 RDEPEND="
 	x11-libs/qwt:5[svg?]
-	dev-python/PyQt4[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	dev-python/sip[${PYTHON_USEDEP}]
-	~dev-python/PyQt4-4.11.1[${PYTHON_USEDEP}]
+	|| ( >=dev-python/PyQt4-4.11.2-r1[${PYTHON_USEDEP},compat(-)] <dev-python/PyQt4-4.11.2-r1[${PYTHON_USEDEP}] )
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}/configure"
 
 src_prepare() {
+	sed -i -e "s|configuration.qt_dir, 'bin'|'$(qt4_get_bindir)'|" configure.py || die
 	python_copy_sources
 	append-flags -fPIC
 }