1 |
commit: 5f747b7770f7a4034cabb7f469e1f5af4a0ac9f1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 16 16:32:20 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 16 16:44:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=5f747b77 |
7 |
|
8 |
kde-apps/marble: Drop IUSE="gps,python" |
9 |
|
10 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
kde-apps/marble/marble-4.14.3.ebuild | 35 +++++++++-------------------------- |
14 |
kde-apps/marble/metadata.xml | 1 - |
15 |
2 files changed, 9 insertions(+), 27 deletions(-) |
16 |
|
17 |
diff --git a/kde-apps/marble/marble-4.14.3.ebuild b/kde-apps/marble/marble-4.14.3.ebuild |
18 |
index 4004926a..78c86a33 100644 |
19 |
--- a/kde-apps/marble/marble-4.14.3.ebuild |
20 |
+++ b/kde-apps/marble/marble-4.14.3.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2015 Gentoo Foundation |
23 |
+# Copyright 1999-2020 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=5 |
27 |
@@ -6,15 +6,12 @@ EAPI=5 |
28 |
KDE_HANDBOOK="optional" |
29 |
KDE_REQUIRED="optional" |
30 |
CPPUNIT_REQUIRED="optional" |
31 |
-PYTHON_COMPAT=( python2_7 ) |
32 |
-inherit kde4-base python-single-r1 |
33 |
+inherit kde4-base |
34 |
|
35 |
DESCRIPTION="Generic geographical map widget" |
36 |
HOMEPAGE="https://marble.kde.org/" |
37 |
KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" |
38 |
-IUSE="debug designer-plugin gps +kde phonon plasma python shapefile test zip" |
39 |
- |
40 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
41 |
+IUSE="debug designer-plugin +kde phonon plasma shapefile test zip" |
42 |
|
43 |
# tests fail / segfault. Last checked for 4.9.0 |
44 |
RESTRICT="test" |
45 |
@@ -29,14 +26,8 @@ RDEPEND=" |
46 |
dev-qt/qtsvg:4 |
47 |
dev-qt/qtwebkit:4 |
48 |
designer-plugin? ( dev-qt/designer:4 ) |
49 |
- gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) |
50 |
kde? ( media-libs/phonon[qt4] ) |
51 |
phonon? ( media-libs/phonon[qt4] ) |
52 |
- python? ( |
53 |
- ${PYTHON_DEPS} |
54 |
- >=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}] |
55 |
- kde? ( $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}" ) ) |
56 |
- ) |
57 |
shapefile? ( sci-libs/shapelib ) |
58 |
zip? ( dev-libs/quazip ) |
59 |
" |
60 |
@@ -47,24 +38,11 @@ DEPEND=" |
61 |
# the qt dependencies are needed because with USE=-kde nothing is pulled in |
62 |
# by default... bugs 414165 & 429346 |
63 |
|
64 |
-REQUIRED_USE=" |
65 |
- plasma? ( kde ) |
66 |
- python? ( kde ) |
67 |
-" |
68 |
- |
69 |
-pkg_setup() { |
70 |
- kde4-base_pkg_setup |
71 |
- use python && python-single-r1_pkg_setup |
72 |
-} |
73 |
+REQUIRED_USE="plasma? ( kde )" |
74 |
|
75 |
src_configure() { |
76 |
local mycmakeargs=( |
77 |
$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN) |
78 |
- $(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS) |
79 |
- $(cmake-utils_use_with python PythonLibrary) |
80 |
- $(cmake-utils_use_with python PyQt4) |
81 |
- $(cmake-utils_use_with python SIP) |
82 |
- $(cmake-utils_use_with gps libgps) |
83 |
$(cmake-utils_use !kde QTONLY) |
84 |
$(cmake-utils_use_with phonon) |
85 |
$(cmake-utils_use_with plasma) |
86 |
@@ -72,7 +50,12 @@ src_configure() { |
87 |
$(cmake-utils_use_with zip quazip) |
88 |
-DBUILD_MARBLE_TESTS=OFF |
89 |
-DWITH_liblocation=0 |
90 |
+ -DEXPERIMENTAL_PYTHON_BINDINGS=OFF |
91 |
+ -DWITH_PythonLibrary=OFF |
92 |
+ -DWITH_PyQt4=OFF |
93 |
+ -DWITH_SIP=OFF |
94 |
-DWITH_QextSerialPort=OFF |
95 |
+ -DWITH_libgps=OFF |
96 |
) |
97 |
|
98 |
kde4-base_src_configure |
99 |
|
100 |
diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml |
101 |
index 6c3f6abc..81793aba 100644 |
102 |
--- a/kde-apps/marble/metadata.xml |
103 |
+++ b/kde-apps/marble/metadata.xml |
104 |
@@ -3,7 +3,6 @@ |
105 |
<pkgmetadata> |
106 |
<!-- maintainer-needed --> |
107 |
<use> |
108 |
- <flag name="aprs">Enable support for APRS data sources</flag> |
109 |
<flag name="designer-plugin">Enable designer plugin</flag> |
110 |
<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag> |
111 |
<flag name="shapefile">Enable support for ESRI shapefiles</flag> |