1 |
commit: 1f2778c479ef9deac38c0eecd3e3ae2f1b939cf9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 1 17:28:46 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 1 17:51:52 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2778c4 |
7 |
|
8 |
sci-geosciences/merkaartor: EAPI-7 bump, gnome2-utils -> xdg-utils |
9 |
|
10 |
Add missing dev-qt/qtwebengine:5[widgets] USE dep. |
11 |
|
12 |
Package-Manager: Portage-2.3.68, Repoman-2.3.16 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../merkaartor/merkaartor-0.18.3-r4.ebuild | 29 +++++++++--------- |
16 |
sci-geosciences/merkaartor/merkaartor-9999.ebuild | 35 +++++++++++----------- |
17 |
2 files changed, 32 insertions(+), 32 deletions(-) |
18 |
|
19 |
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
20 |
index 7c990dab379..b998c164e0c 100644 |
21 |
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
22 |
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
23 |
@@ -1,11 +1,10 @@ |
24 |
# Copyright 1999-2019 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI=6 |
28 |
+EAPI=7 |
29 |
|
30 |
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" |
31 |
- |
32 |
-inherit gnome2-utils l10n qmake-utils xdg-utils flag-o-matic |
33 |
+inherit flag-o-matic l10n qmake-utils xdg-utils |
34 |
|
35 |
DESCRIPTION="Qt based map editor for the openstreetmap.org project" |
36 |
HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor" |
37 |
@@ -16,7 +15,11 @@ SLOT="0" |
38 |
KEYWORDS="~amd64 ~x86" |
39 |
IUSE="debug exif gps libproxy webengine" |
40 |
|
41 |
-RDEPEND=" |
42 |
+BDEPEND=" |
43 |
+ dev-qt/linguist-tools:5 |
44 |
+ virtual/pkgconfig |
45 |
+" |
46 |
+DEPEND=" |
47 |
dev-qt/qtconcurrent:5 |
48 |
dev-qt/qtcore:5 |
49 |
dev-qt/qtgui:5 |
50 |
@@ -33,10 +36,8 @@ RDEPEND=" |
51 |
libproxy? ( net-libs/libproxy ) |
52 |
webengine? ( dev-qt/qtwebengine:5[widgets] ) |
53 |
" |
54 |
-DEPEND="${RDEPEND} |
55 |
- dev-qt/linguist-tools:5 |
56 |
- virtual/pkgconfig |
57 |
-" |
58 |
+RDEPEND="${DEPEND}" |
59 |
+ |
60 |
PATCHES=( |
61 |
"${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826 |
62 |
"${FILESDIR}"/${P}-desktopfile.patch |
63 |
@@ -61,7 +62,7 @@ src_prepare() { |
64 |
fi |
65 |
|
66 |
# build system expects to be building from git |
67 |
- sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die |
68 |
+ sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die |
69 |
} |
70 |
|
71 |
src_configure() { |
72 |
@@ -69,11 +70,11 @@ src_configure() { |
73 |
|
74 |
# TRANSDIR_SYSTEM is for bug #385671 |
75 |
eqmake5 \ |
76 |
- PREFIX="${ED%/}/usr" \ |
77 |
- LIBDIR="${ED%/}/usr/$(get_libdir)" \ |
78 |
+ PREFIX="${ED}/usr" \ |
79 |
+ LIBDIR="${ED}/usr/$(get_libdir)" \ |
80 |
PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \ |
81 |
SHARE_DIR_PATH="/usr/share/${PN}" \ |
82 |
- TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \ |
83 |
+ TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \ |
84 |
TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \ |
85 |
SYSTEM_QTSA=1 \ |
86 |
RELEASE=1 \ |
87 |
@@ -88,10 +89,10 @@ src_configure() { |
88 |
|
89 |
pkg_postinst() { |
90 |
xdg_desktop_database_update |
91 |
- gnome2_icon_cache_update |
92 |
+ xdg_icon_cache_update |
93 |
} |
94 |
|
95 |
pkg_postrm() { |
96 |
xdg_desktop_database_update |
97 |
- gnome2_icon_cache_update |
98 |
+ xdg_icon_cache_update |
99 |
} |
100 |
|
101 |
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
102 |
index 4491ffa4a5c..7fb03801624 100644 |
103 |
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
104 |
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild |
105 |
@@ -1,15 +1,13 @@ |
106 |
-# Copyright 1999-2018 Gentoo Authors |
107 |
+# Copyright 1999-2019 Gentoo Authors |
108 |
# Distributed under the terms of the GNU General Public License v2 |
109 |
|
110 |
-EAPI=6 |
111 |
+EAPI=7 |
112 |
|
113 |
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" |
114 |
- |
115 |
-inherit git-r3 gnome2-utils l10n qmake-utils xdg-utils |
116 |
+inherit git-r3 l10n qmake-utils xdg-utils |
117 |
|
118 |
DESCRIPTION="Qt based map editor for the openstreetmap.org project" |
119 |
HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor" |
120 |
-SRC_URI="" |
121 |
EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git" |
122 |
|
123 |
LICENSE="GPL-2" |
124 |
@@ -17,7 +15,11 @@ SLOT="0" |
125 |
KEYWORDS="" |
126 |
IUSE="debug exif gps libproxy webengine" |
127 |
|
128 |
-RDEPEND=" |
129 |
+BDEPEND=" |
130 |
+ dev-qt/linguist-tools:5 |
131 |
+ virtual/pkgconfig |
132 |
+" |
133 |
+DEPEND=" |
134 |
dev-qt/qtconcurrent:5 |
135 |
dev-qt/qtcore:5 |
136 |
dev-qt/qtgui:5 |
137 |
@@ -32,14 +34,11 @@ RDEPEND=" |
138 |
exif? ( media-gfx/exiv2:= ) |
139 |
gps? ( >=sci-geosciences/gpsd-3.17-r2 ) |
140 |
libproxy? ( net-libs/libproxy ) |
141 |
- webengine? ( dev-qt/qtwebengine:5 ) |
142 |
-" |
143 |
-DEPEND="${RDEPEND} |
144 |
- dev-qt/linguist-tools:5 |
145 |
- virtual/pkgconfig |
146 |
+ webengine? ( dev-qt/qtwebengine:5[widgets] ) |
147 |
" |
148 |
+RDEPEND="${DEPEND}" |
149 |
|
150 |
-PATCHES=( "${FILESDIR}/${PN}-0.18.3-sharedir-pluginsdir.patch" ) # bug 621826 |
151 |
+PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826 |
152 |
|
153 |
DOCS=( AUTHORS CHANGELOG ) |
154 |
|
155 |
@@ -62,18 +61,18 @@ src_prepare() { |
156 |
|
157 |
# build system expects to be building from git |
158 |
if [[ ${PV} != *9999 ]] ; then |
159 |
- sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die |
160 |
+ sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die |
161 |
fi |
162 |
} |
163 |
|
164 |
src_configure() { |
165 |
# TRANSDIR_SYSTEM is for bug #385671 |
166 |
eqmake5 \ |
167 |
- PREFIX="${ED%/}/usr" \ |
168 |
- LIBDIR="${ED%/}/usr/$(get_libdir)" \ |
169 |
+ PREFIX="${ED}/usr" \ |
170 |
+ LIBDIR="${ED}/usr/$(get_libdir)" \ |
171 |
PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \ |
172 |
SHARE_DIR_PATH="/usr/share/${PN}" \ |
173 |
- TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \ |
174 |
+ TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \ |
175 |
TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \ |
176 |
SYSTEM_QTSA=1 \ |
177 |
NODEBUG=$(usex debug 0 1) \ |
178 |
@@ -86,10 +85,10 @@ src_configure() { |
179 |
|
180 |
pkg_postinst() { |
181 |
xdg_desktop_database_update |
182 |
- gnome2_icon_cache_update |
183 |
+ xdg_icon_cache_update |
184 |
} |
185 |
|
186 |
pkg_postrm() { |
187 |
xdg_desktop_database_update |
188 |
- gnome2_icon_cache_update |
189 |
+ xdg_icon_cache_update |
190 |
} |