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() {
