Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlcipher/
Date: Sun, 02 May 2021 20:15:15
Message-Id: 1619986412.3da063722f18a0b744637740847504370c55381d.zlogene@gentoo
1 commit: 3da063722f18a0b744637740847504370c55381d
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 2 20:13:32 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun May 2 20:13:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da06372
7
8 dev-db/sqlcipher: remove libressl support
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 dev-db/sqlcipher/sqlcipher-3.4.2.ebuild | 8 ++------
14 dev-db/sqlcipher/sqlcipher-4.0.1.ebuild | 5 ++---
15 2 files changed, 4 insertions(+), 9 deletions(-)
16
17 diff --git a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
18 index 1f5bdc48135..d67124b09e3 100644
19 --- a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
20 +++ b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
21 @@ -13,14 +13,13 @@ LICENSE="BSD"
22 SLOT="0"
23 KEYWORDS="amd64 x86"
24
25 -IUSE="libedit readline libressl static-libs tcl test"
26 +IUSE="libedit readline static-libs tcl test"
27 RESTRICT="!test? ( test )"
28
29 # Tcl is always needed by buildsystem
30 RDEPEND="
31 libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] )
32 - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
33 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
34 + dev-libs/openssl:0=[${MULTILIB_USEDEP}]
35 readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
36 tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
37 "
38 @@ -37,9 +36,6 @@ REQUIRED_USE="
39 DOCS=( README.md )
40
41 src_prepare() {
42 - # bug #678502
43 - eapply "${FILESDIR}/${P}-libressl-2.8.patch"
44 -
45 append-cflags -DSQLITE_HAS_CODEC
46 default
47 eautoreconf
48
49 diff --git a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
50 index e82a2ba8a15..9751b1c8848 100644
51 --- a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
52 +++ b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
53 @@ -13,13 +13,12 @@ LICENSE="BSD"
54 SLOT="0"
55 KEYWORDS="amd64 x86"
56
57 -IUSE="debug libedit readline libressl static-libs tcl test"
58 +IUSE="debug libedit readline static-libs tcl test"
59
60 # Tcl is always needed by buildsystem
61 RDEPEND="
62 libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] )
63 - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
64 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
65 + dev-libs/openssl:0=[${MULTILIB_USEDEP}]
66 readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
67 tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
68 "