gentoo auto-resync : 17:12:2023 - 14:57:38

12 files changed, 182 insertions, 14 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 3b757478f860..d4a5175fa7ea 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 335e10859524..26dc15a68d37 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -15,6 +15,7 @@ DIST binutils-2.40-patches-5.tar.xz 293628 BLAKE2B b7ed1d1fbf38b420661f984b9519b
 DIST binutils-2.40-patches-6.tar.xz 299212 BLAKE2B 3a68a924e9747fdd0486327a5bd2490cb72376f2cb6c6a60030d8c6b71357150d956a1e71d91683d43b571cb5bf738270880f72ef175d6c8faa257b090abeb8b SHA512 984dab529276ab4f9d215f643c7c18bd1793f438aaad0be158d209787c9c4a6bb68b10bec2065d3fe14a1594d5f1c29f55b2e9bac34a6f489f4b466c02e24766
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
 DIST binutils-2.41-patches-2.tar.xz 20288 BLAKE2B 1cc29e868ded12845856c5da567f23798fe3017961ce079325c20f456b837cab11560d896065f70953b0bab55bf565288541579e9c3e0991a87083edf2a85fa5 SHA512 75619a5e17b75d72f9bdd9d5e5ee3b566c94de64410bfc074f1a9bfb9f08db9ecf8be216efa1053263468aa8ec99b8aa3b2b095e63cb95f3566500ac0c3b9432
+DIST binutils-2.41-patches-4.tar.xz 86580 BLAKE2B 32748fd0e81a7e323e9f56f0864f2a1755b8fe1b09c777075e31a292297e365c47b47003f8f1bffacc254ed8dccf1c655b7b13f61da751c9db090e56d819fbb2 SHA512 90dcf38c1ed2ae015eb9de922e946e2be62355bd51276075e7f1c0a06cd52408057c4151a2d2d4c07e33c1d2c5998001cba5509819e5722cce45f70172465ea5
 DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374
 EBUILD binutils-libs-2.34-r2.ebuild 3633 BLAKE2B 4bb2862dc364c5f64597d2fb22f867028ee85c4d8a14ab85e28c2f5dab43cdb2a690e91b43d1a7994081df9c21be6c9850b808f01d71e18b97c1439ad1890fcb SHA512 84a368c4c1ba2a3f4e1b3043f531deab5457b0169d83b38bada72b857e9a86a7ca86cb317a062216ee7d2b87e39c6648e8bbd62e676507c638ea6fcfc9efda28
 EBUILD binutils-libs-2.35.2.ebuild 4055 BLAKE2B 5a2eed3c0e4a9f23742fe73258504faa0c52a975f9a53b9eaade40bd7f2af66d8524b4b08c02bf88770be79fa2163045b0721d5036860fc7b6c24e865e7da59e SHA512 da95193b41c9776c8f352c1008c3f7e64713ccf3f474f603cb390437e8ccdf0c6a32f5093281294d62441d671b7148a9955c235a8474810c8c8b029eb97d1765
@@ -25,4 +26,5 @@ EBUILD binutils-libs-2.39-r5.ebuild 4766 BLAKE2B ee4275f3555984c95e8063a6858e761
 EBUILD binutils-libs-2.40-r5.ebuild 5004 BLAKE2B 6123463e4f95c7e5f2a9b718f780a89ebc0b4b14ed4075c7213b7c841e9aa8cdf4b9e337c4e1b815ae01c80bb4ba96aca43d6d15d37b6905abb8f41c925d6c0b SHA512 75bafa58c49b4a8e43f7b83619def231265b78b462913873b9c9bfab82ae5ddc297526548d797d6661fecc1da3cfbd8c515fd6537b7d3a320711594c9e819277
 EBUILD binutils-libs-2.40-r7.ebuild 5009 BLAKE2B a78b7e2a58d6603fe9162965bbbdc1ccb59d47a4eb8e0cfe96df31e8039089bd22c0fa499a57fa5eca9ab3b3e14ec36090761f0a5fb93b5fda4cf96a6e083639 SHA512 b489b14a589b7e71ee83b845bead0a43bf6938810e8bde36a573a19869626b26c527bca728fa03f2b611164f7136ec7872d755121543e2b7cce9542c1c152543
 EBUILD binutils-libs-2.41-r2.ebuild 5178 BLAKE2B 87c9fe23b15286dc1aba6516da26184580f557c4530f2eb796a82f4f01f2558ea733a764559b1f09274bc51ed7c1a1547824b4c4c53d229c54e125f9402000ba SHA512 8c880c8774b1a0f297d85614bc83260820b60fc8263d9f75eac34fcdea1c9e31df1d60b2f9008bebc917871b0b63f05fd2ee008015db74c8da4066d3b41376b1
+EBUILD binutils-libs-2.41-r3.ebuild 5181 BLAKE2B 3cb2a22bfe2da2d305d7ae4da606fce583aea9055deddb5ae488f686c3c3629b8a7e74beae0cea69e4d8ab59292706e7d5e1aa8726bda46a6d60c871565ca05c SHA512 38dc3444220d1b5bfb3f71acb75889cbac9333d708bab58b8be6f6495a5dfc2244ce46081a3281a69f1fdcacb8c1930c5ea96ced4b5ed9968595a8a80342523a
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
diff --git a/sys-libs/binutils-libs/binutils-libs-2.41-r3.ebuild b/sys-libs/binutils-libs/binutils-libs-2.41-r3.ebuild
new file mode 100644
index 000000000000..2b5ddcda5f62
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.41-r3.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=4
+PATCH_DEV=dilfridge
+
+inherit libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+
+SLOT="0/${PV%_p?}.0"
+
+IUSE="64-bit-bfd cet multitarget nls static-libs test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? ( dev-util/dejagnu )
+"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P%_p?}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# somehow libtool/configure is messed up and (custom patch at
+		# upstream?) and misdetects (basically assumes) nm can be called
+		# with -B arg -- can't run eautoreconf (fails), so patch up
+		# manually, this would break any target that needs -B to nm
+		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
+			libctf/configure || die
+	fi
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	export MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# libiberty's or bfd's configure.
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Revisit if it's useful, we do have binutils[zstd] though
+		--without-zstd
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Provided by sys-devel/gdb instead
+	rm "${ED}"/usr/share/info/sframe-spec.info || die
+
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index a8cbfb43060a..ada74ce9a325 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -8,10 +8,10 @@ DIST musl-1.2.3.tar.gz.asc 490 BLAKE2B 4de3d2b2f4e748795b71e144df3ac073c68b0b1b5
 DIST musl-1.2.4.tar.gz 1063758 BLAKE2B 7b5c5e335c55248789bca26084a744152f1128dd39159bcf46456ce1a4438c50097c75c7b84aa2980dccf2156f45de41e446ee39c7b3a43d80592c2b9ce75d98 SHA512 498ec5d7941194a8806f4d42f0f6d218c862996ef1398b737d0d06995e0b7a6574b240a48088f6b84016b14b2776fe463f829dcb11149cdfc1023d496b235c55
 DIST musl-1.2.4.tar.gz.asc 490 BLAKE2B 2133cff9ae2c8f69213fb72a256533d0686fd118012bddf0880d444fdfa456c6b448681838fcf3effa5403fd1bfbef7274cac548fecca3ec2f2e4e217ef74409 SHA512 5a3362ef1e60ae021a2c56ecde202a9dfd71914f3631ab498c8b751c38b217010997c8b28e31ebb6d1a8fb2663165a35943615825e2c220eb48ce66908ea1a9e
 DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
-EBUILD musl-1.2.3-r7.ebuild 5777 BLAKE2B d80d49bef335e979a611c2b09b067cdcf03fb41f890327eb954d29a38d37cf8d345cf1884c79d1223c0b060425e2e44e247e7058b172f40415fefeead257fb87 SHA512 441bd800beb8ab5665b77ffa5a4d871ed6eafcdbda9b6d339337813a12f3ca6f29c35856cb95681d2e35b6dcae4d76f58c0ffb117bdddd1e72baf6d2729c68df
-EBUILD musl-1.2.3-r8.ebuild 5933 BLAKE2B ca2d9242e023540908d4580ed7ec999d6abfc85a0a43880f4b5a16054e458bc65f538b21159e9786d3153c240608f08bde3a668b64a4eb2d8577c7ef5f4bd67b SHA512 01664255fb0e679b5f82049fe6fbf127afd53f8ecfd7e0f0b23b637bfe369d4a20bdba09ec699f374ffa4f6776d366a0ee5ab589e06a84c54027484700ebfa4c
-EBUILD musl-1.2.3.ebuild 4844 BLAKE2B 9b976d7e0154bea8c1775fa15085285eaa2a2c85a17c058c03bf0fa4d87c95aa1eb3623ba5fafc0d98ae37ba502d88496b6d03fb033e405572e678da83b97254 SHA512 33557259bad48de230685f9149120c12807473026395218b063322f82b0e9ab5fb4bf2b1a1887823b3706933bee551a3d69d3fb4aab07a20f3615a5c9ebc3c62
-EBUILD musl-1.2.4-r1.ebuild 5722 BLAKE2B aba8545d2d45992993819fd7bbd13d13a29a1e446c5cd73d72425d45d94da9fb571f3c08ea833796379275f057568786d52b47b425b5fd640530631dbf5d661e SHA512 c58b46f69c9419b6d941d18d82308a318543d6e1839388c617062a023299567eed6ff752a4db6c2bf3410a91d163a8f76c691d807e08286f9b256cb07ab3b32d
-EBUILD musl-1.2.4.ebuild 5663 BLAKE2B e23e2766167c9727ace6126699a0c22ee402e059c4e7ee3b25d54965f1a7d6a44045c75473f96822d289df1721506e307edacc2f3ca849b0ea5d85a82f2c52b1 SHA512 6a5fc4e1788eedc00d7192ade8bf706863719b4bc96b1fa53aca2841d75087cca1af0607caf751036282ebfe2df6e92fc79799fb668d72a072970ad7dbd947bf
-EBUILD musl-9999.ebuild 5663 BLAKE2B e23e2766167c9727ace6126699a0c22ee402e059c4e7ee3b25d54965f1a7d6a44045c75473f96822d289df1721506e307edacc2f3ca849b0ea5d85a82f2c52b1 SHA512 6a5fc4e1788eedc00d7192ade8bf706863719b4bc96b1fa53aca2841d75087cca1af0607caf751036282ebfe2df6e92fc79799fb668d72a072970ad7dbd947bf
+EBUILD musl-1.2.3-r7.ebuild 5783 BLAKE2B 70a576de93379765eb5741ea555eeb0290290533014f79ce9a65ae3d73c12ab2c62196d0a00735c2fdd9130074a1d5674bee17b8342df611a4086ae54e2ef089 SHA512 458bbfeb64d14e2c46beeb89f02c8772fa2c9102307bd481d98ff80f245d58ee35bef133b5d6584df6798427ee0f3dd8ec0501dbddc44b0e1afb620173918eb3
+EBUILD musl-1.2.3-r8.ebuild 5939 BLAKE2B db7a02bc65484de181f8a389ed3d635979018f45fd2f241cfdccb295b90a728f7a95341945a548e4aa3c3ff66620a9ca99c595fdd4050dc75b2b8b9c734ad4db SHA512 5e9251dbda73e0dd0e0a71b4cbd35058dae961f0cabe4d555d95c622dd6856b22e6bf18ec6ca61d6e275c2fdd0afa3450d80c7d8c8a95ad92b95507b3ba6017c
+EBUILD musl-1.2.3.ebuild 4850 BLAKE2B 72d5aad92adf02b3e6f459e5533ce810923e05303092d199870b4fc12f49665f774ef2b962449f8d095677737886c4f7406679654e5761c52453984dc69779d7 SHA512 9fe67cc4443473e95c93879a84f0d44c32b00b7c1b108eb68ef96ce021fc7ab1f075e9a1b1822cb7218d3a00c0e01a8afdd23c2854b5d98f714727630858c2e3
+EBUILD musl-1.2.4-r1.ebuild 5728 BLAKE2B 5dd5ff3e8374159ea39c8d3bae7d0070a105add736c4b73dfd3c2f769ec6e1d1c75df60d4ff7b6c2c38bb7308b2fb1c53eee33ce747d401a16d9ebf1348ca9af SHA512 21f9438c28de8a552ed5aa0d71385f75dbb905031234b17ffca30af8291403b21afe203c4d6b7c711a2cfc49337339c7cd20b23cc8c51f731088bed6dd807ee4
+EBUILD musl-1.2.4.ebuild 5669 BLAKE2B cfd2e685efd786a4d9ca498ae798a08662ce6b30f361d1f7ed3833119dcde882456945c08c74875cdbeaa18c6729637522bca0696dc68a851e32881277b4e218 SHA512 89408896f640abda25f2ac468954f37231ecc0256d226a40b2886a02dbb04e43d67e39d5b409935fce519587eef65088309fde05399a642b00b05cbabc73fd7b
+EBUILD musl-9999.ebuild 5669 BLAKE2B cfd2e685efd786a4d9ca498ae798a08662ce6b30f361d1f7ed3833119dcde882456945c08c74875cdbeaa18c6729637522bca0696dc68a851e32881277b4e218 SHA512 89408896f640abda25f2ac468954f37231ecc0256d226a40b2886a02dbb04e43d67e39d5b409935fce519587eef65088309fde05399a642b00b05cbabc73fd7b
 MISC metadata.xml 559 BLAKE2B 8b1093a5278f716b8e21467b325e373a790f54c8ab71b92adc4c87dd569a92b20e08009372065f0f27ced39e3361c9e5e5a2e1bff271753d280439fabbddd3a4 SHA512 a35c13ea32ac8f26984bdb0d70d28a4285f34e32a2b0b17ad98fe3f357fb46c87a1e853377630d4da58fd5953de3fdeb02ee89181394e1815f5e0bbba4cd9f92
diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild
index efb999922037..a201a7574d4a 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
 	inherit git-r3
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
index dfe257f84b9d..f8962b382f48 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
 	inherit git-r3
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 9e1f93d9db53..850138951e5e 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
 	inherit git-r3
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 899ae673cc90..1d1973c35acc 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit crossdev flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
 	inherit git-r3
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
index c41674ff8142..2908fbd17541 100644
--- a/sys-libs/musl/musl-1.2.4.ebuild
+++ b/sys-libs/musl/musl-1.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit crossdev flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
 	inherit git-r3
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index c41674ff8142..2908fbd17541 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit crossdev flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
 	inherit git-r3
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 4a219e781a1b..ca4821ddd0ae 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -10,5 +10,5 @@ DIST zlib-1.3.tar.xz.asc 235 BLAKE2B 5fe6ce952699a19e848d0a6e6c3622f934340068fdc
 EBUILD zlib-1.2.13-r1.ebuild 4668 BLAKE2B a5d0fbbf6d5248157b97fbbcc6ad6b9bf282483d982b288008774e156361120180e572bb793641f892f8c3b998fc15ef6583120af62115838880232f64cb3bc4 SHA512 ae5fcf58a7712464a90a894126e35e68426c3739e8827bb085144b73496b119af7990d3569641b36b09ae9ae97441f057f1f4c7b0a57fe9e397e17651fa3bf45
 EBUILD zlib-1.2.13-r2.ebuild 4750 BLAKE2B d1f29e99bd4671ef6ebfe941f21cc010e4b81ba6c3355c38c3dddcd2dfe395af8d4061b2940dd868d552bdaa8881149570fbef4da3eefbfbfbe8f20fec7d0f30 SHA512 c459dec39b307a52ac6c137a7bb77ec761bc0fc7b5b827731ccd177fa6f24b0dc77c16ce1eb9b9b99d3dda3c51fc0b16eeeadd6e8b053d31edcc12ad612caf18
 EBUILD zlib-1.3-r1.ebuild 4539 BLAKE2B a83bedfe15461ef089d17c3666512162fa46451eea170f2b2bacf09f5fbd1ebd306753e183e1317355a01fe982b7115cf88f19ff567bf0cce9a396b004928744 SHA512 9635ee7b82dc9c0b598906df4fb0c4d1e7814fc0a632ed141036e2571924c9d4ec7a4179d88ceb42b7f1e59e95c10e2a954ef09b03f32b7f10e46fddbe63e0f8
-EBUILD zlib-1.3-r2.ebuild 4622 BLAKE2B 2001c6d0887154f240aa100d21c29c681b26a369779ce0886ddda6bab82d09dc7d2a9ab2607ab917af4904a11f6b852938b127146b9900faf15b531b353661b9 SHA512 620d7002853617372d816b289ec712fa8c3247634c63581931b7b946049c38026db80a736ea02b5fd4662a68ff253ef9bfb4971b76c7faa7dc291f950abd216a
+EBUILD zlib-1.3-r2.ebuild 4621 BLAKE2B 58c6f3a494919167a0314e47c3af83ba2aad965c4180e6943455a87500e88a5d51473903e0d0addf3b0282ac189115f38dee8816ca1984ab81e1938e418f708a SHA512 3a50e51a9b293fe802f4bb359631ba28d5262ce8a7dc0e6ca79abf8360fce6ab9cdaeea901c40d93113da3c99d0db912c356ab741314a34d6bf2d6475e23b926
 MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9
diff --git a/sys-libs/zlib/zlib-1.3-r2.ebuild b/sys-libs/zlib/zlib-1.3-r2.ebuild
index 88e6ce23faba..94ad4d06e8a3 100644
--- a/sys-libs/zlib/zlib-1.3-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="minizip static-libs"
 
 RDEPEND="!sys-libs/zlib-ng[compat]"