gentoo resync : 21.05.2019

6 files changed, 2 insertions, 144 deletions

diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest
index 67661f6a328e..a4208b55c6cd 100644
--- a/dev-db/kdb/Manifest
+++ b/dev-db/kdb/Manifest
@@ -1,8 +1,3 @@
-AUX kdb-3.1.0-crashfix.patch 1137 BLAKE2B e7ea0a921390ee4e6011f7db579de8acc9a8dc79ed71fef1bc6a7959cff81250f4874a4efbafedaddff719e0a17701a45c02951847a42be02b812431424abba2 SHA512 396e6470071b75d79b0868eb58b7d7add83d514e242277b8e32636301cf2326035bf754641c5da593f02641ec8c762e96d66da97fa06c2eac4ce26c267483ed6
-AUX kdb-3.1.0-fix-loading-objdata.patch 1157 BLAKE2B 49e71094b66790a1a7a40ca7c75190ca2c2cc5d6403737c6cfaf89af55e8fb363a80f8ee6ca19b01f2b3c8706caed0dcda5a52dc64c4d9b7c9ea02400a642d86 SHA512 423f817358b1ed7f74dc9dd565b51a3089212d974f3dee7efad4ad2393640f8c23d30ba6d8c1213669beb6e5182978935fe7548a5a7a21e99c8b7b6fbfce9f6f
-AUX kdb-3.1.0-postgresql-11.patch 1087 BLAKE2B 0799a1ac60b2aae5129e6a442f41608a0f4dc76f24315a2add9bcc395a7a4bc1eef4536a345a741bf248f77e7d10a92e3f3108c2e7a180eec7ee2b4c2286d454 SHA512 9986884f2375f3a6bf18855b7a05620a4cbb0e280148ead9ffb390e71270d4b0bbafeb407495ed78216c225ee0760f233d3fb1ceeb39c35ea3f9455f14cdec76
-DIST kdb-3.1.0.tar.xz 543780 BLAKE2B d874765758e245fc939bf88312b064d2dcff3460b2c9e968277e0ce7b8821314273cb3086e821645f9d7605de1a4268e25d11c40f8bf847a8dc98c410bd4d9eb SHA512 f94f1ff87cb5133570f7e9b0ab48202a516eabe1c3f2ed750cd1794800d9b9936bbd62e1479ca6877c293f6473b7f4e2d4a144b928b5bc0f228af327131b43c2
 DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7
-EBUILD kdb-3.1.0-r2.ebuild 1220 BLAKE2B 310d1af5bad0c14b4fe0f0aa1429df87ebcd9410463c19cfc5e93a300bb6400d55bbfa445149772de61401a5be797ef2e643c04e50b1321952c51bd84395085c SHA512 9704432dd43ecd8b2881df1880dc1f7686dbc4b1e833795412b651cbe85b74a2d9689d8ff8b08a516574e4bdff4c5a7027551909d028d4a7a61a337e1d753fa2
-EBUILD kdb-3.2.0.ebuild 1133 BLAKE2B 12991b46ec18638ebf14605cdfbec102ca0358b06a8d9b0ba63e56bae5594d6fcba44ca9b4cf7d0bc44dc39e17b4f15468d75110778910a728a346ec36b0ad62 SHA512 a997a803850b895712ef7ef6240af0099696b9adc7bfc174d491e2a62ab538c84e5d8a0138eb609ba0bc09b25c0b2df33f7cf68283ac1b818dc9ee9989b257c3
+EBUILD kdb-3.2.0.ebuild 1131 BLAKE2B f6953a932cf9f23afb435e47fff7c4e5887cee5762d3afcee1a855cf82c6116b3e3a0a0c89511cb31a38a2d8687cf874dce6a9bb5e9d29638912b4795fd38216 SHA512 583f35410f0c6ee3c844c776b66838c1670a79e5c8f07925e33d7de83d03b0ff519acd88920606b1b05e00c7cad9036998ee72f86400801a8f5d39dc9cba513e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-db/kdb/files/kdb-3.1.0-crashfix.patch b/dev-db/kdb/files/kdb-3.1.0-crashfix.patch
deleted file mode 100644
index dcc114d49915..000000000000
--- a/dev-db/kdb/files/kdb-3.1.0-crashfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 386375b6dd9841fdb24a56dcd637be38fcb4c175 Mon Sep 17 00:00:00 2001
-From: Jaroslaw Staniek <staniek@kde.org>
-Date: Tue, 27 Mar 2018 00:20:34 +0200
-Subject: Fix crash in KDbConnection::recordCount(KDbTableSchema)
-
-FIXED-IN:3.1.1
----
- src/KDbConnection.cpp | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/KDbConnection.cpp b/src/KDbConnection.cpp
-index e53bb33..d416d12 100644
---- a/src/KDbConnection.cpp
-+++ b/src/KDbConnection.cpp
-@@ -3420,10 +3420,8 @@ int KDbConnection::recordCount(const KDbTableSchema& tableSchema)
- {
-     //! @todo does not work with non-SQL data sources
-     int count = -1; // will be changed only on success of querySingleNumber()
--    const tristate result
--        = querySingleNumber(KDbEscapedString("SELECT COUNT(*) FROM ")
--                                + tableSchema.connection()->escapeIdentifier(tableSchema.name()),
--                            &count);
-+    const tristate result = querySingleNumber(
-+        KDbEscapedString("SELECT COUNT(*) FROM ") + escapeIdentifier(tableSchema.name()), &count);
-     if (~result) {
-         count = 0;
-     }
--- 
-cgit v0.11.2
diff --git a/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch b/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch
deleted file mode 100644
index 7bf0100d418a..000000000000
--- a/dev-db/kdb/files/kdb-3.1.0-fix-loading-objdata.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a00f37b024e1a0888de3266af9acff99e6f21aa2 Mon Sep 17 00:00:00 2001
-From: Jaroslaw Staniek <staniek@kde.org>
-Date: Tue, 1 May 2018 23:29:06 +0200
-Subject: Fix loading object data for given type and ID
-
-FIXED-IN:3.1.1
-
-CCBUG:393705
----
- src/KDbConnection.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/KDbConnection.cpp b/src/KDbConnection.cpp
-index d416d12..690752d 100644
---- a/src/KDbConnection.cpp
-+++ b/src/KDbConnection.cpp
-@@ -2188,7 +2188,7 @@ tristate KDbConnection::loadObjectData(int type, int id, KDbObject* object)
-         }
-     } else {
-         if (true != querySingleRecord(KDbEscapedString("SELECT o_id, o_type, o_name, o_caption, o_desc "
--                                                       "FROM kexi__objects WHERE o_type=%1 AND o_id=%1")
-+                                                       "FROM kexi__objects WHERE o_type=%1 AND o_id=%2")
-                                           .arg(d->driver->valueToSql(KDbField::Integer, type))
-                                           .arg(d->driver->valueToSql(KDbField::Integer, id)),
-                                       &data))
--- 
-cgit v0.11.2
diff --git a/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch b/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch
deleted file mode 100644
index 050335a38528..000000000000
--- a/dev-db/kdb/files/kdb-3.1.0-postgresql-11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 675d51d86b377992aacdb8253cb7c3b8a80474c0 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Tue, 22 May 2018 18:37:53 +0200
-Subject: cmake: find PostgreSQL 11
-
----
- cmake/modules/FindPostgreSQL.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
-index 039c380..56e6e56 100644
---- a/cmake/modules/FindPostgreSQL.cmake
-+++ b/cmake/modules/FindPostgreSQL.cmake
-@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
- set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
- 
- set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
--    "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
-+    "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
- 
- # Define additional search paths for root directories.
- foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
--- 
-cgit v0.11.2
diff --git a/dev-db/kdb/kdb-3.1.0-r2.ebuild b/dev-db/kdb/kdb-3.1.0-r2.ebuild
deleted file mode 100644
index 0ce2b2aa7e9e..000000000000
--- a/dev-db/kdb/kdb-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit kde5 python-any-r1
-
-DESCRIPTION="Database connectivity and creation framework for various vendors"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="5/4"
-KEYWORDS="amd64 x86"
-IUSE="debug mysql postgres sqlite"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/icu:=
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? (
-		$(add_qt_dep qtnetwork)
-		dev-db/postgresql:*
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-crashfix.patch"
-	"${FILESDIR}/${P}-fix-loading-objdata.patch"
-	"${FILESDIR}/${P}-postgresql-11.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDB_DEBUG_GUI=$(usex debug)
-		$(cmake-utils_use_find_package mysql MySQL)
-		$(cmake-utils_use_find_package postgres PostgreSQL)
-		$(cmake-utils_use_find_package sqlite Sqlite)
-	)
-
-	kde5_src_configure
-}
diff --git a/dev-db/kdb/kdb-3.2.0.ebuild b/dev-db/kdb/kdb-3.2.0.ebuild
index a69d6f79b1d2..cc81d3aad20c 100644
--- a/dev-db/kdb/kdb-3.2.0.ebuild
+++ b/dev-db/kdb/kdb-3.2.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Database connectivity and creation framework for various vendors"
 
 LICENSE="LGPL-2+"
 SLOT="5/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug mysql postgres sqlite"
 
 BDEPEND="${PYTHON_DEPS}