From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1132266-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 08C58138334
for <garchives@archives.gentoo.org>; Sat, 21 Dec 2019 09:22:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5461BE08AA;
Sat, 21 Dec 2019 09:22:06 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2C07EE08AA
for <gentoo-commits@lists.gentoo.org>; Sat, 21 Dec 2019 09:22:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EBACF34D45C
for <gentoo-commits@lists.gentoo.org>; Sat, 21 Dec 2019 09:22:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A2798D1
for <gentoo-commits@lists.gentoo.org>; Sat, 21 Dec 2019 09:22:03 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1576920108.d84af79d13e2ba8e3164e2c1320bb17f5b8d918f.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/qt5-sqlcipher/Manifest dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025-r1.ebuild dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025.ebuild
X-VCS-Directories: dev-db/qt5-sqlcipher/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: d84af79d13e2ba8e3164e2c1320bb17f5b8d918f
X-VCS-Branch: master
Date: Sat, 21 Dec 2019 09:22:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 31d41d86-08d0-4593-b6db-ff76d514da0f
X-Archives-Hash: 6c9bb8c2d7bfb62b08f5b5854a4e1354
commit: d84af79d13e2ba8e3164e2c1320bb17f5b8d918f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 09:21:26 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 09:21:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d84af79d
dev-db/qt5-sqlcipher: Support Qt 5.14.
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/Manifest | 1 +
...1_p20191025.ebuild => qt5-sqlcipher-1.0.1_p20191025-r1.ebuild} | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 929430adc67..9081c6b40e8 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1 +1,2 @@
+DIST qt5-sqlcipher-1.0.1-qt-5.14.0.tar.xz 8248 BLAKE2B 0cc717deecf2ff1d212a5b510be0c57d5cdac6abf9dc5db8f5d69762adb2a0d79298aa0e2f453417a5aa5b242637094e7ebaf6d7fe777539e0f8896f6adc3709 SHA512 a61231756967f0596b3903db1ca40937f1140a3d06ff9b6b6f6a6195650c170e0d4f42a3d51ac3f3cb35f4e173b78986a8fb31ed7a7e01e125ae78c7dd851246
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.1_p20191025.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025-r1.ebuild
similarity index 83%
rename from dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025.ebuild
rename to dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025-r1.ebuild
index 06dc4411a57..deb835d5057 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025-r1.ebuild
@@ -8,7 +8,8 @@ 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"
+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"
@@ -16,13 +17,15 @@ 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.14:5=[sqlite]"
+ >=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
@@ -34,6 +37,7 @@ src_prepare() {
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"