gentoo resync : 06.04.2022

3 files changed, 26 insertions, 7 deletions

diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index 65f396ea7532..218decd5d4af 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -2,7 +2,8 @@ AUX sdbus-c++-gtest-1.11.patch 2164 BLAKE2B 26bcf5be0de9bc9240123a1c7b6f676e069e
 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.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883
-DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
-EBUILD sdbus-c++-0.9.0.ebuild 3127 BLAKE2B 073d0b6c378c1e5e63882d32e798e67ebac1bc15f3c6524c46ff5534999ec9c58b42de0c400b46fafb3492a9de80bf1a65e6a75aa0220c2c5c606bd8a5d36e95 SHA512 ccd1ef989aac5eae53ac0c142809646569a914c48df17220c61ebc92096a19c8e16e04a0345a6f03c33c361c53570e3d603d4376e9eb15fb645beca4ef64d223
-EBUILD sdbus-c++-1.1.0.ebuild 3178 BLAKE2B e90613baf5061d935d4dfabc555599c02b27f62044cbd61ebe1f79461726dbe0d415ecc78beb0d9f18cb3d52669035e616a5161f8ad9a25b94d2496692a220c2 SHA512 2174b4740d81306500f37cc90f5b974ff16a41bc6c65117e23610ec2a8ebc601573e632c410a28a177890df47d22379bcad794123e81b4496ef8bf48eef81a20
+DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
+DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8
+EBUILD sdbus-c++-0.9.0-r2.ebuild 3411 BLAKE2B 8e7b14f2ec70e2ee909da1226f76da1bd7971929445179d297b526bc2f832e57494b2cbc956035f42297f3c6170846734f70667f8ef30c93d9816d360ee71037 SHA512 a0065880261759f12d64da291312cffe88d10f90152142f9e96d36b8e29d4c2ee0960a097ee57966f6e8917cbb6833e595a73ce193835f90b7ba477d5b5439b7
+EBUILD sdbus-c++-1.1.0-r2.ebuild 3462 BLAKE2B d2a76de3dffeeeabf285ae3ec97cc09381816d0ab43c3f19be3066125054cbf832fbbcbe3760132ff72666cb4808bc6a6c85f09d2b48a32bd114ce5e3bae007a SHA512 ebb1b7b65fc17f3d09923814392367a5d9348365ced15a51e1511ba8e8227b46b78df511dfdd339e09bc0c5b471722f82db99d570b442cc3bd0276c9855c1efe
 MISC metadata.xml 418 BLAKE2B d05d643aa8ee2b37ffb36fd99116e85e714e0e64ef830cbee4f24e2e09315a24c439e0fcc8f0b4c5516860e4dd13730682c3d50a1f65dd1c2954628793791ee9 SHA512 b75a5467a9b29405732dbac6c9e18567f7b37319a4fbffc2b65098ea2d1c3fdcc903834080e6751ef41737290352fd7ab2d0d68296675fb19f5520b81625fcbf
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
index 04f6c85c5a16..0dcc953b32f4 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
@@ -6,11 +6,19 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1 meson cmake
 
-SDP="systemd-stable-250.4"
+SDP="systemd-stable-249.11"
+MUSL_PATCHSET="249.5-r1"
+
 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/systemd/archive/v${SDP##*-}/${SDP}.tar.gz )"
+	!systemd? (
+		https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
+		elibc_musl? (
+			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+		)
+	)"
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
 SLOT="0/0"
 KEYWORDS="~amd64"
@@ -56,6 +64,7 @@ pkg_setup() {
 src_prepare() {
 	if ! use systemd; then
 		pushd "${SDS}" || die
+		use elibc_musl && eapply "${WORKDIR}"/musl-patches
 		eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
 		popd || die
 	fi
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
index 7eee346da844..acaaad6ab19a 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
@@ -6,11 +6,19 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1 meson cmake
 
-SDP="systemd-stable-250.4"
+SDP="systemd-stable-249.11"
+MUSL_PATCHSET="249.5-r1"
+
 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/systemd/archive/v${SDP##*-}/${SDP}.tar.gz )"
+	!systemd? (
+		https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
+		elibc_musl? (
+			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+		)
+	)"
 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"
@@ -60,6 +68,7 @@ pkg_setup() {
 src_prepare() {
 	if ! use systemd; then
 		pushd "${SDS}" || die
+		use elibc_musl && eapply "${WORKDIR}"/musl-patches
 		eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
 		popd || die
 	fi