Gentoo Archives: gentoo-commits

From: Amy Liffey <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/, sci-geosciences/merkaartor/files/
Date: Sun, 05 Aug 2018 15:37:34
Message-Id: 1533483437.0553c73ec423b80b07df52b87db616d17a2f00eb.amynka@gentoo
1 commit: 0553c73ec423b80b07df52b87db616d17a2f00eb
2 Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 5 15:34:43 2018 +0000
4 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 5 15:37:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0553c73e
7
8 sci-geosciences/merkaartor: fix plugins path
9
10 Closes: https://bugs.gentoo.org/621826
11 Package-Manager: Portage-2.3.40, Repoman-2.3.9
12
13 .../merkaartor-0.18.3-sharedir-pluginsdir.patch | 28 +++++++
14 .../merkaartor/merkaartor-0.18.3-r3.ebuild | 91 ++++++++++++++++++++++
15 2 files changed, 119 insertions(+)
16
17 diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
18 new file mode 100644
19 index 00000000000..46f5964e17c
20 --- /dev/null
21 +++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
22 @@ -0,0 +1,28 @@
23 +--- a/src/src.pro 2018-08-05 13:25:02.761849538 +0100
24 ++++ b/src/src.pro 2018-08-05 13:25:55.935846789 +0100
25 +@@ -155,8 +155,10 @@
26 + isEmpty( LIBDIR ) {
27 + LIBDIR = $${PREFIX}/lib${LIB_SUFFIX}
28 + }
29 +-
30 +- DEFINES += PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
31 ++ isEmpty( PLUGINS_DIR ){
32 ++ PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
33 ++ }
34 ++ DEFINES += PLUGINS_DIR=$${PLUGINS_DIR}
35 +
36 + target.path = $${PREFIX}/bin
37 + SHARE_DIR = $${PREFIX}/share/merkaartor
38 +
39 +--- a/src/src.pro 2018-08-05 16:20:33.759305219 +0100
40 ++++ b/src/src.pro 2018-08-05 16:20:53.094304220 +0100
41 +@@ -181,7 +181,7 @@
42 +
43 +
44 +
45 +-DEFINES += SHARE_DIR=$${SHARE_DIR}
46 ++DEFINES += SHARE_DIR=$${SHARE_DIR_PATH}
47 + INSTALLS += target
48 +
49 + win32-msvc* {
50 +
51
52 diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
53 new file mode 100644
54 index 00000000000..19e627bdad4
55 --- /dev/null
56 +++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
57 @@ -0,0 +1,91 @@
58 +# Copyright 1999-2018 Gentoo Foundation
59 +# Distributed under the terms of the GNU General Public License v2
60 +
61 +EAPI=6
62 +
63 +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"
64 +
65 +inherit gnome2-utils l10n qmake-utils xdg-utils
66 +
67 +DESCRIPTION="Qt based map editor for the openstreetmap.org project"
68 +HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
69 +SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
70 +
71 +LICENSE="GPL-2"
72 +SLOT="0"
73 +KEYWORDS="~amd64 ~x86"
74 +IUSE="debug exif gps libproxy"
75 +
76 +RDEPEND="
77 + dev-qt/qtconcurrent:5
78 + dev-qt/qtcore:5
79 + dev-qt/qtgui:5
80 + dev-qt/qtprintsupport:5
81 + dev-qt/qtsvg:5
82 + dev-qt/qtwebkit:5
83 + dev-qt/qtwidgets:5
84 + dev-qt/qtxml:5
85 + dev-qt/qtsingleapplication[X,qt5(+)]
86 + >=sci-libs/gdal-1.6.0
87 + >=sci-libs/proj-4.6
88 + sys-libs/zlib
89 + exif? ( media-gfx/exiv2:= )
90 + gps? ( >=sci-geosciences/gpsd-3.17-r2 )
91 + libproxy? ( net-libs/libproxy )
92 +"
93 +DEPEND="${RDEPEND}
94 + dev-qt/linguist-tools:5
95 + virtual/pkgconfig
96 +"
97 +PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
98 +DOCS=( AUTHORS CHANGELOG )
99 +
100 +src_prepare() {
101 + default
102 +
103 + my_rm_loc() {
104 + sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
105 + rm "translations/${PN}_${1}.ts" || die
106 + }
107 +
108 + if [[ -n "$(l10n_get_locales)" ]]; then
109 + l10n_for_each_disabled_locale_do my_rm_loc
110 + $(qt5_get_bindir)/lrelease src/src.pro || die
111 + fi
112 +
113 + # build system expects to be building from git
114 + sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
115 +}
116 +
117 +src_configure() {
118 + # TRANSDIR_SYSTEM is for bug #385671
119 + eqmake5 \
120 + PREFIX="${ED%/}/usr" \
121 + LIBDIR="${ED%/}/usr/$(get_libdir)" \
122 + PLUGINS_DIR="/usr/$(get_libdir)/plugins" \
123 + SHARE_DIR_PATH="/usr/share/${PN}" \
124 + TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
125 + TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
126 + SYSTEM_QTSA=1 \
127 + RELEASE=1 \
128 + NODEBUG="$(usex debug '0' '1')" \
129 + GEOIMAGE="$(usex exif '1' '0')" \
130 + GPSDLIB="$(usex gps '1' '0')" \
131 + LIBPROXY="$(usex libproxy '1' '0')" \
132 + ZBAR=0 \
133 + Merkaartor.pro
134 +}
135 +
136 +pkg_preinst() {
137 + gnome2_icon_savelist
138 +}
139 +
140 +pkg_postinst() {
141 + xdg_desktop_database_update
142 + gnome2_icon_cache_update
143 +}
144 +
145 +pkg_postrm() {
146 + xdg_desktop_database_update
147 + gnome2_icon_cache_update
148 +}