From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 96BA9138334 for ; Thu, 6 Dec 2018 11:04:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8210CE0872; Thu, 6 Dec 2018 11:04:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5AF69E0872 for ; Thu, 6 Dec 2018 11:04:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2A27335CCD for ; Thu, 6 Dec 2018 11:04:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BED424CE for ; Thu, 6 Dec 2018 11:04:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1544094258.2c810d78a8d50093558a22dcfb5033a83ff38b20.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/scribus-1.5.4-r1.ebuild app-office/scribus/scribus-1.5.4.ebuild app-office/scribus/scribus-9999.ebuild X-VCS-Directories: app-office/scribus/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2c810d78a8d50093558a22dcfb5033a83ff38b20 X-VCS-Branch: master Date: Thu, 6 Dec 2018 11:04:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 34ee7d89-a22d-4af1-9949-692911943f20 X-Archives-Hash: 7f6d055c3bf26246f95cb170d0c7bbfb commit: 2c810d78a8d50093558a22dcfb5033a83ff38b20 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 6 10:40:17 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 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 }