commit: ebe38272496cb9abcb4a3d7225946b769097c49f
Author: Kenton Groombridge <concord <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 18 22:49:48 2025 +0000
Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org>
CommitDate: Mon Sep 22 21:29:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe38272
net-voip/murmur: update live ebuild
- utfcpp patch merged upstream.
- Patch to fix multiple database backends merged upstream.
- Dependency on GSL removed.
- Fixed version dependency on SOCI.
Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org>
net-voip/murmur/files/murmur-1.6-unbundle-utf8cpp.patch | 12 ------------
net-voip/murmur/murmur-9999.ebuild | 11 +++--------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/net-voip/murmur/files/murmur-1.6-unbundle-utf8cpp.patch
b/net-voip/murmur/files/murmur-1.6-unbundle-utf8cpp.patch
deleted file mode 100644
index 880a3393d9f0..000000000000
--- a/net-voip/murmur/files/murmur-1.6-unbundle-utf8cpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -152,7 +152,8 @@ set(CMAKE_UNITY_BUILD_BATCH_SIZE 40)
- set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${lto})
- set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG OFF)
-
--add_subdirectory(${3RDPARTY_DIR}/utfcpp)
-+find_pkg("utf8cpp" REQUIRED)
-+add_library(utfcpp ALIAS utf8cpp::utf8cpp)
-
- if(g15 AND WIN32)
- add_subdirectory("helpers/g15helper")
diff --git a/net-voip/murmur/murmur-9999.ebuild
b/net-voip/murmur/murmur-9999.ebuild
index 763c6828a39a..922869839366 100644
--- a/net-voip/murmur/murmur-9999.ebuild
+++ b/net-voip/murmur/murmur-9999.ebuild
@@ -41,16 +41,15 @@ fi
LICENSE="BSD"
SLOT="0"
IUSE="+ice mysql postgres +sqlite test zeroconf"
-REQUIRED_USE="^^ ( mysql postgres sqlite )"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
RESTRICT="!test? ( test )"
RDEPEND="
acct-group/murmur
acct-user/murmur
dev-cpp/cli11
- dev-cpp/ms-gsl
dev-cpp/nlohmann_json
- dev-db/soci[mysql?,postgres?,sqlite?]
+ >=dev-db/soci-4.1.0[mysql?,postgres?,sqlite?]
>=dev-libs/openssl-1.0.0b:0=
>=dev-libs/protobuf-2.2.0:=
dev-libs/spdlog:=
@@ -72,10 +71,6 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=(
- "${FILESDIR}/${PN}-1.6-unbundle-utf8cpp.patch"
-)
-
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="
The default 'SuperUser' password will be written into the log file
@@ -110,10 +105,10 @@ src_configure() {
local mycmakeargs=(
-DBUILD_TESTING="$(usex test)"
-Dbundled-cli11="OFF"
- -Dbundled-gsl="OFF"
-Dbundled-json="OFF"
-Dbundled-soci="OFF"
-Dbundled-spdlog="OFF"
+ -Dbundled-utfcpp="OFF"
-Dclient="OFF"
-Denable-sqlite="$(usex sqlite)"
-Denable-mysql="$(usex mysql)"
