[patch] qscintilla-multibuild.patch

qscintilla-multibuild.patch (text/plain), 2.92 KB, created by Michael Palimaka (kensington) on 2016-03-31 14:24:27 UTC

--- qscintilla-2.9.1.ebuild
+++ qscintilla-2.9.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit flag-o-matic qmake-utils
+inherit flag-o-matic multibuild qmake-utils
 
 MY_P=QScintilla-gpl-${PV}
 
@@ -15,17 +15,32 @@
 LICENSE="|| ( GPL-2 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 qt5"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
 
 DEPEND="
-	>=dev-qt/qtcore-4.8.5:4
-	>=dev-qt/qtgui-4.8.5:4
-	designer? ( >=dev-qt/designer-4.8.5:4 )
+	qt4? (
+		>=dev-qt/qtcore-4.8.5:4
+		>=dev-qt/qtgui-4.8.5:4
+		designer? ( >=dev-qt/designer-4.8.5:4 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
 "
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
 src_unpack() {
 	default
 
@@ -43,44 +58,70 @@
 	fi
 }
 
+src_prepare() {
+	multibuild_copy_sources
+}
+
 src_configure() {
-	pushd Qt4Qt5 > /dev/null
-	eqmake4
-	popd > /dev/null
-
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-
-		pushd designer-Qt4Qt5 > /dev/null
-		eqmake4
-		popd > /dev/null
-	fi
+	myconfigure() {
+		pushd Qt4Qt5 > /dev/null || die
+
+		local myqmake
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			myqmake=eqmake4
+		elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			myqmake=eqmake5
+		fi
+
+		${myqmake}
+
+		popd > /dev/null || die
+
+		if use designer; then
+			# prevent building against system version (bug 466120)
+			append-cxxflags -I../Qt4Qt5
+			append-ldflags -L../Qt4Qt5
+
+			pushd designer-Qt4Qt5 > /dev/null || die
+			${myqmake}
+			popd > /dev/null || die
+		fi
+	}
+
+	multibuild_foreach_variant run_in_build_dir myconfigure
 }
 
 src_compile() {
-	pushd Qt4Qt5 > /dev/null
-	emake
-	popd > /dev/null
-
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
+	mycompile() {
+		pushd Qt4Qt5 > /dev/null || die
 		emake
-		popd > /dev/null
-	fi
+		popd > /dev/null || die
+
+		if use designer; then
+			pushd designer-Qt4Qt5 > /dev/null || die
+			emake
+			popd > /dev/null || die
+		fi
+	}
+
+	multibuild_foreach_variant run_in_build_dir mycompile
 }
 
 src_install() {
-	pushd Qt4Qt5 > /dev/null
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	if use designer; then
-		pushd designer-Qt4Qt5 > /dev/null
+	myinstall() {
+		pushd Qt4Qt5 > /dev/null || die
 		emake INSTALL_ROOT="${D}" install
-		popd > /dev/null
-	fi
+		popd > /dev/null || die
+
+		if use designer; then
+			pushd designer-Qt4Qt5 > /dev/null || die
+			emake INSTALL_ROOT="${D}" install
+			popd > /dev/null || die
+		fi
+	}
+
+	multibuild_foreach_variant run_in_build_dir myinstall
 
 	dodoc NEWS