Gentoo Archives: gentoo-commits

From: Sergey Popov <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlcipher/files/, dev-db/sqlcipher/
Date: Tue, 26 Feb 2019 09:55:55
Message-Id: 1551174930.fdaf8de795251ce4fad3e4c1d4f2928055f1f73e.pinkbyte@gentoo
1 commit: fdaf8de795251ce4fad3e4c1d4f2928055f1f73e
2 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 26 09:55:30 2019 +0000
4 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 26 09:55:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdaf8de7
7
8 dev-db/sqlcipher: drop old version
9
10 Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.10
12
13 dev-db/sqlcipher/Manifest | 1 -
14 .../sqlcipher/files/sqlcipher-3.4.1-libressl.patch | 11 ----
15 dev-db/sqlcipher/sqlcipher-3.4.1.ebuild | 59 ----------------------
16 3 files changed, 71 deletions(-)
17
18 diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest
19 index 92c76c5bb12..300a2664c6a 100644
20 --- a/dev-db/sqlcipher/Manifest
21 +++ b/dev-db/sqlcipher/Manifest
22 @@ -1,2 +1 @@
23 -DIST sqlcipher-3.4.1.tar.gz 13873645 BLAKE2B 8d910691fff6d31393a9e4adb549c084472b3f962f46a6ecd9f0860e5ad3c225d1e7bccd1fc4d87fb0641de0091408ef82521718c21e874a622f5304b6a7df08 SHA512 1c08ccdf438c0de23b1293192c687cb869db1ea904c47da5643c69f3a21f3f6a801fe8e87eb2e660acf0fe977b1f05bf8801b79162c609ffa3711706392c642b
24 DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03
25
26 diff --git a/dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch b/dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch
27 deleted file mode 100644
28 index f12f1284514..00000000000
29 --- a/dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch
30 +++ /dev/null
31 @@ -1,11 +0,0 @@
32 ---- a/src/crypto_openssl.c 2017-07-06 08:11:21.560000000 +0300
33 -+++ b/src/crypto_openssl.c 2017-07-06 08:11:32.180000000 +0300
34 -@@ -46,7 +46,7 @@
35 - static unsigned int openssl_init_count = 0;
36 - static sqlite3_mutex* openssl_rand_mutex = NULL;
37 -
38 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
39 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
40 - static HMAC_CTX *HMAC_CTX_new(void)
41 - {
42 - HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
43
44 diff --git a/dev-db/sqlcipher/sqlcipher-3.4.1.ebuild b/dev-db/sqlcipher/sqlcipher-3.4.1.ebuild
45 deleted file mode 100644
46 index d75de25de37..00000000000
47 --- a/dev-db/sqlcipher/sqlcipher-3.4.1.ebuild
48 +++ /dev/null
49 @@ -1,59 +0,0 @@
50 -# Copyright 1999-2017 Gentoo Foundation
51 -# Distributed under the terms of the GNU General Public License v2
52 -
53 -EAPI=6
54 -
55 -inherit autotools eutils flag-o-matic multilib-minimal
56 -
57 -DESCRIPTION="Full Database Encryption for SQLite"
58 -HOMEPAGE="https://www.zetetic.net/sqlcipher/"
59 -SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
60 -
61 -LICENSE="BSD"
62 -SLOT="0"
63 -KEYWORDS="amd64 x86"
64 -
65 -IUSE="readline libressl static-libs tcl test"
66 -
67 -# Tcl is always needed by buildsystem
68 -RDEPEND="
69 - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
70 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
71 - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
72 - tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
73 -"
74 -DEPEND="${RDEPEND}
75 - dev-lang/tcl:*"
76 -
77 -# Testsuite requires compilation with TCL, bug #582584
78 -REQUIRED_USE="test? ( tcl )"
79 -
80 -DOCS=( README.md )
81 -
82 -src_prepare() {
83 - append-cflags -DSQLITE_HAS_CODEC
84 -
85 - # bug #622114
86 - epatch "${FILESDIR}/${P}-libressl.patch"
87 -
88 - eapply_user
89 - eautoreconf
90 -}
91 -
92 -multilib_src_configure() {
93 - ECONF_SOURCE=${S} \
94 - econf \
95 - --enable-fts3 \
96 - --enable-fts4 \
97 - --enable-fts5 \
98 - --enable-json1 \
99 - --enable-tempstore \
100 - $(use_enable readline) \
101 - $(use_enable static-libs static) \
102 - $(use_enable tcl)
103 -}
104 -
105 -multilib_src_install_all() {
106 - prune_libtool_files
107 - einstalldocs
108 -}