From 32e4c7fed4715800e2e5df0fd0e98bc7cd80286c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Wed, 27 May 2020 15:13:58 +0200
Subject: [PATCH] dev-db/qt5-sqlcipher: Support Qt 5.15.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 dev-db/qt5-sqlcipher/Manifest                             | 1 +
 ...ipher-1.0.10.ebuild => qt5-sqlcipher-1.0.10-r1.ebuild} | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 rename dev-db/qt5-sqlcipher/{qt5-sqlcipher-1.0.10.ebuild => qt5-sqlcipher-1.0.10-r1.ebuild} (83%)

diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 137e99733c48..14843cb18b63 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,3 +1,4 @@
 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
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
similarity index 83%
rename from dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild
rename to 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"
-- 
2.26.2