[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

[David Seifert]

commit:     5445db343d15bf741f107fc6e65112f4696ecc82
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 17:46:36 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 18:25:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5445db34

x11-libs/qscintilla: Make Qt5 compatible

Gentoo-bug: 541604

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3188

 ...-2.8.4-r1.ebuild => qscintilla-2.8.4-r2.ebuild} |  4 +--
 ...lla-2.9.2.ebuild => qscintilla-2.9.2-r1.ebuild} |  2 +-
 ...lla-2.9.3.ebuild => qscintilla-2.9.3-r1.ebuild} |  2 +-
 ...lla-2.9.3.ebuild => qscintilla-2.9.3-r2.ebuild} | 39 +++++++++++++---------
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild
similarity index 96%
rename from x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild
rename to x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild
index 9c5ece9..0d86621 100644
--- a/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.8.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0/11"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc"
+IUSE="designer doc +qt4"
 
 DEPEND="
 	>=dev-qt/qtcore-4.8.5:4

diff --git a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
similarity index 98%
rename from x11-libs/qscintilla/qscintilla-2.9.2.ebuild
rename to x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
index 5440631..caf9749 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/12"
 KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc"
+IUSE="designer doc +qt4"
 
 DEPEND="
 	dev-qt/qtcore:4

diff --git a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild
similarity index 98%
copy from x11-libs/qscintilla/qscintilla-2.9.3.ebuild
copy to x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild
index 103e457..a73439a 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc"
+IUSE="designer doc +qt4"
 
 DEPEND="
 	dev-qt/qtcore:4

diff --git a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild b/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
similarity index 76%
rename from x11-libs/qscintilla/qscintilla-2.9.3.ebuild
rename to x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
index 103e457..f4626d9 100644
--- a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.3-r2.ebuild
@@ -15,14 +15,24 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer doc"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	designer? ( dev-qt/designer:4 )
-"
-RDEPEND="${DEPEND}"
+IUSE="designer doc +qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		designer? ( dev-qt/designer:4 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -51,14 +61,15 @@ qsci_run_in() {
 }
 
 src_configure() {
-	qsci_run_in Qt4Qt5 eqmake4
+	local my_eqmake=eqmake$(usex qt5 5 4)
+	qsci_run_in Qt4Qt5 $my_eqmake
 
 	if use designer; then
 		# prevent building against system version (bug 466120)
 		append-cxxflags -I../Qt4Qt5
 		append-ldflags -L../Qt4Qt5
 
-		qsci_run_in designer-Qt4Qt5 eqmake4
+		qsci_run_in designer-Qt4Qt5 $my_eqmake
 	fi
 }
 
@@ -73,10 +84,6 @@ src_install() {
 
 	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
 
-	dodoc ChangeLog NEWS
-
-	if use doc; then
-		docinto html
-		dodoc -r doc/html-Qt4Qt5/*
-	fi
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
 }