[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/

[Andreas Sturmlechner]

commit:     2c810d78a8d50093558a22dcfb5033a83ff38b20
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 10:40:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 11:04:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c810d78

app-office/scribus: Drop unused DEPEND after disabling bogus dir

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

 .../scribus/{scribus-1.5.4.ebuild => scribus-1.5.4-r1.ebuild}      | 5 ++++-
 app-office/scribus/scribus-9999.ebuild                             | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.4.ebuild 
b/app-office/scribus/scribus-1.5.4-r1.ebuild
similarity index 98%
rename from app-office/scribus/scribus-1.5.4.ebuild
rename to app-office/scribus/scribus-1.5.4-r1.ebuild
index 8fe01e20f22..be1d49e219d 100644
--- a/app-office/scribus/scribus-1.5.4.ebuild
+++ b/app-office/scribus/scribus-1.5.4-r1.ebuild
@@ -60,7 +60,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
        dev-qt/qtnetwork:5
        dev-qt/qtopengl:5
        dev-qt/qtprintsupport:5
-       dev-qt/qtquickcontrols:5
        dev-qt/qtwidgets:5
        dev-qt/qtxml:5
        media-libs/fontconfig
@@ -124,6 +123,10 @@ src_prepare() {
                scribus/plugins/import/pdf/slaoutput.{cpp,h} \
                scribus/plugins/import/pdf/importpdf.{cpp,h}
 
+       sed \
+               -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+               -i scribus/CMakeLists.txt || die # nothing but a bogus Hello 
World test
+
        cmake-utils_src_prepare
 }
 

diff --git a/app-office/scribus/scribus-9999.ebuild 
b/app-office/scribus/scribus-9999.ebuild
index b2939a8c47f..3dc73f4dbe9 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,7 +61,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
        dev-qt/qtnetwork:5
        dev-qt/qtopengl:5
        dev-qt/qtprintsupport:5
-       dev-qt/qtquickcontrols:5
        dev-qt/qtwidgets:5
        dev-qt/qtxml:5
        media-libs/fontconfig
@@ -119,6 +118,10 @@ src_prepare() {
                -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
                -i resources/templates/CMakeLists.txt || die
 
+       sed \
+               -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+               -i scribus/CMakeLists.txt || die # nothing but a bogus Hello 
World test
+
        cmake-utils_src_prepare
 }