engauge-10.6 - bump

3 files changed, 94 insertions, 49 deletions

diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 262fb4c..7a189b1 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1 +1 @@
-DIST engauge_5.2.tgz 5708224 BLAKE2B 65403f3eb322a3cfee2f04d3a973deef5196a475f594599e3226dad776505c639536fdc46ef94d955d94b0629faf9282378e7bb4d4d7945e0ae69cdd6160a858 SHA512 b1839a223c93866f880ca090b6dd5a9ab45a89b5f6f470fd6abba3e2aa4b108ed228c8b06c3888fa463316798c2d157e20b2e22975bd65a1124d007bb36d2d88
+DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
new file mode 100644
index 0000000..c3280df
--- /dev/null
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="Convert an image file showing a graph or map into numbers"
+HOMEPAGE="http://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/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-libs/log4cpp
+	sci-libs/fftw:3.0
+	jpeg2k? ( media-libs/openjpeg:2 )
+	pdf? ( app-text/poppler[qt5] )"
+DEPEND="${RDEPEND}"
+
+S=$WORKDIR/engauge-digitizer-$PV
+
+src_prepare() {
+	eapply_user
+
+	# 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 || 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
+	insinto /usr/share/doc/${PF} # this must match sed expression in src_prepare
+	doins 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 . || die "install documentation failed"
+		popd >/dev/null || die
+	fi
+	if use examples; then
+		doins -r samples || die "install examples failed"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/engauge/engauge-5.2.ebuild b/media-gfx/engauge/engauge-5.2.ebuild
deleted file mode 100644
index 95b1122..0000000
--- a/media-gfx/engauge/engauge-5.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator qmake-utils eutils
-
-DESCRIPTION="Convert an image file showing a graph or map into numbers"
-HOMEPAGE="http://digitizer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/digitizer/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-qt/qt3support:4
-	dev-qt/qtgui:4[gif(+)]
-	sci-libs/fftw:3.0
-	x11-libs/libXft"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Some patching and using the DEBIAN_PACKAGE ifdef is necessary to make sure the
-	# documentation is looked for in the proper directory
-	sed -i -e "s:/usr/share/doc/engauge-digitizer-doc/html:${ROOT}/usr/share/doc/${PF}/usermanual:" \
-		src/digitmain.cpp || die "sed failed"
-	sed -i -e '/unix {/a DEFINES += DEBIAN_PACKAGE' \
-		digitizer.pro || die "sed failed"
-	eapply_user
-}
-
-src_configure() {
-	eqmake4 digitizer.pro
-}
-
-src_install() {
-	dobin bin/engauge
-	newicon src/img/lo32-app-digitizer.png "${PN}.png"
-	make_desktop_entry engauge "Engauge Digitizer" ${PN} Graphics
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins -r usermanual || die "install documentation failed"
-	fi
-	if use examples; then
-		doins -r samples || die "install examples failed"
-	fi
-}