gentoo resync : 22.12.2021

4 files changed, 226 insertions, 0 deletions

diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 0ffb892c86a6..41f55a808444 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,7 +1,12 @@
+AUX qwt-5.2.3_p20210828-install-headers.patch 777 BLAKE2B e57833f3b77afcb0afa4b66d545e420b56f99d5f9a328eea7e029da0af7d445fee560c481c35fca00e8ee1c44b38485d5fe957a6013b88ee2ff8edd46335327a SHA512 999a2ef2059e2d78e0b37447e356ebd62a4b89bf59979ef526c7ef853cd6d75a639b6d4a1eb238de8f745e0295568be417f443d65ad983e880144875fb5b8c66
 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-5.2.3_p20210828.tar.gz 2324516 BLAKE2B f86ee55dab0e70bb255f90384ee920985d71ff998aa74bb087c2bd7bf3cdc23034786bce0d4e652dd4a7b1551719e4723de6689c76500e5f618838f40f7ca838 SHA512 c5eb64593a476d9ff1ec6c16593896bf3b90738a17775bd8186ffc7f86911ae0b91ceb8e7c1736329e9871fd9e1e5653a85df0a4cdb780a1f2f993f33ee07f62
 DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
+DIST qwt-6.2.0.tar.bz2 4815773 BLAKE2B 30011de7ef9b555584644ccb0994bfe56af2d7efe16690b236aa1aa0860a4408800fbd31003fd7a7a0ddf8572f573b4d0ff77069f291cd2858b31a2840952b3b SHA512 d992f9dddb09ad0e1d09e23a24a9331c950ca19a413d2627cf423e1ddc2a4ad4eb951646f789e8c7a9ab42668c30d7108071f3f8bbd8e1f4118cadb67c34939d
 EBUILD qwt-5.2.3_p20210211.ebuild 2319 BLAKE2B b6062a5d1d7e0c4a42e6cac9ee80a0610a4e3ad4b0868f9806138f8d408c513abf5ae7ef5ecbfbde38b1e9398519ffc8bed798e6db7dfb2374e33c257fb337cc SHA512 2882706eb496ca52501c23d7da465122c4338648e6ef1b72ec202430b7437497568b1ba3e44b812a6ecc2048e00cc060640eaf88d7e8e4c138cfe48e0c0d7916
+EBUILD qwt-5.2.3_p20210828.ebuild 1295 BLAKE2B 2a8af082fbb910433d75c8ba9c368af885f34c2b9670dadbd8ed6024cc86ab943f58d6d211746b41a119899a4a4d6b54f9571065c4841baf783a1f9fec93099b SHA512 789329283a008e17fa89b75c529ab9aa94e97c53bc970b3bf88bc66fd9999f3d6a995373701c142f32f590dbdc513352f01627c0d3c48192f8968123a258f21e
 EBUILD qwt-6.1.5.ebuild 3194 BLAKE2B 7a5d212d05ddfc7ae91c83fb5a8e4af7c3eb6a0b89a9da886a8bdbcaacf2583d8bfaddf0225ea7ed78a70b0fba53d9d75e5f4902ae2fd53b375475a2026d889e SHA512 a3906bee40011fdf0bc6594b230c0b29f3bea7d87d48127a36ab57edc61656043f46a2aae886fc22ec708dc34a10bf1c66082735cc1032862bf447592e2cf661
+EBUILD qwt-6.2.0-r1.ebuild 3141 BLAKE2B 382d602da54a281e5e91f1d50175577383e29ee35b21028c511f059c830752c67a2eac163c74b461f67f2c3699fd7ba8c3faceca0d3ce9e32bc41a3c11892c78 SHA512 04e39d1043f65ce8eb0badb376f16ede28f60bf91308d0a14ad8251f5ebbb0e0d231425ae084fa29f9b63d2cdb1a89e6b04372701c33ae637a7f4c18ddf86c37
 MISC metadata.xml 930 BLAKE2B 7e69f5762e0abf8399921153b73c31e927803de990cb3902be1fcfeaba75d18c36300b374a84a57630fd3eb08f4c99194e8dd3f86059cf9fa05ec049649c3cf7 SHA512 f90beae03d5e96508f139da0206f4aea119fb323aaafaa92931e35c8b6e1fc56c0e4deaedd77c57c5c8173c36c34227b504b9444c7200427ef7daeae3204f14a
diff --git a/x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch b/x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch
new file mode 100644
index 000000000000..9ceff1035e69
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-5.2.3_p20210828-install-headers.patch
@@ -0,0 +1,28 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 502f097..35b8660 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -6,6 +6,7 @@ set( HEADERS
+   "qwt_color_map.h"
+   "qwt_clipper.h"
+   "qwt_double_interval.h"
++  "qwt_double_rect.h"
+   "qwt_dyngrid_layout.h"
+   "qwt_global.h"
+   "qwt_layout_metrics.h"
+@@ -34,6 +35,7 @@ set( SRCS
+   "qwt_color_map.cpp"
+   "qwt_clipper.cpp"
+   "qwt_double_interval.cpp"
++  "qwt_double_rect.cpp"
+   "qwt_dyngrid_layout.cpp"
+   "qwt_layout_metrics.cpp"
+   "qwt_math.cpp"
+@@ -156,6 +158,7 @@ if( QWT_WIDGETS )
+ endif()
+ 
+ add_library( qwt5-qt5 ${SRCS} ${HEADERS} )
++set_target_properties( qwt5-qt5 PROPERTIES PUBLIC_HEADER "${HEADERS}" )
+ 
+ target_link_libraries( qwt5-qt5 Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport )
+ 
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
new file mode 100644
index 000000000000..4321491653bf
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 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
+	virtual/latex-base
+"
+
+inherit docs cmake
+
+COMMIT="f7519200f102676fb04fb7bd0be555e0a419d378"
+
+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"
+S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
+
+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}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-install-headers.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DQWT_DESIGNER=$(usex designer)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	# 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.2.0-r1.ebuild b/x11-libs/qwt/qwt-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..c2bc73d2417c
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.2.0-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="6/2.0"
+IUSE="designer doc examples opengl 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 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
+}