4 files changed, 97 insertions, 1 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 02dd124e756c..fb2b52954f48 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index 683de8621d35..c83766a8f5ac 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,4 +1,5 @@
+AUX sdbus-c++-1.4.0-fix-pkgconfig.patch 3950 BLAKE2B c3205ab76542328e087e09cb51fb1f7ad0d6ae62ce2bd70c9302dd5470da35655bb767bcc732a2f24ef17f2da44d7c19bedf1e907a52d305ac43fbff675c78df SHA512 e8210de333156e69ec3bac855a827dc5a17dbcb0c646d50bcb7320612f3b97a80265e8828bb78c255da4ca862ebb403c2254d144564e650a0536fc26a9ebff1f
 AUX sdbus-c++-1.4.0-gcc-14.patch 735 BLAKE2B 206126f96f28f52a17d18bb134b34a5b3c99c657883bf79f0884d27771793733773cb337a05fc86ef689aec5c8eeb2a074de046062846243aec352a1f137e689 SHA512 d70a06274a0f218830d2787cc76f1bcd2df4605e8fec9030a7083590b51f6d0f00d8c97156d363534182c0de8a08f4f982b88ef732675dca80f5860977075e39
 DIST sdbus-c++-1.4.0.tar.gz 224529 BLAKE2B a82656f3d1b98bbf4f7f83c708e507168105a2c2341df3983f782c2590b9e0e1811fb594065c248d8d93a3b4ca31ca99c141f0ecbab050d7358f78a499ceede2 SHA512 8b13dc57f15de482f59edfff7cdd4e2b4e2e659b9cdff9f946783bb0bf1ec735f789675dd19ebe7d38a06358fe77dcfabdc2a387660af00f2c0f3962de214d76
-EBUILD sdbus-c++-1.4.0.ebuild 1863 BLAKE2B 7e3b941d0ac0bfb80e3bc27e40ed96cbe134654724792938dc3bdb76c8eb516c3667b88b1d3fa85e655cc4351068b10b258b1f89f526877f8772c6c3cca71802 SHA512 a777f1e7cf9745110b7a2643186985ada23bc492ee9a4777451b74f45a4006fa9119ddc0cf86553264d40d55690e13150e8009b4fffa09ac71170b5ffce54f7c
+EBUILD sdbus-c++-1.4.0-r1.ebuild 1903 BLAKE2B a60b025ea048495b473491cbc649cbe2157f10f4819a8cb4aba0444a3f907fb3735761d6457dd9ffa1297d70a351b8541f15d40de11faccfd5ba0d939dfc9d3c SHA512 dae6bb8d788e3ad70f66a90d1bcab525d84b1602bee54ff73d8a448f17eff1e165fea3284128a57fd4ddce2ca9fd70d9009536a0707e47bd77541baea1d43c67
 MISC metadata.xml 506 BLAKE2B 9782068264c44c006c345fa1ffc32eb47e4f526dc0cc371f2ae2cf0d480bccf065aa1cea17ceec02b40269fb029d6473b5dc531546571e558d2a78184f029bed SHA512 347b6ae706fc9878a356e8fa35026ff693989ccb4ea702ff4727e9d256863d2225718be0d40591895970018d5161163b42fb3423594a083794025fb9f73f5167
diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-fix-pkgconfig.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-fix-pkgconfig.patch
new file mode 100644
index 000000000000..d9022bdcfe99
--- /dev/null
+++ b/dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-fix-pkgconfig.patch
@@ -0,0 +1,94 @@
+https://github.com/Kistler-Group/sdbus-cpp/commit/fb9e4ae37152648a67814458d3ff673b1d3ca089
+https://github.com/Kistler-Group/sdbus-cpp/pull/378
+https://bugs.gentoo.org/917678
+https://bugs.gentoo.org/922490
+
+From 674d370470a62c670bf457896561cc36668c04c6 Mon Sep 17 00:00:00 2001
+From: FuchtelJockel <25532271+FuchtelJockel@users.noreply.github.com>
+Date: Mon, 20 Nov 2023 14:41:59 +0100
+Subject: [PATCH] fix: correctly add libsystemd dependency to pkgconfig (#378)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* fix: correctly add libsystemd dependency to pkgconfig
+
+* refactor: solve sd-bus dependencies uniformly
+
+---------
+
+Co-authored-by: Stanislav Angelovič <stanislav.angelovic@protonmail.com>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,8 @@ include(GNUInstallDirs) # Installation directories for `install` command and pkg
+ # PERFORMING CHECKS & PREPARING THE DEPENDENCIES
+ #-------------------------------
+ 
+-set(LIBSYSTEMD "systemd")
++set(LIBSYSTEMD_IMPL "systemd")
++set(LIBSYSTEMD_LIB "libsystemd")
+ 
+ option(BUILD_LIBSYSTEMD "Build libsystemd static library and incorporate it into libsdbus-c++" OFF)
+ 
+@@ -23,13 +24,15 @@ if(NOT BUILD_LIBSYSTEMD)
+         message(WARNING "libsystemd not found, checking for libelogind instead")
+         pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=236)
+         if(TARGET PkgConfig::Systemd)
+-            set(LIBSYSTEMD "elogind")
++            set(LIBSYSTEMD_IMPL "elogind")
++            set(LIBSYSTEMD_LIB "libelogind")
+             string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION})
+             list(GET VERSION_LIST 0 Systemd_VERSION)
+ 	else()
+             message(WARNING "libelogind not found, checking for basu instead")
+             pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu)
+-            set(LIBSYSTEMD "basu")
++            set(LIBSYSTEMD_IMPL "basu")
++            set(LIBSYSTEMD_LIB "basu")
+             # https://git.sr.ht/~emersion/basu/commit/d4d185d29a26
+             set(Systemd_VERSION "240")
+         endif()
+@@ -125,8 +128,8 @@ add_library(sdbus-c++-objlib OBJECT ${SDBUSCPP_SRCS})
+ target_compile_definitions(sdbus-c++-objlib PRIVATE
+     BUILD_LIB=1
+     LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
+-    SDBUS_${LIBSYSTEMD}
+-    SDBUS_HEADER=<${LIBSYSTEMD}/sd-bus.h>)
++    SDBUS_${LIBSYSTEMD_IMPL}
++    SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
+ target_include_directories(sdbus-c++-objlib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+                                                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
+ if(BUILD_SHARED_LIBS)
+@@ -236,6 +239,7 @@ if(BUILD_SHARED_LIBS AND (BUILD_LIBSYSTEMD OR Systemd_LINK_LIBRARIES MATCHES "/l
+ else()
+     set(PKGCONFIG_REQS "")
+ endif()
++set(PKGCONFIG_DEPS ${LIBSYSTEMD_LIB})
+ configure_file(pkgconfig/sdbus-c++.pc.in pkgconfig/sdbus-c++.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/sdbus-c++.pc
+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev)
+--- a/pkgconfig/sdbus-c++.pc.in
++++ b/pkgconfig/sdbus-c++.pc.in
+@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: @PROJECT_NAME@
+ Description: C++ library on top of sd-bus, a systemd D-Bus library
+-Requires@PKGCONFIG_REQS@: @LIBSYSTEMD@
++Requires@PKGCONFIG_REQS@: @PKGCONFIG_DEPS@
+ Version: @SDBUSCPP_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+ Cflags: -I${includedir}
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -106,7 +106,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ add_executable(sdbus-c++-unit-tests ${UNITTESTS_SRCS})
+ target_compile_definitions(sdbus-c++-unit-tests PRIVATE
+     LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
+-    SDBUS_HEADER=<${LIBSYSTEMD}/sd-bus.h>)
++    SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
+ target_link_libraries(sdbus-c++-unit-tests sdbus-c++-objlib GTest::gmock)
+ 
+ add_executable(sdbus-c++-integration-tests ${INTEGRATIONTESTS_SRCS})
+-- 
+2.43.0
+
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.4.0-r1.ebuild
index 1a1fadc23426..8ea87fbecc8e 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.4.0-r1.ebuild
@@ -36,6 +36,7 @@ S="${WORKDIR}/sdbus-cpp-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc-14.patch
+	"${FILESDIR}"/${P}-fix-pkgconfig.patch
 )
 
 src_configure() {