Merge updates from master

4 files changed, 52 insertions, 3 deletions

diff --git a/app-containers/lxd/lxd-5.0.2-r2.ebuild b/app-containers/lxd/lxd-5.0.2-r2.ebuild
index 133cbce8f682..9e5eeb783945 100644
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r2.ebuild
@@ -177,6 +177,7 @@ pkg_postinst() {
 	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
+	optfeature "full lxd-migrate support"
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
index 8d82780756f3..c7a1e0a6bc79 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
@@ -51,7 +51,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-libs/tinyxml[stl]
 		>=dev-db/mysql-connector-c++-8.0.27-r1
 		dev-db/vsqlite++
-		|| ( dev-db/libiodbc dev-db/unixODBC )
+		|| ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
 		dev-python/pexpect
 		>=dev-python/paramiko-1.7.4
 "
@@ -83,8 +83,6 @@ src_prepare() {
 	sed -i -e 's/-Werror//' CMakeLists.txt || die
 	## Fix doc install directory
 	sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-	## Look for an existing header file
-	sed -i -e 's/unixodbc.h/unixodbc_conf.h/' build/cmake/Modules/FindUNIXODBC.cmake || die
 
 	## package is very fragile...
 	strip-flags
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 2def6222d86c..d8710e891db7 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,2 +1,3 @@
 DIST dqlite-1.14.0.tar.gz 190757 BLAKE2B 5304ff10134c7775c4475f77bbe60cc6892cc35c3f2a7b4813743cd27fc1176a1d513d66ebf22b47ed7e83fa833be1408f44f781fbd8200bfd3f4465ea1d6011 SHA512 4305b289903766f00c26e278cce3f761c778b67105a6d7e51e66cc1cbf85564fd41f27689b6895c6f182968d851e10a40d052570d55e22007e9eb5c2929dabd9
 DIST dqlite-1.15.0.tar.gz 208833 BLAKE2B 41d2fced65c787381300aed1d0ee2393dc9e7aa371acd7efbee0744e00fed8a6ee7175eb3041f9cd198c1f0beef8951984e2a34646cbc069ea9d35753ba7568c SHA512 413f5aa7ad9d990638c6ffbdf5706ec69635ead0ad21314603b3c997608c696bd294bd5d15c092d1619509fc4d51c4038deaec82bd82cbbd4070f4a4020f9cc4
+DIST dqlite-1.15.1.tar.gz 216360 BLAKE2B 750c61616dfef548d7d96564f9c46765bbc4803b4af89e7df8573babe970ce05810fe11bb73dac9b98eb815016532c4ca20509b394a37e4143f5917fdd1b4a9b SHA512 3da0aa254747806f439eaf941cbe376d4376e0be351b39d9083c0d257f33750efef3210715b458f003e6a4508e248d3777c2584260e0e82ce10598ba9cfbe4d4
diff --git a/dev-libs/dqlite/dqlite-1.15.1.ebuild b/dev-libs/dqlite/dqlite-1.15.1.ebuild
new file mode 100644
index 000000000000..30514be29254
--- /dev/null
+++ b/dev-libs/dqlite/dqlite-1.15.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
+HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
+SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/1.15.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/libuv:=
+	>=dev-libs/raft-0.17.1:="
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/raft-0.13.0[lz4,test] )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/dqlite-1.12.0-disable-werror.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-backtrace
+		--disable-debug
+		--disable-sanitize
+		--disable-static
+
+		# Will build a bundled libsqlite3.so.
+		--enable-build-sqlite=no
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}