summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-12-06 11:40:17 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-12-06 12:04:18 +0100
commit2c810d78a8d50093558a22dcfb5033a83ff38b20 (patch)
treea9f4b8a70bdac52ee645bc5fcfcfb20ca179df14 /app-office
parentdev-lang/perl: fix fix for #645804 during bootstrap (diff)
downloadgentoo-2c810d78a8d50093558a22dcfb5033a83ff38b20.tar.gz
gentoo-2c810d78a8d50093558a22dcfb5033a83ff38b20.tar.bz2
gentoo-2c810d78a8d50093558a22dcfb5033a83ff38b20.zip
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>
Diffstat (limited to 'app-office')
-rw-r--r--app-office/scribus/scribus-1.5.4-r1.ebuild (renamed from app-office/scribus/scribus-1.5.4.ebuild)5
-rw-r--r--app-office/scribus/scribus-9999.ebuild7
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
index 8fe01e20f220..be1d49e219d0 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 b2939a8c47f2..3dc73f4dbe94 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
}