gentoo resync : 30.05.2020

3 files changed, 59 insertions, 2 deletions

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 3e915cdb4b8e..a522a2e75ad3 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
+DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 EBUILD qtsql-5.14.1.ebuild 1237 BLAKE2B 971a72b1d782c93c70b076a7738e6dc2736bc958d6626a4ff23f66e503b7ab6ed4b853cf508f21cb81181b2dd6bc095576a3620c7225a1bc827f16f6db30b43e SHA512 377ead8cc7956b0ab0630d21f776b218078072e490adac114fbf9c496441803d671634c9277d3dec119dd0546211f08138b79d98ee87c8d52ba0359f10d922c7
-EBUILD qtsql-5.14.2.ebuild 1243 BLAKE2B dc620facd67f743b7b76d8487176a8c53c4ec1cb9549c0de02304c61d64eb45ad358d9bb538e9a486b5a7c16e594fece629c65b028c6a2347fb0c082d14a2cec SHA512 6296749a01ac4095ce83c0875eb0b5066ed0d4023b4e49e3f4b513f5716893a8acea24868646a09b91353a680c7086180b1af2c023ffbdd5e65c2624e1b0310a
+EBUILD qtsql-5.14.2.ebuild 1240 BLAKE2B 67f40d8ead1e8bae9b5fc47619e940801237e94629eae68bbf4d869d46fea8f7113c2ddf775ed8bbf7339bf7403b68073f885af5ecb9668d28f38bc634ded787 SHA512 31a2cb2cf830f873ee954f7414f1968a735e48a683ec6a3699e554d75eb4b246b1bc675ec1bef3b6f3e9beb8aface7f1048997baddd9bbb8cc5ecaa333d3b1c8
+EBUILD qtsql-5.15.0.ebuild 1245 BLAKE2B b2306d8520913bc9532e8e3c1913dfc54afd485e670fa2f556d02fbe8ae11bb33e53cbe98fbe897f9be6b6031b1b5c894f24430cd9c58d984b2e3f5a2a5978c2 SHA512 2b3fd69def9c1c24f672f78600daf57d1f85f5f0f4971b6488d280f9318cd182fde889040ecc883888fc2d0675499baccc5d615f1e40c39a9df34c6388fd9d3a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.14.2.ebuild b/dev-qt/qtsql/qtsql-5.14.2.ebuild
index 38e4f9dfa561..1acad178152c 100644
--- a/dev-qt/qtsql/qtsql-5.14.2.ebuild
+++ b/dev-qt/qtsql/qtsql-5.14.2.ebuild
@@ -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.15.0.ebuild b/dev-qt/qtsql/qtsql-5.15.0.ebuild
new file mode 100644
index 000000000000..4853177b0b96
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.15.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 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}:5=
+	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
+}