gentoo resync : 15.01.2020

3 files changed, 60 insertions, 3 deletions

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 2684e1d2dae2..c98cf69b2300 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -4,8 +4,10 @@ AUX qtsql-5.13.1-postgresql-12.patch 4639 BLAKE2B 85edeacc1c2021bf5e6abe9f76d40c
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
+DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055010f45621606692e7c071039cedfa20a667fdbffc74e2ba7b412b93eebc7bc748a418750045810215335972190fc5ad69947d5494c SHA512 27e640643aa2a15fece96b1a83f8f6fbfbc8a83e224f6dea4d7e6a94c8069a2b18a55ddc76943b10b40ccc95168a48dcfdf46264fdfc24b3594d1c6ea160aff6
 EBUILD qtsql-5.12.3.ebuild 1236 BLAKE2B bf435b5ee02a16ce45e16515b6d58381b2c8c176d728fee76b2f2b1514cdcc1d3531ca40b2012eb5f63ea75ae5175c98963def46dd79c19e3ba366e57aa1eaf6 SHA512 78ba45e7368ac8fc271a4f9c2945005b62d49cb6d6cf9160126c728a30edd614c8b124ee7f528ead26bbfc4c3c2811b2b3e6c3552ed09b27c1440eb40ea6a79c
 EBUILD qtsql-5.12.5-r1.ebuild 1368 BLAKE2B 705a02222d2d83f26ca79c1144a5747dd3951293be3359055da5504ca192ddde932e18f5acd307c540b042917f4e29f6ee38c3960c52519bb571cf410738dd4f SHA512 c2911876f15f68df2197d818d568538c47e7955f52230cb09cfbd4da2d652a1d5e7d473e9d3c99fa215e0da55f6c6047b6d50f4ab4d27d1d8ba616b2d6c65640
 EBUILD qtsql-5.12.5-r2.ebuild 1453 BLAKE2B accd2850f411f6b56ed07654905df782a908b9751cae761a2eab1c43f868d8f39fc308f2f0e0e472b0458488dd7e6bae2c42d31817fb2e48a6a3d3b493961b00 SHA512 af04e9bbd80ecbd9f2c65b237549a72684fc6167c3780b20683d30218771482906e35ab1c0525b9ea30c963f427fcb22197abd5c6b2df6eed5641aad02db86a8
-EBUILD qtsql-5.13.2.ebuild 1346 BLAKE2B d328d52552bab0f6dc3c29bac1f2239486385d3417ca99ceee23d02f0da337d81a47366f67ffcd0c898ce404860fe993c780a0f742352176b9414381ab833f7f SHA512 e0787aabc57932e5a8328a37f4796335388b3e0727c7f68715e006a8a5cdcc65f16293e0d2999a74e929f6f911e311a824b23de254f85ae372edbaad19a45922
+EBUILD qtsql-5.13.2.ebuild 1342 BLAKE2B 7d734a59c6b7027a105b6b38ddd8cd6ca81d70a14e4607d1cf8522137956eeb335c75281494601f878c35af8391debbc4cc6673e8649dcaf61f8a38439582bb5 SHA512 7987b7d96490f33c6340fa0ecc9eaedf992d119f8087043af1bf82e4447472de86596645a4211a00a9f058e1b27c1f372484f4ce18b742d09251db93e38ea5fa
+EBUILD qtsql-5.14.0.ebuild 1242 BLAKE2B 43bbcdce1ac4e4901e241a88c46735ae398e62070a9e4f8569e54e87f681bbe40317c80d3441d64cf22dfad537d6a6b8803f04f5e6be34ef5511565b23e89cf1 SHA512 ca9c5a6bc54d8b0b1c266fde07c99a222a0549576dd9dfa2098cf258801667157482e43a3747283666d36a7db8bb0249631f4694b97d9838d27e1b4249ba1e60
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.13.2.ebuild b/dev-qt/qtsql/qtsql-5.13.2.ebuild
index 256a4b3099e8..11dd296ac672 100644
--- a/dev-qt/qtsql/qtsql-5.13.2.ebuild
+++ b/dev-qt/qtsql/qtsql-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsql/qtsql-5.14.0.ebuild b/dev-qt/qtsql/qtsql-5.14.0.ebuild
new file mode 100644
index 000000000000..5378ef3907f8
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.14.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	freetds? ( dev-db/freetds )
+	mysql? ( dev-db/mysql-connector-c:= )
+	oci8? ( dev-db/oracle-instantclient:=[sdk] )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(usex sqlite -system-sqlite '')
+	)
+
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+
+	qt5-build_src_configure
+}