gentoo auto-resync : 15:06:2023 - 13:38:09

3 files changed, 160 insertions, 129 deletions

diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index aaab775bfc0e..a9c8a1f62323 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -9,5 +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
-EBUILD qwt-6.2.0-r2.ebuild 3215 BLAKE2B 32800f8303668fefbce93894a854ce5ecfae4dec072a26067d82b51ee5fa743f16d0e0a7927427b7d919b8b49d474d51d2852889c3d73d69bb6187dc3dbd8383 SHA512 699735b556226b466b66163a79cff3fd7a698bc1f3bcb46bb1b94da7d217f70b0bd9d0c0c8c1718c96dce0693fcb9598caadec55a664f5ea5307acbbc507cb2f
+EBUILD qwt-6.2.0-r3.ebuild 4198 BLAKE2B e28ecd21cb77af879d76bc1db18795c1768034feff2669f21f9602c28333858d1fd609b80edd5f855eade62cc5188759703b087df278cc2b16a7249acd671252 SHA512 c35e8ae9947301bf043cf36620a1215cf8fbce7fb949586f5785e04cc06f890a2cc1ba5792ef896eb3da591931cea116dba0323a35cd7e5c1cad38b747a985a1
 MISC metadata.xml 991 BLAKE2B 4f669bab45796e2bdeb95201f6f376ca4ba38f9143c5d5528532bfce996bc943b890d3838ea527bf5d58eb1e4af6cc3d7e3ab0360379aab394fec954ccda3498 SHA512 5343aaa93b8a882d8a2d98e060916a0683454e7f5d39e3d7d080aadc5a2bf45eb227c90009f6f2c9dbdb08664389166404ffdd8590fdd0a085c6769e3763306e
diff --git a/x11-libs/qwt/qwt-6.2.0-r2.ebuild b/x11-libs/qwt/qwt-6.2.0-r2.ebuild
deleted file mode 100644
index cea9701a4b9a..000000000000
--- a/x11-libs/qwt/qwt-6.2.0-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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/qwt/qwt-6.2.0-r3.ebuild b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
new file mode 100644
index 000000000000..01157fff6808
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2023 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 docs multibuild qmake-utils
+
+DESCRIPTION="2D plotting library for Qt"
+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 +qt5 qt6 svg"
+
+DEPEND="
+	qt5? (
+		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 )
+	)
+	qt6? (
+		dev-qt/qtbase:6[concurrent,gui,cups,widgets]
+		designer? ( dev-qt/qttools:6[designer] )
+		opengl? (
+			dev-qt/qtbase:6[opengl]
+			virtual/opengl
+		)
+		svg? ( dev-qt/qtsvg:6 )
+	)
+"
+RDEPEND="${DEPEND}"
+
+# tests require package to be already installed
+RESTRICT="test"
+
+DOCS=( CHANGES-6.2 README )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_prepare() {
+	my_src_prepare() {
+		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}/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/plugins/designer"
+			QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/mkspecs/features"
+		EOF
+		sed \
+			-e 's/target doc/target/' \
+			-e "/^TARGET/s:(qwt):(qwt6-${MULTIBUILD_VARIANT}):g" \
+			-e "/^TARGET/s:qwt):qwt6-${MULTIBUILD_VARIANT}):g" \
+			-e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-${MULTIBUILD_VARIANT}.so:g" \
+			-i src/src.pro || die
+
+		sed \
+			-e "/qwtAddLibrary/s:(qwt):(qwt6-${MULTIBUILD_VARIANT}):g" \
+			-e "/qwtAddLibrary/s:qwt):qwt6-${MULTIBUILD_VARIANT}):g" \
+			-i qwt.prf designer/designer.pro examples/examples.pri || die
+	}
+	default
+	multibuild_copy_sources
+	multibuild_foreach_variant run_in_build_dir my_src_prepare
+}
+
+src_configure() {
+	my_src_configure() {
+		case ${MULTIBUILD_VARIANT} in
+			qt5) eqmake5 ;;
+			qt6) eqmake6 ;;
+		esac
+	}
+	multibuild_foreach_variant run_in_build_dir my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir emake
+
+	# need doxyfilter.sh in PATH
+	PATH="${PATH}:${S}/doc/" docs_compile
+}
+
+src_test() {
+	my_src_test() {
+		cd "${BUILD_DIR}"/tests || die
+		case ${MULTIBUILD_VARIANT} in
+			qt5) eqmake5 tests.pro ;;
+			qt6) eqmake6 tests.pro ;;
+		esac
+		emake
+	}
+	multibuild_foreach_variant my_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant run_in_build_dir 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
+}