gentoo resync : 06.04.2022

4 files changed, 121 insertions, 18 deletions

diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index bba3d36866a7..34a355535585 100644
--- a/media-libs/quarter/Manifest
+++ b/media-libs/quarter/Manifest
@@ -1,4 +1,6 @@
 AUX quarter-1.1.0-cmake.patch 535 BLAKE2B b800b87ff88a824170700f37599bd425c08d2defdd515f98314de531710ff56f916a7619cd9eac35c74664bc7dd55f4320234ac96b0e1c6b08ff64b04c312918 SHA512 fbd981e1af9003ee6f92a6218a2d150b110f3e86c580b2a57a7d5e496f3e7a36e0ee8b5e664ef38b7d5db7294b2500c64e1c8c4adf9a8ee3b877173f409bb411
+AUX quarter-1.1.0-find-qhelpgenerator-binary.patch 864 BLAKE2B dbffc6c53bb6834b8825b4c515c749a1fbaf378a7b03b9f9d2509ba72ca9ba363b800f26eed68421e4bca0a68f721e0ef360cd29ca95f465f4fca7ee3054b99d SHA512 23e9a0bb5a3cabe7f2c4e1b977d5a01973331416633fa3f44c1869d22d420a5e60c1d3d61853f422b6ce4340a8b3352031e4a6841fcb4be5c3b0cdf416087ae3
 DIST quarter-1.1.0-src.tar.gz 724762 BLAKE2B 8f1f0025706c4502ea178c09204e442b9c52148371863a5a49640ba751084cca9ca464398ee171729d85e8fc2f3fe3ea9d5f0492d114d810527601936abbd1e0 SHA512 2b2649132c66c709e3d5df2a99d621fb9cf61424c5376a5ca6a016ee5c7514841f8bbe390d1acc7b94688a86b56304ed12fb98840e11933162ac6ccb3f3d681c
+EBUILD quarter-1.1.0-r1.ebuild 1548 BLAKE2B d5f36f88da213b610d6582c102d489ffe73d9ebeb12abe79b0b51d186072d6b3181d2ee8578d70f59d7f5656e60e4ad2bfaaff7521dcf1f1d12a2e50e2d87114 SHA512 8add446876bc3daae6cb9d45345e0255f4fce5f49b94b19a3c68b449e81cb9e7e81af98fa7eb90fd3bc060acac9d5ae2fdaf261b214552fbd16b3c846ce4a675
 EBUILD quarter-1.1.0.ebuild 1363 BLAKE2B dd6327391b0a12c2987f83b71a66d0e90484d89b5083eab58f79921e2e2a6332613fabdd139062d8bf675e3685c96ff20231a0bc535c386073b907ac2db3c11d SHA512 ea0579d3912689f1a36aca4bf832a2bd69c7446d4271d54e6e59a0acc75bcb0bca7aa4a28c68d3dea8016211ac54e3844cda0e19742da1e46c2571414367ff5f
-MISC metadata.xml 850 BLAKE2B 88b9deaea963a026b2a89f7fbbf1661f5f5894e67ead85804920abd9c0a014b2d51c284a0e7c14054c617b2f6a2c97ecb3d3e8ca037cb14306b4e1f1ce506b70 SHA512 e295d24e8bb5aac5c04f0a2b944d7fb612b98f75b3f4db5cc003fffc66bf152dd0c19c444400ad03d1c69a241f5349dfefe19e603b36d69e58fa4eb27b07aa89
+MISC metadata.xml 1095 BLAKE2B d49405831d4200b0294c6bdedee25ce91e91f8a74f69d279fa557ab85df3f4a84b4f65d8824375ef943bbdf135ec0affbbdd74459b7dc3d16c813816c6405ff0 SHA512 c6ddcec450816262a64df90e9f081c0a6eb7572d8d3d2ff0dcf5980263d84ac2425a1d49997072dd9d7baf8e27007944a46a96cfcdde12282e8fcbe84c47fd0a
diff --git a/media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch b/media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch
new file mode 100644
index 000000000000..6fe804551e72
--- /dev/null
+++ b/media-libs/quarter/files/quarter-1.1.0-find-qhelpgenerator-binary.patch
@@ -0,0 +1,22 @@
+From 04994984239e18ea68af04734c4c8a1324bc0ac6 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 2 Apr 2022 15:00:42 +0200
+Subject: [PATCH] find qhelpgenerator binary
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -204,7 +204,9 @@ if(QUARTER_BUILD_DOCUMENTATION)
+     endif()
+   endif()
+   if(QUARTER_BUILD_DOC_QTHELP)
+-    find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator")
++    get_target_property(qt_qmake_location Qt5::qmake LOCATION)
++    get_filename_component(qt_bin_dir "${qt_qmake_location}" PATH)
++    find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator" HINTS "${qt_bin_dir}")
+     if(NOT QHG_LOCATION)
+       message(FATAL_ERROR "Missing program Qt qhelpgenerator")
+     else()
+-- 
+2.35.1
+
diff --git a/media-libs/quarter/metadata.xml b/media-libs/quarter/metadata.xml
index 9ef4a04c87ad..356911f89686 100644
--- a/media-libs/quarter/metadata.xml
+++ b/media-libs/quarter/metadata.xml
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>reavertm@gentoo.org</email>
-    <description>Feel free to maintain/fix</description>
-  </maintainer>
-  <longdescription lang="en">
-  Quarter is a light-weight glue library that provides seamless
-  integration between Systems in Motions's Coin high-level 3D
-  visualization library and Trolltech's Qt 2D user interface library.
-  It supersedes previous Qt binding - SoQt - by subclassing QGLWidget.
-  </longdescription>
-  <use>
-    <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-    <flag name="qthelp">Build API documentation in QtHelp format</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">coin3d/quarter</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<description>Feel free to maintain/fix</description>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>waebbl-gentoo@posteo.net</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	Quarter is a light-weight glue library that provides seamless
+	integration between Systems in Motions's Coin high-level 3D
+	visualization library and Trolltech's Qt 2D user interface library.
+	It supersedes previous Qt binding - SoQt - by subclassing QGLWidget.
+	</longdescription>
+	<use>
+		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="qthelp">Build API documentation in QtHelp format</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">coin3d/quarter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/quarter/quarter-1.1.0-r1.ebuild b/media-libs/quarter/quarter-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..9ccb1a4a1aac
--- /dev/null
+++ b/media-libs/quarter/quarter-1.1.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_P=${P/quarter/Quarter}
+
+HOMEPAGE="https://github.com/coin3d/coin/wiki"
+DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
+SRC_URI="https://github.com/coin3d/quarter/releases/download/${MY_P}/${P}-src.tar.gz"
+S="${WORKDIR}/quarter"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug designer doc man qthelp"
+
+REQUIRED_USE="
+	man? ( doc )
+	qthelp? ( doc )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-libs/coin
+	virtual/opengl
+	designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		qthelp? ( dev-qt/qthelp:5 )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-cmake.patch
+	"${FILESDIR}"/${PN}-1.1.0-find-qhelpgenerator-binary.patch
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e 's|/lib$|/lib@LIB_SUFFIX@|' \
+		-i Quarter.pc.cmake.in || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DQUARTER_DEBUG=1
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DQUARTER_BUILD_SHARED_LIBS=ON
+		-DQUARTER_BUILD_PLUGIN=$(usex designer)
+		-DQUARTER_BUILD_EXAMPLES=OFF
+		-DQUARTER_BUILD_DOCUMENTATION=$(usex doc)
+		-DQUARTER_BUILD_INTERNAL_DOCUMENTATION=OFF
+		-DQUARTER_BUILD_DOC_MAN=$(usex man)
+		-DQUARTER_BUILD_DOC_QTHELP=$(usex qthelp)
+		-DQUARTER_BUILD_DOC_CHM=OFF
+		-DQUARTER_USE_QT5=ON
+	)
+	cmake_src_configure
+}