gentoo resync : 09.07.2022

3 files changed, 2 insertions, 61 deletions

diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 5f6f3e95979a..a74cc2b5b783 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,8 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtsql-5.15.4.ebuild 1265 BLAKE2B 13e902c32e37d5cfddfc7d250e7e534aadfd9eb78a4df108448ea71548d85e520e8400d98190bf97c370b10bd5f77e273d3a64ea43c909faf6db52ee0a710c80 SHA512 235338720210c84624728b09dc42a5fd8394b3d27d6c4242483fdfdaccf56b2ab6873f9843e55d1c254c5549952a54d5c552091ea951c926602d4ba6061e5f6a
-EBUILD qtsql-5.15.5.ebuild 1278 BLAKE2B 01521732844db011227ed5c6ebbecc2d1d1bed58a3f88bdb3824def04819c75679614f0d54c0969994d7f6538cb3128b4a968f577d15a9024c93ef71f269714c SHA512 626d27e070fa1ac548deecc56da08ef9e98296c253009bd56102c64488257cfee26b2ad90e477d5c9f623f18b60f0755235b247103a07f9e4afe51673ad083d1
+EBUILD qtsql-5.15.5.ebuild 1272 BLAKE2B 88f52cb97a7549e7a62d2a7519a6907b0941434188f4e7222a93ba2bd5c5b11ef12841f80b525bd5f6cbc4328bd41a264b82856f74507e1e04e4d9900c6fb6b9 SHA512 ba44241e78c299a38bc776c01a51d38552420ad0b19125c68343f932c784b8931252c847b3fd75b71c39cea14c00a9268731d06816929d3e08e835d0a2d0a6f8
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/qtsql-5.15.4.ebuild b/dev-qt/qtsql/qtsql-5.15.4.ebuild
deleted file mode 100644
index 475735092f6c..000000000000
--- a/dev-qt/qtsql/qtsql-5.15.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_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)
-		$(usev sqlite -system-sqlite)
-	)
-
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-5.15.5.ebuild b/dev-qt/qtsql/qtsql-5.15.5.ebuild
index cf831ef54fe7..3c428c7a673c 100644
--- a/dev-qt/qtsql/qtsql-5.15.5.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"