x11-libs/qwt: Add missing dep on dev-qt/designer, #490926

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 47 insertions, 15 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 52d73abf1c62..22b42ccfe0b4 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.113 2013/07/10 07:26:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.114 2013/11/10 13:38:43 jlec Exp $
+
+  10 Nov 2013; Justin Lecher <jlec@gentoo.org> qwt-5.2.3-r2.ebuild,
+  qwt-6.0.2-r1.ebuild:
+  Add missing dep on dev-qt/designer, #490926
 
   10 Jul 2013; Patrick Lauer <patrick@gentoo.org> qwt-6.1.0.ebuild:
   Fixing qtgui/designer deps for qt-4.8.5
diff --git a/x11-libs/qwt/qwt-5.2.3-r2.ebuild b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
index 4990f6b792cd..ebe0d9a3b57e 100644
--- a/x11-libs/qwt/qwt-5.2.3-r2.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.3-r2.ebuild,v 1.3 2013/06/05 02:52:28 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.3-r2.ebuild,v 1.4 2013/11/10 13:38:43 jlec Exp $
 
 EAPI=5
 
@@ -11,11 +11,12 @@ HOMEPAGE="http://qwt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="qwt"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
 SLOT="5"
 IUSE="doc examples static-libs svg"
 
 DEPEND="
+	dev-qt/designer:4
 	dev-qt/qtgui:4
 	doc? ( !<media-libs/coin-3.1.3[doc] )
 	svg? ( dev-qt/qtsvg:4 )"
diff --git a/x11-libs/qwt/qwt-6.0.2-r1.ebuild b/x11-libs/qwt/qwt-6.0.2-r1.ebuild
index 6e5ecb0089ba..ea0b814342bc 100644
--- a/x11-libs/qwt/qwt-6.0.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.0.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.2-r1.ebuild,v 1.1 2013/03/05 12:56:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.2-r1.ebuild,v 1.2 2013/11/10 13:38:43 jlec Exp $
 
 EAPI=5
 
-inherit eutils qt4-r2
+inherit eutils multibuild qt4-r2
 
 MY_P="${PN}-${PV/_/-}"
 
@@ -32,7 +32,7 @@ src_prepare() {
 		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
 		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
 		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
-		QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
+		QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner
 		VERSION = ${PV/_*}
 		QWT_VERSION = ${PV/_*}
 		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
@@ -66,22 +66,48 @@ src_prepare() {
 	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
 
 	epatch "${FILESDIR}/${PN}-6.0.2-invalid-read.patch"
+
+	MULTIBUILD_VARIANTS=( shared )
+	use static-libs && MULTIBUILD_VARIANTS+=( static )
+
+	preparation() {
+		cp -rf "${S}" "${BUILD_DIR}" || die
+		[[ ${MULTIBUILD_VARIANT} == shared ]] && \
+			echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
+		run_in_build_dir qt4-r2_src_prepare
+	}
+	multibuild_foreach_variant preparation
+}
+
+src_configure() {
+	multibuild_parallel_foreach_variant qt4-r2_src_configure
 }
 
 src_compile() {
+	compilation() {
+#		cd "${BUILD_DIR}" || die
+#		run_in_build_dir pwd
+#		run_in_build_dir ls -l
+#	run_in_build_dir default
+		cd "${BUILD_DIR}" || die
+		default
+	}
+#	multibuild_foreach_variant run_in_build_dir default
+	multibuild_foreach_variant compilation
+
 	building() {
 		# split compilation to allow parallel building
 		emake sub-src
 		emake
 	}
-	building
-
-	if use static-libs; then
-		sed "/QwtDll/d" -i qwtconfig.pri || die
-		eqmake4
-		building
-		echo "CONFIG += QwtDll" >> qwtconfig.pri || die
-	fi
+#	building
+
+#	if use static-libs; then
+#		sed "/QwtDll/d" -i qwtconfig.pri || die
+#		eqmake4
+#		building
+#		echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri || die
+#	fi
 }
 
 src_test() {
@@ -93,7 +119,8 @@ src_test() {
 src_install () {
 	qt4-r2_src_install
 
-	use static-libs && dolib.a lib/libqwt.a
+#	use static-libs && dolib.so lib/*.so*
+	use static-libs && dolib.a lib/*.a
 
 	if use doc; then
 		dohtml -r doc/html/*