x11-libs/qwtpolar: revision bump to v1.1.1-r3

Package-Manager: portage-2.2.20.1

5 files changed, 158 insertions, 5 deletions

diff --git a/x11-libs/qwtpolar/ChangeLog b/x11-libs/qwtpolar/ChangeLog
index a691e29..df942fc 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-r3 (20 Oct 2015)
+
+  20 Oct 2015; AstroFloyd <AstroFloyd@gmail.com> +qwtpolar-1.1.1-r3.ebuild:
+  Revision bump: install examples if desired
+
 *qwtpolar-1.1.1-r2 (02 Aug 2015)
 
   02 Aug 2015; AstroFloyd <AstroFloyd@gmail.com> +qwtpolar-1.1.1-r2.ebuild:
diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index 8b90dbf..8f09ca9 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,5 +1,6 @@
 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
-EBUILD qwtpolar-1.1.1-r2.ebuild 3582 SHA256 ab0cd3eb4aea06190c87e1c11e3ed6155c06b0c3b4c102643ce7e4b4d511b5bf SHA512 b70404fa703975acd9f45656f4c941cd2bb28dff2b75ef0410c1e123d49e9aebfd2d2df2a369f1add85bb12edef90348c55fc41007b9946e7dd389d48a648baf WHIRLPOOL 897c35e888529ba44cde1c69cdc6d6a7f99e7f4e1796eb1a447ee189d8c78dc5dfbc8be73f45381da08d08a06f07e68d8ab579013820c474e4fd58a08c00ec66
-MISC ChangeLog 1763 SHA256 4225de10a4a78ae905e981b1d9f88452484580cb4a0f2ecbf985f4f5939dd1b8 SHA512 339941f30dcfd38f24ed3572757d92f2f3ca36882794fc398278daf46561ba813ce17a1c75aec6dc6c7ca9bbd058670209d4f293ef9fb863a9c1960b94993890 WHIRLPOOL b10e1fa336e39fc200c4e0316549207a7df526889353a00cb879c9788a986b986f561f65800cd391d1627d174cb6c8f18176f14a6d6a8b6ca540948d14efcce0
+EBUILD qwtpolar-1.1.1-r1.ebuild 3308 SHA256 9a242fe0f0b290980130673d3160f470bcc59d7879658fdab7d0571bcaea8caa SHA512 6dc4ccb9bc450c3a4a515d3644f857e798eff4932f3344fd4b743be2c7fe37bebe034ff566abc60f8db1959b004d76cfbe9ad8ad7cd21a55133622e79b769817 WHIRLPOOL 3e089eabd695acaf68b929e9af25895581622864aadbea64bf28c9c7736d4d555a0ed8dab094fdf191f1773e08247e1d93b678d25aebc55f00797c20705a3634
+EBUILD qwtpolar-1.1.1-r2.ebuild 3477 SHA256 ccd45d54780d231a31df96388cd2302b2047ab15d455f1a12ab20a538f7fe593 SHA512 8c4fb42b42761456be3d9ba8c4fbb482a77f1069e9d33f5dc33d12c741f374f0ea86caf0b7aa69bfe3a7e689e96247f9a1dbd39cb6cb31c46c0a85135703d815 WHIRLPOOL 8890a4bfce5605115225e43cc63bbade118ddd6c798358d3394861a9039a0e713b3dabb65ffe418a31c771e5cc0e50c74f6a44aa7e2c5a2afcf3c01af152338e
+EBUILD qwtpolar-1.1.1-r3.ebuild 4169 SHA256 964dc809a266603d5acecc6a997fb3e9105967be90425d9bb8f6854d7f60498d SHA512 c16f965a10a674ded21876d7e399308d5e8a97fd8084f16e168d2756183f56f3a71582f7813c4cbd110cd621fdb03528d559e6efc8f17b3873f1311a3d88542e WHIRLPOOL 79898682fd64bde43852a09abc381487353e464413ea1f50671f3abe12419f56b50090667ac162b313f3f439315104001ba1f82491196e555ba80b77a976292f
+MISC ChangeLog 1919 SHA256 fb75100e258638ed536f420f64c3243775d1d084d8b7a7addc033761515f96ec SHA512 6bd342a7c18d349250a28c50e5760337aec70e2a1c6d0932194f3698e27b0718bdb4aba598965271d7a26d5877ed83920241d8d78fa9ae9b8b6a0db36cf9e1f3 WHIRLPOOL 6e21365f63e144495a5915341b25bad931fd50bfec3596b01d2cecb9f586a96ecf74a33036ce7b3ee511fe8cffe7665ba7ea91b98d829db47ebe8ab5ff4c2597
 MISC metadata.xml 379 SHA256 5c84374624ad2b49dd0331192ac11e909c41a6c2ff5f657fd29a34363fa28628 SHA512 50bcb483cfd0ff4259a51bcc18dcce42ebf6f2add47150c03df6927bfcca587c9fb98753cabb0937fe4684fa91fa25f777d0195239e925620e660f2dbc69c9af WHIRLPOOL d71df1a35c4fcd54dc55d67c48b8ef400414d700963ac68a7268d2bb3443eb0112fdd69d3695ff732ff6a352d073b0190321ad6782a5ea5e38e78f74924ba54b
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
index ff91cba..a5d9fbc 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Id$
 
 EAPI=5
 
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
index 3445b06..6a25f87 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Id$
 
 EAPI=5
 
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild
new file mode 100644
index 0000000..e199fda
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 examples 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
+				sed -i '/LIBS /s/$(SUBLIBS)/$(SUBLIBS) -lqwt6-qt5/' src/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
+
+	if use examples; then
+		# don't build examples - fix the Qt files to allow build once installed
+		cat > examples/examples.pri <<-EOF
+TEMPLATE     = app
+
+unix:  include( "${EPREFIX}/usr/share/qt4/mkspecs/features/qwt.prf" )
+unix:  include( "${EPREFIX}/usr/share/qt4/mkspecs/features/qwtpolar.prf" )
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport concurrent
+
+contains(QWT_POLAR_CONFIG, QwtPolarSvg) {
+   QT += svg
+} else {
+   DEFINES += QWT_POLAR_NO_SVG
+}
+		EOF
+		if use qt4; then
+			insinto /usr/share/${PN}-qt4
+			doins -r examples
+		fi
+		if use qt5; then
+			sed -i -e 's/qt4/qt5/g' examples/examples.pri || die
+			insinto /usr/share/${PN}-qt5
+			doins -r examples
+		fi
+	fi
+}