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@gentoo.org>

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 8fe01e20f22036e705a1afb6014fb64c0da6e294..be1d49e219d0d9f346c3cf54eaf0ce94386cbc37 100644 (file)
--- 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 b2939a8c47f2c5ab5df1eeadf962e1f8c0719184..3dc73f4dbe94e323d267154fec33660d95dc13e4 100644 (file)
--- 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
 }