gentoo resync : 23.03.2018

4 files changed, 117 insertions, 1 deletions

diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 5dcd6a779445..d309adc6b160 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,3 +1,6 @@
+AUX kexi-3.1.0-qt-5.11.patch 724 BLAKE2B 8571c381220f163685017a5f6ed74cae80042e23836227e510160ffc1190e2172deb7c8280c3fadbec9b85d6f7469747e185e89414a5e2e508a4c6888442b17c SHA512 11817808ff2b0c86b52511c1f03941470beeebb61f63a6f1b5b29546de17371f9f3d771a49b2664e8c9fe07b5ffee65995d22ff19cc1aadf50af484cb2d43e17
 DIST kexi-3.0.2.tar.xz 3676556 BLAKE2B 2d1d08904c4459362d7e0d2f79bd9ae0dce2bf11c18e6a9c3a68276bbd8c2fa67075c5d0739f7ecbb853802791df8676b76b0900eda396b62d0e09cb7f3a2107 SHA512 ef1da2e4a7b9d1f80200feb111f5dcedf8e3422e797bba4ac45744cb4b2f948cf3190aa0d126d0a3bb2bfb88f8fa112919e3dbb191bfcedd03e8e4512d1cf74e
+DIST kexi-3.1.0.tar.xz 3028492 BLAKE2B 8af7105ba570af225e7e2cbea2ab15d0c6e4997414c321654691af1329930754bea8a52c3ce5abb246c6a47e17473c462b9212eab8ef30fc23e4691f2ab8c9b2 SHA512 538b8b2c021bababb59a05cd477aa4414df76f84a9ae88244afe6f3dc29751257bfee2586279ee8ee7800d939702c3a81f71562039a6f97132f2cba4e9018118
 EBUILD kexi-3.0.2.ebuild 2076 BLAKE2B cd375cffc042e1b3a2f12896b9a5b4ce3a53363ad05264e7b7fb8be7ab28b2ff38e617da4e97807f11519da7687f8dd66f1b564982b994122eea4e2cc627abdd SHA512 d24fcd511261340f6efc35c5a6179d102f905e9f61df808d80cc77e79e09fc0234c47d6b0c624b3ae349d173ff96a5885b87446fe2cf20b83a63bff2ebccfa15
-MISC metadata.xml 517 BLAKE2B 4444f9c6b70e97920fe59cbfdddae38c5a72be5e730c43ecf16ccc036b4d42d59a779366e020ce9751a38778d417dfd079517515b88cac1c6d79c6689d40741c SHA512 c7ac5eac011066fd4fed1d58c2669d844c56b5016dc6d387ac8a0b2e2eff13b1f7ddcdf92438393ead8d574a7412bf7dbd3ca62db48a18b44ba0162f83cc3d9d
+EBUILD kexi-3.1.0.ebuild 2387 BLAKE2B 718a49a42c1895f747d89a30d76f0a95dfeacaab981cd51b30cda70c7703c0bdbeb55c15a00d4ba19134def2f791365ea61b35432a2aaa1160f376f1d583424b SHA512 f1bfcc7abce347c1d855ce79740af600911a398ecd8fa5a7e7e62b84fa34213c7a5dfdd3e417fde7f3fb0897440e9d85b7d1846541143e9212159ccbb712af69
+MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f
diff --git a/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch b/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch
new file mode 100644
index 000000000000..a879b2a46045
--- /dev/null
+++ b/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch
@@ -0,0 +1,24 @@
+From c7b9215e7ae30a052fa11aa4199e7adea517c7e2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 20 Mar 2018 00:06:46 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
+
+---
+ src/main/startup/KexiNewProjectAssistant.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp
+index 59e819acc..6568f1b5c 100644
+--- a/src/main/startup/KexiNewProjectAssistant.cpp
++++ b/src/main/startup/KexiNewProjectAssistant.cpp
+@@ -48,6 +48,7 @@
+ #include <KIconLoader>
+ #include <KStandardGuiItem>
+ 
++#include <QAction>
+ #include <QDebug>
+ #include <QLayout>
+ #include <QCheckBox>
+-- 
+2.16.2
+
diff --git a/app-office/kexi/kexi-3.1.0.ebuild b/app-office/kexi/kexi-3.1.0.ebuild
new file mode 100644
index 000000000000..8ceeaf7b7c77
--- /dev/null
+++ b/app-office/kexi/kexi-3.1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# KDE_HANDBOOK="true"
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.8.0"
+inherit kde5
+
+DESCRIPTION="Visual database applications creator"
+HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="debug experimental marble mdb mysql postgres sqlite webkit"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep breeze-icons-rcc)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(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)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
+	>=dev-libs/kproperty-3.1.0:5=
+	>=dev-libs/kreport-3.1.0:5=[scripting]
+	marble? ( $(add_kdeapps_dep marble) )
+	mdb? (
+		dev-libs/glib:2
+		virtual/libiconv
+	)
+	mysql? ( virtual/libmysqlclient )
+	postgres? (
+		dev-db/postgresql:*
+		dev-libs/libpqxx
+	)
+	webkit? ( $(add_qt_dep qtwebkit) )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_kexi]
+	!app-office/calligra-l10n:4[calligra_features_kexi(+)]
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch )
+
+src_prepare() {
+	if ! use webkit; then
+		punt_bogus_dep Qt5 WebKit
+		punt_bogus_dep Qt5 WebKitWidgets
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
+		-DKEXI_SCRIPTING_DEBUG=$(usex debug)
+		-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
+		-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
+		$(cmake-utils_use_find_package marble KexiMarble)
+		$(cmake-utils_use_find_package mdb GLIB2)
+		$(cmake-utils_use_find_package mysql MySQL)
+		$(cmake-utils_use_find_package postgres PostgreSQL)
+	)
+	kde5_src_configure
+}
diff --git a/app-office/kexi/metadata.xml b/app-office/kexi/metadata.xml
index a7106e621be4..6b5e3bba39b1 100644
--- a/app-office/kexi/metadata.xml
+++ b/app-office/kexi/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="experimental">Enable features deemed experimental by upstream</flag>
 		<flag name="marble">Enable displaying of maps using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="mdb">Enable support for Microsoft Access database</flag>
 		<flag name="webkit">Enable web form designer widget using <pkg>dev-qt/qtwebkit</pkg></flag>