diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2023-05-15 22:58:08 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-05-15 23:26:36 +0200 |
| commit | 1d274d6ae8d2fd32b2a2c065519a0b6313db0460 (patch) | |
| tree | 25355b49bd03cd6323420fda9387e18a14b49e1c | |
| parent | app-editors/neovim: update maintainers (diff) | |
| download | gentoo-1d274d6ae8d2fd32b2a2c065519a0b6313db0460.tar.gz gentoo-1d274d6ae8d2fd32b2a2c065519a0b6313db0460.tar.bz2 gentoo-1d274d6ae8d2fd32b2a2c065519a0b6313db0460.zip | |
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@gentoo.org>
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-9999.ebuild | 30 |
1 files 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}" } |