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 6506013832F for ; Sun, 7 Aug 2016 16:30:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8505221C102; Sun, 7 Aug 2016 16:30:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D78FF21C102 for ; Sun, 7 Aug 2016 16:30:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9F77340A9D for ; Sun, 7 Aug 2016 16:30:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68E5CE62 for ; Sun, 7 Aug 2016 16:30:52 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1470587445.557e32dbb088b2ecc890c077cc5a6a089fc2d29c.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/kexi/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/kexi/kexi-9999.ebuild app-office/kexi/metadata.xml X-VCS-Directories: app-office/kexi/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 557e32dbb088b2ecc890c077cc5a6a089fc2d29c X-VCS-Branch: master Date: Sun, 7 Aug 2016 16:30:52 +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-Archives-Salt: d2e5a1c3-40ad-4a10-84c2-f29e8f5227d8 X-Archives-Hash: d02c855ba1d51dd30768ddc0b76c25a2 commit: 557e32dbb088b2ecc890c077cc5a6a089fc2d29c Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Aug 6 15:21:32 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Aug 7 16:30:45 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=557e32db app-office/kexi: Add kcrash DEPEND, rename USE=webform->webkit Fix configure with USE=-webkit at the same time. Package-Manager: portage-2.2.28 app-office/kexi/kexi-9999.ebuild | 20 +++++++++++++++++--- app-office/kexi/metadata.xml | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app-office/kexi/kexi-9999.ebuild b/app-office/kexi/kexi-9999.ebuild index 854f698..effa296 100644 --- a/app-office/kexi/kexi-9999.ebuild +++ b/app-office/kexi/kexi-9999.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="Visual database applications creator" HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/" KEYWORDS="" -IUSE="activities marble mdb mysql postgres sqlite sybase webform xbase" +IUSE="activities marble mdb mysql postgres sqlite sybase webkit xbase" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -20,6 +20,7 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) $(add_frameworks_dep kguiaddons) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) @@ -47,7 +48,7 @@ COMMON_DEPEND=" dev-libs/libpqxx ) sybase? ( dev-db/freetds ) - webform? ( $(add_qt_dep qtwebkit) ) + webkit? ( $(add_qt_dep qtwebkit) ) xbase? ( dev-db/xbase ) " DEPEND="${COMMON_DEPEND} @@ -57,6 +58,20 @@ RDEPEND="${COMMON_DEPEND} !app-office/calligra:4[calligra_features_kexi] " +src_prepare() { + if ! use webkit; then + punt_bogus_dep Qt5 WebKit + punt_bogus_dep Qt5 WebKitWidgets + fi + + # otherwise requires breeze-icons w/ -DBINARY_ICONS_RESOURCE=ON + sed -i CMakeLists.txt \ + -e "/include(CheckIfQtGuiCanBeExecuted)/ s/^/#DONT/" \ + -e "/include(CheckGlobalBreezeIcons)/ s/^/#DONT/" || die + + kde5_src_prepare +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package activities KF5Activities) @@ -65,7 +80,6 @@ src_configure() { $(cmake-utils_use_find_package mysql MySQL) $(cmake-utils_use_find_package postgres KexiPostgreSQL) $(cmake-utils_use_find_package sybase FreeTDS) - $(cmake-utils_use_find_package webform Qt5WebKitWidgets) $(cmake-utils_use_find_package xbase XBase) ) diff --git a/app-office/kexi/metadata.xml b/app-office/kexi/metadata.xml index 621a30d..05577d3 100644 --- a/app-office/kexi/metadata.xml +++ b/app-office/kexi/metadata.xml @@ -9,7 +9,7 @@ Enable kactivities support Enable displaying of maps using kde-apps/marble Enable support for Microsoft Access database - Enable web form designer widget using dev-qt/qtwebkit + Enable web form designer widget using dev-qt/qtwebkit Enable support for xbase compatible database formats