gentoo auto-resync : 20:08:2022 - 20:39:37

5 files changed, 40 insertions, 2 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 7f887cb99836..840297796794 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 0f4388459d11..bd004fd5c02a 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,8 +1,9 @@
+AUX sdbus-c++-pc-reqs.patch 1106 BLAKE2B 8f2cbb5d8f91b736cc3d15997e236dc452dd80ed9cc8c28c2b42a624b98f1f55fd986424291a37e9c8eba74c7bbeb9a6071231f875246706b5bcc617b10d227a SHA512 d27efa14fe841be0d6e0c7ca179a44aea560894eb5fb951deb31c63b8d65e223aa387d854dbc68209075bacb25cf5f40dea38715d62ced510fbef8284f67efe2
 AUX sdbus-c++-static-libsystemd.patch 417 BLAKE2B ec6120631ad48d70820c1070a47a224c837c838e0ff24c031b02fb4b9ef900da7b3a2c0b0e696066665a9004b9fcb68851c6971a220b2446da03dbbf42138ac5 SHA512 e42a080f580597aa7c3cddb71f6e6368addfe4a36b08b2944baf111dd70029c3d0d79868dabeaf78b91836c2a84939163ce10c3ffe4b36e53424be06c1fe1a0e
 DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5
 DIST sdbus-c++-1.2.0.tar.gz 205798 BLAKE2B da040acb49f5294665b09df97c171eac38f7c6ce5e86093b45b896c4b216afc9b45870395404ffb8e7c32ac8b98f6c795fb528691b344587545e5ae27d4423d6 SHA512 dab2c4d9a5ea6d626672a5a6ee6f3490c60c6fdd160769801a4d6b4cf3df4983fad57ff0230132a5d637ec78a55993200ce217fa89461016e101865cc2777d7d
 DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
-EBUILD sdbus-c++-0.9.0-r4.ebuild 3555 BLAKE2B 5b329e0468b93c7ebef9f5a0c4b17c5debd08cc138764c9585c5ca9668407025ed7636429f13b82b76e6a1374491debd9f1ad4704642cef280219d14541a0064 SHA512 bb28c32a8e35b0fc8ad94a0144e2820a6864fa96c28c459c78f5a7e327adef9f39b823e8688cf43f2940adbd1f7b1d06c1ab2b0bea3c8d916be0e0ee44777516
-EBUILD sdbus-c++-1.2.0.ebuild 3555 BLAKE2B 080ddcefa1d4c9e3430fc8006c3223b21c7a641fa11d17901700339fb71fa5a191a9e97ad44e4179ad23c1eec831e56a50e7e4048332b10d1c3bbef51c9d7b57 SHA512 1bdfe685bd9ce25745dbac7ddcd5b05a4723f3b66db9366ea191ebd67de56e33e767cf881278da82241f64544761d112b6145ee6a29543a76f2cabccf48820a6
+EBUILD sdbus-c++-0.9.0-r4.ebuild 3603 BLAKE2B 050ac8a69ff23d89481ab5e19cf3c2b5a908620d25c24d24c419d94ec3e44a94b60485df2693907d7a6d08cd4e944fcdfeced9f5a624869a0e6e58d1997fa88f SHA512 810251fe55eb4b12a8b7bcb91667b4e3b0f4616c8816342293ea4a7c2ea8bf36cd7b56e7bb71565815c2ae9a5c77fec0b63f6839acbe0dae4804decf5f3c30cd
+EBUILD sdbus-c++-1.2.0.ebuild 3603 BLAKE2B 891d9be5221d96951e100d04544bde86dc392c10870d7d70193050ecfa2fb01e2850ecf9e58f78b99f09c17c52f3165e5c4d9f5f9a5625842e93f731da9b9b3f SHA512 1c8f3dbfbb4c75a962dba5e736bfc987baa72493251625806b1f16669fa573d2526d00d95ee76fb62e19b69cec8bda9647089b689ba69d449999e96f9796a0b8
 MISC metadata.xml 418 BLAKE2B d05d643aa8ee2b37ffb36fd99116e85e714e0e64ef830cbee4f24e2e09315a24c439e0fcc8f0b4c5516860e4dd13730682c3d50a1f65dd1c2954628793791ee9 SHA512 b75a5467a9b29405732dbac6c9e18567f7b37319a4fbffc2b65098ea2d1c3fdcc903834080e6751ef41737290352fd7ab2d0d68296675fb19f5520b81625fcbf
diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch
new file mode 100644
index 000000000000..9730bda5bc65
--- /dev/null
+++ b/dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0733b41..fd613be 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,6 +210,11 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-config.cmake
+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++
+         COMPONENT dev)
+ 
++if(BUILD_LIBSYSTEMD OR pkgcfg_lib_Systemd_systemd MATCHES "\.a$")
++    set(PKGCONFIG_REQS "")
++else()
++    set(PKGCONFIG_REQS "libsystemd")
++endif()
+ 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)
+diff --git a/pkgconfig/sdbus-c++.pc.in b/pkgconfig/sdbus-c++.pc.in
+index 21e0f0b..a6d6ec9 100644
+--- 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: libsystemd
++Requires: @PKGCONFIG_REQS@
+ Version: @SDBUSCPP_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+ Cflags: -I${includedir}
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r4.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r4.ebuild
index 12f7585b9012..d65f5c3ead87 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r4.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r4.ebuild
@@ -58,6 +58,10 @@ S="${WORKDIR}/sdbus-cpp-${PV}"
 SDS="${WORKDIR}/${SDP}"
 SDB="${WORKDIR}/systemd-build"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-pc-reqs.patch
+)
+
 pkg_setup() {
 	use systemd || python-any-r1_pkg_setup
 }
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild
index 2ebb4f8fe333..e6de260d88b5 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild
@@ -58,6 +58,10 @@ S="${WORKDIR}/sdbus-cpp-${PV}"
 SDS="${WORKDIR}/${SDP}"
 SDB="${WORKDIR}/systemd-build"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-pc-reqs.patch
+)
+
 pkg_setup() {
 	use systemd || python-any-r1_pkg_setup
 }