gentoo auto-resync : 21:10:2022 - 20:03:11

6 files changed, 134 insertions, 4 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 78c7586c7c4e..082199d69dc7 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 8d9eef23e69e..aaab775bfc0e 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -9,4 +9,5 @@ EBUILD qwt-5.2.3_p20210211.ebuild 2319 BLAKE2B b6062a5d1d7e0c4a42e6cac9ee80a0610
 EBUILD qwt-5.2.3_p20210828.ebuild 1302 BLAKE2B 5cfca149406425020e839499bde1bea68c19cf1622cba7a58f2c0b79d5d6f4226e19cb12e4836b3a21d54c9a170766ab639d1a1484c93e6b7b21af7d4ac6c6e5 SHA512 61e455f856809f3f0685b68236a4d65d68470aa3efa664fce404beb24d25234ab2e4a31a5313dfd95d945877c304a371cb940ef3c06ca55058b7961a86aed398
 EBUILD qwt-6.1.5.ebuild 3194 BLAKE2B 7a5d212d05ddfc7ae91c83fb5a8e4af7c3eb6a0b89a9da886a8bdbcaacf2583d8bfaddf0225ea7ed78a70b0fba53d9d75e5f4902ae2fd53b375475a2026d889e SHA512 a3906bee40011fdf0bc6594b230c0b29f3bea7d87d48127a36ab57edc61656043f46a2aae886fc22ec708dc34a10bf1c66082735cc1032862bf447592e2cf661
 EBUILD qwt-6.2.0-r1.ebuild 3148 BLAKE2B faf1610223f59970117cf4d0c5682db4fd14b80d7152fdba15cc52d328a6b5f2039ea2c23110b9fd72ce7b1398ac02487753f8d71613d6ba42902926ae73edb7 SHA512 97ec3eada43e1437270ff637edbec2e4ce63f25ca29bd4f5056f2d76a4bb638d00e3819a97384f9046f2e9bcab88e2a5794b1959f42f937b2bb8962c29034f6f
-MISC metadata.xml 932 BLAKE2B 3f33557d8f5eb094139c72cd8b6822459cf8c728a83a4b87f8a0b897efa177720e86ca4ffec408ab8017804e19db9969abd6a9c66cd9514488e4971b9c1a4afe SHA512 58e8cde4bd554fcc44f0706f9107b831cd4003f1b5988c3c8b224627c82dd92c303cdbe2705ed87320dcb96ba72d3e5741f467345d070d52d60eb6bf6630a91f
+EBUILD qwt-6.2.0-r2.ebuild 3215 BLAKE2B 32800f8303668fefbce93894a854ce5ecfae4dec072a26067d82b51ee5fa743f16d0e0a7927427b7d919b8b49d474d51d2852889c3d73d69bb6187dc3dbd8383 SHA512 699735b556226b466b66163a79cff3fd7a698bc1f3bcb46bb1b94da7d217f70b0bd9d0c0c8c1718c96dce0693fcb9598caadec55a664f5ea5307acbbc507cb2f
+MISC metadata.xml 991 BLAKE2B 4f669bab45796e2bdeb95201f6f376ca4ba38f9143c5d5528532bfce996bc943b890d3838ea527bf5d58eb1e4af6cc3d7e3ab0360379aab394fec954ccda3498 SHA512 5343aaa93b8a882d8a2d98e060916a0683454e7f5d39e3d7d080aadc5a2bf45eb227c90009f6f2c9dbdb08664389166404ffdd8590fdd0a085c6769e3763306e
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 3a84e892fae0..4ae06e042f79 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -15,6 +15,7 @@
   <use>
     <flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
     <flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag>
+    <flag name="polar">Install the QwtPolar headers</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">qwt</remote-id>
diff --git a/x11-libs/qwt/qwt-6.2.0-r2.ebuild b/x11-libs/qwt/qwt-6.2.0-r2.ebuild
new file mode 100644
index 000000000000..cea9701a4b9a
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.2.0-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="doc"
+DOCS_CONFIG_NAME="Doxyfile"
+DOCS_DEPEND="media-gfx/graphviz"
+
+inherit qmake-utils docs
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="6/2.0"
+IUSE="designer doc examples opengl polar svg"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+	opengl? (
+		dev-qt/qtopengl:5
+		virtual/opengl
+	)
+	svg? ( dev-qt/qtsvg:5 )
+"
+RDEPEND="${DEPEND}"
+
+# tests require package to be already installed
+RESTRICT="test"
+
+DOCS=( CHANGES-6.2 README )
+
+src_prepare() {
+	default
+
+	cat > qwtconfig.pri <<-EOF || die
+		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+		QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
+		VER_MAJ = $(ver_cut 1)
+		VER_MIN = $(ver_cut 2)
+		VER_PAT = $(ver_cut 3)
+		VERSION = ${PV/_*}
+		QWT_VER_MAJ = $(ver_cut 1)
+		QWT_VER_MIN = $(ver_cut 2)
+		QWT_VER_PAT = $(ver_cut 3)
+		QWT_VERSION = ${PV/_*}
+	EOF
+
+	use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+	use polar && echo "QWT_CONFIG += QwtPolar" >> qwtconfig.pri
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+	cat > qwtbuild.pri <<-EOF || die
+		QWT_CONFIG += qt warn_on thread release no_keywords
+		DEFINES += QWT_MOC_INCLUDE=1
+	EOF
+
+	echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+	cat >> qwtconfig.pri <<-EOF || die
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
+	EOF
+	sed \
+		-e 's/target doc/target/' \
+		-e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
+		-e "/^TARGET/s:qwt):qwt6-qt5):g" \
+		-e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-qt5.so:g" \
+		-i src/src.pro || die
+
+	sed \
+		-e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
+		-e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
+		-i qwt.prf designer/designer.pro examples/examples.pri || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+	# need doxyfilter.sh in PATH
+	PATH="${PATH}:${S}/doc/" docs_compile
+}
+
+src_test() {
+	cd tests || die
+	eqmake5 tests.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	mkdir -p "${ED}"/usr/share/man/ || die
+	mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
+		rmdir "${ED}"/usr/share/doc/${PF}/man || die
+
+	if use examples; then
+		# don't build examples - fix the qt files to build once installed
+		cat > examples/examples.pri <<-EOF || die
+			include( qwtconfig.pri )
+			TEMPLATE     = app
+			MOC_DIR      = moc
+			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
+			LIBS        += -lqwt6
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		insinto /usr/share/${PN}6
+		doins -r examples
+	fi
+}
diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index 13d4f24d3cac..a478bd570f0c 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,3 +1,3 @@
 DIST qwtpolar-1.1.1.tar.bz2 565546 BLAKE2B 7067a006c44d49fab1dc16e115c528aaf72fa172d92487bd38e112bdff99e8ea4d83f0dafcb7f17af4bad9190c809468e47db652ca712645504b350dc9f03ed3 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621
-EBUILD qwtpolar-1.1.1-r2.ebuild 1438 BLAKE2B a36821c7ab8a18a14abb1f28c7621d8387b0f8e6635f1cd621a883d274d225264548465f4ac651e3866d58ebe06a408a8d0ab1ceab86f901eb7e5d460996b320 SHA512 3e849cd907a486305662d61342529c5ed41f41c2762d8c036f2dc58f1337824861d6b3fd6a85bf5802425499d00f26cef377db5a962c32845853c8738a1e5884
+EBUILD qwtpolar-1.1.1-r3.ebuild 1453 BLAKE2B 3a3b5398c4dbfab0506008e65f08e396c1152b9d112c4a70b98df812581c97b467c20665fac580978477e4bdfb734df5bca922c48d20650dd07c3346467ae0a6 SHA512 f6d83ceec3283ff2d2454988f96b9054f2685fdda84607c2074ff755b250334b17664840ed9dffca3d5e23b44f9f3903fc555e5ff201f40565880c5ab6a5f6f1
 MISC metadata.xml 348 BLAKE2B 3cbd28f9c682cf2caec49ea1ca00fb991ead2b5c9692473550d9492c9fce7c3598492ac7bf719f8be991459c357e7ed2818577d7263dfd057a7316be59feb97f SHA512 cefce0b3816b27d9cdb557339ac258caab08f5090610aee3dd94098233616e8e2a0f642e4fd9b136ebb87138ba7d2fff6d442dba40390c4d63b350d59158d7ae
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild
index 39bb2faf54f9..b3cb574faa90 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	x11-libs/qwt:6=[designer,qt5(+),svg]
+	<x11-libs/qwt-6.2:6=[designer,qt5(+),svg,-polar(-)]
 "
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5