dev-cpp/sdbus-c++: Fix musl, fix systemd 251+, bump static systemd, Python 3.11

Closes: https://bugs.gentoo.org/862648
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

5 files changed, 61 insertions, 18 deletions

diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index 4702d52ddcd0..dc68d12bda1f 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,4 +1,4 @@
 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
+DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
+DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
diff --git a/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch b/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch
new file mode 100644
index 000000000000..93767dc94be7
--- /dev/null
+++ b/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch
@@ -0,0 +1,39 @@
+From c812d03bc726aafc90f996073bfc327bb0ae230d Mon Sep 17 00:00:00 2001
+From: Stanislav Angelovic <stanislav.angelovic@siemens.com>
+Date: Mon, 2 Jan 2023 15:05:57 +0100
+Subject: [PATCH] fix: integration tests for libsystemd v251
+
+diff --git a/tests/integrationtests/DBusStandardInterfacesTests.cpp b/tests/integrationtests/DBusStandardInterfacesTests.cpp
+index a291be3..6381587 100644
+--- a/tests/integrationtests/DBusStandardInterfacesTests.cpp
++++ b/tests/integrationtests/DBusStandardInterfacesTests.cpp
+@@ -201,7 +201,13 @@ TEST_F(SdbusTestObject, EmitsInterfacesAddedSignalForAllObjectInterfaces)
+             , const std::map<std::string, std::map<std::string, sdbus::Variant>>& interfacesAndProperties )
+     {
+         EXPECT_THAT(objectPath, Eq(OBJECT_PATH));
++#if LIBSYSTEMD_VERSION<=250
+         EXPECT_THAT(interfacesAndProperties, SizeIs(5)); // INTERFACE_NAME + 4 standard interfaces
++#else
++        // Since systemd v251, ObjectManager standard interface is not listed among the interfaces
++        // if the object does not have object manager functionality explicitly enabled.
++        EXPECT_THAT(interfacesAndProperties, SizeIs(4)); // INTERFACE_NAME + 3 standard interfaces
++#endif
+ #if LIBSYSTEMD_VERSION<=244
+         // Up to sd-bus v244, all properties are added to the list, i.e. `state', `action', and `blocking' in this case.
+         EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(3));
+@@ -248,7 +254,13 @@ TEST_F(SdbusTestObject, EmitsInterfacesRemovedSignalForAllObjectInterfaces)
+                                                                           , const std::vector<std::string>& interfaces )
+     {
+         EXPECT_THAT(objectPath, Eq(OBJECT_PATH));
++#if LIBSYSTEMD_VERSION<=250
+         ASSERT_THAT(interfaces, SizeIs(5)); // INTERFACE_NAME + 4 standard interfaces
++#else
++        // Since systemd v251, ObjectManager standard interface is not listed among the interfaces
++        // if the object does not have object manager functionality explicitly enabled.
++        ASSERT_THAT(interfaces, SizeIs(4)); // INTERFACE_NAME + 3 standard interfaces
++#endif
+         signalReceived = true;
+     };
+
+--
+2.39.1
diff --git a/dev-cpp/sdbus-c++/metadata.xml b/dev-cpp/sdbus-c++/metadata.xml
index 3bd4943a1267..dfc9fb610081 100644
--- a/dev-cpp/sdbus-c++/metadata.xml
+++ b/dev-cpp/sdbus-c++/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="systemd">Use external libsystemd instead of statically-linked build</flag>
 		<flag name="tools">Install interface stub code generator</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Kistler-Group/sdbus-cpp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r4.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild
index 425108f6b4d5..a51620da4851 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r4.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit python-any-r1 meson cmake
 
-SDP="systemd-stable-251.4"
-MUSL_PATCHSET="251.2"
+SDP="systemd-stable-252.6"
+MUSL_PATCHSET="systemd-musl-patches-252.4"
 
 DESCRIPTION="High-level C++ D-Bus library"
 HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
@@ -15,9 +15,9 @@ SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar
 	!systemd? (
 		https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
 		elibc_musl? (
-			https://dev.gentoo.org/~floppym/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
-			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
-			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~floppym/distfiles/${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~gyakovlev/distfiles/${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~soap/distfiles/${MUSL_PATCHSET}.tar.gz
 		)
 	)"
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
@@ -51,7 +51,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
 }
 
 S="${WORKDIR}/sdbus-cpp-${PV}"
@@ -69,7 +69,7 @@ pkg_setup() {
 src_prepare() {
 	if ! use systemd; then
 		pushd "${SDS}" || die
-		use elibc_musl && eapply "${WORKDIR}"/musl-patches
+		use elibc_musl && eapply "${WORKDIR}/${MUSL_PATCHSET}"
 		eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
 		popd || die
 	fi
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild
index 5b11673a480c..14aec38d9337 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.2.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit python-any-r1 meson cmake
 
-SDP="systemd-stable-251.4"
-MUSL_PATCHSET="251.2"
+SDP="systemd-stable-252.6"
+MUSL_PATCHSET="systemd-musl-patches-252.4"
 
 DESCRIPTION="High-level C++ D-Bus library"
 HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
@@ -15,9 +15,9 @@ SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar
 	!systemd? (
 		https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
 		elibc_musl? (
-			https://dev.gentoo.org/~floppym/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
-			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
-			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~floppym/distfiles/${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~gyakovlev/distfiles/${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~soap/distfiles/${MUSL_PATCHSET}.tar.gz
 		)
 	)"
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
@@ -51,7 +51,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
 }
 
 S="${WORKDIR}/sdbus-cpp-${PV}"
@@ -59,6 +59,7 @@ SDS="${WORKDIR}/${SDP}"
 SDB="${WORKDIR}/systemd-build"
 
 PATCHES=(
+	"${FILESDIR}"/0001-fix-integration-tests-for-libsystemd-v251.patch
 	"${FILESDIR}"/${PN}-pc-reqs.patch
 )
 
@@ -69,7 +70,7 @@ pkg_setup() {
 src_prepare() {
 	if ! use systemd; then
 		pushd "${SDS}" || die
-		use elibc_musl && eapply "${WORKDIR}"/musl-patches
+		use elibc_musl && eapply "${WORKDIR}/${MUSL_PATCHSET}"
 		eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
 		popd || die
 	fi