[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2016-06-24  7:16 Amy Winston
  0 siblings, 0 replies; 30+ messages in thread
From: Amy Winston @ 2016-06-24  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     22c745ac1cf5d66b640a04804eef0b44f94245b6
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 07:13:44 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 07:13:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c745ac

sci-geosciences/merkaartor: remove unnecessary boost dep bug #586836

Package-Manager: portage-2.2.28

 sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild | 1 -
 sci-geosciences/merkaartor/merkaartor-9999.ebuild   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
index e4c7b96..7e21c51 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
@@ -46,7 +46,6 @@ RDEPEND="
 	qrcode? ( media-gfx/zbar[qt4] )
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
 	virtual/pkgconfig
 "
 

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 633d069..59fa727 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,7 +34,6 @@ RDEPEND="
 	qrcode? ( media-gfx/zbar )
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
 	virtual/pkgconfig
 "
 


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2016-06-26 18:13 Amy Winston
  0 siblings, 0 replies; 30+ messages in thread
From: Amy Winston @ 2016-06-26 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     55c19bd2c8a003d6dab8744ca12d5e6995ba815b
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sun Jun 26 11:18:38 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 18:10:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c19bd2

sci-geosciences/merkaartor: Only allow qrcode with Qt4

Closes: #1748

 sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
index 7e21c51..e512319 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
@@ -17,8 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug exif gps libproxy qrcode qt4 qt5"
 
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
+REQUIRED_USE="
+	^^ ( qt4 qt5 )
+	qrcode? ( qt4 )
+"
 RDEPEND="
 	qt4? (
 		dev-qt/qtcore:4


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2016-10-04 17:38 Amy Winston
  0 siblings, 0 replies; 30+ messages in thread
From: Amy Winston @ 2016-10-04 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     54f09f4cb10e2a3b439b890618508c178ee05274
Author:     mudler <mudler <AT> sabayon <DOT> org>
AuthorDate: Mon Oct  3 13:51:53 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 17:36:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f09f4c

sci-geosciences/merkaartor: version bump to 0.18.3

* migrated to EAPI6
* use COMMON_DEPEND
* Dropped patches of 0.18.2 that were merged by upstream
* added dev-qt/linguist-tools as a qt5 dep to fix compilation issues with qt5 USE
* updated PLOCALES and dropped l10n_find_plocales_changes maintenance call
* dropped HACKING from DOCS

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=595480
Package-Manager: portage-2.3.1

 sci-geosciences/merkaartor/Manifest                |   1 +
 .../merkaartor/merkaartor-0.18.3.ebuild            | 127 +++++++++++++++++++++
 2 files changed, 128 insertions(+)

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index f3b45f6..ed07d72 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,3 +1,4 @@
 DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed WHIRLPOOL 22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
 DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d WHIRLPOOL fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
 DIST merkaartor-0.18.2.tar.gz 6267866 SHA256 9e04d554ebc4f9999d0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508 SHA512 577dd88e522eb3f9c21d3588358137dc9419a4d3961299a2162f7edb07e2b95a46d87022b57f0ea190bf9d76a2b1d2aada61c03e952e29c432e250e4686d594d WHIRLPOOL 00ae2547625442697d74084ea939e8d5ca588aeed3d67d82e2239ebfe2bd33703ad51871c4e4e38353c2692eb14a63664af5eddbeed2c6862b20122d0f5fbb0d
+DIST merkaartor-0.18.3.tar.gz 7104234 SHA256 d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915 WHIRLPOOL 6013770bfbde1360afc8106bc3ba250228e5c864483efa402033055ab0376c41b661ac188783b79a639ecb1404e38d28dc554bbbb923dc5fd17c24cefd3e192d

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3.ebuild
new file mode 100644
index 00000000..a906766
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
+
+inherit eutils fdo-mime gnome2-utils l10n qmake-utils
+
+DESCRIPTION="A Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps libproxy qrcode qt4 qt5"
+
+REQUIRED_USE="
+	^^ ( qt4 qt5 )
+	qrcode? ( qt4 )
+"
+
+COMMON_DEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+		dev-qt/qtwebkit:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtprintsupport:5
+	)
+	>=dev-qt/qtsingleapplication-2.6.1[X,qt4?,qt5?]
+	>=sci-libs/gdal-1.6.0
+	>=sci-libs/proj-4.6
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
+	libproxy? ( net-libs/libproxy )
+	qrcode? ( media-gfx/zbar[qt4] )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools )
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CHANGELOG )
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	if [[ -n "$(l10n_get_locales)" ]]; then
+		l10n_for_each_disabled_locale_do my_rm_loc
+		if use qt4 ; then
+			$(qt4_get_bindir)/lrelease src/src.pro || die
+		else
+			$(qt5_get_bindir)/lrelease src/src.pro || die
+		fi
+	fi
+
+	# build system expects to be building from git
+	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g"
+
+	eapply_user
+}
+
+src_configure() {
+	# TRANSDIR_SYSTEM is for bug #385671
+	if use qt4 ; then
+		eqmake4 \
+		PREFIX="${ED}/usr" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
+		SYSTEM_QTSA=1 \
+		RELEASE=1 \
+		NODEBUG="$(usex debug '0' '1')" \
+		GEOIMAGE="$(usex exif '1' '0')" \
+		GPSDLIB="$(usex gps '1' '0')" \
+		LIBPROXY="$(usex libproxy '1' '0')" \
+		ZBAR="$(usex qrcode '1' '0')" \
+		Merkaartor.pro
+	else
+		eqmake5 \
+		PREFIX="${ED}/usr" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
+		SYSTEM_QTSA=1 \
+		RELEASE=1 \
+		NODEBUG="$(usex debug '0' '1')" \
+		GEOIMAGE="$(usex exif '1' '0')" \
+		GPSDLIB="$(usex gps '1' '0')" \
+		LIBPROXY="$(usex libproxy '1' '0')" \
+		ZBAR="$(usex qrcode '1' '0')" \
+		Merkaartor.pro
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2016-10-04 19:41 Amy Winston
  0 siblings, 0 replies; 30+ messages in thread
From: Amy Winston @ 2016-10-04 19:41 UTC (permalink / raw
  To: gentoo-commits

commit:     155aebfc2c92f6eea70f2ee70c2497ce47b91243
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 19:41:00 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 19:41:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155aebfc

sci-geosciences/merkaartor: remove old version

Package-Manager: portage-2.2.28

 sci-geosciences/merkaartor/Manifest                |  1 -
 .../merkaartor/merkaartor-0.17.2.ebuild            | 69 ----------------------
 2 files changed, 70 deletions(-)

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index ed07d72..c012668 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,4 +1,3 @@
-DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed WHIRLPOOL 22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
 DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d WHIRLPOOL fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
 DIST merkaartor-0.18.2.tar.gz 6267866 SHA256 9e04d554ebc4f9999d0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508 SHA512 577dd88e522eb3f9c21d3588358137dc9419a4d3961299a2162f7edb07e2b95a46d87022b57f0ea190bf9d76a2b1d2aada61c03e952e29c432e250e4686d594d WHIRLPOOL 00ae2547625442697d74084ea939e8d5ca588aeed3d67d82e2239ebfe2bd33703ad51871c4e4e38353c2692eb14a63664af5eddbeed2c6862b20122d0f5fbb0d
 DIST merkaartor-0.18.3.tar.gz 7104234 SHA256 d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915 WHIRLPOOL 6013770bfbde1360afc8106bc3ba250228e5c864483efa402033055ab0376c41b661ac188783b79a639ecb1404e38d28dc554bbbb923dc5fd17c24cefd3e192d

diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
deleted file mode 100644
index 70efafc..00000000
--- a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-REDMINE_HASH="253"
-
-inherit multilib qt4-r2 ${SCM_ECLASS}
-
-DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be"
-SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug exif gps nls libproxy"
-
-QT_MINIMAL="4.7.2"
-DEPEND="
-	>=dev-libs/boost-1.46
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
-	>=dev-qt/qtgui-${QT_MINIMAL}:4
-	>=dev-qt/qtsvg-${QT_MINIMAL}:4
-	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
-	exif? ( media-gfx/exiv2 )
-	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
-	libproxy? ( net-libs/libproxy )
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS CHANGELOG HACKING"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-includes.patch"
-	"${FILESDIR}/${PV}-libproxy.patch"
-)
-
-merkaartor_use() {
-	local useflag=${1}
-	[[ -z ${useflag} ]] && die "No useflag specified"
-	if use ${useflag}; then
-		echo "1"
-	else
-		echo "0"
-	fi
-}
-
-src_configure() {
-	local myconf
-	myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
-	myconf+=" GEOIMAGE=$(${PN}_use exif)"
-	myconf+=" GPSDLIB=$(${PN}_use gps)"
-	myconf+=" LIBPROXY=$(${PN}_use libproxy)"
-	myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic
-	myconf+=" NOUSEWEBKIT=0" # fails to link if disabled, upstream needs to fix
-	myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671
-
-	if use nls; then
-		lrelease src/src.pro || die "lrelease failed"
-	fi
-
-	eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf}
-}


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2016-10-23 17:41 Ettore Di Giacinto
  0 siblings, 0 replies; 30+ messages in thread
From: Ettore Di Giacinto @ 2016-10-23 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     bec60395687cb861b51055df119c8b672080bbe1
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct 22 20:18:41 2016 +0000
Commit:     Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 17:40:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec60395

sci-geosciences/merkaartor: Drop old

Package-Manager: portage-2.3.0

Signed-off-by: Ettore Di Giacinto <mudler <AT> gentoo.org>

 .../merkaartor/merkaartor-0.18.3.ebuild            | 127 ---------------------
 1 file changed, 127 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3.ebuild
deleted file mode 100644
index a906766..00000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-
-inherit eutils fdo-mime gnome2-utils l10n qmake-utils
-
-DESCRIPTION="A Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy qrcode qt4 qt5"
-
-REQUIRED_USE="
-	^^ ( qt4 qt5 )
-	qrcode? ( qt4 )
-"
-
-COMMON_DEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qtwebkit:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtprintsupport:5
-	)
-	>=dev-qt/qtsingleapplication-2.6.1[X,qt4?,qt5?]
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
-	sys-libs/zlib
-	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
-	libproxy? ( net-libs/libproxy )
-	qrcode? ( media-gfx/zbar[qt4] )
-"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools )
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CHANGELOG )
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
-		rm "translations/${PN}_${1}.ts" || die
-	}
-
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
-		if use qt4 ; then
-			$(qt4_get_bindir)/lrelease src/src.pro || die
-		else
-			$(qt5_get_bindir)/lrelease src/src.pro || die
-		fi
-	fi
-
-	# build system expects to be building from git
-	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g"
-
-	eapply_user
-}
-
-src_configure() {
-	# TRANSDIR_SYSTEM is for bug #385671
-	if use qt4 ; then
-		eqmake4 \
-		PREFIX="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
-		SYSTEM_QTSA=1 \
-		RELEASE=1 \
-		NODEBUG="$(usex debug '0' '1')" \
-		GEOIMAGE="$(usex exif '1' '0')" \
-		GPSDLIB="$(usex gps '1' '0')" \
-		LIBPROXY="$(usex libproxy '1' '0')" \
-		ZBAR="$(usex qrcode '1' '0')" \
-		Merkaartor.pro
-	else
-		eqmake5 \
-		PREFIX="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
-		SYSTEM_QTSA=1 \
-		RELEASE=1 \
-		NODEBUG="$(usex debug '0' '1')" \
-		GEOIMAGE="$(usex exif '1' '0')" \
-		GPSDLIB="$(usex gps '1' '0')" \
-		LIBPROXY="$(usex libproxy '1' '0')" \
-		ZBAR="$(usex qrcode '1' '0')" \
-		Merkaartor.pro
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2016-10-23 17:41 Ettore Di Giacinto
  0 siblings, 0 replies; 30+ messages in thread
From: Ettore Di Giacinto @ 2016-10-23 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     437ec6e52ef6edd12ef2f0e5af53a85c3948d616
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Oct 23 09:53:35 2016 +0000
Commit:     Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 17:40:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437ec6e5

sci-geosciences/merkaartor: Sync live with latest release ebuild changes

Package-Manager: portage-2.3.0

Signed-off-by: Ettore Di Giacinto <mudler <AT> gentoo.org>

 sci-geosciences/merkaartor/merkaartor-9999.ebuild | 84 +++++++++++++++++------
 1 file changed, 62 insertions(+), 22 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 59fa727..9e81333 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
+PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
 
-inherit eutils fdo-mime gnome2-utils git-r3 l10n multilib qt4-r2
+inherit fdo-mime gnome2-utils git-r3 l10n qmake-utils
 
-DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
+DESCRIPTION="A Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
@@ -16,55 +16,94 @@ EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug exif gps libproxy qrcode"
+IUSE="debug exif gps libproxy qrcode qt5"
+
+REQUIRED_USE="qrcode? ( !qt5 )"
 
 RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	>=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)]
-	>=dev-libs/quazip-0.7[qt4(+)]
+	!qt5? (
+		>=dev-libs/quazip-0.7[qt4(+)]
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsingleapplication[qt4]
+		dev-qt/qtsvg:4
+		dev-qt/qtwebkit:4
+	)
+	qt5? (
+		>=dev-libs/quazip-0.7.1[qt5]
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	dev-qt/qtsingleapplication[X,qt5?]
 	>=sci-libs/gdal-1.6.0
 	>=sci-libs/proj-4.6
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
+	gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
 	libproxy? ( net-libs/libproxy )
-	qrcode? ( media-gfx/zbar )
+	qrcode? ( media-gfx/zbar[qt4] )
 "
 DEPEND="${RDEPEND}
+	qt5? ( dev-qt/linguist-tools )
 	virtual/pkgconfig
 "
 
-DOCS=( AUTHORS CHANGELOG HACKING )
+DOCS=( AUTHORS CHANGELOG )
 
 src_unpack() {
 	git-r3_src_unpack
 }
 
 src_prepare() {
+	default
+
 	my_rm_loc() {
 		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
 		rm "translations/${PN}_${1}.ts" || die
 	}
 
-	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
-
 	if [[ -n "$(l10n_get_locales)" ]]; then
 		l10n_for_each_disabled_locale_do my_rm_loc
-		$(qt4_get_bindir)/lrelease src/src.pro || die
+		if use qt5 ; then
+			$(qt5_get_bindir)/lrelease src/src.pro || die
+		else
+			$(qt4_get_bindir)/lrelease src/src.pro || die
+		fi
 	fi
 
-	epatch_user
+	# build system expects to be building from git
+	if [[ ${PV} != *9999 ]] ; then
+		sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+	fi
 }
 
 src_configure() {
 	# TRANSDIR_SYSTEM is for bug #385671
-	eqmake4 \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" \
+	if use qt5 ; then
+		eqmake5 \
+		PREFIX="${ED}usr" \
+		LIBDIR="${ED}usr/$(get_libdir)" \
+		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
+		SYSTEM_QTSA=1 \
+		SYSTEM_QUAZIP=1 \
+		NODEBUG="$(usex debug '0' '1')" \
+		GEOIMAGE="$(usex exif '1' '0')" \
+		GPSDLIB="$(usex gps '1' '0')" \
+		LIBPROXY="$(usex libproxy '1' '0')" \
+		ZBAR="$(usex qrcode '1' '0')" \
+		Merkaartor.pro
+	else
+		eqmake4 \
+		PREFIX="${ED}usr" \
+		LIBDIR="${ED}usr/$(get_libdir)" \
+		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
 		SYSTEM_QTSA=1 \
 		SYSTEM_QUAZIP=1 \
@@ -74,6 +113,7 @@ src_configure() {
 		LIBPROXY="$(usex libproxy '1' '0')" \
 		ZBAR="$(usex qrcode '1' '0')" \
 		Merkaartor.pro
+	fi
 }
 
 pkg_preinst() {


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2016-10-23 17:41 Ettore Di Giacinto
  0 siblings, 0 replies; 30+ messages in thread
From: Ettore Di Giacinto @ 2016-10-23 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     855efdeb80592d86448b02a1b5cccfa5816040ee
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct 22 20:17:21 2016 +0000
Commit:     Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 17:40:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855efdeb

sci-geosciences/merkaartor: Drop unnecessary REQUIRED_USE, simplify

Removes another possible blocker for users and one line from plasma
profile package.use.

metadata.xml: Indentation

Package-Manager: portage-2.3.0

Signed-off-by: Ettore Di Giacinto <mudler <AT> gentoo.org>

 .../merkaartor/merkaartor-0.18.3-r1.ebuild         | 122 +++++++++++++++++++++
 sci-geosciences/merkaartor/metadata.xml            |  26 ++---
 2 files changed, 133 insertions(+), 15 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
new file mode 100644
index 00000000..6765950
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
+
+inherit fdo-mime gnome2-utils l10n qmake-utils
+
+DESCRIPTION="A Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps libproxy qrcode qt5"
+
+REQUIRED_USE="qrcode? ( !qt5 )"
+
+RDEPEND="
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsingleapplication[qt4]
+		dev-qt/qtsvg:4
+		dev-qt/qtwebkit:4
+	)
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	dev-qt/qtsingleapplication[X,qt5?]
+	>=sci-libs/gdal-1.6.0
+	>=sci-libs/proj-4.6
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
+	libproxy? ( net-libs/libproxy )
+	qrcode? ( media-gfx/zbar[qt4] )
+"
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/linguist-tools )
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CHANGELOG )
+
+src_prepare() {
+	default
+
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	if [[ -n "$(l10n_get_locales)" ]]; then
+		l10n_for_each_disabled_locale_do my_rm_loc
+		if use qt5 ; then
+			$(qt5_get_bindir)/lrelease src/src.pro || die
+		else
+			$(qt4_get_bindir)/lrelease src/src.pro || die
+		fi
+	fi
+
+	# build system expects to be building from git
+	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+}
+
+src_configure() {
+	# TRANSDIR_SYSTEM is for bug #385671
+	if use qt5 ; then
+		eqmake5 \
+		PREFIX="${ED}usr" \
+		LIBDIR="${ED}usr/$(get_libdir)" \
+		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
+		SYSTEM_QTSA=1 \
+		RELEASE=1 \
+		NODEBUG="$(usex debug '0' '1')" \
+		GEOIMAGE="$(usex exif '1' '0')" \
+		GPSDLIB="$(usex gps '1' '0')" \
+		LIBPROXY="$(usex libproxy '1' '0')" \
+		ZBAR="$(usex qrcode '1' '0')" \
+		Merkaartor.pro
+	else
+		eqmake4 \
+		PREFIX="${ED}usr" \
+		LIBDIR="${ED}usr/$(get_libdir)" \
+		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
+		SYSTEM_QTSA=1 \
+		RELEASE=1 \
+		NODEBUG="$(usex debug '0' '1')" \
+		GEOIMAGE="$(usex exif '1' '0')" \
+		GPSDLIB="$(usex gps '1' '0')" \
+		LIBPROXY="$(usex libproxy '1' '0')" \
+		ZBAR="$(usex qrcode '1' '0')" \
+		Merkaartor.pro
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}

diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 418a660..ac3993f 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-geosciences@gentoo.org</email>
-    <name>Gentoo Geosciences Project</name>
-  </maintainer>
-  <use>
-    <flag name="libproxy">
-    	Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration
-    	</flag>
-    <flag name="qrcode">
-    Enable QR code scanning with <pkg>media-gfx/zbar</pkg>
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">openstreetmap/merkaartor</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<use>
+		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
+		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">openstreetmap/merkaartor</remote-id>
+	</upstream>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2016-10-29 11:22 Michael Palimaka
  0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2016-10-29 11:22 UTC (permalink / raw
  To: gentoo-commits

commit:     d09dfadb1b540b706cfb15135de2df0efbf7d223
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 11:22:28 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 11:22:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09dfadb

sci-geosciences/merkaartor: drop dev-libs/quazip dependency from live ebuild

quazip is no longer used since upstream commit 79b8acd7049a0d5869b24c911ef42da4454a0af5.

Package-Manager: portage-2.3.2

 sci-geosciences/merkaartor/merkaartor-9999.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 9e81333..a599d9f 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -22,7 +22,6 @@ REQUIRED_USE="qrcode? ( !qt5 )"
 
 RDEPEND="
 	!qt5? (
-		>=dev-libs/quazip-0.7[qt4(+)]
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 		dev-qt/qtsingleapplication[qt4]
@@ -30,7 +29,6 @@ RDEPEND="
 		dev-qt/qtwebkit:4
 	)
 	qt5? (
-		>=dev-libs/quazip-0.7.1[qt5]
 		dev-qt/qtconcurrent:5
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -92,7 +90,6 @@ src_configure() {
 		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
 		SYSTEM_QTSA=1 \
-		SYSTEM_QUAZIP=1 \
 		NODEBUG="$(usex debug '0' '1')" \
 		GEOIMAGE="$(usex exif '1' '0')" \
 		GPSDLIB="$(usex gps '1' '0')" \
@@ -106,7 +103,6 @@ src_configure() {
 		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
 		SYSTEM_QTSA=1 \
-		SYSTEM_QUAZIP=1 \
 		NODEBUG="$(usex debug '0' '1')" \
 		GEOIMAGE="$(usex exif '1' '0')" \
 		GPSDLIB="$(usex gps '1' '0')" \


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2016-12-29 12:05 Michael Palimaka
  0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2016-12-29 12:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d2402cf0240afedc419e6210b961ffdfd2b6c29b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 12:05:31 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 12:05:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2402cf0

sci-geosciences/merkaartor: pin dev-qt/linguist-tools to SLOT 5

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild | 2 +-
 sci-geosciences/merkaartor/merkaartor-9999.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
index 6765950..a58c641 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	qrcode? ( media-gfx/zbar[qt4] )
 "
 DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools:5 )
 	virtual/pkgconfig
 "
 

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index a599d9f..1776c7b 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 	qrcode? ( media-gfx/zbar[qt4] )
 "
 DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools:5 )
 	virtual/pkgconfig
 "
 


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2017-03-03  0:15 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2017-03-03  0:15 UTC (permalink / raw
  To: gentoo-commits

commit:     bc1f037fd9968571cfb37951b8bbe171512af8ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 23:27:03 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 00:14:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1f037f

sci-geosciences/merkaartor: Add USE=webengine, drop Qt4 support

Qt4 is deprecated upstream.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/merkaartor/merkaartor-9999.ebuild | 75 +++++++----------------
 sci-geosciences/merkaartor/metadata.xml           |  1 +
 2 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index dfce8ca18ad..5e16f21d97d 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi z
 
 inherit fdo-mime gnome2-utils git-r3 l10n qmake-utils
 
-DESCRIPTION="A Qt based map editor for the openstreetmap.org project"
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
@@ -15,39 +15,27 @@ EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug exif gps libproxy qrcode qt5"
-
-REQUIRED_USE="qrcode? ( !qt5 )"
+IUSE="debug exif gps libproxy webengine"
 
 RDEPEND="
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsingleapplication[qt4]
-		dev-qt/qtsvg:4
-		dev-qt/qtwebkit:4
-	)
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	dev-qt/qtsingleapplication[X,qt5?]
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[X,qt5]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gdal
+	sci-libs/proj
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
 	libproxy? ( net-libs/libproxy )
-	qrcode? ( media-gfx/zbar[qt4] )
+	webengine? ( dev-qt/qtwebengine:5 )
 "
 DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
 
@@ -67,11 +55,7 @@ src_prepare() {
 
 	if [[ -n "$(l10n_get_locales)" ]]; then
 		l10n_for_each_disabled_locale_do my_rm_loc
-		if use qt5 ; then
-			$(qt5_get_bindir)/lrelease src/src.pro || die
-		else
-			$(qt4_get_bindir)/lrelease src/src.pro || die
-		fi
+		$(qt5_get_bindir)/lrelease src/src.pro || die
 	fi
 
 	# build system expects to be building from git
@@ -82,33 +66,18 @@ src_prepare() {
 
 src_configure() {
 	# TRANSDIR_SYSTEM is for bug #385671
-	if use qt5 ; then
-		eqmake5 \
+	eqmake5 \
 		PREFIX="${ED}usr" \
 		LIBDIR="${ED}usr/$(get_libdir)" \
 		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
 		SYSTEM_QTSA=1 \
-		NODEBUG="$(usex debug '0' '1')" \
-		GEOIMAGE="$(usex exif '1' '0')" \
-		GPSDLIB="$(usex gps '1' '0')" \
-		LIBPROXY="$(usex libproxy '1' '0')" \
-		ZBAR="$(usex qrcode '1' '0')" \
+		NODEBUG=$(usex debug 0 1) \
+		GEOIMAGE=$(usex exif 1 0) \
+		GPSDLIB=$(usex gps 1 0) \
+		LIBPROXY=$(usex libproxy 1 0) \
+		USEWEBENGINE=$(usex webengine 1 0) \
 		Merkaartor.pro
-	else
-		eqmake4 \
-		PREFIX="${ED}usr" \
-		LIBDIR="${ED}usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
-		SYSTEM_QTSA=1 \
-		NODEBUG="$(usex debug '0' '1')" \
-		GEOIMAGE="$(usex exif '1' '0')" \
-		GPSDLIB="$(usex gps '1' '0')" \
-		LIBPROXY="$(usex libproxy '1' '0')" \
-		ZBAR="$(usex qrcode '1' '0')" \
-		Merkaartor.pro
-	fi
 }
 
 pkg_preinst() {

diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index ac3993f6272..0182aec4c09 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
 		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
+		<flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> in some plugins</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">openstreetmap/merkaartor</remote-id>


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2017-06-04 10:25 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2017-06-04 10:25 UTC (permalink / raw
  To: gentoo-commits

commit:     0bc29c73699c8115f225e9bce6bc0e4e7b798d7a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 09:40:38 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 10:25:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc29c73

sci-geosciences/merkaartor: Drop USE=qt5,qrcode

USE !qt5 depends on dev-qt/qtwebkit:4 which is ancient and will never
see any security updates.

Gentoo-bug: 620746

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../merkaartor/merkaartor-0.18.3-r1.ebuild         | 64 ++++++----------------
 sci-geosciences/merkaartor/metadata.xml            |  1 -
 2 files changed, 16 insertions(+), 49 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
index 9f96ba78ff5..30b1ceb20cd 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,46 +7,34 @@ PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi z
 
 inherit fdo-mime gnome2-utils l10n qmake-utils
 
-DESCRIPTION="A Qt based map editor for the openstreetmap.org project"
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
 SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy qrcode qt5"
-
-REQUIRED_USE="qrcode? ( !qt5 )"
+IUSE="debug exif gps libproxy"
 
 RDEPEND="
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsingleapplication[qt4]
-		dev-qt/qtsvg:4
-		dev-qt/qtwebkit:4
-	)
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	dev-qt/qtsingleapplication[X,qt5?]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtsingleapplication[X,qt5]
 	>=sci-libs/gdal-1.6.0
 	>=sci-libs/proj-4.6
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
 	libproxy? ( net-libs/libproxy )
-	qrcode? ( media-gfx/zbar[qt4] )
 "
 DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
 
@@ -62,11 +50,7 @@ src_prepare() {
 
 	if [[ -n "$(l10n_get_locales)" ]]; then
 		l10n_for_each_disabled_locale_do my_rm_loc
-		if use qt5 ; then
-			$(qt5_get_bindir)/lrelease src/src.pro || die
-		else
-			$(qt4_get_bindir)/lrelease src/src.pro || die
-		fi
+		$(qt5_get_bindir)/lrelease src/src.pro || die
 	fi
 
 	# build system expects to be building from git
@@ -75,8 +59,7 @@ src_prepare() {
 
 src_configure() {
 	# TRANSDIR_SYSTEM is for bug #385671
-	if use qt5 ; then
-		eqmake5 \
+	eqmake5 \
 		PREFIX="${ED}usr" \
 		LIBDIR="${ED}usr/$(get_libdir)" \
 		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
@@ -87,23 +70,8 @@ src_configure() {
 		GEOIMAGE="$(usex exif '1' '0')" \
 		GPSDLIB="$(usex gps '1' '0')" \
 		LIBPROXY="$(usex libproxy '1' '0')" \
-		ZBAR="$(usex qrcode '1' '0')" \
-		Merkaartor.pro
-	else
-		eqmake4 \
-		PREFIX="${ED}usr" \
-		LIBDIR="${ED}usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
-		SYSTEM_QTSA=1 \
-		RELEASE=1 \
-		NODEBUG="$(usex debug '0' '1')" \
-		GEOIMAGE="$(usex exif '1' '0')" \
-		GPSDLIB="$(usex gps '1' '0')" \
-		LIBPROXY="$(usex libproxy '1' '0')" \
-		ZBAR="$(usex qrcode '1' '0')" \
+		ZBAR=0 \
 		Merkaartor.pro
-	fi
 }
 
 pkg_preinst() {

diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 0182aec4c09..47721d5d2eb 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
-		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
 		<flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> in some plugins</flag>
 	</use>
 	<upstream>


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2018-02-16 10:31 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2018-02-16 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     ed16cc395de8f8d21f310d2f2792f8e82f9c2694
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 10:28:58 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 10:30:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed16cc39

sci-geosciences/merkaartor: Switch to xdg-utils

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild | 6 +++---
 sci-geosciences/merkaartor/merkaartor-9999.ebuild      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
index 30f2f46f37e..9470b88ad6f 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
 
-inherit fdo-mime gnome2-utils l10n qmake-utils
+inherit gnome2-utils l10n qmake-utils xdg-utils
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -79,11 +79,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 15304170c5d..fa01cf15ac0 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
 
-inherit fdo-mime gnome2-utils git-r3 l10n qmake-utils
+inherit git-r3 gnome2-utils l10n qmake-utils xdg-utils
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -85,11 +85,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2018-02-16 10:31 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2018-02-16 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     41a04495f176ecdbd8b44e011a6f262bc5aaa366
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 10:26:47 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 10:30:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a04495

sci-geosciences/merkaartor: Fix gpsd use-dep

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../{merkaartor-0.18.3-r1.ebuild => merkaartor-0.18.3-r2.ebuild}    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
similarity index 94%
rename from sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
rename to sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
index 30b1ceb20cd..30f2f46f37e 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,12 +25,12 @@ RDEPEND="
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-qt/qtsingleapplication[X,qt5]
+	dev-qt/qtsingleapplication[X,qt5(+)]
 	>=sci-libs/gdal-1.6.0
 	>=sci-libs/proj-4.6
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
 	libproxy? ( net-libs/libproxy )
 "
 DEPEND="${RDEPEND}


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2018-12-29 23:52 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2018-12-29 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a8b45e983c4a03566e2341538f688684ea1b2c47
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 22:46:47 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 23:52:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8b45e98

sci-geosciences/merkaartor: Fix plugin path

Sync 9999 with 0.18.3-r3 changes
Drop bundled libs
Drop obsolete pkg_preinst

Thanks-to: Jonathan Marten <jjm <AT> keelhaul.me.uk>
Closes: https://bugs.gentoo.org/621826
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...tor-9999.ebuild => merkaartor-0.18.3-r4.ebuild} | 39 ++++++++++------------
 sci-geosciences/merkaartor/merkaartor-9999.ebuild  | 16 ++++-----
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
similarity index 69%
copy from sci-geosciences/merkaartor/merkaartor-9999.ebuild
copy to sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index fa01cf15ac0..29f7b22e8be 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
 
-inherit git-r3 gnome2-utils l10n qmake-utils xdg-utils
+inherit gnome2-utils l10n qmake-utils xdg-utils
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug exif gps libproxy webengine"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps libproxy"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
@@ -24,6 +23,7 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsingleapplication[X,qt5(+)]
 	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	sci-libs/gdal
@@ -32,22 +32,20 @@ RDEPEND="
 	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
 	libproxy? ( net-libs/libproxy )
-	webengine? ( dev-qt/qtwebengine:5 )
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
+PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
 
 DOCS=( AUTHORS CHANGELOG )
 
-src_unpack() {
-	git-r3_src_unpack
-}
-
 src_prepare() {
 	default
 
+	rm -r 3rdparty || die "Failed to remove bundled libs"
+
 	my_rm_loc() {
 		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
 		rm "translations/${PN}_${1}.ts" || die
@@ -59,31 +57,28 @@ src_prepare() {
 	fi
 
 	# build system expects to be building from git
-	if [[ ${PV} != *9999 ]] ; then
-		sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
-	fi
+	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
 }
 
 src_configure() {
 	# TRANSDIR_SYSTEM is for bug #385671
 	eqmake5 \
-		PREFIX="${ED}usr" \
-		LIBDIR="${ED}usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
+		PREFIX="${ED%/}/usr" \
+		LIBDIR="${ED%/}/usr/$(get_libdir)" \
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
+		SHARE_DIR_PATH="/usr/share/${PN}" \
+		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
 		SYSTEM_QTSA=1 \
+		RELEASE=1 \
 		NODEBUG=$(usex debug 0 1) \
 		GEOIMAGE=$(usex exif 1 0) \
 		GPSDLIB=$(usex gps 1 0) \
 		LIBPROXY=$(usex libproxy 1 0) \
-		USEWEBENGINE=$(usex webengine 1 0) \
+		ZBAR=0 \
 		Merkaartor.pro
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index fa01cf15ac0..4491ffa4a5c 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${PN}-0.18.3-sharedir-pluginsdir.patch" ) # bug 621826
+
 DOCS=( AUTHORS CHANGELOG )
 
 src_unpack() {
@@ -67,9 +69,11 @@ src_prepare() {
 src_configure() {
 	# TRANSDIR_SYSTEM is for bug #385671
 	eqmake5 \
-		PREFIX="${ED}usr" \
-		LIBDIR="${ED}usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
+		PREFIX="${ED%/}/usr" \
+		LIBDIR="${ED%/}/usr/$(get_libdir)" \
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
+		SHARE_DIR_PATH="/usr/share/${PN}" \
+		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
 		SYSTEM_QTSA=1 \
 		NODEBUG=$(usex debug 0 1) \
@@ -80,10 +84,6 @@ src_configure() {
 		Merkaartor.pro
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2018-12-31 10:09 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2018-12-31 10:09 UTC (permalink / raw
  To: gentoo-commits

commit:     46ee28df08edf66e29b93cf94264245e97359559
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 10:07:07 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 10:08:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ee28df

sci-geosciences/merkaartor: Fix dep on dev-qt/qtwebengine[widgets]

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

 sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index ef8f4c26acf..d3bb9dded76 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
 	libproxy? ( net-libs/libproxy )
-	webengine? ( dev-qt/qtwebengine:5 )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2018-12-31 10:09 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2018-12-31 10:09 UTC (permalink / raw
  To: gentoo-commits

commit:     dcea66aaeb133f2a92abd54d18e95df55f395f9c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 10:07:52 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 10:08:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcea66aa

sci-geosciences/merkaartor: Drop 0.18.3-r2

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

 .../merkaartor/merkaartor-0.18.3-r2.ebuild         | 89 ----------------------
 1 file changed, 89 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
deleted file mode 100644
index 9470b88ad6f..00000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-
-inherit gnome2-utils l10n qmake-utils xdg-utils
-
-DESCRIPTION="Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
-	sys-libs/zlib
-	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
-	libproxy? ( net-libs/libproxy )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CHANGELOG )
-
-src_prepare() {
-	default
-
-	my_rm_loc() {
-		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
-		rm "translations/${PN}_${1}.ts" || die
-	}
-
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
-		$(qt5_get_bindir)/lrelease src/src.pro || die
-	fi
-
-	# build system expects to be building from git
-	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
-}
-
-src_configure() {
-	# TRANSDIR_SYSTEM is for bug #385671
-	eqmake5 \
-		PREFIX="${ED}usr" \
-		LIBDIR="${ED}usr/$(get_libdir)" \
-		TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
-		SYSTEM_QTSA=1 \
-		RELEASE=1 \
-		NODEBUG="$(usex debug '0' '1')" \
-		GEOIMAGE="$(usex exif '1' '0')" \
-		GPSDLIB="$(usex gps '1' '0')" \
-		LIBPROXY="$(usex libproxy '1' '0')" \
-		ZBAR=0 \
-		Merkaartor.pro
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2019-01-09 11:52 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2019-01-09 11:52 UTC (permalink / raw
  To: gentoo-commits

commit:     92c5867ebd7a58c7b73a6d279c5b1d6a933088fd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  9 11:21:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  9 11:51:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c5867e

sci-geosciences/merkaartor: Drop 0.18.3-r3

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

 .../merkaartor/merkaartor-0.18.3-r3.ebuild         | 91 ----------------------
 1 file changed, 91 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
deleted file mode 100644
index 19e627bdad4..00000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-
-inherit gnome2-utils l10n qmake-utils xdg-utils
-
-DESCRIPTION="Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
-	sys-libs/zlib
-	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
-	libproxy? ( net-libs/libproxy )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
-DOCS=( AUTHORS CHANGELOG )
-
-src_prepare() {
-	default
-
-	my_rm_loc() {
-		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
-		rm "translations/${PN}_${1}.ts" || die
-	}
-
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
-		$(qt5_get_bindir)/lrelease src/src.pro || die
-	fi
-
-	# build system expects to be building from git
-	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
-}
-
-src_configure() {
-	# TRANSDIR_SYSTEM is for bug #385671
-	eqmake5 \
-		PREFIX="${ED%/}/usr" \
-		LIBDIR="${ED%/}/usr/$(get_libdir)" \
-		PLUGINS_DIR="/usr/$(get_libdir)/plugins" \
-		SHARE_DIR_PATH="/usr/share/${PN}" \
-		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
-		SYSTEM_QTSA=1 \
-		RELEASE=1 \
-		NODEBUG="$(usex debug '0' '1')" \
-		GEOIMAGE="$(usex exif '1' '0')" \
-		GPSDLIB="$(usex gps '1' '0')" \
-		LIBPROXY="$(usex libproxy '1' '0')" \
-		ZBAR=0 \
-		Merkaartor.pro
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2019-06-30  7:18 Amy Liffey
  0 siblings, 0 replies; 30+ messages in thread
From: Amy Liffey @ 2019-06-30  7:18 UTC (permalink / raw
  To: gentoo-commits

commit:     7fee9321d16014b12fe82a608c79f860dba68a61
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 07:17:40 2019 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 07:18:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fee9321

sci-geosciences/merkaartor: fix compilation with proj-6.0.0

Closes: https://bugs.gentoo.org/685234
Submitted-by: <phobosk <AT> fastmail.fm>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index d3bb9dded76..7c990dab379 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
 
-inherit gnome2-utils l10n qmake-utils xdg-utils
+inherit gnome2-utils l10n qmake-utils xdg-utils flag-o-matic
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -65,6 +65,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
 	# TRANSDIR_SYSTEM is for bug #385671
 	eqmake5 \
 		PREFIX="${ED%/}/usr" \


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2019-07-01 17:52 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2019-07-01 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     1f2778c479ef9deac38c0eecd3e3ae2f1b939cf9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  1 17:28:46 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 17:51:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2778c4

sci-geosciences/merkaartor: EAPI-7 bump, gnome2-utils -> xdg-utils

Add missing dev-qt/qtwebengine:5[widgets] USE dep.

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

 .../merkaartor/merkaartor-0.18.3-r4.ebuild         | 29 +++++++++---------
 sci-geosciences/merkaartor/merkaartor-9999.ebuild  | 35 +++++++++++-----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index 7c990dab379..b998c164e0c 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-
-inherit gnome2-utils l10n qmake-utils xdg-utils flag-o-matic
+inherit flag-o-matic l10n qmake-utils xdg-utils
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -16,7 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug exif gps libproxy webengine"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -33,10 +36,8 @@ RDEPEND="
 	libproxy? ( net-libs/libproxy )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
 	"${FILESDIR}"/${P}-desktopfile.patch
@@ -61,7 +62,7 @@ src_prepare() {
 	fi
 
 	# build system expects to be building from git
-	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+	sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
 }
 
 src_configure() {
@@ -69,11 +70,11 @@ src_configure() {
 
 	# TRANSDIR_SYSTEM is for bug #385671
 	eqmake5 \
-		PREFIX="${ED%/}/usr" \
-		LIBDIR="${ED%/}/usr/$(get_libdir)" \
+		PREFIX="${ED}/usr" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
 		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
 		SHARE_DIR_PATH="/usr/share/${PN}" \
-		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
+		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
 		SYSTEM_QTSA=1 \
 		RELEASE=1 \
@@ -88,10 +89,10 @@ src_configure() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 4491ffa4a5c..7fb03801624 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-
-inherit git-r3 gnome2-utils l10n qmake-utils xdg-utils
+inherit git-r3 l10n qmake-utils xdg-utils
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
 
 LICENSE="GPL-2"
@@ -17,7 +15,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug exif gps libproxy webengine"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -32,14 +34,11 @@ RDEPEND="
 	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
 	libproxy? ( net-libs/libproxy )
-	webengine? ( dev-qt/qtwebengine:5 )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
+RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.18.3-sharedir-pluginsdir.patch" ) # bug 621826
+PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
 
 DOCS=( AUTHORS CHANGELOG )
 
@@ -62,18 +61,18 @@ src_prepare() {
 
 	# build system expects to be building from git
 	if [[ ${PV} != *9999 ]] ; then
-		sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+		sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
 	fi
 }
 
 src_configure() {
 	# TRANSDIR_SYSTEM is for bug #385671
 	eqmake5 \
-		PREFIX="${ED%/}/usr" \
-		LIBDIR="${ED%/}/usr/$(get_libdir)" \
+		PREFIX="${ED}/usr" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
 		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
 		SHARE_DIR_PATH="/usr/share/${PN}" \
-		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
+		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
 		SYSTEM_QTSA=1 \
 		NODEBUG=$(usex debug 0 1) \
@@ -86,10 +85,10 @@ src_configure() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2020-04-10  9:26 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2020-04-10  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     fc8df273ff2053be4286db1533ea3ea1ec45d676
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 08:59:32 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 09:25:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8df273

sci-geosciences/merkaartor: 0.18.4 version bump

Closes: https://bugs.gentoo.org/716894
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/merkaartor/Manifest                     |  1 +
 sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild  |  2 +-
 ...aartor-0.18.3-r4.ebuild => merkaartor-0.18.4.ebuild} | 17 ++++++-----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 6a49ca07d56..3c1ea402a81 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1 +1,2 @@
 DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
+DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index 6eed24c6150..4bb8c0e5e1e 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	sci-libs/proj
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
 	libproxy? ( net-libs/libproxy )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
similarity index 86%
copy from sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
copy to sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
index 6eed24c6150..e5d0a17a126 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,13 +23,14 @@ DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsingleapplication[X,qt5(+)]
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	sci-libs/gdal
-	sci-libs/proj
+	sci-libs/gdal:=
+	sci-libs/proj:=
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
@@ -38,12 +39,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
-	"${FILESDIR}"/${P}-desktopfile.patch
-	"${FILESDIR}"/${P}-webengine{1,2,3}.patch
-	"${FILESDIR}"/${P}-exiv2-0.27.1.patch # bug 689098
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
 
 DOCS=( AUTHORS CHANGELOG )
 
@@ -67,7 +63,7 @@ src_prepare() {
 }
 
 src_configure() {
-	append-flags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 
 	# TRANSDIR_SYSTEM is for bug #385671
 	eqmake5 \
@@ -84,7 +80,6 @@ src_configure() {
 		GPSDLIB=$(usex gps 1 0) \
 		LIBPROXY=$(usex libproxy 1 0) \
 		USEWEBENGINE=$(usex webengine 1 0) \
-		ZBAR=0 \
 		Merkaartor.pro
 }
 


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2020-04-10  9:26 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2020-04-10  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     cc3cb11b34965398a4fa3c7b717d142b51fdc381
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 08:47:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 09:25:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3cb11b

sci-geosciences/merkaartor: Add missing DEPEND, slot ops, live switch

Put src_configure variables into array.

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

 sci-geosciences/merkaartor/merkaartor-9999.ebuild | 58 +++++++++++++----------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 7fb03801624..8ff9caf11e1 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,18 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit git-r3 l10n qmake-utils xdg-utils
+inherit l10n qmake-utils xdg-utils
+
+if [[ ${PV} != *9999 ]] ; then
+	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
+	inherit git-r3
+fi
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug exif gps libproxy webengine"
 
 BDEPEND="
@@ -23,16 +29,17 @@ DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsingleapplication[X,qt5(+)]
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	sci-libs/gdal
-	sci-libs/proj
+	sci-libs/gdal:=
+	sci-libs/proj:=
 	sys-libs/zlib
 	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
 	libproxy? ( net-libs/libproxy )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
@@ -42,13 +49,11 @@ PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
 
 DOCS=( AUTHORS CHANGELOG )
 
-src_unpack() {
-	git-r3_src_unpack
-}
-
 src_prepare() {
 	default
 
+	rm -r 3rdparty || die "Failed to remove bundled libs"
+
 	my_rm_loc() {
 		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
 		rm "translations/${PN}_${1}.ts" || die
@@ -67,20 +72,23 @@ src_prepare() {
 
 src_configure() {
 	# TRANSDIR_SYSTEM is for bug #385671
-	eqmake5 \
-		PREFIX="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
-		SHARE_DIR_PATH="/usr/share/${PN}" \
-		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
-		SYSTEM_QTSA=1 \
-		NODEBUG=$(usex debug 0 1) \
-		GEOIMAGE=$(usex exif 1 0) \
-		GPSDLIB=$(usex gps 1 0) \
-		LIBPROXY=$(usex libproxy 1 0) \
-		USEWEBENGINE=$(usex webengine 1 0) \
-		Merkaartor.pro
+	local myeqmakeargs=(
+		PREFIX="${ED}/usr"
+		LIBDIR="${ED}/usr/$(get_libdir)"
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins"
+		SHARE_DIR_PATH="/usr/share/${PN}"
+		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations"
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations"
+		SYSTEM_QTSA=1
+		NODEBUG=$(usex debug 0 1)
+		GEOIMAGE=$(usex exif 1 0)
+		GPSDLIB=$(usex gps 1 0)
+		LIBPROXY=$(usex libproxy 1 0)
+		USEWEBENGINE=$(usex webengine 1 0)
+	)
+	[[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 )
+
+	eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
 }
 
 pkg_postinst() {


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2021-04-10 12:40 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-04-10 12:40 UTC (permalink / raw
  To: gentoo-commits

commit:     6b8d0f22a739a4ca454c9e14504426dad06f9188
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 12:21:13 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 12:40:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8d0f22

sci-geosciences/merkaartor: add 0.18.4_p20210410 (snapshot for PROJ 8)

Hot off the press snapshot to add compatibility with PROJ 8.

Closes: https://bugs.gentoo.org/685234
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/merkaartor/Manifest                       |  1 +
 ...tor-9999.ebuild => merkaartor-0.18.4_p20210410.ebuild} | 15 +++++++++++++--
 sci-geosciences/merkaartor/merkaartor-9999.ebuild         |  7 ++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 3f1b0c066e1..ce9bffda55d 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1 +1,2 @@
 DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
+DIST merkaartor-0.18.4_p20210410.tar.gz 6566072 BLAKE2B d2788552794e2778d6b68cc39ad04ec081ef88d0e3748af380774ee3ac98871bdaf1f26a04065bfb591b9245d740acec4fcfb4b781311409b49932014dfa86bb SHA512 3051280fd1ab6fa5b9e40e4c1aa1df137b60f3f4062daaa9301dce3697c51d7f4514bd01d7954f5c332849e268f6fcf6f23a2bc58b13645c5e29f9a12c9a3a34

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410.ebuild
similarity index 83%
copy from sci-geosciences/merkaartor/merkaartor-9999.ebuild
copy to sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410.ebuild
index 8ff9caf11e1..26387cc5076 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410.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
@@ -7,7 +7,13 @@ PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi z
 inherit l10n qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then
-	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	# Needed for new Proj API support
+	# bug #685234
+	COMMIT="7ae76834bcba9934f38d85058f7372fc016c1d1c"
+	SRC_URI="https://github.com/openstreetmap/merkaartor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
@@ -71,6 +77,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if has_version "<sci-libs/proj-8.0.0" ; then
+		# bug #685234
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	fi
+
 	# TRANSDIR_SYSTEM is for bug #385671
 	local myeqmakeargs=(
 		PREFIX="${ED}/usr"

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 8ff9caf11e1..a18b587ed58 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.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
@@ -71,6 +71,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if has_version "<sci-libs/proj-8.0.0" ; then
+		# bug #685234
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	fi
+
 	# TRANSDIR_SYSTEM is for bug #385671
 	local myeqmakeargs=(
 		PREFIX="${ED}/usr"


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2021-04-11 13:43 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-04-11 13:43 UTC (permalink / raw
  To: gentoo-commits

commit:     69fac3376868c3d810a2b61304f02dc1be2696fb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 13:40:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 13:42:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fac337

sci-geosciences/merkaartor: fix flag-o-matic

Closes: https://bugs.gentoo.org/781998
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...or-0.18.4_p20210410.ebuild => merkaartor-0.18.4_p20210410-r1.ebuild} | 2 +-
 sci-geosciences/merkaartor/merkaartor-9999.ebuild                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
similarity index 98%
rename from sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410.ebuild
rename to sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
index 26387cc5076..49fce917fa1 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit l10n qmake-utils xdg-utils
+inherit flag-o-matic l10n qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then
 	# Needed for new Proj API support

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index a18b587ed58..4cdd436ca64 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit l10n qmake-utils xdg-utils
+inherit flag-o-matic l10n qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then
 	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2021-07-04 14:03 Ulrich Müller
  0 siblings, 0 replies; 30+ messages in thread
From: Ulrich Müller @ 2021-07-04 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     5887570604af067e2f54aa70affc02e6ee7e949c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 15:47:01 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 14:02:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58875706

sci-geosciences/merkaartor: Update from l10n.eclass to plocale.eclass

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild              | 8 ++++----
 sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild | 6 +++---
 sci-geosciences/merkaartor/merkaartor-9999.ebuild                | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
index 360d580f309..6f1f3aaf2e6 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit flag-o-matic l10n qmake-utils xdg-utils
+inherit flag-o-matic plocale qmake-utils xdg-utils
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -56,8 +56,8 @@ src_prepare() {
 		rm "translations/${PN}_${1}.ts" || die
 	}
 
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
+	if [[ -n "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
 		$(qt5_get_bindir)/lrelease src/src.pro || die
 	fi
 

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
index 49fce917fa1..4b22730517f 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit flag-o-matic l10n qmake-utils xdg-utils
+inherit flag-o-matic plocale qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then
 	# Needed for new Proj API support
@@ -65,8 +65,8 @@ src_prepare() {
 		rm "translations/${PN}_${1}.ts" || die
 	}
 
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
+	if [[ -n "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
 		$(qt5_get_bindir)/lrelease src/src.pro || die
 	fi
 

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 4cdd436ca64..7ea1462d493 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit flag-o-matic l10n qmake-utils xdg-utils
+inherit flag-o-matic plocale qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then
 	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -59,8 +59,8 @@ src_prepare() {
 		rm "translations/${PN}_${1}.ts" || die
 	}
 
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
+	if [[ -n "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
 		$(qt5_get_bindir)/lrelease src/src.pro || die
 	fi
 


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2022-03-01 13:30 Andrew Ammerlaan
  0 siblings, 0 replies; 30+ messages in thread
From: Andrew Ammerlaan @ 2022-03-01 13:30 UTC (permalink / raw
  To: gentoo-commits

commit:     7dbee1c80a9f0a2bd579149328294b4b5def7103
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 13:29:54 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 13:30:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbee1c8

sci-geosciences/merkaartor: add version 0.19.0

Closes: https://bugs.gentoo.org/828781
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-geosciences/merkaartor/Manifest                |  1 +
 .../merkaartor/merkaartor-0.19.0.ebuild            | 86 ++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index ce9bffda55df..1e97f01ebf10 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,2 +1,3 @@
 DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
 DIST merkaartor-0.18.4_p20210410.tar.gz 6566072 BLAKE2B d2788552794e2778d6b68cc39ad04ec081ef88d0e3748af380774ee3ac98871bdaf1f26a04065bfb591b9245d740acec4fcfb4b781311409b49932014dfa86bb SHA512 3051280fd1ab6fa5b9e40e4c1aa1df137b60f3f4062daaa9301dce3697c51d7f4514bd01d7954f5c332849e268f6fcf6f23a2bc58b13645c5e29f9a12c9a3a34
+DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d

diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
new file mode 100644
index 000000000000..e9c4e0b933f1
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
+inherit flag-o-matic plocale qmake-utils xdg
+
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps libproxy webengine"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gdal:=
+	<sci-libs/proj-8:=
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
+	libproxy? ( net-libs/libproxy )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # bug 621826
+)
+
+DOCS=( AUTHORS CHANGELOG )
+
+src_prepare() {
+	default
+
+	rm -r 3rdparty || die "Failed to remove bundled libs"
+
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	if [[ -n "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
+		$(qt5_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	# build system expects to be building from git
+	sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+}
+
+src_configure() {
+	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
+	# TRANSDIR_SYSTEM is for bug #385671
+	eqmake5 \
+		PREFIX="${ED}/usr" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
+		SHARE_DIR_PATH="/usr/share/${PN}" \
+		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
+		SYSTEM_QTSA=1 \
+		RELEASE=1 \
+		NODEBUG=$(usex debug 0 1) \
+		GEOIMAGE=$(usex exif 1 0) \
+		GPSDLIB=$(usex gps 1 0) \
+		LIBPROXY=$(usex libproxy 1 0) \
+		USEWEBENGINE=$(usex webengine 1 0) \
+		Merkaartor.pro
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2022-04-04 12:18 Ionen Wolkens
  0 siblings, 0 replies; 30+ messages in thread
From: Ionen Wolkens @ 2022-04-04 12:18 UTC (permalink / raw
  To: gentoo-commits

commit:     abd26791d24a5f30d9fd8dff8667b63896755af3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 12:13:16 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 12:18:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd26791

sci-geosciences/merkaartor: update plocales

Closes: https://bugs.gentoo.org/836762
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild | 2 +-
 sci-geosciences/merkaartor/merkaartor-9999.ebuild   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
index e9c4e0b933f1..8a4daa01f386 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
+PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW"
 inherit flag-o-matic plocale qmake-utils xdg
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 7ea1462d4938..27f04eaf049e 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
+PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW"
 inherit flag-o-matic plocale qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2023-05-15 21:28 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2023-05-15 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     6d1c0fa63caaf34e86731b96dd09adf7039a182d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 21:08:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 15 21:28:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1c0fa6

sci-geosciences/merkaartor: Redo 0.19.0 from 9999, restore PROJ-8 compat

As it should be done.

Bug: https://bugs.gentoo.org/828781
Closes: https://bugs.gentoo.org/836098
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../merkaartor/merkaartor-0.19.0-r1.ebuild         | 101 +++++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
new file mode 100644
index 000000000000..f0f4b1dbd195
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW"
+inherit flag-o-matic plocale qmake-utils xdg
+
+if [[ ${PV} != *9999 ]] ; then
+	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
+	inherit git-r3
+fi
+
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug exif gps libproxy webengine"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sci-libs/gdal:=
+	sci-libs/proj:=
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
+	libproxy? ( net-libs/libproxy )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
+
+DOCS=( AUTHORS CHANGELOG )
+
+src_prepare() {
+	default
+
+	rm -r 3rdparty || die "Failed to remove bundled libs"
+
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	if [[ -n "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
+		$(qt5_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	# build system expects to be building from git
+	if [[ ${PV} != *9999 ]] ; then
+		sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+	fi
+}
+
+src_configure() {
+	if has_version "<sci-libs/proj-8.0.0" ; then
+		# bug #685234
+		append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	fi
+
+	# TRANSDIR_SYSTEM is for bug #385671
+	local myeqmakeargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins"
+		SHARE_DIR_PATH="/usr/share/${PN}"
+		TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations"
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations"
+		SYSTEM_QTSA=1
+		NODEBUG=$(usex debug 0 1)
+		GEOIMAGE=$(usex exif 1 0)
+		GPSDLIB=$(usex gps 1 0)
+		LIBPROXY=$(usex libproxy 1 0)
+		USEWEBENGINE=$(usex webengine 1 0)
+	)
+	[[ ${PV} != *9999 ]] && myeqmakeargs+=( RELEASE=1 )
+
+	eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2023-05-15 21:28 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2023-05-15 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     1d274d6ae8d2fd32b2a2c065519a0b6313db0460
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 20:58:08 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 15 21:26:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d274d6a

sci-geosciences/merkaartor: 9999 EAPI-8 bump, fix VariableScope

Bug: https://bugs.gentoo.org/828781
Bug: https://bugs.gentoo.org/836098
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/merkaartor/merkaartor-9999.ebuild | 30 +++++++++--------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 27f04eaf049e..f0f4b1dbd195 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW"
-inherit flag-o-matic plocale qmake-utils xdg-utils
+inherit flag-o-matic plocale qmake-utils xdg
 
 if [[ ${PV} != *9999 ]] ; then
 	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -21,10 +21,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug exif gps libproxy webengine"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
 DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -44,6 +40,10 @@ DEPEND="
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
 
@@ -78,11 +78,11 @@ src_configure() {
 
 	# TRANSDIR_SYSTEM is for bug #385671
 	local myeqmakeargs=(
-		PREFIX="${ED}/usr"
-		LIBDIR="${ED}/usr/$(get_libdir)"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins"
 		SHARE_DIR_PATH="/usr/share/${PN}"
-		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations"
+		TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations"
 		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations"
 		SYSTEM_QTSA=1
 		NODEBUG=$(usex debug 0 1)
@@ -96,12 +96,6 @@ src_configure() {
 	eqmake5 "${myeqmakeargs[@]}" Merkaartor.pro
 }
 
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+src_install() {
+	emake install INSTALL_ROOT="${D}"
 }


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2023-05-15 21:28 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2023-05-15 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     cfb84454ab4cd4f10bc1763f1611d85535b12ba2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 21:11:38 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 15 21:28:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb84454

sci-geosciences/merkaartor: drop 0.19.0

Bug: https://bugs.gentoo.org/828781
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../merkaartor/merkaartor-0.19.0.ebuild            | 86 ----------------------
 1 file changed, 86 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
deleted file mode 100644
index 8a4daa01f386..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="cs de en es fi fr hr hu id_ID it ja nl pl pt_BR ru sv uk zh_TW"
-inherit flag-o-matic plocale qmake-utils xdg
-
-DESCRIPTION="Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy webengine"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sci-libs/gdal:=
-	<sci-libs/proj-8:=
-	sys-libs/zlib
-	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
-	libproxy? ( net-libs/libproxy )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # bug 621826
-)
-
-DOCS=( AUTHORS CHANGELOG )
-
-src_prepare() {
-	default
-
-	rm -r 3rdparty || die "Failed to remove bundled libs"
-
-	my_rm_loc() {
-		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
-		rm "translations/${PN}_${1}.ts" || die
-	}
-
-	if [[ -n "$(plocale_get_locales)" ]]; then
-		plocale_for_each_disabled_locale my_rm_loc
-		$(qt5_get_bindir)/lrelease src/src.pro || die
-	fi
-
-	# build system expects to be building from git
-	sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
-}
-
-src_configure() {
-	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-
-	# TRANSDIR_SYSTEM is for bug #385671
-	eqmake5 \
-		PREFIX="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
-		SHARE_DIR_PATH="/usr/share/${PN}" \
-		TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
-		SYSTEM_QTSA=1 \
-		RELEASE=1 \
-		NODEBUG=$(usex debug 0 1) \
-		GEOIMAGE=$(usex exif 1 0) \
-		GPSDLIB=$(usex gps 1 0) \
-		LIBPROXY=$(usex libproxy 1 0) \
-		USEWEBENGINE=$(usex webengine 1 0) \
-		Merkaartor.pro
-}


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

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
@ 2024-10-21 17:58 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2024-10-21 17:58 UTC (permalink / raw
  To: gentoo-commits

commit:     04cad82a4b70b691cc22a8909de026ae20d10d9e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 17:55:23 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 17:56:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04cad82a

sci-geosciences/merkaartor: add 0.20.0

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

 sci-geosciences/merkaartor/Manifest                |  1 +
 .../merkaartor/merkaartor-0.20.0.ebuild            | 71 ++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index eb14ca0751f1..511699b85cad 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1 +1,2 @@
 DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
+DIST merkaartor-0.20.0.tar.gz 5592116 BLAKE2B 9a78f66cea55bab3262d80d594da93f80bb834c7121960da1ade02624f8435545168b911a944d005995a0c60e4974fd58494867a6ec2eca47b1430968677a9d3 SHA512 db64c3053618a0bed7984223c9aa8e4175fdf7db2dd70bf3c6ec021b46fae1d095c513c3e151086baf07446c7cf81c49923a2e43e79963d956d29643d7f93910

diff --git a/sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild b/sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild
new file mode 100644
index 000000000000..892191a4c37c
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.20.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
+	inherit git-r3
+fi
+
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="https://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="exif gps libproxy webengine zbar"
+
+# bundles qtsingleapplication again, unfortunately
+DEPEND="
+	dev-libs/protobuf:=
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+	dev-qt/qtnetworkauth:6
+	dev-qt/qtsvg:6
+	sci-libs/gdal:=
+	sci-libs/proj:=
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
+	libproxy? ( >=net-libs/libproxy-0.5 )
+	webengine? ( dev-qt/qtwebengine:6[widgets] )
+	zbar? ( media-gfx/zbar )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CHANGELOG )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-disable-git.patch # downstream patch
+	# pending upstream PR: https://github.com/openstreetmap/merkaartor/pull/291
+	"${FILESDIR}"/${PN}-0.20.0-GNUInstallDirs.patch
+)
+
+src_prepare() {
+	# no Qt5 automagic, please
+	sed -e "/^ *find_package.*QT NAMES/s/Qt5 //" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGEOIMAGE=$(usex exif)
+		-DGPSD=$(usex gps)
+		-DLIBPROXY=$(usex libproxy)
+		-DWEBENGINE=$(usex webengine)
+		-DZBAR=$(usex zbar)
+		-DEXTRA_TESTS=OFF
+	)
+
+	cmake_src_configure
+}


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

end of thread, other threads:[~2024-10-21 17:58 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-30  7:18 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/ Amy Liffey
  -- strict thread matches above, loose matches on Subject: below --
2024-10-21 17:58 Andreas Sturmlechner
2023-05-15 21:28 Andreas Sturmlechner
2023-05-15 21:28 Andreas Sturmlechner
2023-05-15 21:28 Andreas Sturmlechner
2022-04-04 12:18 Ionen Wolkens
2022-03-01 13:30 Andrew Ammerlaan
2021-07-04 14:03 Ulrich Müller
2021-04-11 13:43 Sam James
2021-04-10 12:40 Sam James
2020-04-10  9:26 Andreas Sturmlechner
2020-04-10  9:26 Andreas Sturmlechner
2019-07-01 17:52 Andreas Sturmlechner
2019-01-09 11:52 Andreas Sturmlechner
2018-12-31 10:09 Andreas Sturmlechner
2018-12-31 10:09 Andreas Sturmlechner
2018-12-29 23:52 Andreas Sturmlechner
2018-02-16 10:31 Andreas Sturmlechner
2018-02-16 10:31 Andreas Sturmlechner
2017-06-04 10:25 Andreas Sturmlechner
2017-03-03  0:15 Andreas Sturmlechner
2016-12-29 12:05 Michael Palimaka
2016-10-29 11:22 Michael Palimaka
2016-10-23 17:41 Ettore Di Giacinto
2016-10-23 17:41 Ettore Di Giacinto
2016-10-23 17:41 Ettore Di Giacinto
2016-10-04 19:41 Amy Winston
2016-10-04 17:38 Amy Winston
2016-06-26 18:13 Amy Winston
2016-06-24  7:16 Amy Winston

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