gentoo resync : 31.05.2021

4 files changed, 102 insertions, 7 deletions

diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index c6dabbac6d6e..16123985f5f8 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,5 +1,7 @@
 AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb2800c88ad06aa989d3293c42be8945db11982c915b775dac43d773f557dbfa57f5f3abf40a0f57c4d414f4003d09f581b SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201
 AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769
+DIST qwt-5.2.3_p20210211.tar.gz 2324714 BLAKE2B 86556c9cf65af80500b3cba7ef78be8aec0f2413a1d485641f8870b447a1b1370b9821ad6b4a58c74f87a73172e4b2fa3eb2f02bb525c0ab3982aec550914666 SHA512 8268213c9e809015d83f3f7d42e66c85b6c9cb16efb9586ad4e5da2fa60fdcc5bdf52e0a422adcdfe928e36df0f63d8bbed1fabded91ef36d226e6cc7fa372bb
 DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
-EBUILD qwt-6.1.5.ebuild 3167 BLAKE2B 50920fd2e5b173db1db2557700577f0c2a1a73b7cd64468c3d188e7a3fe8469227d64ee1b30840ad405e148f910be1d6b89e7d59282195488f70cdba69fd39a6 SHA512 377afb48fc2a3818acae82d2ca21fab2fa1c06cc3836e24583704aa9494ad6f4e1f820bc702a882655b5e99922066f71a701e7f784d77369f6ae94dc71e859fa
-MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43
+EBUILD qwt-5.2.3_p20210211.ebuild 2323 BLAKE2B 958df6c967dc0ad4c9835d045526c6c6b004878e521a86fd67c3c54b49f29bc31a02e628b19211a40a56fd3d61b4d5ed6241aac60d9d2c3e85b703ae9baf3bc5 SHA512 a8465b3dc22dcbb067031fc5bd26c1bbf56a20859dabd207e6785f3c9d8c27a82c98e82864c0ce76d320685c9756f07dfd7f3eaac5b3d01cbc33f8797909fb81
+EBUILD qwt-6.1.5.ebuild 3194 BLAKE2B 7a5d212d05ddfc7ae91c83fb5a8e4af7c3eb6a0b89a9da886a8bdbcaacf2583d8bfaddf0225ea7ed78a70b0fba53d9d75e5f4902ae2fd53b375475a2026d889e SHA512 a3906bee40011fdf0bc6594b230c0b29f3bea7d87d48127a36ab57edc61656043f46a2aae886fc22ec708dc34a10bf1c66082735cc1032862bf447592e2cf661
+MISC metadata.xml 929 BLAKE2B ea1453d30af94929b5ad57f1874a2b69c0f89dbbdda15f8960a3866936fe2472d61fe0288d508517ae14c761c50c5b95f2fda539385183c3739ba1e7989f7c8e SHA512 0789a2d491bc9562cc28c039dcd65c27dec51197026155e6466aa6c1d1fa8bab485673f05a5c2755b31310165c55dd5c7ed584820005f81e1b8cb70d949ec8c0
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 5fa861212232..5acd8316bb0a 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -18,5 +18,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">qwt</remote-id>
+    <remote-id type="github">SciDAVis/qwt5-qt5</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
new file mode 100644
index 000000000000..5762259d2e39
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+COMMIT="2a9f1ae2f394abf3a000906b507a0d925b1e4b25"
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
+SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="5"
+IUSE="designer examples"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtsvg:5
+	designer? ( dev-qt/designer:5 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
+
+src_prepare() {
+	default
+	sed -e "/QwtVersion/s:5.2.2.:${PV/_*}:g" -i ${PN}.prf || die
+
+	cat > qwtconfig.pri <<-EOF || die
+		target.path = "${EPREFIX}/usr/$(get_libdir)"
+		headers.path = "${EPREFIX}/usr/include/qwt5"
+		doc.path = "${EPREFIX}/usr/share/doc/${PF}"
+		CONFIG += qt warn_on thread release
+		CONFIG += QwtDll QwtPlot QwtWidgets QwtSVGItem
+		VERSION = ${PV/_*}
+		QWT_VERSION = ${PV/_*}
+	EOF
+	use designer && echo "CONFIG += QwtDesigner" >> qwtconfig.pri
+	# Fails to compile with MathML enabled
+	#use mathml && echo "CONFIG += QwtMathML" >> 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 -i -e 's/headers doc/headers/' src/src.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+}
+
+src_install () {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+	doman doc/man/*/*
+
+	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/qwt5"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt5"
+			LIBS        += -lqwt
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		insinto /usr/share/${PN}5
+		doins -r examples
+	fi
+
+	# avoid file conflict with qwt:6
+	# https://github.com/gbm19/qwt5-qt5/issues/2
+	pushd "${ED}/usr/share/man/man3/" || die
+		for f in *; do
+			mv ${f} ${f//.3/.5qt5.3} || die
+		done
+	popd || die
+}
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
index 1c2423d812c1..96d8e6a1750a 100644
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit qmake-utils
 
 DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://qwt.sourceforge.net/"
+HOMEPAGE="https://qwt.sourceforge.io/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
@@ -39,7 +39,7 @@ PATCHES=(
 src_prepare() {
 	default
 
-	cat > qwtconfig.pri <<-EOF
+	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}"
@@ -53,13 +53,13 @@ src_prepare() {
 	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
 	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
 
-	cat > qwtbuild.pri <<-EOF
+	cat > qwtbuild.pri <<-EOF || die
 		QWT_CONFIG += qt warn_on thread release no_keywords
 	EOF
 
 	echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
 
-	cat >> qwtconfig.pri <<-EOF
+	cat >> qwtconfig.pri <<-EOF || die
 		QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
 		QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
 	EOF
@@ -113,7 +113,7 @@ src_install() {
 
 	if use examples; then
 		# don't build examples - fix the qt files to build once installed
-		cat > examples/examples.pri <<-EOF
+		cat > examples/examples.pri <<-EOF || die
 			include( qwtconfig.pri )
 			TEMPLATE     = app
 			MOC_DIR      = moc