gentoo resync : 30.05.2020

3 files changed, 8 insertions, 59 deletions

diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index e6c63f1b2a36..c259c3e61473 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,8 +1,6 @@
 AUX qt5-sqlcipher-1.0.10-install-path.patch 566 BLAKE2B e2d5d854ebe12233c55dbc213df033dbf0d26ebe0ec8c87bc41a1d8aa1d9775331a8080d6263fccd6de14cfa0d7dbacfa005109d2f69de987cac339b1e652322 SHA512 f07d7d1659fc120ae00bc1bb6256895fcdfddee7054c77b5f25793945921e1d9f95dc26088edd57af3488728df857d1f567e0a9c4ecb61a21c7db055f77eda06
 AUX qt5-sqlcipher-install-path.patch 542 BLAKE2B 099aec88aa739615c444478dcf946a11782d34bcda0ea9905d88a766745a063b97f1198d0e03bb7222f338293178dad2c00d430eab7754475766ebfdf95a785d SHA512 a46bb590fe8f56f61d404b4c5deba362f70ecf3044fd746f5de3a897cf884aada1bd2345e768774e674ee8e91bd162775b6f2131e4f822cc91fae22c4d71bb13
-DIST qt5-sqlcipher-1.0.1-qt-5.14.0.tar.xz 8248 BLAKE2B 0cc717deecf2ff1d212a5b510be0c57d5cdac6abf9dc5db8f5d69762adb2a0d79298aa0e2f453417a5aa5b242637094e7ebaf6d7fe777539e0f8896f6adc3709 SHA512 a61231756967f0596b3903db1ca40937f1140a3d06ff9b6b6f6a6195650c170e0d4f42a3d51ac3f3cb35f4e173b78986a8fb31ed7a7e01e125ae78c7dd851246
+DIST qt5-sqlcipher-1.0.10-qt-5.15.0.tar.xz 8240 BLAKE2B 93541d04b1ce25e01438e7d9282645b4e9ae613390160e7a76ee106d9b4dcb42cd8b979918952ef151beac17e0bc3a1e52b03607c30c1005ce3d03875532830b SHA512 db506bf37373822c784aee533318a5899bdf46f5d89548b5ff8a6017e5e6f1ba7e5a4b856a28623e464ba34182382b8ada95b4f73dd47ba8e5b651dc6a747e35
 DIST qt5-sqlcipher-1.0.10.tar.gz 245054 BLAKE2B edb36a47881e2d5801cf07cc9b6094ea53b9e0e595c0078d3a09b493979222a6ad655b074b015c0a152073e0f39d1e31ecb9e2021f7788dda04a0547cd47eddd SHA512 1a23da7d7c6de020ee0739154abe83f94208a3a6d385fd58eff38d3ea27ce51b37a66994e8ad0ff5102525c3573134f9b9362accf2032b7386ea174b12ea1338
-DIST qt5-sqlcipher-1.0.1_p20191025.tar.gz 200293 BLAKE2B 5a0c6401353bc1c9dc511ac585ebce8556742278c303032b3434116c5a778034df01a5133913f8eaac187863b91ef8432b20184b75882c738ed6d850682ac765 SHA512 9e5294ff4c25dc18ef83ecec6c7ef985fec73744f36b27d21591983eb9976b8a13151ef0a31ce3af9767ee3f6388b8f008404002345d328bf0094d03ca4dd8d0
-EBUILD qt5-sqlcipher-1.0.10.ebuild 1213 BLAKE2B 043a9bffc8f3973066220edb6bea8fa4aa5203dd6e351e1b6d3eae9bc6e741a521bb362dd3dcbcd7cf61f3d09847b4de3b5b28603e80ee545879931cdff7d816 SHA512 4d5d1a7f41998f60429cc1b9dddbeff1531651f474bbbbcb9c3da217f29998e386549c77cd78de7c4ad4bcf3a9175577b7013e439111072531f5a35de8fc06db
-EBUILD qt5-sqlcipher-1.0.1_p20191025-r1.ebuild 1416 BLAKE2B 19c8479a8f3817b3b3493f1b11bd47c0ec069f6bda93c43341e1f66c125445c5e11cd7395aaccd5c453620982565b41e0e965488773943816e4a77ab3802181b SHA512 c26b6b985db7d5f3980ddc799de0c39355fef69609c49638359893e83a719cdc016a03794fc2b75e6e600c1f4266797e0d252c8f8395e4c472b7e727c2b81764
+EBUILD qt5-sqlcipher-1.0.10-r1.ebuild 1353 BLAKE2B b3d69bf7b075873fb24ba3c16826f16364f1cc4ddaee9f99418c0d3e5652c3bbc912a58c224849f145a26b5b3b17d42f1432407ee4d777466b25773ba6458d53 SHA512 0ab78003fea0323ad7ba04964f60df0ee308da7ce6a41aeb51d82261127e6260b174e97d85ff0e2868038db4e0558bb08b40593a5fd1e303e64bc34cdcf160e7
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10-r1.ebuild
index 2e1c4834cc6c..1a5c9d0bfc5d 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10-r1.ebuild
@@ -7,7 +7,8 @@ inherit cmake-utils
 
 DESCRIPTION="Qt SQL driver plugin for SQLCipher"
 HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
-SRC_URI="https://github.com/blizzard4591/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/blizzard4591/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${PN}-${PV%_*}-qt-5.15.0.tar.xz"
 
 LICENSE="LGPL-2.1" # version 2.1 only
 SLOT="0"
@@ -15,12 +16,14 @@ KEYWORDS="~amd64"
 
 RDEPEND=">=dev-db/sqlcipher-3.4.1
 	>=dev-qt/qtcore-5.12.3:5=
-	>=dev-qt/qtsql-5.12.3:5=[sqlite] <dev-qt/qtsql-5.15:5=[sqlite]"
+	>=dev-qt/qtsql-5.12.3:5=[sqlite] <dev-qt/qtsql-5.16:5=[sqlite]"
 DEPEND="${RDEPEND}"
 
 DOCS=(README.md)
 
 src_prepare() {
+	mv "${WORKDIR}/5.15.0" qt-file-cache/ || die
+
 	eapply "${FILESDIR}"/${P}-install-path.patch
 	sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
 
@@ -33,6 +36,7 @@ src_prepare() {
 			5.12) vc=5.12.5 ;;
 			5.13) vc=5.13.2 ;;
 			5.14) vc=5.14.1 ;;
+			5.15) vc=5.15.0 ;;
 			*) die "qtsql-${v} not supported" ;;
 		esac
 		elog "qtsql-${v} not in cache, using ${vc} instead"
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025-r1.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025-r1.ebuild
deleted file mode 100644
index deb835d5057a..000000000000
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-COMMIT="8b8ba1579f4fdd0d2c1e8bd9596eedf5101dd917"
-DESCRIPTION="Qt SQL driver plugin for SQLCipher"
-HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
-SRC_URI="https://github.com/blizzard4591/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${PN}-${PV%_*}-qt-5.14.0.tar.xz"
-
-LICENSE="LGPL-2.1" # version 2.1 only
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-db/sqlcipher-3.4.1
-	>=dev-qt/qtcore-5.12.3:5=
-	>=dev-qt/qtsql-5.12.3:5=[sqlite] <dev-qt/qtsql-5.15:5=[sqlite]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-DOCS=(README.md)
-
-src_prepare() {
-	mv "${WORKDIR}/5.14.0" qt-file-cache/ || die
-
-	eapply "${FILESDIR}"/${PN}-install-path.patch
-	sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
-
-	local v=$(best_version dev-qt/qtsql:5)
-	v=$(ver_cut 1-3 ${v#*/qtsql-})
-	[[ -n ${v} ]] || die "could not determine qtsql version"
-	if ! [[ -d qt-file-cache/${v} ]]; then
-		local vc
-		case $(ver_cut 1-2 ${v}) in
-			5.12) vc=5.12.5 ;;
-			5.13) vc=5.13.1 ;;
-			5.14) vc=5.14.0 ;;
-			*) die "qtsql-${v} not supported" ;;
-		esac
-		elog "qtsql-${v} not in cache, using ${vc} instead"
-		cp -R qt-file-cache/${vc} qt-file-cache/${v} || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./qsqlcipher-test || die
-}