gentoo resync : 03.03.2019

5 files changed, 40 insertions, 29 deletions

diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest
index 0a56fa5a6c60..dbb55864f1f9 100644
--- a/dev-db/sqlcipher/Manifest
+++ b/dev-db/sqlcipher/Manifest
@@ -1,6 +1,6 @@
-AUX sqlcipher-3.4.1-libressl.patch 450 BLAKE2B 23bacf888e5744f012ef1bb080984b99f81a365750ef6c660aa80d0c1b0f5185966c59e1d0b8ead7d7d605d3daf8e475bce9a49833ec66d854a36319a2480b96 SHA512 ceb74cfb4b2dd3dae16bcb0ac53ed2746f59d88811a81b5099c6fbac71ccc83ccde08642d25eed5ae8229a672f74baa5a28221ae071a32836bb3e2f2fedfbad4
-DIST sqlcipher-3.4.1.tar.gz 13873645 BLAKE2B 8d910691fff6d31393a9e4adb549c084472b3f962f46a6ecd9f0860e5ad3c225d1e7bccd1fc4d87fb0641de0091408ef82521718c21e874a622f5304b6a7df08 SHA512 1c08ccdf438c0de23b1293192c687cb869db1ea904c47da5643c69f3a21f3f6a801fe8e87eb2e660acf0fe977b1f05bf8801b79162c609ffa3711706392c642b
+AUX sqlcipher-3.4.2-libressl-2.8.patch 490 BLAKE2B 5ac29fbf1370f1ed1a28335d68f86dada605d6362521fbe4eb4decbd215c5eda04d7c62017979de829f46ac37a9f0718d8c748069173f4d0ff591664f51d83da SHA512 bea99e890d78f1b1417f3a81d612388ad3305d30cc576ef5b29d0726459570a231786551fd8ba4cc03ef8fd257ee985ce5933b7f2bcfc15867f6afc2f662f229
 DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03
-EBUILD sqlcipher-3.4.1.ebuild 1292 BLAKE2B fd9485d5be219da430ac438d00eb2054912a5365ae8f1cca9d179b028a31f6f0179cc9b994ab5e6ba60a5a17bcae80ed5ea9b8e12c19f9d3bd11f263987f0312 SHA512 9e3b046b8d46e6bce55403b5166de1f86131b8bc2c713581c78c4c5602af8f9a9a89df9d8b48b58698176481ab93ce062f54a5b73e914027648f411633f97ca6
-EBUILD sqlcipher-3.4.2.ebuild 1408 BLAKE2B 5f91475f33d74387e274d01652e22bc192bfce1bcc23b5edc30c32863a12ad193f7082ec415220e4e57b3bfe74158d78763e3a6d8130bde61fd6088848abbe3b SHA512 6a8df12165e6accfed7cbae5eba1233fce7f0e9e3749e55f11273d678b8557488ee699476b1b699a9a8b59bdb75ab6448a0a13898f53c256f50a529f1e266e7b
+DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc
+EBUILD sqlcipher-3.4.2.ebuild 1470 BLAKE2B f0820774b609ca8045c015687c966909e2094577eb741fea9efc43d73d69712c6c38f1faec36cb7f4e68ccd8785cc99e6593956525591a8f98dbdffb8003f873 SHA512 80590c4c20230c9af47c3c2e8a51175bbc258c3738aba529879906976700880d67ff66840c69cbb32a53a5ff7344c90774b2905f3429e5eee0f005376a060c96
+EBUILD sqlcipher-4.0.1.ebuild 1627 BLAKE2B 258ddb4af9b98087b013a41470c32774c6b148b22facc1c81557428d74737be2036b7848a9a31ddbb74ae15673596b37a4988cfdb7bc7b5f701ec50e2423515f SHA512 fe40b4090a11183d24961031aa11c3bfed87694f1845789eda90a84a79c6d3bc6638018128de5ed92a2f428a462a3a2ef1688122927b85246ba4e6ca6741edd8
 MISC metadata.xml 341 BLAKE2B f5035fe38770437027936a72b9b7d66854fd6a19cf19f7140e409e8004297ed3da11aab122ba81b2f2b5d82302e8252462a7f185de0a998f79d348dd45e16c7e SHA512 b387658993279fb3c74c7647b36035f5c0e0e3e81a3cf4eab28f3dac19319f0b6958cfa16fab30295e5508c0810d601b0e2899710f57e992886f35c781e37dfa
diff --git a/dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch b/dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch
deleted file mode 100644
index f12f1284514d..000000000000
--- a/dev-db/sqlcipher/files/sqlcipher-3.4.1-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/crypto_openssl.c	2017-07-06 08:11:21.560000000 +0300
-+++ b/src/crypto_openssl.c	2017-07-06 08:11:32.180000000 +0300
-@@ -46,7 +46,7 @@
- static unsigned int openssl_init_count = 0;
- static sqlite3_mutex* openssl_rand_mutex = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static HMAC_CTX *HMAC_CTX_new(void)
- {
-   HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
diff --git a/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch b/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch
new file mode 100644
index 000000000000..da4c55eddfa0
--- /dev/null
+++ b/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch
@@ -0,0 +1,11 @@
+--- a/src/crypto_openssl.c	2017-12-21 14:31:28.000000000 -0500
++++ b/src/crypto_openssl.c	2019-02-22 12:33:54.110516410 -0500
+@@ -47,7 +47,7 @@
+ static unsigned int openssl_init_count = 0;
+ static sqlite3_mutex* openssl_rand_mutex = NULL;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x2080000L
+ static HMAC_CTX *HMAC_CTX_new(void)
+ {
+   HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
diff --git a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
index fd967068f3ca..e660467e442a 100644
--- a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,6 +36,9 @@ REQUIRED_USE="
 DOCS=( README.md )
 
 src_prepare() {
+	# bug #678502
+	eapply "${FILESDIR}/${P}-libressl-2.8.patch"
+
 	append-cflags -DSQLITE_HAS_CODEC
 	eapply_user
 	eautoreconf
diff --git a/dev-db/sqlcipher/sqlcipher-3.4.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
index d75de25de377..7ce770c2ff1d 100644
--- a/dev-db/sqlcipher/sqlcipher-3.4.1.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils flag-o-matic multilib-minimal
+inherit autotools flag-o-matic multilib-minimal
 
 DESCRIPTION="Full Database Encryption for SQLite"
 HOMEPAGE="https://www.zetetic.net/sqlcipher/"
@@ -11,12 +11,13 @@ SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="readline libressl static-libs tcl test"
+IUSE="debug libedit readline libressl static-libs tcl test"
 
 # Tcl is always needed by buildsystem
 RDEPEND="
+	libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] )
 	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
@@ -25,18 +26,19 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-lang/tcl:*"
 
+# Libedit and readline support are mutually exclusive
 # Testsuite requires compilation with TCL, bug #582584
-REQUIRED_USE="test? ( tcl )"
+REQUIRED_USE="
+	libedit? ( !readline )
+	test? ( tcl )
+"
 
 DOCS=( README.md )
 
 src_prepare() {
-	append-cflags -DSQLITE_HAS_CODEC
-
-	# bug #622114
-	epatch "${FILESDIR}/${P}-libressl.patch"
-
-	eapply_user
+	# Column metadata added due to bug #670346
+	append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA
+	default_src_prepare
 	eautoreconf
 }
 
@@ -46,14 +48,20 @@ multilib_src_configure() {
 		--enable-fts3 \
 		--enable-fts4 \
 		--enable-fts5 \
+		--enable-geopoly \
 		--enable-json1 \
+		--enable-memsys5 \
+		--enable-rtree \
+		--enable-session \
 		--enable-tempstore \
+		$(use_enable debug) \
+		$(use_enable libedit editline) \
 		$(use_enable readline) \
 		$(use_enable static-libs static) \
 		$(use_enable tcl)
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 	einstalldocs
 }