commit: 6505053527cbd9034258053fc33ed60ecfb1947d
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Jul 6 15:01:59 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Jul 6 15:02:02 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=65050535
net-im/conduit: sync live
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-im/conduit/conduit-9999.ebuild | 70 ++++++++++++++++++------------------
net-im/conduit/files/conduit.initd | 20 -----------
net-im/conduit/files/conduit.service | 13 -------
3 files changed, 35 insertions(+), 68 deletions(-)
diff --git a/net-im/conduit/conduit-9999.ebuild
b/net-im/conduit/conduit-9999.ebuild
index 4027c69ded..7fb4d51f01 100644
--- a/net-im/conduit/conduit-9999.ebuild
+++ b/net-im/conduit/conduit-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Auto-Generated by cargo-ebuild 0.5.4
-
EAPI=8
-RUST_MIN_VER="1.75.0"
+LLVM_COMPAT=( {15..20} )
+RUST_MIN_VER="1.85.0"
-inherit cargo git-r3 systemd toolchain-funcs
+inherit cargo git-r3 llvm-r2 systemd
DESCRIPTION="Matrix homeserver written in Rust"
HOMEPAGE="
@@ -20,61 +19,63 @@ EGIT_BRANCH="next"
LICENSE="Apache-2.0"
# Dependent crate licenses
LICENSE+="
- || ( 0BSD Apache-2.0 MIT )
- || ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT )
- || ( Apache-2.0 BSD MIT )
- || ( Apache-2.0 BSD-1 MIT )
- || ( Apache-2.0 BSD-2 MIT )
- || ( Apache-2.0 Boost-1.0 )
- || ( Apache-2.0 CC0-1.0 MIT )
- || ( Apache-2.0 ISC MIT )
- || ( Apache-2.0 MIT )
- || ( Apache-2.0 MIT ZLIB )
- || ( MIT Unlicense )
- BSD BSD-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB openssl
+ Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0 openssl Unicode-3.0 ZLIB
"
SLOT="0"
-IUSE="jemalloc rocksdb system-rocksdb"
+IUSE="jemalloc rocksdb sqlite system-rocksdb"
# Libraries that can't be unbundled right now:
-# - app-arch/bzip2 (no pkg-config file)
+# - app-arch/bzip2 ("rust-librocksdb-sys" pulls "bzip-sys[static]")
# - app-arch/lz4 ("lz4-sys" crate doesn't look for system library...
ironic)
-# - dev-db/sqlite:3 ("conduit" pulls "rusqlite[bundled]" explicitly)
-# - sys-libs/zlib ("rust-librocksdb-sys" pulls "libz-sys[static]" by
default)
-DEPEND="
+# - sys-libs/zlib ("rust-librocksdb-sys" pulls "libz-sys[static]")
+COMMON_DEPEND="
jemalloc? ( dev-libs/jemalloc:= )
rocksdb? (
app-arch/snappy:=
app-arch/zstd:=
- system-rocksdb? ( dev-libs/rocksdb )
+ system-rocksdb? (
+ dev-libs/rocksdb
+ )
)
+ sqlite? ( dev-db/sqlite:3 )
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
acct-user/conduit
app-misc/ca-certificates
"
-BDEPEND="
+# clang needed for bindgen
+DEPEND="${COMMON_DEPEND}
rocksdb? (
- llvm-core/clang
- virtual/pkgconfig
+ $(llvm_gen_dep '
+ llvm-core/clang:${LLVM_SLOT}
+ llvm-core/llvm:${LLVM_SLOT}
+ ')
)
"
+BDEPEND="virtual/pkgconfig"
DOCS=( {APPSERVICES,CODE_OF_CONDUCT,DEPLOY,README,TURN}.md )
QA_FLAGS_IGNORED="usr/bin/${PN}"
+pkg_setup() {
+ use rocksdb && llvm-r2_pkg_setup
+ rust_pkg_setup
+}
+
src_unpack() {
git-r3_src_unpack
cargo_live_src_unpack
}
src_configure() {
- tc-export AR CC
-
- # Tracker bug for that Cargo nonsense:
+ # * Tracker bug for "*-sys" crates that build C code:
# https://bugs.gentoo.org/709568
+ # * Gentoo Wiki articles with tips and tricks:
+ # https://wiki.gentoo.org/wiki/Project:Rust/sys_crates
+ #
https://wiki.gentoo.org/wiki/Writing_Rust_ebuilds#Unbundling_C_libraries
export PKG_CONFIG_ALLOW_CROSS=1
+ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
export ZSTD_SYS_USE_PKG_CONFIG=1
export SNAPPY_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
export JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)/libjemalloc.so"
@@ -90,8 +91,7 @@ src_configure() {
$(usev jemalloc)
# database backends
- backend_persy
- backend_sqlite
+ $(usex sqlite backend_sqlite '')
$(usex rocksdb backend_rocksdb '')
)
@@ -103,7 +103,7 @@ src_install() {
keepdir /var/lib/matrix-conduit
fowners conduit:conduit /var/lib/matrix-conduit
- fperms 700 /var/lib/matrix-conduit
+ fperms 750 /var/lib/matrix-conduit
insinto /etc/conduit
newins conduit-example.toml conduit.toml
@@ -111,7 +111,7 @@ src_install() {
insinto /etc/logrotate.d
newins "${FILESDIR}"/conduit.logrotate conduit
- newinitd "${FILESDIR}"/conduit.initd conduit
+ newinitd "${FILESDIR}"/conduit.initd-r1 conduit
newconfd "${FILESDIR}"/conduit.confd conduit
- systemd_dounit "${FILESDIR}"/conduit.service
+ systemd_newunit "${FILESDIR}"/conduit.service-r1 conduit.service
}
diff --git a/net-im/conduit/files/conduit.initd
b/net-im/conduit/files/conduit.initd
deleted file mode 100644
index 4f1eb84411..0000000000
--- a/net-im/conduit/files/conduit.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-export CONDUIT_CONFIG=${CONDUIT_CONFIG:-/etc/conduit/conduit.toml}
-
-command="/usr/bin/conduit"
-command_user="conduit:conduit"
-command_background=true
-pidfile="/run/${RC_SVCNAME}.pid"
-
-output_log="/var/log/conduit.log"
-error_log="/var/log/conduit.log"
-
-depend() {
- need net
-}
-
-start_pre() {
- checkpath -d -m 0755 -o "$command_user" /var/lib/conduit
- checkpath -f -m 0644 -o "$command_user" "$output_log"
-}
diff --git a/net-im/conduit/files/conduit.service
b/net-im/conduit/files/conduit.service
deleted file mode 100644
index f7238645d4..0000000000
--- a/net-im/conduit/files/conduit.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Conduit Matrix Server
-After=network.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/conduit
-User=conduit
-Group=conduit
-Restart=always
-ExecStart=/usr/bin/conduit
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
