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

Signed-off-by: AstroFloyd <AstroFloyd@gmail.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

4 files changed, 13 insertions, 157 deletions

diff --git a/x11-libs/qwtpolar/ChangeLog b/x11-libs/qwtpolar/ChangeLog
index a27caa7..e409ed4 100644
--- a/x11-libs/qwtpolar/ChangeLog
+++ b/x11-libs/qwtpolar/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for x11-libs/qwtpolar
-# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2018 Gentoo Authors; 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-r5 (24 Nov 2018)
+
+  24 Nov 2018; AstroFloyd <AstroFloyd@gmail.com> +qwtpolar-1.1.1-r5.ebuild,
+  -qwtpolar-1.1.1-r3.ebuild, -qwtpolar-1.1.1-r4.ebuild:
+  x11-libs/qwtpolar: revision bump to v1.1.1-r5
+
   07 Apr 2017; AstroFloyd <AstroFloyd@gmail.com> -qwtpolar-1.1.1-r1.ebuild,
   -qwtpolar-1.1.1-r2.ebuild, +qwtpolar-1.1.1-r4.ebuild:
   Revision bump
@@ -61,4 +67,3 @@
   12 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> +qwtpolar-0.1.0.ebuild,
   +metadata.xml:
   Initial commit. Required by qgis.
-
diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index 679e323..dc7074b 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,5 +1,4 @@
-DIST qwtpolar-1.1.1.tar.bz2 565546 SHA256 6168baa9dbc8d527ae1ebf2631313291a1d545da268a05f4caa52ceadbe8b295 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621 WHIRLPOOL e03906b22f06d6ea42ab0609d28a578be70c4d5c9a71d0cb00f40e2630f2868890085434e4f2833280db2c445eaefc16bfd321a3d4f5cc9e1538a608fd1d727b
-EBUILD qwtpolar-1.1.1-r3.ebuild 4169 SHA256 964dc809a266603d5acecc6a997fb3e9105967be90425d9bb8f6854d7f60498d SHA512 c16f965a10a674ded21876d7e399308d5e8a97fd8084f16e168d2756183f56f3a71582f7813c4cbd110cd621fdb03528d559e6efc8f17b3873f1311a3d88542e WHIRLPOOL 79898682fd64bde43852a09abc381487353e464413ea1f50671f3abe12419f56b50090667ac162b313f3f439315104001ba1f82491196e555ba80b77a976292f
-EBUILD qwtpolar-1.1.1-r4.ebuild 4256 SHA256 d8d4bea8e208f5a4a6630d8fe7ddd0cd7e8e6649cfcbb63e19e7e2dbc5f6a324 SHA512 6daa27ce5b8f23bbcd68e106b4f8f0c5dae8aeb76b60807f63e61cdbc2446c78a8ab1a4313488dd9677648b4fa05954a3c66a10df5fd3f9109f0e74c63b5d011 WHIRLPOOL 457786291e750f1e5855f80d360b50f74a242ba6aa6d654c7df27875c60c48e68230064ad196dced3bacdeb29570589f890b85705831d3df46b82474219d6fe6
-MISC ChangeLog 2068 SHA256 e0f672d2ce1f844db13dc9ba0ebe58c125e14a1f857748c1149dfe51d4f5583d SHA512 e712adf3aa874e21de53ffee18952f19021eee7d4ff29d8dc6f20589aadb2500130d891a98c7d1e2909575f4f68eb394ae02c3e626c9992b41e0710a5b5bc0eb WHIRLPOOL 9897e57286cece023365461e5d35192c09f7411d5dbe6fccd3dd3457f956f256efee332f1d4c372f17cb6c767579a87c38afb65b9b18ef8ecabce74ba605622b
-MISC metadata.xml 348 SHA256 945ba9f6f842b18c5bfbb9fc05a83645132796647acf4417e4cc0cb280a34789 SHA512 963095bcf3d3ebbab769a6d3c189b86be7495586f04ccdfd3e26e1433f9c395ce05eff709676283b22ee73700d7d3bbd3bf5fbedacbe2ef9e3ad1c4146cc2d90 WHIRLPOOL 4de5e82d28c67c762fd90e551a2f7ad46c16cff3bab1499f1c6cc8b66012afbe51b861388b64f78bdccd29b9aa53918c16016521d9707a880cd6f84f3546222f
+DIST qwtpolar-1.1.1.tar.bz2 565546 BLAKE2B 7067a006c44d49fab1dc16e115c528aaf72fa172d92487bd38e112bdff99e8ea4d83f0dafcb7f17af4bad9190c809468e47db652ca712645504b350dc9f03ed3 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621
+EBUILD qwtpolar-1.1.1-r5.ebuild 4242 BLAKE2B 67edfa3040519171e4d802d20c3a962c176369a03905ce4c989696eb1e59fbc09192f2dc06cbb824df64663ecc1641bb5c11dfa48a205c2ba6120f22a9c2cab1 SHA512 b2af26a3db5fe41edeeaac3d243b5b8a91b5fde8580a0d285f7f301478cd02d2cebe80a3ce3dc70350aeaa14a83a65999784d829c4464b792abf778fbec0dc45
+MISC ChangeLog 2279 BLAKE2B 4342fc46a1d03821c60cdc40c90c4fb287bccc3416c878062dbdd609805393ae844243d40bace29e07d57bd310c99a225d7b0ff5d6d181a7acfcc059e46882b4 SHA512 ab7f0b9477f814846f3d130abe096e9a013e4c43e6f427ed461fd2cc823c1ea56f1e59c0be91c1409aed4ae6956a2a67bf355ba040aef662078576dcf467f58f
+MISC metadata.xml 348 BLAKE2B 7540aace51d0266f04a93433805d5fb26a66526f144a8f0ee13a6b77c50f17ab64088881729cb12291b8e2f2326fdcc61f7c711ffe74209d5d0b7f5ab46be851 SHA512 963095bcf3d3ebbab769a6d3c189b86be7495586f04ccdfd3e26e1433f9c395ce05eff709676283b22ee73700d7d3bbd3bf5fbedacbe2ef9e3ad1c4146cc2d90
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild
deleted file mode 100644
index e199fda..0000000
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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
-}
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r4.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r5.ebuild
index de4931e..879417b 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r4.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r5.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
@@ -17,7 +16,7 @@ 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] )"
+		 qt5? ( >=x11-libs/qwt-6.1.3-r2[svg] )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {