1 |
commit: a8b45e983c4a03566e2341538f688684ea1b2c47 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 22:46:47 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 29 23:52:37 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8b45e98 |
7 |
|
8 |
sci-geosciences/merkaartor: Fix plugin path |
9 |
|
10 |
Sync 9999 with 0.18.3-r3 changes |
11 |
Drop bundled libs |
12 |
Drop obsolete pkg_preinst |
13 |
|
14 |
Thanks-to: Jonathan Marten <jjm <AT> keelhaul.me.uk> |
15 |
Closes: https://bugs.gentoo.org/621826 |
16 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
18 |
|
19 |
...tor-9999.ebuild => merkaartor-0.18.3-r4.ebuild} | 39 ++++++++++------------ |
20 |
sci-geosciences/merkaartor/merkaartor-9999.ebuild | 16 ++++----- |
21 |
2 files changed, 25 insertions(+), 30 deletions(-) |
22 |
|
23 |
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
24 |
similarity index 69% |
25 |
copy from sci-geosciences/merkaartor/merkaartor-9999.ebuild |
26 |
copy to sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
27 |
index fa01cf15ac0..29f7b22e8be 100644 |
28 |
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
29 |
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
30 |
@@ -1,21 +1,20 @@ |
31 |
-# Copyright 1999-2018 Gentoo Foundation |
32 |
+# Copyright 1999-2018 Gentoo Authors |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
|
35 |
EAPI=6 |
36 |
|
37 |
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" |
38 |
|
39 |
-inherit git-r3 gnome2-utils l10n qmake-utils xdg-utils |
40 |
+inherit gnome2-utils l10n qmake-utils xdg-utils |
41 |
|
42 |
DESCRIPTION="Qt based map editor for the openstreetmap.org project" |
43 |
HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor" |
44 |
-SRC_URI="" |
45 |
-EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git" |
46 |
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
47 |
|
48 |
LICENSE="GPL-2" |
49 |
SLOT="0" |
50 |
-KEYWORDS="" |
51 |
-IUSE="debug exif gps libproxy webengine" |
52 |
+KEYWORDS="~amd64 ~x86" |
53 |
+IUSE="debug exif gps libproxy" |
54 |
|
55 |
RDEPEND=" |
56 |
dev-qt/qtconcurrent:5 |
57 |
@@ -24,6 +23,7 @@ RDEPEND=" |
58 |
dev-qt/qtprintsupport:5 |
59 |
dev-qt/qtsingleapplication[X,qt5(+)] |
60 |
dev-qt/qtsvg:5 |
61 |
+ dev-qt/qtwebkit:5 |
62 |
dev-qt/qtwidgets:5 |
63 |
dev-qt/qtxml:5 |
64 |
sci-libs/gdal |
65 |
@@ -32,22 +32,20 @@ RDEPEND=" |
66 |
exif? ( media-gfx/exiv2:= ) |
67 |
gps? ( >=sci-geosciences/gpsd-3.17-r2 ) |
68 |
libproxy? ( net-libs/libproxy ) |
69 |
- webengine? ( dev-qt/qtwebengine:5 ) |
70 |
" |
71 |
DEPEND="${RDEPEND} |
72 |
dev-qt/linguist-tools:5 |
73 |
virtual/pkgconfig |
74 |
" |
75 |
+PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826 |
76 |
|
77 |
DOCS=( AUTHORS CHANGELOG ) |
78 |
|
79 |
-src_unpack() { |
80 |
- git-r3_src_unpack |
81 |
-} |
82 |
- |
83 |
src_prepare() { |
84 |
default |
85 |
|
86 |
+ rm -r 3rdparty || die "Failed to remove bundled libs" |
87 |
+ |
88 |
my_rm_loc() { |
89 |
sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die |
90 |
rm "translations/${PN}_${1}.ts" || die |
91 |
@@ -59,31 +57,28 @@ src_prepare() { |
92 |
fi |
93 |
|
94 |
# build system expects to be building from git |
95 |
- if [[ ${PV} != *9999 ]] ; then |
96 |
- sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die |
97 |
- fi |
98 |
+ sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die |
99 |
} |
100 |
|
101 |
src_configure() { |
102 |
# TRANSDIR_SYSTEM is for bug #385671 |
103 |
eqmake5 \ |
104 |
- PREFIX="${ED}usr" \ |
105 |
- LIBDIR="${ED}usr/$(get_libdir)" \ |
106 |
- TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \ |
107 |
+ PREFIX="${ED%/}/usr" \ |
108 |
+ LIBDIR="${ED%/}/usr/$(get_libdir)" \ |
109 |
+ PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \ |
110 |
+ SHARE_DIR_PATH="/usr/share/${PN}" \ |
111 |
+ TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \ |
112 |
TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \ |
113 |
SYSTEM_QTSA=1 \ |
114 |
+ RELEASE=1 \ |
115 |
NODEBUG=$(usex debug 0 1) \ |
116 |
GEOIMAGE=$(usex exif 1 0) \ |
117 |
GPSDLIB=$(usex gps 1 0) \ |
118 |
LIBPROXY=$(usex libproxy 1 0) \ |
119 |
- USEWEBENGINE=$(usex webengine 1 0) \ |
120 |
+ ZBAR=0 \ |
121 |
Merkaartor.pro |
122 |
} |
123 |
|
124 |
-pkg_preinst() { |
125 |
- gnome2_icon_savelist |
126 |
-} |
127 |
- |
128 |
pkg_postinst() { |
129 |
xdg_desktop_database_update |
130 |
gnome2_icon_cache_update |
131 |
|
132 |
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
133 |
index fa01cf15ac0..4491ffa4a5c 100644 |
134 |
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
135 |
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
136 |
@@ -1,4 +1,4 @@ |
137 |
-# Copyright 1999-2018 Gentoo Foundation |
138 |
+# Copyright 1999-2018 Gentoo Authors |
139 |
# Distributed under the terms of the GNU General Public License v2 |
140 |
|
141 |
EAPI=6 |
142 |
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND} |
143 |
virtual/pkgconfig |
144 |
" |
145 |
|
146 |
+PATCHES=( "${FILESDIR}/${PN}-0.18.3-sharedir-pluginsdir.patch" ) # bug 621826 |
147 |
+ |
148 |
DOCS=( AUTHORS CHANGELOG ) |
149 |
|
150 |
src_unpack() { |
151 |
@@ -67,9 +69,11 @@ src_prepare() { |
152 |
src_configure() { |
153 |
# TRANSDIR_SYSTEM is for bug #385671 |
154 |
eqmake5 \ |
155 |
- PREFIX="${ED}usr" \ |
156 |
- LIBDIR="${ED}usr/$(get_libdir)" \ |
157 |
- TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \ |
158 |
+ PREFIX="${ED%/}/usr" \ |
159 |
+ LIBDIR="${ED%/}/usr/$(get_libdir)" \ |
160 |
+ PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \ |
161 |
+ SHARE_DIR_PATH="/usr/share/${PN}" \ |
162 |
+ TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \ |
163 |
TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \ |
164 |
SYSTEM_QTSA=1 \ |
165 |
NODEBUG=$(usex debug 0 1) \ |
166 |
@@ -80,10 +84,6 @@ src_configure() { |
167 |
Merkaartor.pro |
168 |
} |
169 |
|
170 |
-pkg_preinst() { |
171 |
- gnome2_icon_savelist |
172 |
-} |
173 |
- |
174 |
pkg_postinst() { |
175 |
xdg_desktop_database_update |
176 |
gnome2_icon_cache_update |