From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 7 Jul 2018 11:42:03 +0100
Subject: gentoo resync : 07.07.2018

---
 dev-db/qt5-sqlcipher/Manifest                      |  3 +-
 dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild | 47 ---------------------
 dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild | 49 ++++++++++++++++++++++
 3 files changed, 51 insertions(+), 48 deletions(-)
 delete mode 100644 dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild
 create mode 100644 dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild

(limited to 'dev-db/qt5-sqlcipher')

diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 12d0fa4586e0..af7293f067e2 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,4 +1,5 @@
 AUX qt5-sqlcipher-install-path.patch 542 BLAKE2B 099aec88aa739615c444478dcf946a11782d34bcda0ea9905d88a766745a063b97f1198d0e03bb7222f338293178dad2c00d430eab7754475766ebfdf95a785d SHA512 a46bb590fe8f56f61d404b4c5deba362f70ecf3044fd746f5de3a897cf884aada1bd2345e768774e674ee8e91bd162775b6f2131e4f822cc91fae22c4d71bb13
+DIST qt5-sqlcipher-1.0.1-qt-5.11.1.tar.xz 8528 BLAKE2B 981565882399943c6ab47b09968c27fa9f53cade5baee66259e416d749905a6bf7a9c1c27ed8165d7b6fc0a72fee85d51bb9ac0c3819b9dab5e89e741e880b13 SHA512 9d64b12990cd81ad1e81b941ff970388c8e7f34fd446ecd4ce2ed58e3f8e50acc06fe88fc0f6693e48b19422e70372516bc36b5c71908e18096e092f261c9eff
 DIST qt5-sqlcipher-1.0.1.tar.gz 56994 BLAKE2B 9de780126bc7ba99e23b529e6e45d629e9b20d52dfb4d91fcb7c8a6b77b8a8bc17bedaa40a288c4af32e40cc563631e164428be0f8c5a81ffa6143acc58b2e55 SHA512 ba83ba1d98b7764c7ad4bf776b1f39baff44ff6189e51cbc2131150e5a4c2962a21134d21d5ed41f171629395c721fce11ee911d080d304566033d53c552642a
-EBUILD qt5-sqlcipher-1.0.1-r2.ebuild 1197 BLAKE2B 2dacdec3175c7c7aaeb27e69c392f38f17a3a86aac21bebdf7828d352c91eeb9603a3adc866a9b64bd812c799e66045aba4048f55c25310efd5c9aeb4a9ed640 SHA512 fcf16f38d76544260d193bc87d9bea5491e2e13429c9f0fea1553cdb09e2c6d981864a8e82341e34e4de009f194ec157fba0f3f6c4691f29eeb5d42d4b397b04
+EBUILD qt5-sqlcipher-1.0.1-r3.ebuild 1281 BLAKE2B e3b45a2ef37f67bdc021c6c8b5108af6cc6def1dbab04c8c4a5b19991751cf2b16cfb12ec444a413b9e5b5f1c2915170d5cde70c2f7ee3668261ac04bdf7ef3e SHA512 3a28c4a2c67c2b5ce77d92843b549c26df8d222c540c369217b09947ccdbf1b472a8a0869eb86a831b3fa8ac9be9584cf1ba48d94766ea8fb725baf00beeaf0d
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild
deleted file mode 100644
index 952ae0ab2e74..000000000000
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eapi7-ver
-
-DESCRIPTION="Qt SQL driver plugin for SQLCipher"
-HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
-SRC_URI="https://github.com/blizzard4591/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1" # version 2.1 only
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-db/sqlcipher-3.4.1
-	>=dev-qt/qtcore-5.7.1:5=
-	>=dev-qt/qtsql-5.7.1:5=[sqlite]	<dev-qt/qtsql-5.10:5=[sqlite]"
-RDEPEND="${DEPEND}"
-
-DOCS=(README.md)
-
-src_prepare() {
-	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.7) vc=5.7.1 ;;
-			5.9) vc=5.9.3 ;;
-			*) 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
-}
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..2a2bd7f67a3a
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eapi7-ver
+
+DESCRIPTION="Qt SQL driver plugin for SQLCipher"
+HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
+SRC_URI="https://github.com/blizzard4591/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${P}-qt-5.11.1.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.7.1:5=
+	>=dev-qt/qtsql-5.7.1:5=[sqlite]	<dev-qt/qtsql-5.12:5=[sqlite]"
+DEPEND="${RDEPEND}"
+
+DOCS=(README.md)
+
+src_prepare() {
+	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.7) vc=5.7.1 ;;
+			5.9) vc=5.9.3 ;;
+			5.11) vc=5.11.1 ;;
+			*) 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
+}
-- 
cgit v1.2.3