gentoo auto-resync : 30:08:2024 - 12:00:55

3 files changed, 67 insertions, 73 deletions

diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest
index 33882d3aa36d..a072942cf52e 100644
--- a/dev-db/sqlcipher/Manifest
+++ b/dev-db/sqlcipher/Manifest
@@ -1,5 +1,5 @@
-DIST sqlcipher-4.5.1.tar.gz 18132121 BLAKE2B 233ffbd9636eae78533553325f08fa3ceb1e01ce0d809be44ca8ed64d46478d6a70dd40f81c38a1f0524986932ebe8614e52fda9dfc1c2f20134692cac7d4b16 SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3
 DIST sqlcipher-4.5.5.tar.gz 18816611 BLAKE2B 46c6c64140848e02f7572afc3268db648f9968c41bd7d7e945d4918904ac572d57e0fdc049cf3dac40cc0fd0b034fb96693438ff04fffb4fcd603db2263b7ae9 SHA512 034774f8d320a53f08a9735c035bf83f81ef9223780473c39ec07658b80af89dc665599caa3b2662055039fa678c7a29cbf777d046922948e86123e677b823bc
-EBUILD sqlcipher-4.5.1.ebuild 1618 BLAKE2B 72c75037eb125d99eb9c0c325f954fab82bf58cdf8b7494727095011b7bb6a5886ad2eccb1c4844d877752da164238333e329b9c70f00a9d2f95d9845264aade SHA512 ca5e6a16fc92a73fd7c046bbfd36caa727b1999325f6a8137ac4db261ec739872f634cf424fc0e3a6e3bcbe7aceedffbf4b1f63907f72d4de36548bbb65da46b
+DIST sqlcipher-4.6.1.tar.gz 19115004 BLAKE2B 792e3342eba78ed8aee49265fcb9e216edaeb7d4c68fd9a95ac9abe60093a8baeb755e32e736a7af98811921d1bfd93f882418864bf5785952ffc2bbae1fc649 SHA512 023b2fc7248fe38b758ef93dd8436677ff0f5d08b1061e7eab0adb9e38ad92d523e0ab69016ee69bd35c1fd53c10f61e99b01f7a2987a1f1d492e1f7216a0a9c
 EBUILD sqlcipher-4.5.5.ebuild 1578 BLAKE2B 295a2cec2625641addf1aa75f62015b35eed4a971a5e5298b190cf80426e13483acd6664ff410d9a04cefe5229624a8b4be5912410a832478c0246de275f617f SHA512 20900416a8e26ec20358c3e570126696365799fb256b8b6bae4d5f7d101249406b5d370dce586f84710d03d800ed658ce8e833f8c37855fc294dda60daf90f7c
+EBUILD sqlcipher-4.6.1.ebuild 1488 BLAKE2B a4862d85610f6045bdd97467a98b202585100e2426b0d7f534e3e059e6c9215f960df3c4f3181f4c6e892f1221c481a73c2413a382b6f4f5169ed9b258b9b8ca SHA512 e5a8e79edd831c1be24fa66aeffd0b72abdc72abc968027979aec67b78d2c3ba214d2ef5d2f3e1e20536fba61d1385231dc8f4737e9bc7ae766172915d068ebb
 MISC metadata.xml 257 BLAKE2B e4c5efda473f899ccef71f7f88348b4e9fce729321cc99cc82660644e21bbbd99fe9e4e4b9ed57edd369d72279e0bc6f3a4e736cccfe2d94bc7640aaa46d7f85 SHA512 b0693017c413734c5e429bb6d5bc05ffb3db578f08bdacca0143e10e58fc70d81e896032dfc612497c8a3531ea0862e0dfa41a702e99da6599929e609be5d97c
diff --git a/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild
deleted file mode 100644
index 9c9ca41bb64d..000000000000
--- a/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo 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 static-libs tcl test"
-
-# Tcl is always needed by buildsystem
-RDEPEND="
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	libedit? ( dev-libs/libedit[${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
-	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
-}
diff --git a/dev-db/sqlcipher/sqlcipher-4.6.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.6.1.ebuild
new file mode 100644
index 000000000000..33844a3cf18b
--- /dev/null
+++ b/dev-db/sqlcipher/sqlcipher-4.6.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Full Database Encryption for SQLite"
+HOMEPAGE="
+	https://www.zetetic.net/sqlcipher/
+	https://github.com/sqlcipher/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 tcl test"
+# Testsuite requires compilation with TCL, bug #582584
+REQUIRED_USE="
+	?? ( libedit readline )
+	test? ( tcl )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/tcl"
+
+src_configure() {
+	# Column metadata added due to bug #670346
+	append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fts3
+		--enable-fts4
+		--enable-fts5
+		--enable-geopoly
+		--enable-memsys5
+		--enable-rtree
+		--enable-session
+		--enable-tempstore
+		$(use_enable debug)
+		$(use_enable libedit editline)
+		$(use_enable readline)
+		$(use_enable tcl)
+	)
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}