commit: 94c379bcbe5c40707197f209da31547e4e3702eb
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 22:07:04 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 22:07:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c379bc
dev-python/qscintilla-python: support building against Qt5/PyQt5
Gentoo-Bug: 541604
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../qscintilla-python-2.9.2-r1.ebuild | 2 +-
....4.ebuild => qscintilla-python-2.9.4-r1.ebuild} | 40 +++++++++++++++-------
.../qscintilla-python-2.9.4.ebuild | 2 +-
dev-util/eric/eric-16.12.ebuild | 4 +--
dev-util/eric/eric-17.01.ebuild | 2 +-
dev-vcs/hgview/hgview-1.9.0.ebuild | 4 +--
dev-vcs/tortoisehg/tortoisehg-3.8.4.ebuild | 2 +-
dev-vcs/tortoisehg/tortoisehg-3.9.2.ebuild | 4 +--
dev-vcs/tortoisehg/tortoisehg-4.0.1.ebuild | 4 +--
dev-vcs/tortoisehg/tortoisehg-4.0.ebuild | 4 +--
dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 4 +--
net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild | 4 +--
net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild | 2 +-
net-analyzer/linkchecker/linkchecker-9999.ebuild | 4 +--
sci-geosciences/qgis/qgis-2.14.5-r1.ebuild | 4 +--
sci-geosciences/qgis/qgis-2.18.2-r1.ebuild | 4 +--
sci-geosciences/qgis/qgis-2.18.2-r2.ebuild | 2 +-
sci-geosciences/qgis/qgis-2.18.2-r3.ebuild | 2 +-
sci-geosciences/qgis/qgis-2.18.3.ebuild | 2 +-
19 files changed, 55 insertions(+), 41 deletions(-)
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild
b/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild
index b1671d7..02e9309 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild
@@ -53,7 +53,7 @@ src_configure() {
"${myconf[@]}" || die
# Run eqmake4 to respect toolchain, build flags, and prevent
stripping
- eqmake4
+ eqmake4 -recursive
}
python_foreach_impl run_in_build_dir configuration
}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
b/dev-python/qscintilla-python/qscintilla-python-2.9.4-r1.ebuild
similarity index 61%
copy from dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
copy to dev-python/qscintilla-python/qscintilla-python-2.9.4-r1.ebuild
index 444c588..8c66719 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.9.4-r1.ebuild
@@ -15,21 +15,33 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="debug +qt4 qt5"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ^^ ( qt4 qt5 )
+"
DEPEND="
${PYTHON_DEPS}
>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
- >=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- ~x11-libs/qscintilla-${PV}:=[qt4(-)]
+ ~x11-libs/qscintilla-${PV}:=[qt4(-)?,qt5(+)?]
+ qt4? (
+ >=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+ qt5? (
+ dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ )
"
RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
S=${WORKDIR}/${MY_P}/Python
src_prepare() {
@@ -38,22 +50,24 @@ src_prepare() {
}
src_configure() {
+ local my_qt_ver=$(usex qt5 5 4)
+
configuration() {
local myconf=(
"${PYTHON}"
configure.py
- --qmake="$(qt4_get_bindir)"/qmake
- --destdir="$(python_get_sitedir)"/PyQt4
+ --qmake="$(qt${my_qt_ver}_get_bindir)"/qmake
+ --destdir="$(python_get_sitedir)"/PyQt${my_qt_ver}
--sip-incdir="$(python_get_includedir)"
- --pyqt=PyQt4
+ --pyqt=PyQt${my_qt_ver}
$(usex debug '--debug --trace' '')
--verbose
)
echo "${myconf[@]}"
"${myconf[@]}" || die
- # Run eqmake4 to respect toolchain, build flags, and prevent
stripping
- eqmake4
+ # Run eqmake to respect toolchain, build flags, and prevent
stripping
+ eqmake${my_qt_ver} -recursive
}
python_foreach_impl run_in_build_dir configuration
}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
b/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
index 444c588..6174d4c 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.9.4.ebuild
@@ -53,7 +53,7 @@ src_configure() {
"${myconf[@]}" || die
# Run eqmake4 to respect toolchain, build flags, and prevent
stripping
- eqmake4
+ eqmake4 -recursive
}
python_foreach_impl run_in_build_dir configuration
}
diff --git a/dev-util/eric/eric-16.12.ebuild b/dev-util/eric/eric-16.12.ebuild
index 691a9c1..ca9846f 100644
--- a/dev-util/eric/eric-16.12.ebuild
+++ b/dev-util/eric/eric-16.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -23,7 +23,7 @@ DEPEND="
${PYTHON_DEPS}
>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
>=dev-python/PyQt4-4.10[${PYTHON_USEDEP},X,help,sql,svg,webkit]
- >=dev-python/qscintilla-python-2.8[${PYTHON_USEDEP}]
+ >=dev-python/qscintilla-python-2.8[qt4(+),${PYTHON_USEDEP}]
"
RDEPEND="${DEPEND}
>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
diff --git a/dev-util/eric/eric-17.01.ebuild b/dev-util/eric/eric-17.01.ebuild
index eb2727e..ca9846f 100644
--- a/dev-util/eric/eric-17.01.ebuild
+++ b/dev-util/eric/eric-17.01.ebuild
@@ -23,7 +23,7 @@ DEPEND="
${PYTHON_DEPS}
>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
>=dev-python/PyQt4-4.10[${PYTHON_USEDEP},X,help,sql,svg,webkit]
- >=dev-python/qscintilla-python-2.8[${PYTHON_USEDEP}]
+ >=dev-python/qscintilla-python-2.8[qt4(+),${PYTHON_USEDEP}]
"
RDEPEND="${DEPEND}
>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
diff --git a/dev-vcs/hgview/hgview-1.9.0.ebuild
b/dev-vcs/hgview/hgview-1.9.0.ebuild
index 7f38028..f1c9417 100644
--- a/dev-vcs/hgview/hgview-1.9.0.ebuild
+++ b/dev-vcs/hgview/hgview-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,7 +26,7 @@ RDEPEND="dev-vcs/mercurial[${PYTHON_USEDEP}]
qt4? (
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/PyQt4[X,${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
)"
DEPEND="${RDEPEND}
doc? (
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.8.4.ebuild
b/dev-vcs/tortoisehg/tortoisehg-3.8.4.ebuild
index add5242..0d40ccc 100644
--- a/dev-vcs/tortoisehg/tortoisehg-3.8.4.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-3.8.4.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${HG_DEPEND}
dev-python/iniparse[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt4[svg,${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]"
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-1.0.3 )"
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.9.2.ebuild
b/dev-vcs/tortoisehg/tortoisehg-3.9.2.ebuild
index d6b86c8..51aa692 100644
--- a/dev-vcs/tortoisehg/tortoisehg-3.9.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-3.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,7 +31,7 @@ RDEPEND="${HG_DEPEND}
dev-python/iniparse[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt4[svg,${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]"
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-1.0.3 )"
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.0.1.ebuild
b/dev-vcs/tortoisehg/tortoisehg-4.0.1.ebuild
index ae3a7bd..fbb9a0e 100644
--- a/dev-vcs/tortoisehg/tortoisehg-4.0.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,7 +31,7 @@ RDEPEND="${HG_DEPEND}
dev-python/iniparse[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt4[svg,${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]"
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-1.0.3 )"
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.0.ebuild
b/dev-vcs/tortoisehg/tortoisehg-4.0.ebuild
index ae3a7bd..fbb9a0e 100644
--- a/dev-vcs/tortoisehg/tortoisehg-4.0.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,7 +31,7 @@ RDEPEND="${HG_DEPEND}
dev-python/iniparse[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt4[svg,${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]"
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-1.0.3 )"
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 3b0a0c0..9225a6d 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,7 +31,7 @@ RDEPEND="${HG_DEPEND}
dev-python/iniparse[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/PyQt4[svg,${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]"
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-1.0.3 )"
diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
b/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
index ecd8b4e..5a4f929 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ RDEPEND="
gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
X? (
dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
)"
DEPEND="
X? (
diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
index c602251..16e55e2 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
X? (
dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
)"
DEPEND="
X? (
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild
b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index 01653b1..ad27a47 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,7 +26,7 @@ RDEPEND="
gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
X? (
dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
)"
DEPEND="
X? (
diff --git a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
index 3416afd..f4fa477 100644
--- a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -51,7 +51,7 @@ RDEPEND="
python? (
dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
dev-python/sip[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
index dec2e4d..9e687a8 100644
--- a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -52,7 +52,7 @@ RDEPEND="
python? (
dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
dev-python/sip[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
index 2dddf93..7dc1b69 100644
--- a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
python? (
dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
<dev-python/sip-4.19:=[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
index 084b555..96193db 100644
--- a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
python? (
dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
<dev-python/sip-4.19:=[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild
b/sci-geosciences/qgis/qgis-2.18.3.ebuild
index b631f4b..6afa49f 100644
--- a/sci-geosciences/qgis/qgis-2.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.3.ebuild
@@ -61,7 +61,7 @@ COMMON_DEPEND="
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
<dev-python/sip-4.19:=[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
