gentoo auto-resync : 15:08:2022 - 20:28:49

9 files changed, 22 insertions, 14 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index dab6b94a1cd0..2361b9363300 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index b0167f5a7f56..c1144f5adeb1 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,9 +1,10 @@
 AUX linuxptp-2.0_nettstamp-systypes.patch 1374 BLAKE2B 2b90a983e99cea7c686cbb28eb7c53fece2ad22dda0a898fa3ba0a867686d500f288e24c18c473729d48deda99565069b4983ee02f56214bab6367e6a19ff9cd SHA512 e9e0ae1be45c1d3d71cbf9c7df30584e52d8169755f516e920eb49e52c0dea5e388c36e92d9d000112d7630631cdc97d2eaa55fab1413d13d145a4970b1b7120
+AUX linuxptp-3.1.1-user_cpp.patch 329 BLAKE2B e99f87e5e8c42ac3eff67b8fea87994718ab7531dac0a69b609cd2fda0e3d88762439c1dbcfe9b76ef07bea8a159476e32624c146c9a89756e22560b691d0b27 SHA512 03a40f08cd783a16849ebfbf033e1f0a953d8aac31c56ea69adad4e4c2fede3a8acc7ecc8bc62706b9fbc7271fb5781c95fd7f7b03aa4c67da8a2afae65dfa19
 AUX phc2sysAT.service 248 BLAKE2B b0e1926a7755314bd0def600e81dbf7b60707216ff3844194512511ce99407cc88da7a2c83e019b20571098eba3f2297c1a1fe54da47f8fb5e07a58c20a007a2 SHA512 55f048ae44eb43894aad957b35842b0b21aa27e922be85bd286847281f8716bdde9b8187ca90d90d31c9d4587de4c35eebaf0e47498f9b950279037e03069086
 AUX ptp4lAT.service 242 BLAKE2B 2b0ca6ca5b7e4adde39ca360713af02450c0d36b1f4a2393350a59d80dcb0cc26000862546b732aac9f6b89ed6fdec0175485685cc3343d2d33fc48d671cca03 SHA512 f182fc52ebfc8fa878d94604fd398d071fcf8347cc8c251a2f8f78fbce518181c543f2eae971ecfb768bc9337c816d894ab150b37ce1642e854a65792324a50b
 AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b4170a00d0f5b44f118fff5a56dd2fb74fecead5068f8b345399bb27dfef1e382fa27a777e9ddc65b7b92a9 SHA512 d3b1f7fb31ca0b233575bc491ba52700be8d586ead5657facda3b84141cd1467b55c52f4cafea972f13d1c647cc8b3bb1092bca580fd0b0d135688d00a641a82
 DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
 DIST linuxptp-3.1.1.tgz 218784 BLAKE2B 5b46580a0e1b6e003f5f03e512c4f9b348c086f356fd47d3480da5e8223ba291fdb213798c696c37759896a99bccf21cd7e7daddce5aa5ed5701afb0e622a755 SHA512 c3c40987fe68480a8473097ebc3c506fb4f8f3b6456bbe637b2b3cb0b3e0182f1513b511fdc04b3607d5f7d8bd1bd22502bb86eb13f9fa4fa63a3331846b33ec
 EBUILD linuxptp-2.0-r1.ebuild 1042 BLAKE2B c1ca710e95c14a358dfa16ee99fbe0fe5594e7e7c403a987a79b03eb9a74464a3f72a7f585c0ec779d5aceceb8f5a25afc4d3f55ac4a0038fde8fd5b4a992f42 SHA512 3cd615b214e0f519f6ec63fbadc36169aee412742debeffbf3364b05d301cae2361a7d0ad9ac79567e25713f38744160f359abb72fad840eeafd5c0d53364017
-EBUILD linuxptp-3.1.1.ebuild 1123 BLAKE2B ee9ce4164baa4e80be57f33fcd37deba319c4a83badffa167eb88f924b31c6aaf8384160e319deb8025a53bbc51dbcb9df733931f0a257c4b28e34e63c959897 SHA512 915a2cf5143ef773f0cc0e9b8656e6f9504f94caf1ccf5ef878f8e3da6f7c4b1f8cd72d108b2482728510e912402264748a40b4ca20f45174810d4a9e3c8921a
+EBUILD linuxptp-3.1.1.ebuild 1197 BLAKE2B c9c46db95d7c8d7ef267218a50d348cc862473e7c251a051992f7a4b5b29b72f1626e0811c8abcb3335b6f337384ea84e3d45759152ab73092e781dc40062c95 SHA512 1afb7a7eea3a5d1f89002ee9802eff08268e45ca16ea4ded9cdbe66f9017a5226a847ca506f024cf40546a48c0564351ee93cb7d7d603291681a99b855132f25
 MISC metadata.xml 434 BLAKE2B 6294b76d69b7459ff51a8b3f679ca7bfd940a70088eb53be6e15092465a3cb01f4a7b8b5430244b871321c320ec389ac1b05b239f3eef54e9284e881910e13cf SHA512 7f2fb3921793510144e823c70d1ac263297d3591055c680fc8192dd8402e8a763bc8de8882f9c441e060e23cebaa5e6c684873d82738a6ae8f54b6e027b5c837
diff --git a/net-misc/linuxptp/files/linuxptp-3.1.1-user_cpp.patch b/net-misc/linuxptp/files/linuxptp-3.1.1-user_cpp.patch
new file mode 100644
index 000000000000..d2b3728b6141
--- /dev/null
+++ b/net-misc/linuxptp/files/linuxptp-3.1.1-user_cpp.patch
@@ -0,0 +1,11 @@
+--- a/incdefs.sh
++++ b/incdefs.sh
+@@ -27,7 +27,7 @@
+ 	printf " -D_GNU_SOURCE"
+ 
+ 	# Get list of directories searched for header files.
+-	dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /")
++	dirs=$(echo "" | ${CPP} -Wp,-v - 2>&1 >/dev/null | grep ^" /")
+ 
+ 	# Look for clock_adjtime().
+ 	for d in $dirs; do
diff --git a/net-misc/linuxptp/linuxptp-3.1.1.ebuild b/net-misc/linuxptp/linuxptp-3.1.1.ebuild
index faae13c19360..281c2325d00b 100644
--- a/net-misc/linuxptp/linuxptp-3.1.1.ebuild
+++ b/net-misc/linuxptp/linuxptp-3.1.1.ebuild
@@ -17,13 +17,17 @@ DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
 
 CONFIG_CHECK="~NETWORK_PHY_TIMESTAMPING ~PPS ~PTP_1588_CLOCK"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-user_cpp.patch
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 }
 
 src_compile() {
 	# parse needed additional CFLAGS
-	export MY_FLAGS=$(./incdefs.sh)
+	export MY_FLAGS=$(CPP="$(tc-getCPP)" ./incdefs.sh)
 	export EXTRA_CFLAGS="${CFLAGS} ${MY_FLAGS}"
 	emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man
 }
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 8076d4158656..d54c50fa0535 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -2,6 +2,6 @@ AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f56962
 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
 DIST ModemManager-1.18.10.tar.xz 2611480 BLAKE2B ca6c690f2365917b5c879c1bd80ec2752880fb4ffe779c0dae7e2b0852d5f77bb403b5cc1f529e254818fd3e6df2698cd77493d801f5c55d5fe60c817df1e713 SHA512 4615ddb852b750ba0ca62224b669145a408a22b841937d42271638a73bf59dff5fb8b73553388afee8e7d2b2126c61f51af3f8fcb4475a2e2ea313d438443f9b
 DIST ModemManager-1.18.8.tar.xz 2533392 BLAKE2B 7e95aa2303b55524174475ace96e0b938d2ac9abee0867bb56c6405f3460e73fad0ab68e50361c148551401ff2450abe70733616534507251cbaaee41ee02028 SHA512 fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c
-EBUILD modemmanager-1.18.10-r1.ebuild 4115 BLAKE2B 8aa318ab5a12c7f5e28a9b320c34dc1ca60a195914ad0bb0f02f92448163bdefe9dfa43a297794bc150ae099172f3419e9b628b1c04bcbae1bbfea70a4243dfd SHA512 7b327781b89d144535af7e002ba71827f4bb9874e334456c361d7cde8925c772fd2b234a6d52641aa2fdbc6e749ace72158ccc9feb9046e3b6880130143b68a0
+EBUILD modemmanager-1.18.10-r1.ebuild 4114 BLAKE2B 6662fd37bb94863447fb478638b160f0dc15b6c8a602133c303551482aa20b6df4ae0b0c0fa656c5fc385d547bf94fe863c67142cd464ea43daca57d78a52d45 SHA512 8bcafea3976e5ef239b409cb04514c341dc89c77466e3c6367659e1c2f790c0c84dbf2bce66261dfa6588ce9f31dc18a979dedeed1526e9bbe28e4001a557bc6
 EBUILD modemmanager-1.18.8.ebuild 4030 BLAKE2B 9ee5f4baa98a5a28b09b2b663a283c6af93fd7c51c6518bff6bb287cfc3ca081cc2a4169b0427d6ecb0298607b8661598f930e9aed66108205400fdf251acb63 SHA512 dd4971c173bf32e59434a427ed904888fee2ec098c7ae3e046c019411d1d23792d6ce37db6569e2060307ff94b7e846b764fe47b93f3bfb83fc25184d917ca80
 MISC metadata.xml 522 BLAKE2B 9a2c3612abbf39e1518eac9eb5d1be220a11c81c0612c876779caced0a00c282a5a571cf19a1ab174accd2c22c071e69b16336cc0e93e45c1b3903a4013ac242 SHA512 2539c9975be03c6b365bdf32353529469dc3fece4f4df7d31784d8e5299126d813bb6a310c4fefba5e81d2db5aa073446ef4697c059a2eac7efe1502a6671a4f
diff --git a/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild b/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild
index 89e61a449262..3d192b76ac98 100644
--- a/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi +qrtr systemd test +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index e3f584888466..fd8298aa1eab 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -11,6 +11,6 @@ DIST rsync-3.2.5.tar.gz 1129957 BLAKE2B a0d1c4a2dbebe37bad4f6e2e5e4fae41c53529d9
 DIST rsync-3.2.5.tar.gz.asc 195 BLAKE2B 9ca9034afc39299c2178190412b188f561d274d8e38d58a988487f2db14a8135840acf3413096d26f080358b69779fa3b48e292670ba6b23ae4eb0c05f9df614 SHA512 b384f48b2fd459a51715c8ab2a14e540c5fa7f7f12453282db770893d6121b1b3c9809e667ccacaf910fd90548abeb700a2c717d76fbea22fe3d6a22aa6b2c44
 EBUILD rsync-3.2.4-r1.ebuild 4489 BLAKE2B d13cc511cb1c48c11dfce0df382a0e3baf107ffeddc6d8204debf64c2a15aa97f970a0e4a59b33f71d3e98ad42913ece4ffe576e653a985d9e3391b61419896b SHA512 bdb098101abe7ef32e23b8658f56718cfb00ca3acf273bf590a21edd80e1e54bdeee6169e4a55af4d6e9c94d00233f9e3dbbe970e48bc9d21da5a9479863df73
 EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2
-EBUILD rsync-3.2.5.ebuild 4467 BLAKE2B 36f3710e9eb5928e3fff26a4fb367acd7fa09965fe175f11cded1ebde7cdd712dce721e71b43d967855a624e2c7be68e02789cf2a4461af993e157e9fe9e5b0e SHA512 db6e8173b31bba6a922ef731ee1aa5397eb276e42a154cfb46140bda2d013abb1ba5e34d7bbec769e57c4c1d46053230759352c388ba649a7553ce0336cc271c
-EBUILD rsync-9999.ebuild 4467 BLAKE2B 36f3710e9eb5928e3fff26a4fb367acd7fa09965fe175f11cded1ebde7cdd712dce721e71b43d967855a624e2c7be68e02789cf2a4461af993e157e9fe9e5b0e SHA512 db6e8173b31bba6a922ef731ee1aa5397eb276e42a154cfb46140bda2d013abb1ba5e34d7bbec769e57c4c1d46053230759352c388ba649a7553ce0336cc271c
+EBUILD rsync-3.2.5.ebuild 4326 BLAKE2B 05e2d480e9cd3282787167369b9ed95ddfbe4895c5364e69573b6a5ef8e5649306baaea820bf72c6a294863e0ba06dded02f5e98ac98d2c90a6645bdff805c3d SHA512 8d4a6bf17790fc85f5385a3e4325d6e149d426a6e99440987bdffb7a72aae0995bbbd25cd90d8417c70402355b4f79f21c68974a9f11a98c414c5eb5bb688ec7
+EBUILD rsync-9999.ebuild 4326 BLAKE2B 05e2d480e9cd3282787167369b9ed95ddfbe4895c5364e69573b6a5ef8e5649306baaea820bf72c6a294863e0ba06dded02f5e98ac98d2c90a6645bdff805c3d SHA512 8d4a6bf17790fc85f5385a3e4325d6e149d426a6e99440987bdffb7a72aae0995bbbd25cd90d8417c70402355b4f79f21c68974a9f11a98c414c5eb5bb688ec7
 MISC metadata.xml 707 BLAKE2B 54c2a5840dd4fabb9055652c6bd39d657fab4846891b5ea3fbc59345d98a494b28033336f52d7dfe69b783f73bc64e40496b5c1d09f735545fa1bd74c04d69a8 SHA512 607337487ce0a6b7a5d52f9cdd0a8c5d40daf67ae9e1a3a2107b366484aca6b1eaed05840b95839a2957971accb28ce228f5a4922c7bbace1cc65fb29151df6d
diff --git a/net-misc/rsync/rsync-3.2.5.ebuild b/net-misc/rsync/rsync-3.2.5.ebuild
index b98126e7a197..ab9d689fb713 100644
--- a/net-misc/rsync/rsync-3.2.5.ebuild
+++ b/net-misc/rsync/rsync-3.2.5.ebuild
@@ -78,10 +78,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# Force enable IPv6 on musl - upstream bug:
-	# https://bugzilla.samba.org/show_bug.cgi?id=10715
-	use elibc_musl && append-cppflags -DINET6
-
 	local myeconfargs=(
 		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
 		--without-included-popt
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index b98126e7a197..ab9d689fb713 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -78,10 +78,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# Force enable IPv6 on musl - upstream bug:
-	# https://bugzilla.samba.org/show_bug.cgi?id=10715
-	use elibc_musl && append-cppflags -DINET6
-
 	local myeconfargs=(
 		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
 		--without-included-popt