summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild29
-rw-r--r--sci-geosciences/merkaartor/merkaartor-9999.ebuild35
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 7c990dab3794..b998c164e0c0 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 4491ffa4a5cd..7fb038016249 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
}