gentoo auto-resync : 02:09:2023 - 16:16:36

5 files changed, 81 insertions, 197 deletions

diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index 87745fd92f1d..1fe33e69a3b5 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,10 +1,9 @@
-AUX 0001-fix-integration-tests-for-libsystemd-v251.patch 2164 BLAKE2B a922c1aaf7453ae1d399dcfc5cc8df35837048fa44ccd087587be8bf8c119c11ed9a19ba56b8ed28ab9d41c2778548ad0279d3aad9aa35be43740beb191f95af SHA512 f8426b7eb27e25a75289e5586816bf552d123bbb53ab94ce2f70af074b93c3e2b834f010f1618040fb642ac19b922af87ca5b632825950b909a335b810a3f56a
 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-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
-DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
-EBUILD sdbus-c++-0.9.0-r5.ebuild 3685 BLAKE2B f7c16fbc4a019f68b69008fbd6e273b60e7ca34d1e47fa67c2fe263910cecf6171fa951671a153d9d5bed7bcc231f6f1663860f55a365ff75f46c4b3c284581a SHA512 42ec168b7da085bbf3d9268ec8ac991827bf8862c594dcb1de925391650430d0285cb641568037094e3edc7bdf51078dd63c15dbc3d5e57b6ff7f4d355115285
-EBUILD sdbus-c++-1.2.0-r1.ebuild 3753 BLAKE2B e52ca0e5974b41db92a9770bd06fe331d4478ee940deba5832808eccc9acf8dd5ef757c4cec596e7723ea26f10fd3cd8022ea08dfa33804f4a212a2d79d167a4 SHA512 39bc92811e27fde4427c7ea555dfde9956d480f4d8e6c24fb5fa356e74117af1b244a51751abe31478f25a9a9d9298eef06a996d408fa577437370c3a7b48b0b
+DIST sdbus-c++-1.3.0.tar.gz 217150 BLAKE2B aa9a902cdff6a6f2268cfe04b45105ab08ee4b3a257db10af63f8224a9932e28c5f755879c866274722a2087a59c0a22dc0616ac5d696229daeaa965a156e220 SHA512 8f4cb9ae88b1ec0db0bcc27e131fcb9ad8a8bc88e39721b3b73f63e057bae4cd36619894e25114ccddb1a8e6c21db2f80adcabb3263ff5d8b34b72af7563afe2
+DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80
+DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
+EBUILD sdbus-c++-0.9.0-r6.ebuild 3685 BLAKE2B d3d1eaa418d6c8d9dbeedd2033885a3d3b2984cc1654d0a7c3240106af9f7f188453a1282bd771393516ef7ec7c2285762fccf34e31ea4fcb0722f4a57da7da8 SHA512 00efb828f2f728f984102677fa33af19929fff25e5559fc9c44cdf775fe82fdf3d85c8c37cb52a70ad6d19ac85bd03c365f0a1b8a27c6e366fcb3dd6946587a4
+EBUILD sdbus-c++-1.3.0.ebuild 1765 BLAKE2B 2b3a96e688b2f67defc722a81cd5222e1b9c827b9961f38845b29fa3e9fc879f09679d8df51e025478dad61385cec1df485b4b85a84cf317e76d9c19dd08b324 SHA512 c59b9ad88143ed4bccb971d8dcb87a1656a0cf2df22004ff3268886556e5bc368be3ccb38053887a62ea441de47df01d5f1ad8a836e7b66dde0b6ec15c295359
 MISC metadata.xml 506 BLAKE2B 9782068264c44c006c345fa1ffc32eb47e4f526dc0cc371f2ae2cf0d480bccf065aa1cea17ceec02b40269fb029d6473b5dc531546571e558d2a78184f029bed SHA512 347b6ae706fc9878a356e8fa35026ff693989ccb4ea702ff4727e9d256863d2225718be0d40591895970018d5161163b42fb3423594a083794025fb9f73f5167
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
deleted file mode 100644
index 93767dc94be7..000000000000
--- a/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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++/sdbus-c++-0.9.0-r5.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild
index 4ad16b14b087..9e5abbf648df 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 inherit python-any-r1 meson cmake flag-o-matic
 
-SDP="systemd-stable-252.6"
-MUSL_PATCHSET="systemd-musl-patches-252.4"
+SDP="systemd-stable-253.7"
+MUSL_PATCHSET="systemd-musl-patches-253.3"
 
 DESCRIPTION="High-level C++ D-Bus library"
 HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild
deleted file mode 100644
index 56e8e1beb44e..000000000000
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1 meson cmake flag-o-matic
-
-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"
-SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	!systemd? (
-		https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
-		elibc_musl? (
-			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.
-SLOT="0/1"
-KEYWORDS="~amd64"
-IUSE="doc systemd test tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!systemd? ( sys-libs/libcap )
-	systemd? ( >=sys-apps/systemd-236:= )
-	tools? ( dev-libs/expat )
-"
-
-# util-linux is needed for libmount when building libsystemd, but sdbus-c++
-# doesn't need it when subsequently linking libsystemd statically.
-
-DEPEND="
-	${RDEPEND}
-	!systemd? ( sys-apps/util-linux )
-	test? ( >=dev-cpp/gtest-1.10.0 )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	!systemd? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-S="${WORKDIR}/sdbus-cpp-${PV}"
-SDS="${WORKDIR}/${SDP}"
-SDB="${WORKDIR}/systemd-build"
-
-PATCHES=(
-	"${FILESDIR}"/0001-fix-integration-tests-for-libsystemd-v251.patch
-	"${FILESDIR}"/${PN}-pc-reqs.patch
-)
-
-pkg_setup() {
-	use systemd || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use systemd; then
-		pushd "${SDS}" || die
-		use elibc_musl && eapply "${WORKDIR}/${MUSL_PATCHSET}"
-		eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
-		popd || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	if ! use systemd; then
-		# Avoid redefinition of struct ethhdr.
-		use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0
-
-		EMESON_SOURCE=${SDS} \
-		BUILD_DIR=${SDB} \
-		meson_src_configure \
-			--prefix "${WORKDIR}" \
-			--includedir "${SDP}/src" \
-			-Drootlibdir="${SDB}" \
-			-Dselinux=false \
-			-Dstatic-libsystemd=pic \
-			-Dgshadow=false \
-			-Dsmack=false \
-			-Dutmp=false
-
-		# systemd doesn't generate the needed pkg-config file during configure.
-		BUILD_DIR=${SDB} \
-		meson_src_compile libsystemd.pc
-
-		# Need this present otherwise CMake generates the wrong linker args.
-		touch "${SDB}"/libsystemd.a || die
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_CODE_GEN=$(usex tools)
-		-DBUILD_DOC=yes
-		-DBUILD_DOXYGEN_DOC=$(usex doc)
-		-DBUILD_LIBSYSTEMD=no
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	PKG_CONFIG_PATH=${SDB}/src/libsystemd:${PKG_CONFIG_PATH} \
-	cmake_src_configure
-}
-
-src_compile() {
-	if ! use systemd; then
-		BUILD_DIR=${SDB} \
-		meson_src_compile version.h systemd:static_library
-	fi
-
-	cmake_src_compile all $(usev doc)
-}
-
-src_test() {
-	if ! cmp -s {"${S}"/tests/integrationtests/files,/etc/dbus-1/system.d}/org.sdbuscpp.integrationtests.conf; then
-		ewarn "Not running the tests as a D-Bus configuration file has not been"
-		ewarn "installed yet or has changed since. The tests can be run after"
-		ewarn "the package has been merged."
-		return
-	elif [[ ! -S /run/dbus/system_bus_socket ]]; then
-		ewarn "Not running the tests as the system-wide D-Bus daemon is unavailable."
-		return
-	fi
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	rm -v "${ED}"/usr/share/doc/${PF}/COPYING || die
-
-	if use test; then
-		# Delete installed test binaries.
-		rm -rv "${ED}"/opt || die
-	fi
-}
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.3.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.3.0.ebuild
new file mode 100644
index 000000000000..9ea9f723b88a
--- /dev/null
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.3.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson cmake
+
+DESCRIPTION="High-level C++ D-Bus library"
+HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
+SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="doc +elogind systemd test tools"
+REQUIRED_USE="^^ ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	elogind? ( >=sys-auth/elogind-236 )
+	systemd? ( >=sys-apps/systemd-236:= )
+	tools? ( dev-libs/expat )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.10.0 )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+S="${WORKDIR}/sdbus-cpp-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CODE_GEN=$(usex tools)
+		-DBUILD_DOC=yes
+		-DBUILD_DOXYGEN_DOC=$(usex doc)
+		-DBUILD_LIBSYSTEMD=no
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	if ! cmp -s {"${S}"/tests/integrationtests/files,/etc/dbus-1/system.d}/org.sdbuscpp.integrationtests.conf; then
+		ewarn "Not running the tests as a D-Bus configuration file has not been"
+		ewarn "installed yet or has changed since. The tests can be run after"
+		ewarn "the package has been merged."
+		return
+	elif [[ ! -S /run/dbus/system_bus_socket ]]; then
+		ewarn "Not running the tests as the system-wide D-Bus daemon is unavailable."
+		return
+	fi
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	rm -v "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+	if use test; then
+		# Delete installed test binaries.
+		rm -rv "${ED}"/opt || die
+	fi
+}