diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-29 23:46:47 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-30 00:52:37 +0100 |
| commit | a8b45e983c4a03566e2341538f688684ea1b2c47 (patch) | |
| tree | eb27c3376672a34507bd2f1e283fb797729da588 /sci-geosciences/merkaartor/merkaartor-9999.ebuild | |
| parent | x11-wm/aewm: update HOMEPAGE. (diff) | |
| download | gentoo-a8b45e983c4a03566e2341538f688684ea1b2c47.tar.gz gentoo-a8b45e983c4a03566e2341538f688684ea1b2c47.tar.bz2 gentoo-a8b45e983c4a03566e2341538f688684ea1b2c47.zip | |
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@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@gentoo.org>
Diffstat (limited to 'sci-geosciences/merkaartor/merkaartor-9999.ebuild')
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-9999.ebuild | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild index fa01cf15ac09..4491ffa4a5cd 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 |