5 files changed, 101 insertions, 33 deletions
diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest
index 300a2664c6a4..506ad5a3f1ae 100644
--- a/dev-db/sqlcipher/Manifest
+++ b/dev-db/sqlcipher/Manifest
@@ -1 +1,2 @@
-DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03
+DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc
+DIST sqlcipher-4.4.2.tar.gz 17611236 BLAKE2B 1bc8149d7da1cf821f64e78f81adcbb2ed45fabcc729f45ac5d876b12746762e3eaeff7bf43ad7e66a143b818547309c52d81e969ee213bd3d8f272413f820d4 SHA512 c76d1af337ce1451070d97b70e5d445bdca7edadaa21f56e836b2e3fca07c0f4eaf97c9cd7ce9bc1dbb89a942f85492354375e0c4b92c4fbead1517655423474
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
deleted file mode 100644
index da4c55eddfa0..000000000000
--- a/dev-db/sqlcipher/files/sqlcipher-3.4.2-libressl-2.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/metadata.xml b/dev-db/sqlcipher/metadata.xml
index 97d08dafb28d..b8127fa1a4fa 100644
--- a/dev-db/sqlcipher/metadata.xml
+++ b/dev-db/sqlcipher/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>pinkbyte@gentoo.org</email>
-    <name>Sergey Popov</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sqlcipher/sqlcipher</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>pinkbyte@gentoo.org</email>
+  <name>Sergey Popov</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">sqlcipher/sqlcipher</remote-id>
+ </upstream>
+ <origin>ports</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
index c796650f7e94..80192b6fd123 100644
--- a/dev-db/sqlcipher/sqlcipher-3.4.2.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
+EAPI=7
 
-EAPI=6
-
-inherit autotools eutils flag-o-matic ltprune multilib-minimal
+inherit autotools flag-o-matic multilib-minimal
 
 DESCRIPTION="Full Database Encryption for SQLite"
 HOMEPAGE="https://www.zetetic.net/sqlcipher/"
@@ -13,8 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="libedit readline libressl static-libs tcl test"
-RESTRICT="!test? ( test )"
+IUSE="debug libedit readline libressl static-libs tcl test"
 
 # Tcl is always needed by buildsystem
 RDEPEND="
@@ -36,12 +34,13 @@ REQUIRED_USE="
 
 DOCS=( README.md )
 
-src_prepare() {
-	# bug #678502
-	eapply "${FILESDIR}/${P}-libressl-2.8.patch"
+# Testsuite fails, bug #692310
+RESTRICT="test"
 
-	append-cflags -DSQLITE_HAS_CODEC
-	eapply_user
+src_prepare() {
+	# Column metadata added due to bug #670346
+	append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA
+	default_src_prepare
 	eautoreconf
 }
 
@@ -51,8 +50,13 @@ 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) \
@@ -60,6 +64,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 	einstalldocs
 }
diff --git a/dev-db/sqlcipher/sqlcipher-4.4.2.ebuild b/dev-db/sqlcipher/sqlcipher-4.4.2.ebuild
new file mode 100644
index 000000000000..80192b6fd123
--- /dev/null
+++ b/dev-db/sqlcipher/sqlcipher-4.4.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Full Database Encryption for SQLite"
+HOMEPAGE="https://www.zetetic.net/sqlcipher/"
+SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+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}] )
+	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/tcl:*"
+
+# Libedit and readline support are mutually exclusive
+# Testsuite requires compilation with TCL, bug #582584
+REQUIRED_USE="
+	libedit? ( !readline )
+	test? ( tcl )
+"
+
+DOCS=( README.md )
+
+# Testsuite fails, bug #692310
+RESTRICT="test"
+
+src_prepare() {
+	# Column metadata added due to bug #670346
+	append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA
+	default_src_prepare
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--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() {
+	find "${D}" -name '*.la' -type f -delete || die
+	einstalldocs
+}