gentoo resync : 20.03.2022

3 files changed, 87 insertions, 10 deletions

diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 7c83d651c941..959507f6df0e 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,4 +1,6 @@
 AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2121 BLAKE2B 9e2b2a20d1cd0e0b9686803e8bb943af14d3b18aa0f7afe815bc096d9889a2c03904c0f8b6def8f3565c70d9d2b225f8dbaccdd12023bb8d4c94296bcbf5bef1 SHA512 f9bbef207118d99d05797fe9f9369cba0059e144ebf8a9dbd3bf43f117722c5c9d9d59acac0361dd58489e66218f80c94e803454bf1c7e5812abcde7d54b8653
+DIST engauge-digitizer-12.1.tar.gz 72358942 BLAKE2B c7581734f3c5591ee5c17e16f2e68d8f75fa083d4b53933d16ea15d36890664f375ac53b5e37872eb0d2ffb5980946fe920412ee56d8a1aa16b0a81e66fcb115 SHA512 54ae573eb1e82ec3a81403c3c64af43207e139a2d97eb633993ffe31e03fedb1c1a5fe63157011851ad4a89822a3109b87a2c90a71f77865b3629a517a353a61
+EBUILD engauge-10.6.ebuild 2037 BLAKE2B 0a1bc802686216484e86d1f78541411ec96065f71669a34eee5a8aa77d1d8df73a10d15a62c9d58f1903de07347f41d8c83d8b44a23df1f974d7011e32d4e39e SHA512 f5df8d4e5fba4b72f59e35660cb690daf4ad03d20224fd4dc806260b67d2516881bf8db7995d3443b41f876da04b829c791f7d03e80ab7a0fc0af5f1afb39daf
+EBUILD engauge-12.1.ebuild 2030 BLAKE2B 2366e9f9fe0d1902488d6117f6365c5514f47989aa94cbcccb2864ba1112e052acee72699462192def3d8538db0c00db3ed3dae4fe0974968c20c6d5ab1437c1 SHA512 721f9be4023e5d2a1cdf499724a019e610b7c6ab19d85d0806a6eda48b6238e865054a54fcc9c76fecf97d57f87f635920f5fc38360d599d2abca9dc51495aa8
 MISC metadata.xml 344 BLAKE2B 35482a9cb0cddfadc856560af8580bf70bc38715d15fa9df1e910299d9246ae795070707afd7eb8e4694cd9b24cd5e6c0be87a23f4a6e3de47d16961ee631a21 SHA512 09b55d6c5f904a9a0c3735f2df0fccc0ef44ab55f677b7f6d4ca1892c48c866a44ac7b72f57a254bdf982d62d84aa2003723df223cc23de5f96cb4c326247595
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index a1c0d06f4b6e..7edd5d1d42c9 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -68,16 +68,12 @@ src_install() {
 	make_desktop_entry engauge "Engauge Digitizer" engauge-digitizer Graphics
 
 	# Install qt help files
-	insinto /usr/share/doc/${PF} # this must match sed expression in src_prepare
-	doins bin/documentation/engauge.{qch,qhc}
+	dodoc bin/documentation/engauge.{qch,qhc}
 	docompress -x "${EPREFIX}"/usr/share/doc/${PF}/engauge.{qch,qhc}
 
-	if use doc; then
-		pushd doc >/dev/null || die
-		doins -r .
-		popd >/dev/null || die
-	fi
+	use doc && dodoc -r doc/.
 	if use examples; then
-		doins -r samples
+		dodoc -r samples
+		docompress -x "${EPREFIX}"/usr/share/doc/${PF}/samples
 	fi
 }
diff --git a/media-gfx/engauge/engauge-12.1.ebuild b/media-gfx/engauge/engauge-12.1.ebuild
new file mode 100644
index 000000000000..39f94ddb1b7f
--- /dev/null
+++ b/media-gfx/engauge/engauge-12.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Convert an image file showing a graph or map into numbers"
+HOMEPAGE="https://markummitchell.github.io/engauge-digitizer/"
+SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v${PV}.tar.gz -> engauge-digitizer-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples jpeg2k pdf"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-libs/log4cpp
+	media-libs/libpng:0=
+	sci-libs/fftw:3.0
+	virtual/jpeg
+	jpeg2k? ( media-libs/openjpeg:2 )
+	pdf? ( app-text/poppler[qt5] )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/engauge-digitizer-${PV}
+
+src_prepare() {
+	default
+
+	# Make sure the documentation is looked for in the proper directory
+	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
+		-i src/Help/HelpWindow.cpp || die
+
+	# This otherwise overrides user CFLAGS
+	sed -e '/QMAKE_CXXFLAGS_WARN_ON/s/-O1//' \
+		-i engauge.pro || die
+
+	# Neuter the non-pkg-config hackery
+	sed -e '/error.*OPENJPEG_/d' \
+		-e '/LIBS.*OPENJPEG_LIB/d' \
+		-e '/QMAKE_POST_LINK.*OPENJPEG_LIB/d' \
+		-e '/error.*POPPLER_/d' \
+		-e '/LIBS.*POPPLER_LIB/d' \
+		-i engauge.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		CONFIG+=link_pkgconfig \
+		$(usex jpeg2k "CONFIG+=jpeg2000 PKGCONFIG+=libopenjp2" "") \
+		$(usex pdf "CONFIG+=pdf PKGCONFIG+=poppler-qt5" "") \
+		engauge.pro
+	pushd help >/dev/null || die
+	./build_qt5_12_0.bash || die
+	popd >/dev/null || die
+}
+
+src_install() {
+	dobin bin/engauge
+	doicon src/img/engauge-digitizer.svg
+	make_desktop_entry engauge "Engauge Digitizer" engauge-digitizer Graphics
+
+	# Install qt help files
+	dodoc bin/documentation/engauge.qch
+	docompress -x "${EPREFIX}"/usr/share/doc/${PF}/engauge.qch
+
+	use doc && dodoc -r doc/.
+	if use examples; then
+		dodoc -r samples
+		docompress -x "${EPREFIX}"/usr/share/doc/${PF}/samples
+	fi
+}