* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2017-12-03 9:41 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2017-12-03 9:41 UTC (permalink / raw
To: gentoo-commits
commit: 41afaec0cffb2cb061e4328cc3d4cba1756adc75
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 09:36:55 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 09:36:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41afaec0
dev-db/qt5-sqlcipher: Version bump.
Closes: https://bugs.gentoo.org/639438
Package-Manager: Portage-2.3.16, Repoman-2.3.6
dev-db/qt5-sqlcipher/Manifest | 2 +-
...-0.1.1_pre20171123.ebuild => qt5-sqlcipher-0.1.1_pre20171202.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 44f13991405..7f8b4c29d81 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1 +1 @@
-DIST qt5-sqlcipher-0.1.1_pre20171123.tar.xz 14160 BLAKE2B 9cd35540e2e8945f7c227c3237670771462ca5e42461c4abd65c4095324305fea35ef25c7ad19337e000101d65b2fb1323e60847082ad48de83a0e181d4cf422 SHA512 9d9f41949a728e6da28bb644b8ad70a63e156744970602c87640c894aba4fb2267a9b622b9b09175b51909cebf29f941b6b2e6ea3e9e823b78f2be9f32acc1b2
+DIST qt5-sqlcipher-0.1.1_pre20171202.tar.xz 24340 BLAKE2B de40988c9ca13de0ebafebd4078f9da1c21ad4d8d78a9931497048859617d34f4de8ba630d438024dbb034bb817703e1e456619c3897b3c7dc6dbfa2a719e307 SHA512 e95eb1e73ff944d24f785129cb3e6ebc297abf457d14a2c6466d64230003932eb99b83dc3b216b27fe40565213e67d62b45d43fa538f6f693626283c788ca562
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171123.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
similarity index 100%
rename from dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171123.ebuild
rename to dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2018-02-14 21:00 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2018-02-14 21:00 UTC (permalink / raw
To: gentoo-commits
commit: be23a9b584a5ac3bd1b6ea046b0f7d90e930a534
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 20:59:19 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 20:59:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be23a9b5
dev-db/qt5-sqlcipher: Fix build with Qt 5.9.4.
Cached files for Qt versions 5.9.3 and 5.9.4 are identical, so simpy
copy them.
Bug: https://bugs.gentoo.org/647624
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
index 75caf3f0bb1..74d3f8006b7 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,6 +24,8 @@ DOCS=(README.md)
src_prepare() {
eapply "${FILESDIR}"/${PN}-install-path.patch
sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
+ # workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical)
+ cp -R qt-file-cache/5.9.{3,4} || die
cmake-utils_src_prepare
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2018-02-17 20:39 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2018-02-17 20:39 UTC (permalink / raw
To: gentoo-commits
commit: ce2699ebcf40f43717cf4a9b9b556bb2eacad96e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 19:20:08 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 20:38:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2699eb
dev-db/qt5-sqlcipher: Fix dependency on dev-qt/qtsql.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
index 74d3f8006b7..d238eda6ea6 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
@@ -15,7 +15,7 @@ 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.7.1:5=[sqlite] <dev-qt/qtsql-5.9.5:5=[sqlite]"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2018-02-17 20:39 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2018-02-17 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 20063c69694fd080bb4109b0995bb8d90b8bd429
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 19:21:38 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 20:39:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20063c69
dev-db/qt5-sqlcipher: Version bump.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-db/qt5-sqlcipher/Manifest | 1 +
dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1.ebuild | 34 +++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 7f8b4c29d81..cff59e81457 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1 +1,2 @@
DIST qt5-sqlcipher-0.1.1_pre20171202.tar.xz 24340 BLAKE2B de40988c9ca13de0ebafebd4078f9da1c21ad4d8d78a9931497048859617d34f4de8ba630d438024dbb034bb817703e1e456619c3897b3c7dc6dbfa2a719e307 SHA512 e95eb1e73ff944d24f785129cb3e6ebc297abf457d14a2c6466d64230003932eb99b83dc3b216b27fe40565213e67d62b45d43fa538f6f693626283c788ca562
+DIST qt5-sqlcipher-1.0.1.tar.gz 56994 BLAKE2B 9de780126bc7ba99e23b529e6e45d629e9b20d52dfb4d91fcb7c8a6b77b8a8bc17bedaa40a288c4af32e40cc563631e164428be0f8c5a81ffa6143acc58b2e55 SHA512 ba83ba1d98b7764c7ad4bf776b1f39baff44ff6189e51cbc2131150e5a4c2962a21134d21d5ed41f171629395c721fce11ee911d080d304566033d53c552642a
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1.ebuild
new file mode 100644
index 00000000000..fcef1f8e730
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/${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.9.5: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
+ # workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical)
+ cp -R qt-file-cache/5.9.{3,4} || die
+ cmake-utils_src_prepare
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ./qsqlcipher-test || die
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2018-04-14 12:14 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2018-04-14 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 4b781a17b563f297bbd3c407a2eb9ed49d1d1e14
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 12:11:49 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 12:11:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b781a17
dev-db/qt5-sqlcipher: Fix build with Qt 5.9.5.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../{qt5-sqlcipher-1.0.1.ebuild => qt5-sqlcipher-1.0.1-r1.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r1.ebuild
similarity index 88%
rename from dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1.ebuild
rename to dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r1.ebuild
index fcef1f8e730..3a85ab072f1 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r1.ebuild
@@ -15,7 +15,7 @@ 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.9.5:5=[sqlite]"
+ >=dev-qt/qtsql-5.7.1:5=[sqlite] <dev-qt/qtsql-5.9.6:5=[sqlite]"
RDEPEND="${DEPEND}"
DOCS=(README.md)
@@ -25,6 +25,7 @@ src_prepare() {
sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
# workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical)
cp -R qt-file-cache/5.9.{3,4} || die
+ cp -R qt-file-cache/5.9.{3,5} || die
cmake-utils_src_prepare
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2018-04-14 12:14 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2018-04-14 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 3974b89ef75dc85270173171a4bf889004f4b392
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 12:13:54 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 12:13:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3974b89e
dev-db/qt5-sqlcipher: Remove old.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-db/qt5-sqlcipher/Manifest | 1 -
.../qt5-sqlcipher-0.1.1_pre20171202.ebuild | 35 ----------------------
2 files changed, 36 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index cff59e81457..af8ee994141 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,2 +1 @@
-DIST qt5-sqlcipher-0.1.1_pre20171202.tar.xz 24340 BLAKE2B de40988c9ca13de0ebafebd4078f9da1c21ad4d8d78a9931497048859617d34f4de8ba630d438024dbb034bb817703e1e456619c3897b3c7dc6dbfa2a719e307 SHA512 e95eb1e73ff944d24f785129cb3e6ebc297abf457d14a2c6466d64230003932eb99b83dc3b216b27fe40565213e67d62b45d43fa538f6f693626283c788ca562
DIST qt5-sqlcipher-1.0.1.tar.gz 56994 BLAKE2B 9de780126bc7ba99e23b529e6e45d629e9b20d52dfb4d91fcb7c8a6b77b8a8bc17bedaa40a288c4af32e40cc563631e164428be0f8c5a81ffa6143acc58b2e55 SHA512 ba83ba1d98b7764c7ad4bf776b1f39baff44ff6189e51cbc2131150e5a4c2962a21134d21d5ed41f171629395c721fce11ee911d080d304566033d53c552642a
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
deleted file mode 100644
index d238eda6ea6..00000000000
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Qt SQL driver plugin for SQLCipher"
-HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-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.9.5:5=[sqlite]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-DOCS=(README.md)
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-install-path.patch
- sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
- # workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical)
- cp -R qt-file-cache/5.9.{3,4} || die
- cmake-utils_src_prepare
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- ./qsqlcipher-test || die
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2018-04-14 19:43 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2018-04-14 19:43 UTC (permalink / raw
To: gentoo-commits
commit: df9b751f851ae073d6b68b3571a1652d2ac4221b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 19:39:58 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 19:43:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9b751f
dev-db/qt5-sqlcipher: More general handling of cached versions.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
...0.1-r1.ebuild => qt5-sqlcipher-1.0.1-r2.ebuild} | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r1.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild
similarity index 57%
rename from dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r1.ebuild
rename to dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild
index 3a85ab072f1..952ae0ab2e7 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r1.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils
+inherit cmake-utils eapi7-ver
DESCRIPTION="Qt SQL driver plugin for SQLCipher"
HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
@@ -15,7 +15,7 @@ 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.9.6:5=[sqlite]"
+ >=dev-qt/qtsql-5.7.1:5=[sqlite] <dev-qt/qtsql-5.10:5=[sqlite]"
RDEPEND="${DEPEND}"
DOCS=(README.md)
@@ -23,9 +23,21 @@ DOCS=(README.md)
src_prepare() {
eapply "${FILESDIR}"/${PN}-install-path.patch
sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
- # workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical)
- cp -R qt-file-cache/5.9.{3,4} || die
- cp -R qt-file-cache/5.9.{3,5} || 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
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2018-07-04 23:54 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2018-07-04 23:54 UTC (permalink / raw
To: gentoo-commits
commit: e13be0dd1a6f17248dd58b5c9e343d951bc0c002
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 4 23:49:29 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 4 23:50:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13be0dd
dev-db/qt5-sqlcipher: Support Qt 5.11.
Package-Manager: Portage-2.3.41, Repoman-2.3.9
dev-db/qt5-sqlcipher/Manifest | 1 +
...sqlcipher-1.0.1-r2.ebuild => qt5-sqlcipher-1.0.1-r3.ebuild} | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index af8ee994141..9f9e0011246 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1 +1,2 @@
+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
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild
similarity index 82%
rename from dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild
rename to dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild
index 952ae0ab2e7..2a2bd7f67a3 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild
@@ -7,16 +7,17 @@ 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"
+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"
-DEPEND=">=dev-db/sqlcipher-3.4.1
+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.10:5=[sqlite]"
-RDEPEND="${DEPEND}"
+ >=dev-qt/qtsql-5.7.1:5=[sqlite] <dev-qt/qtsql-5.12:5=[sqlite]"
+DEPEND="${RDEPEND}"
DOCS=(README.md)
@@ -32,6 +33,7 @@ src_prepare() {
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"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2019-03-18 18:12 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2019-03-18 18:12 UTC (permalink / raw
To: gentoo-commits
commit: f2226f1f71722d8fc1b01020fcb2efb65fa73e20
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 16:53:12 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 18:11:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2226f1f
dev-db/qt5-sqlcipher: New snapshot, supports Qt 5.12.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/Manifest | 1 +
.../qt5-sqlcipher-1.0.1_p20181221.ebuild | 50 ++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 9f9e0011246..27a03e84a77 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,2 +1,3 @@
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
+DIST qt5-sqlcipher-1.0.1_p20181221.tar.xz 27668 BLAKE2B e9f7a380be72997a1364ff985271b421230ea75b80200fc1cb4d58946abcb5a98504e458811e9b6641a84a4f8bc7145fd9d6746a147f98bc886e8c2639698646 SHA512 408f71b7fdb26aea3f0419ce0fb295a438c247aa1649756a20b6743571dd9d45cb17d46f5b261a1fd611df4fe39a9dcd6cbd36180bf3742b0abba8b02a9a2d9a
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20181221.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20181221.ebuild
new file mode 100644
index 00000000000..744c62f7f41
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20181221.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Qt SQL driver plugin for SQLCipher"
+HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.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.13:5=[sqlite]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+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.6 ;;
+ 5.11) vc=5.11.3 ;;
+ 5.12) vc=5.12.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
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2019-06-05 8:37 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2019-06-05 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 93acb0f0194d2d00d0109d079309d0ec65c94c9e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 08:34:54 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 08:37:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93acb0f0
dev-db/qt5-sqlcipher: Remove old.
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/Manifest | 2 -
dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild | 49 ----------------------
2 files changed, 51 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 27a03e84a77..1d2291285f1 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,3 +1 @@
-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
DIST qt5-sqlcipher-1.0.1_p20181221.tar.xz 27668 BLAKE2B e9f7a380be72997a1364ff985271b421230ea75b80200fc1cb4d58946abcb5a98504e458811e9b6641a84a4f8bc7145fd9d6746a147f98bc886e8c2639698646 SHA512 408f71b7fdb26aea3f0419ce0fb295a438c247aa1649756a20b6743571dd9d45cb17d46f5b261a1fd611df4fe39a9dcd6cbd36180bf3742b0abba8b02a9a2d9a
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
deleted file mode 100644
index 2a2bd7f67a3..00000000000
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild
+++ /dev/null
@@ -1,49 +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
- 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
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2019-11-09 11:51 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2019-11-09 11:51 UTC (permalink / raw
To: gentoo-commits
commit: 2532a5f4b19749bf245dfcec763ec05f94fe4ace
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 11:50:09 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 11:50:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2532a5f4
dev-db/qt5-sqlcipher: New snapshot, supports Qt 5.13.
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/Manifest | 2 +-
...181221.ebuild => qt5-sqlcipher-1.0.1_p20191025.ebuild} | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 1d2291285f1..929430adc67 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1 +1 @@
-DIST qt5-sqlcipher-1.0.1_p20181221.tar.xz 27668 BLAKE2B e9f7a380be72997a1364ff985271b421230ea75b80200fc1cb4d58946abcb5a98504e458811e9b6641a84a4f8bc7145fd9d6746a147f98bc886e8c2639698646 SHA512 408f71b7fdb26aea3f0419ce0fb295a438c247aa1649756a20b6743571dd9d45cb17d46f5b261a1fd611df4fe39a9dcd6cbd36180bf3742b0abba8b02a9a2d9a
+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_p20181221.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025.ebuild
similarity index 76%
rename from dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20181221.ebuild
rename to dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025.ebuild
index 744c62f7f41..06dc4411a57 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20181221.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025.ebuild
@@ -5,20 +5,21 @@ EAPI=7
inherit cmake-utils
+COMMIT="8b8ba1579f4fdd0d2c1e8bd9596eedf5101dd917"
DESCRIPTION="Qt SQL driver plugin for SQLCipher"
HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+SRC_URI="https://github.com/blizzard4591/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
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.13:5=[sqlite]"
+ >=dev-qt/qtcore-5.12.3:5=
+ >=dev-qt/qtsql-5.12.3:5=[sqlite] <dev-qt/qtsql-5.14:5=[sqlite]"
DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}-${COMMIT}"
DOCS=(README.md)
src_prepare() {
@@ -31,10 +32,8 @@ src_prepare() {
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.6 ;;
- 5.11) vc=5.11.3 ;;
- 5.12) vc=5.12.0 ;;
+ 5.12) vc=5.12.5 ;;
+ 5.13) vc=5.13.1 ;;
*) die "qtsql-${v} not supported" ;;
esac
elog "qtsql-${v} not in cache, using ${vc} instead"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2019-12-21 9:22 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2019-12-21 9:22 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2020-05-27 13:19 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2020-05-27 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 32e4c7fed4715800e2e5df0fd0e98bc7cd80286c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 13:13:58 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed May 27 13:15:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e4c7fe
dev-db/qt5-sqlcipher: Support Qt 5.15.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/Manifest | 1 +
...qt5-sqlcipher-1.0.10.ebuild => qt5-sqlcipher-1.0.10-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 137e99733c4..14843cb18b6 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 2e1c4834cc6..1a5c9d0bfc5 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"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2020-05-27 13:19 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2020-05-27 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 637ebc38a1e6985d524ba49d2e692275b814b569
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 13:14:46 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed May 27 13:15:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=637ebc38
dev-db/qt5-sqlcipher: Remove old.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/Manifest | 2 -
.../qt5-sqlcipher-1.0.1_p20191025-r1.ebuild | 53 ----------------------
2 files changed, 55 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 14843cb18b6..55ef4fe798a 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,4 +1,2 @@
-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.1_p20191025-r1.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20191025-r1.ebuild
deleted file mode 100644
index deb835d5057..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2020-05-31 10:00 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2020-05-31 10:00 UTC (permalink / raw
To: gentoo-commits
commit: ff40993604b8bd131591d15da2c33abae38fefa7
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 09:55:49 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 31 10:00:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff409936
dev-db/qt5-sqlcipher: Version bump to 1.0.11.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/Manifest | 1 +
dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild | 49 ++++++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 55ef4fe798a..b486b924395 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,2 +1,3 @@
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.11.tar.gz 267993 BLAKE2B e938f7de368af90cb3304eeb79afcc86354bcecd55e57b7fb73c979e5e40dbf1b0936db37c16b8e9cc3ca4646aac5cd773917eff14735f2eaf91ac67d9432d66 SHA512 6ed4bd6fa7155438266cae2ecaeaea648e9b55df23f7fb811daa7d90fda0ab36e489c28b3739a4cc1103fc5f550e16f9a58f9df4e001e72ac10937bc2115bad9
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild
new file mode 100644
index 00000000000..2c4d7596f41
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+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.16:5=[sqlite]"
+DEPEND="${RDEPEND}"
+
+DOCS=(README.md)
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-1.0.10-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.2 ;;
+ 5.14) vc=5.14.2 ;;
+ 5.15) vc=5.15.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
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2020-05-31 10:00 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2020-05-31 10:00 UTC (permalink / raw
To: gentoo-commits
commit: 732c35e7ab80901447c7bd930bacc3e06dfd04a7
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 09:56:54 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 31 10:00:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732c35e7
dev-db/qt5-sqlcipher: Remove old.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/Manifest | 2 -
.../qt5-sqlcipher/qt5-sqlcipher-1.0.10-r1.ebuild | 52 ----------------------
2 files changed, 54 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index b486b924395..32e7b35ba9a 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,3 +1 @@
-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.11.tar.gz 267993 BLAKE2B e938f7de368af90cb3304eeb79afcc86354bcecd55e57b7fb73c979e5e40dbf1b0936db37c16b8e9cc3ca4646aac5cd773917eff14735f2eaf91ac67d9432d66 SHA512 6ed4bd6fa7155438266cae2ecaeaea648e9b55df23f7fb811daa7d90fda0ab36e489c28b3739a4cc1103fc5f550e16f9a58f9df4e001e72ac10937bc2115bad9
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10-r1.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10-r1.ebuild
deleted file mode 100644
index 1a5c9d0bfc5..00000000000
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
- https://dev.gentoo.org/~ulm/distfiles/${PN}-${PV%_*}-qt-5.15.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.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
-
- 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.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"
- 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
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2022-02-27 10:01 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2022-02-27 10:01 UTC (permalink / raw
To: gentoo-commits
commit: 9048832d9d744034063b1ff6538f39db8f565c41
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 09:57:08 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 10:00:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9048832d
dev-db/qt5-sqlcipher: Migrate to cmake.eclass
Closes: https://bugs.gentoo.org/834119
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../qt5-sqlcipher/qt5-sqlcipher-1.0.11-r1.ebuild | 49 ++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r1.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r1.ebuild
new file mode 100644
index 000000000000..57ef6aa14443
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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"
+
+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.16:5=[sqlite]"
+DEPEND="${RDEPEND}"
+
+DOCS=(README.md)
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-1.0.10-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.2 ;;
+ 5.14) vc=5.14.2 ;;
+ 5.15) vc=5.15.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_src_prepare
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ./qsqlcipher-test || die
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/
@ 2022-03-02 6:41 Ulrich Müller
0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2022-03-02 6:41 UTC (permalink / raw
To: gentoo-commits
commit: 71dd2f53fe48c47e3c29b82bc654fd9593f4cf99
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 06:40:51 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 06:40:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71dd2f53
dev-db/qt5-sqlcipher: Remove old
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild | 49 ------------------------
1 file changed, 49 deletions(-)
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild
deleted file mode 100644
index 2c4d7596f412..000000000000
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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.16:5=[sqlite]"
-DEPEND="${RDEPEND}"
-
-DOCS=(README.md)
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-1.0.10-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.2 ;;
- 5.14) vc=5.14.2 ;;
- 5.15) vc=5.15.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
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2022-03-02 6:41 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-09 11:51 [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2022-03-02 6:41 Ulrich Müller
2022-02-27 10:01 Ulrich Müller
2020-05-31 10:00 Ulrich Müller
2020-05-31 10:00 Ulrich Müller
2020-05-27 13:19 Ulrich Müller
2020-05-27 13:19 Ulrich Müller
2019-12-21 9:22 Ulrich Müller
2019-06-05 8:37 Ulrich Müller
2019-03-18 18:12 Ulrich Müller
2018-07-04 23:54 Ulrich Müller
2018-04-14 19:43 Ulrich Müller
2018-04-14 12:14 Ulrich Müller
2018-04-14 12:14 Ulrich Müller
2018-02-17 20:39 Ulrich Müller
2018-02-17 20:39 Ulrich Müller
2018-02-14 21:00 Ulrich Müller
2017-12-03 9:41 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox