gentoo auto-resync : 16:05:2023 - 04:05:52

3 files changed, 58 insertions, 49 deletions

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 6208534f015b..d14075bd23d1 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,5 +1,5 @@
 AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
 DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
-EBUILD merkaartor-0.19.0.ebuild 2226 BLAKE2B 3adc8c0d7cc379bbef1eb72b1170e4467df4832eb2b8e5dd91e3eaf1173f0c5235e5608b6c4088b3df68bd8e0473ec666846e9697fc67096546cf2ce0628cc49 SHA512 c0cad11913d5a96587ad624549ffc321aa4aef47401b818b2bd0fe1464fa84b9ffbf87346ececffa47164e3333d3f117c288d43c75214f9db1103cc7cc21853e
-EBUILD merkaartor-9999.ebuild 2657 BLAKE2B 02c5f40887650c1af92a0a7f71fdfd42a7019a0c43ad6eee46c157c9e5c9716bbf3433a1237b87a83545f5cb493aa53fb15264ff2e63761d140c215759b22b1f SHA512 25bf6aa0c9949ce77da3132b72ee2d5b830e4eab99f10befc1cb745c493fdf2a09d5a809b9c8e0e5265e23c77e4e7906cd1a70865f9c27a54736f2939bbda015
+EBUILD merkaartor-0.19.0-r1.ebuild 2578 BLAKE2B c75be6e26cd264bafc3455af31c0e6ee0d6bfc32fc1c0d1af6ebcf0d60d7f39b908e137ff9365c3b527e908e17cab9f2ecb90f718afd25f81c2200c2935f3b95 SHA512 bc905a13cc28388f7cb7b9030ca8dc1a87bcc5ed3500449ad5bfb64e5038375bf61ce4c0148c54a56eaf1d3c30a48a04a839c49b1f5c39e36dafed40bd2159e9
+EBUILD merkaartor-9999.ebuild 2578 BLAKE2B c75be6e26cd264bafc3455af31c0e6ee0d6bfc32fc1c0d1af6ebcf0d60d7f39b908e137ff9365c3b527e908e17cab9f2ecb90f718afd25f81c2200c2935f3b95 SHA512 bc905a13cc28388f7cb7b9030ca8dc1a87bcc5ed3500449ad5bfb64e5038375bf61ce4c0148c54a56eaf1d3c30a48a04a839c49b1f5c39e36dafed40bd2159e9
 MISC metadata.xml 576 BLAKE2B a768f64dba4052d56e3ae00ccb0ddb95e1d4712ec5bb99216ebfad87012a2d9aece4acfa3eee2715625f9726d70a620209f4b4a83ed323188a92205953cc1406 SHA512 e099e0546c907c76f864ff5cdc4cb91fe1b8d72289022e6f621d827bc7140c4b1b47f6ba97783a4d703d46245013695e2d8a213272b665298e89f5ed332f7ff9
diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
index 8a4daa01f386..f0f4b1dbd195 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.19.0.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,19 +6,21 @@ 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"
-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
@@ -30,18 +32,20 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	sci-libs/gdal:=
-	<sci-libs/proj-8:=
+	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] )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 
-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 )
 
@@ -61,26 +65,37 @@ src_prepare() {
 	fi
 
 	# build system expects to be building from git
-	sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+	if [[ ${PV} != *9999 ]] ; then
+		sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+	fi
 }
 
 src_configure() {
-	append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+	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
-	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
+	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}"
 }
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}"
 }