[gentoo-commits] proj/kde:master commit in: kde-apps/marble/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     175afb357bd189429002ffdb39ea1d971979250b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 19:03:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 15:17:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=175afb35

kde-apps/marble: Fix DEPENDs, src_configure() with USE !kde

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/marble/marble-19.08.49.9999.ebuild | 16 +++++++++++-----
 kde-apps/marble/marble-9999.ebuild          | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/kde-apps/marble/marble-19.08.49.9999.ebuild b/kde-apps/marble/marble-19.08.49.9999.ebuild
index c66895e677..4db7aa7256 100644
--- a/kde-apps/marble/marble-19.08.49.9999.ebuild
+++ b/kde-apps/marble/marble-19.08.49.9999.ebuild
@@ -30,6 +30,7 @@ DEPEND="
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	sys-libs/zlib
 	aprs? ( $(add_qt_dep qtserialport) )
 	dbus? ( $(add_qt_dep qtdbus) )
 	designer? ( $(add_qt_dep designer) )
@@ -58,13 +59,14 @@ RDEPEND="${DEPEND}"
 RESTRICT+=" test"
 
 src_prepare() {
+	kde5_src_prepare
+
+	rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
+
 	if use kde; then
 		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
-			-i src/apps/CMakeLists.txt \
-			|| die "Failed to disable marble-qt"
+			-i src/apps/CMakeLists.txt || die "Failed to disable marble-qt"
 	fi
-
-	kde5_src_prepare
 }
 
 src_configure() {
@@ -83,5 +85,9 @@ src_configure() {
 		# bug 608890
 		-DKDE_INSTALL_CONFDIR="/etc/xdg"
 	)
-	kde5_src_configure
+	if use kde; then
+		kde5_src_configure
+	else
+		cmake-utils_src_configure
+	fi
 }

diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild
index c66895e677..4db7aa7256 100644
--- a/kde-apps/marble/marble-9999.ebuild
+++ b/kde-apps/marble/marble-9999.ebuild
@@ -30,6 +30,7 @@ DEPEND="
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	sys-libs/zlib
 	aprs? ( $(add_qt_dep qtserialport) )
 	dbus? ( $(add_qt_dep qtdbus) )
 	designer? ( $(add_qt_dep designer) )
@@ -58,13 +59,14 @@ RDEPEND="${DEPEND}"
 RESTRICT+=" test"
 
 src_prepare() {
+	kde5_src_prepare
+
+	rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
+
 	if use kde; then
 		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
-			-i src/apps/CMakeLists.txt \
-			|| die "Failed to disable marble-qt"
+			-i src/apps/CMakeLists.txt || die "Failed to disable marble-qt"
 	fi
-
-	kde5_src_prepare
 }
 
 src_configure() {
@@ -83,5 +85,9 @@ src_configure() {
 		# bug 608890
 		-DKDE_INSTALL_CONFDIR="/etc/xdg"
 	)
-	kde5_src_configure
+	if use kde; then
+		kde5_src_configure
+	else
+		cmake-utils_src_configure
+	fi
 }