| 1 |
commit: 175afb357bd189429002ffdb39ea1d971979250b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 17 19:03:27 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 18 15:17:27 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=175afb35 |
| 7 |
|
| 8 |
kde-apps/marble: Fix DEPENDs, src_configure() with USE !kde |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
kde-apps/marble/marble-19.08.49.9999.ebuild | 16 +++++++++++----- |
| 14 |
kde-apps/marble/marble-9999.ebuild | 16 +++++++++++----- |
| 15 |
2 files changed, 22 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/marble/marble-19.08.49.9999.ebuild b/kde-apps/marble/marble-19.08.49.9999.ebuild |
| 18 |
index c66895e677..4db7aa7256 100644 |
| 19 |
--- a/kde-apps/marble/marble-19.08.49.9999.ebuild |
| 20 |
+++ b/kde-apps/marble/marble-19.08.49.9999.ebuild |
| 21 |
@@ -30,6 +30,7 @@ DEPEND=" |
| 22 |
$(add_qt_dep qtsvg) |
| 23 |
$(add_qt_dep qtwidgets) |
| 24 |
$(add_qt_dep qtxml) |
| 25 |
+ sys-libs/zlib |
| 26 |
aprs? ( $(add_qt_dep qtserialport) ) |
| 27 |
dbus? ( $(add_qt_dep qtdbus) ) |
| 28 |
designer? ( $(add_qt_dep designer) ) |
| 29 |
@@ -58,13 +59,14 @@ RDEPEND="${DEPEND}" |
| 30 |
RESTRICT+=" test" |
| 31 |
|
| 32 |
src_prepare() { |
| 33 |
+ kde5_src_prepare |
| 34 |
+ |
| 35 |
+ rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" |
| 36 |
+ |
| 37 |
if use kde; then |
| 38 |
sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ |
| 39 |
- -i src/apps/CMakeLists.txt \ |
| 40 |
- || die "Failed to disable marble-qt" |
| 41 |
+ -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" |
| 42 |
fi |
| 43 |
- |
| 44 |
- kde5_src_prepare |
| 45 |
} |
| 46 |
|
| 47 |
src_configure() { |
| 48 |
@@ -83,5 +85,9 @@ src_configure() { |
| 49 |
# bug 608890 |
| 50 |
-DKDE_INSTALL_CONFDIR="/etc/xdg" |
| 51 |
) |
| 52 |
- kde5_src_configure |
| 53 |
+ if use kde; then |
| 54 |
+ kde5_src_configure |
| 55 |
+ else |
| 56 |
+ cmake-utils_src_configure |
| 57 |
+ fi |
| 58 |
} |
| 59 |
|
| 60 |
diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild |
| 61 |
index c66895e677..4db7aa7256 100644 |
| 62 |
--- a/kde-apps/marble/marble-9999.ebuild |
| 63 |
+++ b/kde-apps/marble/marble-9999.ebuild |
| 64 |
@@ -30,6 +30,7 @@ DEPEND=" |
| 65 |
$(add_qt_dep qtsvg) |
| 66 |
$(add_qt_dep qtwidgets) |
| 67 |
$(add_qt_dep qtxml) |
| 68 |
+ sys-libs/zlib |
| 69 |
aprs? ( $(add_qt_dep qtserialport) ) |
| 70 |
dbus? ( $(add_qt_dep qtdbus) ) |
| 71 |
designer? ( $(add_qt_dep designer) ) |
| 72 |
@@ -58,13 +59,14 @@ RDEPEND="${DEPEND}" |
| 73 |
RESTRICT+=" test" |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
+ kde5_src_prepare |
| 77 |
+ |
| 78 |
+ rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" |
| 79 |
+ |
| 80 |
if use kde; then |
| 81 |
sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ |
| 82 |
- -i src/apps/CMakeLists.txt \ |
| 83 |
- || die "Failed to disable marble-qt" |
| 84 |
+ -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" |
| 85 |
fi |
| 86 |
- |
| 87 |
- kde5_src_prepare |
| 88 |
} |
| 89 |
|
| 90 |
src_configure() { |
| 91 |
@@ -83,5 +85,9 @@ src_configure() { |
| 92 |
# bug 608890 |
| 93 |
-DKDE_INSTALL_CONFDIR="/etc/xdg" |
| 94 |
) |
| 95 |
- kde5_src_configure |
| 96 |
+ if use kde; then |
| 97 |
+ kde5_src_configure |
| 98 |
+ else |
| 99 |
+ cmake-utils_src_configure |
| 100 |
+ fi |
| 101 |
} |
Archives