gentoo resync : 11.05.2018

4 files changed, 2 insertions, 116 deletions

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 549a0d6035b3..875c42243b85 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,14 +1,11 @@
-AUX qtsql-5.7.1-mariadb.patch 1888 BLAKE2B bd8a93f2b28ac9db84c1da1d294c974f1bed0a87a99177c0ac9738d4057d168be7d563d1c34ba40c2695dad47c83b16a6d9d05257dd1e768e1f3c5049fe1cc65 SHA512 4fb0e066eaf848feb7379d4f0f92e26a1e60e9003d77b8976588036df09c04cc24431335cfe08616a4c23b10975ba44e6c25b92417a8f285308bc8f0b46c2c78
 AUX qtsql-5.9.4-mariadb-10.2.patch 1187 BLAKE2B 1ee0a4ad020a1d0e5bcaa19ac987eb5b472f9701adf876024003e377ca40060a52323bdfd3ec8213e6e8e199336bbfd92c7aab716be38b46fd105628eea447f6 SHA512 3ad71a5c3a31bb60484de09bb6503fd1c35f6e55aa2116f5ea468314a3c72cc43ddcfde6da01f479f91c381fbf2f2e64024ab88cf0e8f2e0a3edbda45bd44609
 AUX qtsql-5.9.5-mariadb-10.2.patch 1199 BLAKE2B cb5d5079aca9f9adb0343db8691418afc1e1b43c8a425f5c8f52ab24872047c9f9bdadfe48fee9e7c85b5cd1f886951aa3777f55ccada790113150c71a77ca42 SHA512 be4d8c3569ba3007a0b512184295f12043b79e09e948651fae3af5b4a6e7e0ebcf5c5f55c32c321c64a469eefeff16ee7169bbc03d7027ee04d62d384e04288d
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtbase-everywhere-src-5.11.0-beta4.tar.xz 46815720 BLAKE2B bf21828ed94d02140ebc5b9f366b935f944c40b8fe15094161a9c3d0adc16b2e8bfa7f4d514030569f5f463f39dd8083b6cacb536e71b1e81f743749c8742682 SHA512 c70b575729bdbd580d32350a233dfa1db3f450a3e0f4f41a5c8d153df396edc3f795099e4bf3447d3a0751f9acbc1978b4e499c6dbb6d9357c0288288b83d5ca
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
+DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.5.tar.xz 45125492 BLAKE2B ee3cad23c6c89a0cd2b149c033fa98dba475c3b67b82074f31a7b0c53f2c062a72a6d979b157286b6044c936b646eed39febaef795549da27d4a1b45c6016e6b SHA512 910cbcfed1f2a0590e701cede0a9e8399e1f1363ac4863e2f200b675650e3bd1802113df0dfe4309470d27bf6bc0e53fbbab01024d52fad904db8cb2e038454a
 EBUILD qtsql-4.8.7-r1.ebuild 2261 BLAKE2B 24e39792f5fd56b5d61a7b61dee71f00cae4a45436e74137de29460d89c5c13235811142dfb8f5499eea483890c4c39ff2fd9d86f0ac9e52f05d08499b1ac8ce SHA512 a81056b36b8a081403824b1102883d7d35e181c05bc6b8e56e29c227ec832fe712a1dde8a4178a30bad5454798aa17eaf33890403c15b08b67cb221487b8e4ca
-EBUILD qtsql-5.11.0_beta4.ebuild 1469 BLAKE2B cdd2ec18ec1e1487d311caa9f752aa0888e66d0130675ce3a9dafa1f1b58921cc5fb17a98fcf1bc552c41a3d8f003bdc5ffa2715afee4fc26d8aee240129798a SHA512 63ed07f225e86ce674b3d1f26c52eee4c44fcf00d5a96ba0e2104dc6cceafba8e21b9a05b9d23819738bf8e0e98b77b7184b3e35f0d8e91b983d99fc7027bd4d
-EBUILD qtsql-5.7.1-r1.ebuild 1468 BLAKE2B c8765bf757236f1556d55318f9777f7dffa3a68dd2e73e991836da5f05b48b8d28b3c80b99873d8f79e112acace4fd06348350e24fee06cbbdf5bc079f52222d SHA512 074c701f0d8d5dee3e4d496651ba8aea30be61e649ff6b26306fcbe2f13c22c8577a91eaa45f31116ee105e1fda8f84cba0f44e4e49c96ffe2f43b2d7bd83522
+EBUILD qtsql-5.11.0_rc.ebuild 1469 BLAKE2B cdd2ec18ec1e1487d311caa9f752aa0888e66d0130675ce3a9dafa1f1b58921cc5fb17a98fcf1bc552c41a3d8f003bdc5ffa2715afee4fc26d8aee240129798a SHA512 63ed07f225e86ce674b3d1f26c52eee4c44fcf00d5a96ba0e2104dc6cceafba8e21b9a05b9d23819738bf8e0e98b77b7184b3e35f0d8e91b983d99fc7027bd4d
 EBUILD qtsql-5.9.4-r1.ebuild 1576 BLAKE2B e87c3461b70676298963c099fa518a622e05cf054f5dfebb707584ba6c629c37844b3d29c5dd846128f38295abdf26b016347a2b34ff9b1592dbcda74d89fdd6 SHA512 d33dca9366dc91e4410eed715aa3e31028dfc4be35f3cdc9dc266d3a83ba12c77e210362320a5e78ae9d9f8d3e77ea08cba9409b4a79e1317daa1aa7c7f8569a
 EBUILD qtsql-5.9.5.ebuild 1587 BLAKE2B f33e314530ad8acddb838f505d74dee0e3638809a759ebc5f195ae31680ed393ba5426801b55eb2ed50c1354b0fca66ea920beafd5584faca27b2e9124c9ab29 SHA512 492ac2cb3cd76a1fab47161fdaa79a97a478798dc25d80429a6d77e4f219caf869bc9dc55eec74f3460c658241f1a02dfad04f44483b9f071f807655351382e5
 MISC metadata.xml 701 BLAKE2B b9f31dc4bdb158bda952ca941dc3a5f70004800c8874e310a2a9634223dde59e799df9b4f9d424d89870c191fe041ec29ecbab79c1f04be55c786170d921c10e SHA512 c807e5c85d7e4f23f15ef9f95f4bed3e303e25e355a096ee118e4846330948957dc44d16c97d3c687ee30a5895c511e9d1480a39ddf2360f8989d06daf0b91b8
diff --git a/dev-qt/qtsql/files/qtsql-5.7.1-mariadb.patch b/dev-qt/qtsql/files/qtsql-5.7.1-mariadb.patch
deleted file mode 100644
index 8aede46c3b4d..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.7.1-mariadb.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d25346417238b7dc0fb37359a9b56eff2908a5dc Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Daniel=20Vr=C3=A1til?= <daniel.vratil@kdab.com>
-Date: Mon, 18 Sep 2017 22:33:55 +0200
-Subject: [PATCH] Only call mysql_library_end() once when using MariaDB
-
-MariaDB allows only a single call to mysql_library_end(), all subsequent calls
-to mysql_library_init() or any other API call will fail. Since QMYSQLDriver
-calls mysql_library_end() function whenever the refcount drops to 0, this
-breaks applications that close and reopen database connections.
-
-This change registers call to mysql_library_init() via qAddPostRoutine()
-when compiled against MariaDB, so that we only call it once.
-
-Task-number: QTBUG-63108
-Change-Id: I22c1f0c5b081216f12596a32748dca25cae919e9
-Reviewed-by: Andy Shaw <andy.shaw@qt.io>
----
- src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-index ee439fa..6e428fb 100644
---- a/src/sql/drivers/mysql/qsql_mysql.cpp
-+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -1158,16 +1158,22 @@ static void qLibraryInit()
-     }
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
-+
-+#ifdef MARIADB_BASE_VERSION
-+    qAddPostRoutine(mysql_server_end);
-+#endif
- }
- 
- static void qLibraryEnd()
- {
--#ifndef Q_NO_MYSQL_EMBEDDED
--# if MYSQL_VERSION_ID > 40000
--#  if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
--    mysql_library_end();
--#  else
--    mysql_server_end();
-+#if !defined(MARIADB_BASE_VERSION)
-+# if !defined(Q_NO_MYSQL_EMBEDDED)
-+#  if MYSQL_VERSION_ID > 40000
-+#   if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
-+     mysql_library_end();
-+#   else
-+     mysql_server_end();
-+#   endif
- #  endif
- # endif
- #endif
--- 
-2.7.4
-
diff --git a/dev-qt/qtsql/qtsql-5.11.0_beta4.ebuild b/dev-qt/qtsql/qtsql-5.11.0_rc.ebuild
index db29e42db712..db29e42db712 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_beta4.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.0_rc.ebuild
diff --git a/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild b/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild
deleted file mode 100644
index 71698562ab53..000000000000
--- a/dev-qt/qtsql/qtsql-5.7.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 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? ( virtual/libmysqlclient:= )
-	oci8? ( dev-db/oracle-instantclient-basic )
-	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.10.2:3 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.1-mariadb.patch" )
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-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 mysql && myconf+=("-I${EPREFIX}/usr/include/mysql" "-L${EPREFIX}/usr/$(get_libdir)/mysql")
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-	use odbc && myconf+=("-I${EPREFIX}/usr/include/iodbc")
-	use postgres && myconf+=("-I${EPREFIX}/usr/include/postgresql/pgsql")
-
-	qt5-build_src_configure
-}