public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2016-03-18 17:24 Denis Dupeyron
  0 siblings, 0 replies; 12+ messages in thread
From: Denis Dupeyron @ 2016-03-18 17:24 UTC (permalink / raw
  To: gentoo-commits

commit:     577c7eaa024c8e31906ce92598a370eb50f32834
Author:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 17:23:55 2016 +0000
Commit:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 17:23:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=577c7eaa

media-gfx/engauge: remove 5.1

 media-gfx/engauge/Manifest           |  1 -
 media-gfx/engauge/engauge-5.1.ebuild | 50 ------------------------------------
 2 files changed, 51 deletions(-)

diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 87349cd..8747bd7 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,2 +1 @@
-DIST engauge-5.1.tar.gz 10612879 SHA256 64ec75af53a757622da786835f4cc70c09fc491e69aafc6e69dbfd54bfdc3a59 SHA512 595ac3c96c88d20e2405019efadaff802c0c85079314ec955475b16aec3763f3cb954f5e072678fc1b155bd339b2b758c8963087e4e09e390e29ffea0f7b9a5a WHIRLPOOL fa4dbea7617bae87d7b32b025a2182bfa9ce194850748b98464fe15a3fe3375d259a3af72df71ab859ce9294a25739d96a117254991d0b14ac5a2b4609eaa39c
 DIST engauge_5.2.tgz 5708224 SHA256 2defe5f06a78cbb9e3361e649de6b84b90fa85e3f587245e240b8efb8df78b36 SHA512 b1839a223c93866f880ca090b6dd5a9ab45a89b5f6f470fd6abba3e2aa4b108ed228c8b06c3888fa463316798c2d157e20b2e22975bd65a1124d007bb36d2d88 WHIRLPOOL 528cc08a6c6d2dcef39ca0bcbc221f29131ae47e1b28b5b727a1336d15ed9c5a6045fd62a853a423ca5edd3a4a369bd1dc76847396c0d51036a4c6bc33ff9004

diff --git a/media-gfx/engauge/engauge-5.1.ebuild b/media-gfx/engauge/engauge-5.1.ebuild
deleted file mode 100644
index 722690f..0000000
--- a/media-gfx/engauge/engauge-5.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit versionator qt4-r2 eutils
-
-DESCRIPTION="Convert an image file showing a graph or map into numbers"
-HOMEPAGE="http://digitizer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/digitizer/digit-src-$(replace_version_separator . _).tar.gz -> ${P}.tar.gz"
-
-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}"
-
-S="${WORKDIR}/${PN}"
-
-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"
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2016-03-18 17:42 Denis Dupeyron
  0 siblings, 0 replies; 12+ messages in thread
From: Denis Dupeyron @ 2016-03-18 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     61385370eb1ea4030562a5dff1af818c4b89fd80
Author:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 17:42:37 2016 +0000
Commit:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 17:42:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61385370

media-gfx/engauge: migrate to EAPI 6

 media-gfx/engauge/engauge-5.2.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-gfx/engauge/engauge-5.2.ebuild b/media-gfx/engauge/engauge-5.2.ebuild
index 4513874..cee112b 100644
--- a/media-gfx/engauge/engauge-5.2.ebuild
+++ b/media-gfx/engauge/engauge-5.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
-inherit versionator qt4-r2 eutils
+inherit versionator qmake-utils eutils
 
 DESCRIPTION="Convert an image file showing a graph or map into numbers"
 HOMEPAGE="http://digitizer.sourceforge.net/"
@@ -28,6 +28,7 @@ src_prepare() {
 		src/digitmain.cpp || die "sed failed"
 	sed -i -e '/unix {/a DEFINES += DEBIAN_PACKAGE' \
 		digitizer.pro || die "sed failed"
+	eapply_user
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2018-05-09 18:36 Denis Dupeyron
  0 siblings, 0 replies; 12+ messages in thread
From: Denis Dupeyron @ 2018-05-09 18:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4468685583024688e79eb9157f318630a237d51c
Author:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Wed May  9 18:35:59 2018 +0000
Commit:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Wed May  9 18:36:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44686855

media-gfx/engauge: bump to 10.6, bugs 616518 and 639248

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-gfx/engauge/Manifest            |  1 +
 media-gfx/engauge/engauge-10.6.ebuild | 93 +++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 262fb4cdc76..ac881634a74 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1 +1,2 @@
+DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
 DIST engauge_5.2.tgz 5708224 BLAKE2B 65403f3eb322a3cfee2f04d3a973deef5196a475f594599e3226dad776505c639536fdc46ef94d955d94b0629faf9282378e7bb4d4d7945e0ae69cdd6160a858 SHA512 b1839a223c93866f880ca090b6dd5a9ab45a89b5f6f470fd6abba3e2aa4b108ed228c8b06c3888fa463316798c2d157e20b2e22975bd65a1124d007bb36d2d88

diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
new file mode 100644
index 00000000000..ea7530fd0b5
--- /dev/null
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2018-06-10 21:39 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2018-06-10 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     2eb9a4b49cd4946f4a95019293dafbb1fe88d2a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 21:38:36 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 21:38:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb9a4b4

media-gfx/engauge: Drop old, Qt4-based

Closes: https://bugs.gentoo.org/639248
Closes: https://bugs.gentoo.org/655214
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/engauge/Manifest           |  1 -
 media-gfx/engauge/engauge-5.2.ebuild | 48 ------------------------------------
 2 files changed, 49 deletions(-)

diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index ac881634a74..7a189b18dcd 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,2 +1 @@
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-DIST engauge_5.2.tgz 5708224 BLAKE2B 65403f3eb322a3cfee2f04d3a973deef5196a475f594599e3226dad776505c639536fdc46ef94d955d94b0629faf9282378e7bb4d4d7945e0ae69cdd6160a858 SHA512 b1839a223c93866f880ca090b6dd5a9ab45a89b5f6f470fd6abba3e2aa4b108ed228c8b06c3888fa463316798c2d157e20b2e22975bd65a1124d007bb36d2d88

diff --git a/media-gfx/engauge/engauge-5.2.ebuild b/media-gfx/engauge/engauge-5.2.ebuild
deleted file mode 100644
index 95b112256c2..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2020-10-23 15:00 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-10-23 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     12d60733ea2e1e9994c0b75af348dcfcc16157a1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 14:55:45 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 15:00:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d60733

media-gfx/engauge: EAPI-7 bump, gnome2-utils.eclass -> xdg.eclass

Use https, sort deps, call default in src_prepare.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/engauge/engauge-10.6.ebuild | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index 7f52ab96807..e1145ca2e15 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils qmake-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Convert an image file showing a graph or map into numbers"
-HOMEPAGE="http://markummitchell.github.io/engauge-digitizer/"
+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"
@@ -16,23 +16,23 @@ 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-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
+S=${WORKDIR}/engauge-digitizer-${PV}
 
-src_prepare() {
-	eapply_user
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
-	eapply "${FILESDIR}/${P}-qt-5.11.patch"
+src_prepare() {
+	default
 
 	# Make sure the documentation is looked for in the proper directory
 	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
@@ -81,15 +81,3 @@ src_install() {
 		doins -r samples
 	fi
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2021-03-15 21:15 Andreas K. Hüttel
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas K. Hüttel @ 2021-03-15 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     fc030a48a284be817a4365032940d421c6daf80a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:15:11 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:15:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc030a48

media-gfx/engauge: Stable for amd64

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/engauge/engauge-10.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index e1145ca2e15..57437e9947c 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v$PV.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples jpeg2k pdf"
 
 RDEPEND="dev-qt/qtcore:5


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2021-03-15 21:15 Andreas K. Hüttel
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas K. Hüttel @ 2021-03-15 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     98591859c79c720afb745173d1bc99aaab4c78aa
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:13:46 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:15:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98591859

media-gfx/engauge: Take package

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/engauge/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/engauge/metadata.xml b/media-gfx/engauge/metadata.xml
index fa3fced03f3..339348097be 100644
--- a/media-gfx/engauge/metadata.xml
+++ b/media-gfx/engauge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">digitizer</remote-id>
   </upstream>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2021-04-29  1:52 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2021-04-29  1:52 UTC (permalink / raw
  To: gentoo-commits

commit:     70d53ee7b393ffc42ea0419fa3e9b4e9176e2937
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 01:46:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 01:52:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d53ee7

media-gfx/engauge: fix variable reference style

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/engauge/engauge-10.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index a7edfc0f4de..a1c0d06f4b6 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -70,7 +70,7 @@ src_install() {
 	# 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}
+	docompress -x "${EPREFIX}"/usr/share/doc/${PF}/engauge.{qch,qhc}
 
 	if use doc; then
 		pushd doc >/dev/null || die


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2022-03-05 23:08 Andreas K. Hüttel
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas K. Hüttel @ 2022-03-05 23:08 UTC (permalink / raw
  To: gentoo-commits

commit:     7669c186d6bf6e44ea74054d84824b796b94ca5a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  5 23:08:04 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 23:08:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7669c186

media-gfx/engauge: Version bump 12.1

Closes: https://bugs.gentoo.org/729698
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/engauge/Manifest            |  1 +
 media-gfx/engauge/engauge-12.1.ebuild | 79 +++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 7a189b18dcd4..fc493b850489 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1 +1,2 @@
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
+DIST engauge-digitizer-12.1.tar.gz 72358942 BLAKE2B c7581734f3c5591ee5c17e16f2e68d8f75fa083d4b53933d16ea15d36890664f375ac53b5e37872eb0d2ffb5980946fe920412ee56d8a1aa16b0a81e66fcb115 SHA512 54ae573eb1e82ec3a81403c3c64af43207e139a2d97eb633993ffe31e03fedb1c1a5fe63157011851ad4a89822a3109b87a2c90a71f77865b3629a517a353a61

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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2022-10-16 14:28 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2022-10-16 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     3d7418c0a4913d81e601b1fb50cd32e072ea4453
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 14:26:47 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 14:28:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d7418c0

media-gfx/engauge: Fix src_install by generating engauge.qch in ebuild

Closes: https://bugs.gentoo.org/655372
Closes: https://bugs.gentoo.org/764452
Closes: https://bugs.gentoo.org/847244
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/engauge/engauge-12.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-gfx/engauge/engauge-12.1.ebuild b/media-gfx/engauge/engauge-12.1.ebuild
index 39f94ddb1b7f..a75b08d00c25 100644
--- a/media-gfx/engauge/engauge-12.1.ebuild
+++ b/media-gfx/engauge/engauge-12.1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="dev-qt/qtcore:5
 	jpeg2k? ( media-libs/openjpeg:2 )
 	pdf? ( app-text/poppler[qt5] )"
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qthelp:5"
 
 S=${WORKDIR}/engauge-digitizer-${PV}
 
@@ -58,7 +59,7 @@ src_configure() {
 		$(usex pdf "CONFIG+=pdf PKGCONFIG+=poppler-qt5" "") \
 		engauge.pro
 	pushd help >/dev/null || die
-	./build_qt5_12_0.bash || die
+	$(qt5_get_bindir)/qhelpgenerator engauge.qhp || die
 	popd >/dev/null || die
 }
 
@@ -68,7 +69,7 @@ src_install() {
 	make_desktop_entry engauge "Engauge Digitizer" engauge-digitizer Graphics
 
 	# Install qt help files
-	dodoc bin/documentation/engauge.qch
+	dodoc help/engauge.qch
 	docompress -x "${EPREFIX}"/usr/share/doc/${PF}/engauge.qch
 
 	use doc && dodoc -r doc/.


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2022-10-16 19:23 Andreas K. Hüttel
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas K. Hüttel @ 2022-10-16 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     b2e31a2dc316ef0984987ba276cda587e40f44c7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 19:22:34 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 19:23:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e31a2d

media-gfx/engauge: reset xdg environment

Closes: https://bugs.gentoo.org/656926
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 media-gfx/engauge/engauge-12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/engauge/engauge-12.1.ebuild b/media-gfx/engauge/engauge-12.1.ebuild
index a75b08d00c25..a7146611da55 100644
--- a/media-gfx/engauge/engauge-12.1.ebuild
+++ b/media-gfx/engauge/engauge-12.1.ebuild
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/qthelp:5"
 S=${WORKDIR}/engauge-digitizer-${PV}
 
 src_prepare() {
-	default
+	xdg_src_prepare
 
 	# Make sure the documentation is looked for in the proper directory
 	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/
@ 2022-10-20 10:52 Jakov Smolić
  0 siblings, 0 replies; 12+ messages in thread
From: Jakov Smolić @ 2022-10-20 10:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3bc7dd25942363b33d2e7e04848c4ccfd02dab9e
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 10:50:58 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 10:50:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc7dd25

media-gfx/engauge: Stabilize 12.1 amd64, #877333

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-gfx/engauge/engauge-12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/engauge/engauge-12.1.ebuild b/media-gfx/engauge/engauge-12.1.ebuild
index a7146611da55..c5546bdb921d 100644
--- a/media-gfx/engauge/engauge-12.1.ebuild
+++ b/media-gfx/engauge/engauge-12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v${PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples jpeg2k pdf"
 
 RDEPEND="dev-qt/qtcore:5


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2022-10-20 10:52 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-09 18:36 [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/ Denis Dupeyron
  -- strict thread matches above, loose matches on Subject: below --
2022-10-20 10:52 Jakov Smolić
2022-10-16 19:23 Andreas K. Hüttel
2022-10-16 14:28 Andreas Sturmlechner
2022-03-05 23:08 Andreas K. Hüttel
2021-04-29  1:52 Sam James
2021-03-15 21:15 Andreas K. Hüttel
2021-03-15 21:15 Andreas K. Hüttel
2020-10-23 15:00 Andreas Sturmlechner
2018-06-10 21:39 Andreas Sturmlechner
2016-03-18 17:42 Denis Dupeyron
2016-03-18 17:24 Denis Dupeyron

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox