gentoo resync : 21.01.2018

5 files changed, 3 insertions, 57 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index b96db2ebe040..e35482e5917f 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index e6e90f98cb99..47d1b076766b 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -4,6 +4,5 @@ DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b7
 DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c
 EBUILD qtsql-4.8.7-r1.ebuild 2261 BLAKE2B 24e39792f5fd56b5d61a7b61dee71f00cae4a45436e74137de29460d89c5c13235811142dfb8f5499eea483890c4c39ff2fd9d86f0ac9e52f05d08499b1ac8ce SHA512 a81056b36b8a081403824b1102883d7d35e181c05bc6b8e56e29c227ec832fe712a1dde8a4178a30bad5454798aa17eaf33890403c15b08b67cb221487b8e4ca
 EBUILD qtsql-5.7.1-r1.ebuild 1467 BLAKE2B 113ce8884c0b442c4fb6ec7c651f4cc25d735ebe115e86647dab0bdfdf73fd2361a9e6c4c74defaf16ca32c627e6de7c4f785bc413d3df3a8c69441e8d8f8831 SHA512 c5512de8111d6546f1c3525e85e9c15602515b704bfacf978bb0025c13b20c9dd791468f10b7fb2f22210d2dff12e7ccdbf834704f2bb37247b37f6c425b155f
-EBUILD qtsql-5.7.1.ebuild 1414 BLAKE2B d14e5d76a82a2636c9dbb89059cb36a7d7588b688d9760870486bfdcc932c7cf92eaf51602e228d877358c5f2ac64021ea8134889e56ab8ce75edefc18702de9 SHA512 8f5890db58f62f475306bff09d3dcd9e2876840f7ae04210d3bc53ff01bb376250a2d964a86f2621da7b3818a1fae97631bea067467650e08b7b3ca325b0c418
 EBUILD qtsql-5.9.3.ebuild 1419 BLAKE2B 468469c3056b9f9b8ccdd3fd51773c13860020584fe27d454aa37a40aaebc7995fe95a05732eccd5772c53b79d860c370b067708665d3b38d517e1dccd4e320d SHA512 5339d5c51acabe4ddd2ab80ddeaf14bf679531026b1603b70d3671967827523b1909b3a6982a21c64df4e16df8d08f010a877ed88bb45d4a56f683b5d879ba43
 MISC metadata.xml 701 BLAKE2B b9f31dc4bdb158bda952ca941dc3a5f70004800c8874e310a2a9634223dde59e799df9b4f9d424d89870c191fe041ec29ecbab79c1f04be55c786170d921c10e SHA512 c807e5c85d7e4f23f15ef9f95f4bed3e303e25e355a096ee118e4846330948957dc44d16c97d3c687ee30a5895c511e9d1480a39ddf2360f8989d06daf0b91b8
diff --git a/dev-qt/qtsql/qtsql-5.7.1.ebuild b/dev-qt/qtsql/qtsql-5.7.1.ebuild
deleted file mode 100644
index a320910a9c2c..000000000000
--- a/dev-qt/qtsql/qtsql-5.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 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 tooolkit"
-
-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}"
-
-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
-}
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index c7af7a25c359..acb441af4f0f 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,5 @@
 DIST qtvirtualkeyboard-opensource-src-5.7.1.tar.xz 10014088 BLAKE2B 02f460a58d1dd26bdfff788003857c2a0b9e37cab3001fcf18edf0c9f26a8bbedcd96391300f20a89f3ab5021f977bc7a4cdccb1851ba594e9b64950b4a090aa SHA512 31481a88b91ef936437e54c863d39a63917496bd5701670ed38f1695c7cc6d867b8cc0eede62a523d5fea3819bc2688845277c9737349a0982de711cc464f00f
 DIST qtvirtualkeyboard-opensource-src-5.9.3.tar.xz 10030260 BLAKE2B 9199493c747f4cd7e8a8ce3965ede6b4e2943ddf4cdace9b61b3ec4380a7be958687e1e39e2005ca154ea73d2129a0e9268969f6c2a86b5cce6e7d156fb49efa SHA512 feac25b2f88e182e58431a92e27436149072e2dd2eb09abbb69b732a6c3e484c4259759a99f730856993c6d50260bf5ef234f29f6f7e2a4fddbe77d15838b5c8
-EBUILD qtvirtualkeyboard-5.7.1.ebuild 999 BLAKE2B 05db2274557522afe45a841f8e90485187dd56b2af6d3bd24cdc3b50cbb624a36bde10f4e8caa1c6a882f6024ac46d4bb4d2626a606881108ddd40766f66ff19 SHA512 12c1349bd9625fad53e113867d18f9995fbfd1feed30daf67af36b1cba37907fb51fb806e0116f91474f238898793d8f6ebc1203c8dc309e56b6891e2a772e0a
+EBUILD qtvirtualkeyboard-5.7.1.ebuild 997 BLAKE2B d961e5a79c9bbbe52c52a940a24e4d933cfc69a43cf7ddcf93cf46ba6e3e4bb3b64a2f998a90c37c81c445031628acbb4cb7fc60b9cb49ef937c116c30cc8633 SHA512 1bad77e24919a9d2b7d3aa4f4568ff491b9edddeaf2812f2f5cc93fe11dd0c24c747e82db263650f972821c3aa2e660a75ed40c21cb7dd8642dbe9b4f863d3ca
 EBUILD qtvirtualkeyboard-5.9.3.ebuild 999 BLAKE2B 05db2274557522afe45a841f8e90485187dd56b2af6d3bd24cdc3b50cbb624a36bde10f4e8caa1c6a882f6024ac46d4bb4d2626a606881108ddd40766f66ff19 SHA512 12c1349bd9625fad53e113867d18f9995fbfd1feed30daf67af36b1cba37907fb51fb806e0116f91474f238898793d8f6ebc1203c8dc309e56b6891e2a772e0a
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild
index 852cb2cb27d1..f4fd12c22636 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 # TODO: unbudle libraries for more layouts