x11-libs/qwtpolar: revision bump to v1.1.1-r2: manually link qwt-qt5

* x11-libs/qwtpolar: revision bump to v1.1.1-r2: manually link qwt-qt5:
  * the qt5 .so and designer plugin weren't linked to qwt
    * hence the plugin didn't show up in qt-creator
  * not sure why this happens - does qmake5 fail to pick up qwt?
  * applied a manual fix:
    * run qmake
    * run make sub-src-qmake_all to generate src/Makefile
    * patch src/Makefile using sed

Package-Manager: portage-2.2.20

3 files changed, 128 insertions, 1 deletions

diff --git a/x11-libs/qwtpolar/ChangeLog b/x11-libs/qwtpolar/ChangeLog
index 98bda4f..a691e29 100644
--- a/x11-libs/qwtpolar/ChangeLog
+++ b/x11-libs/qwtpolar/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtpolar/ChangeLog,v 1.9 2014/09/19 12:56:13 jlec Exp $
 
+*qwtpolar-1.1.1-r2 (02 Aug 2015)
+
+  02 Aug 2015; AstroFloyd <AstroFloyd@gmail.com> +qwtpolar-1.1.1-r2.ebuild:
+  Revision bump: manually link qwt-qt5
+
 *qwtpolar-1.1.1-r1 (30 Jul 2015)
 
   31 Jul 2015; AstroFloyd <AstroFloyd@gmail.com> +qwtpolar-1.1.1-r1.ebuild,
diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index dd5fd8b..0f0b4f6 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,4 +1,5 @@
 DIST qwtpolar-1.1.1.tar.bz2 565546 SHA256 6168baa9dbc8d527ae1ebf2631313291a1d545da268a05f4caa52ceadbe8b295 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621 WHIRLPOOL e03906b22f06d6ea42ab0609d28a578be70c4d5c9a71d0cb00f40e2630f2868890085434e4f2833280db2c445eaefc16bfd321a3d4f5cc9e1538a608fd1d727b
 EBUILD qwtpolar-1.1.1-r1.ebuild 3413 SHA256 2460c10d26b5422837fac0c0deb35ec090399a62a6b2d3240448bb1379db0fca SHA512 553130aa746eca7d304fa0467d4e9ad28b19c0daf3210883e64bb948d7b89a2b43fc0d73e412a75785c48420f1876bb3728650d352f6f9c942dc312e452c3f30 WHIRLPOOL b2304a91f954cbd58a73ea156c4dd5a9d50459dbb6dc4e26503c6f6bd954d23b8ea303b6a029aa0b82d5a9dfd9fc8a5ac4d7763e040b0d244d36ec8d2a3ec68f
-MISC ChangeLog 1613 SHA256 6927179d146771924d9c7a5338c6988fbe57ded5cc0d1aac77ad22e11fa93042 SHA512 061ee6f3625a4440ac8ebe6444956990f3bde9dd75fdb87cc8053c14598201db42d4a624da9075110280f80ca8595e9dbfa54d6ca6375c9aa96696b862670d43 WHIRLPOOL d2d7d944994d9d732bf7fd572851b442cf695d3529e7c666d9649aa7b41f46b01420ef7a6a23560076d8ca81c8db68b50b08c37a4b350971f2d8988ed3e1ab05
+EBUILD qwtpolar-1.1.1-r2.ebuild 3590 SHA256 b0f1349bf563f907bb6039b93e9d7eaa79f9a173d698f1d3ac1bfa6e2482cc73 SHA512 5d5ab368efa4b94bd272e8046b7ff2f4474aa5ca1de034e28eb6f5800c697703489c12e75a0e253280b785723e37d9e395bad73f9aa3a68d14b3b0c4f82ab81f WHIRLPOOL ee16f17c1ce9240384584d2f2a6e784b7714e1c015eecb93132ea5feee27379e7d70c4d408f865cdaab6db4c08cdba265fa519717f02ee9619e4fcd1afee6b50
+MISC ChangeLog 1763 SHA256 4225de10a4a78ae905e981b1d9f88452484580cb4a0f2ecbf985f4f5939dd1b8 SHA512 339941f30dcfd38f24ed3572757d92f2f3ca36882794fc398278daf46561ba813ce17a1c75aec6dc6c7ca9bbd058670209d4f293ef9fb863a9c1960b94993890 WHIRLPOOL b10e1fa336e39fc200c4e0316549207a7df526889353a00cb879c9788a986b986f561f65800cd391d1627d174cb6c8f18176f14a6d6a8b6ca540948d14efcce0
 MISC metadata.xml 379 SHA256 5c84374624ad2b49dd0331192ac11e909c41a6c2ff5f657fd29a34363fa28628 SHA512 50bcb483cfd0ff4259a51bcc18dcce42ebf6f2add47150c03df6927bfcca587c9fb98753cabb0937fe4684fa91fa25f777d0195239e925620e660f2dbc69c9af WHIRLPOOL d71df1a35c4fcd54dc55d67c48b8ef400414d700963ac68a7268d2bb3443eb0112fdd69d3695ff732ff6a352d073b0190321ad6782a5ea5e38e78f74924ba54b
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
new file mode 100644
index 0000000..5bc4066
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtpolar/qwtpolar-1.1.1.ebuild,v 1.1 2014/09/19 12:56:13 jlec Exp $
+
+EAPI=5
+
+inherit multibuild multilib qmake-utils
+
+DESCRIPTION="Library for displaying values on a polar coordinate system"
+HOMEPAGE="http://qwtpolar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="designer doc qt4 qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="x11-libs/qwt:6[svg]
+		 qt5? ( >=x11-libs/qwt-6.1.2-r1[svg,qt5] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed \
+		-e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
+		-e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
+		-e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
+		-e "/= QwtPolarExamples/d" \
+		-i ${PN}config.pri || die
+
+	use designer || sed -e "/= QwtPolarDesigner/ d" -i ${PN}config.pri || die
+	use doc      || sed -e 's/target doc/target/'   -i src/src.pro     || die
+
+	sed \
+		-e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
+		-i src/src.pro || die
+	echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
+	cat >> designer/designer.pro <<- EOF
+	INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
+	LIBS += -L"${S}"/$(get_libdir)
+	EOF
+
+	MULTIBUILD_VARIANTS=( )
+
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=( qt4-shared )
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=( qt5-shared )
+	fi
+
+	multibuild_copy_sources
+
+	qt45_preparation() {
+		case "${MULTIBUILD_VARIANT}" in
+			qt4-*)
+				sed \
+					-e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer/:g" \
+					-e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${EPREFIX}/usr/share/qt4/mkspecs/features/:g" \
+					-i ${PN}config.pri || die
+
+				sed \
+					-e "/^TARGET/s:(qwtpolar):(qwtpolar-qt4):g" \
+					-e "/^TARGET/s:qwtpolar):qwtpolar-qt4):g" \
+					-i src/src.pro || die
+
+				sed \
+					-e '/qwtPolarAddLibrary/s:(qwtpolar):(qwtpolar-qt4):g' \
+					-e '/qwtPolarAddLibrary/s:qwtpolar):qwtpolar-qt4):g' \
+					-e "s:\${QWT_POLAR_ROOT}/lib:\${QWT_POLAR_ROOT}/$(get_libdir):g" \
+					-i qwtpolar.prf designer/designer.pro examples/examples.pri || die
+				;;
+			qt5-*)
+				sed \
+					-e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${EPREFIX}/usr/$(get_libdir)/qt5/plugins/designer/:g" \
+					-e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${EPREFIX}/usr/share/qt5/mkspecs/features/:g" \
+					-i ${PN}config.pri || die
+
+				sed \
+					-e "/^TARGET/s:(qwtpolar):(qwtpolar-qt5):g" \
+					-e "/^TARGET/s:qwtpolar):qwtpolar-qt5):g" \
+					-i src/src.pro || die
+
+				sed \
+					-e '/qwtPolarAddLibrary/s:(qwtpolar):(qwtpolar-qt5):g' \
+					-e '/qwtPolarAddLibrary/s:qwtpolar):qwtpolar-qt5):g' \
+					-e "s:\${QWT_POLAR_ROOT}/lib:\${QWT_POLAR_ROOT}/$(get_libdir):g" \
+					-i qwtpolar.prf designer/designer.pro examples/examples.pri || die
+				;;
+		esac
+	}
+
+	multibuild_foreach_variant run_in_build_dir qt45_preparation
+}
+
+src_configure() {
+	configuration() {
+		case "${MULTIBUILD_VARIANT}" in
+			qt4-*)
+				eqmake4
+				;;
+			qt5-*)
+				eqmake5
+				# qmake 5 doesn't seem to find Qwt - not sure why, but fix it by hand...
+				make sub-src-qmake_all
+				cd src/
+				sed -i '/LIBS /s/$(SUBLIBS)/$(SUBLIBS) -lqwt6-qt5/' Makefile
+				;;
+		esac
+	}
+	multibuild_parallel_foreach_variant run_in_build_dir configuration
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir default
+}
+
+src_install () {
+	multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install
+	mv "${D}/usr/share/doc/${PN}-${PVR}/man" "${D}"/usr/share
+}