From 9368ace94caa5cdda868a0dbb7c75a3fc7a2b911 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 22 Aug 2023 21:47:11 +0100
Subject: gentoo auto-resync : 22:08:2023 - 21:47:11

---
 sys-libs/musl/Manifest          |  4 ++--
 sys-libs/musl/musl-1.2.4.ebuild | 34 +++++++++++-----------------------
 sys-libs/musl/musl-9999.ebuild  | 40 ++++++++++++++--------------------------
 3 files changed, 27 insertions(+), 51 deletions(-)

(limited to 'sys-libs/musl')

diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 2e2f4a99df93..8c013965d7e0 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -10,6 +10,6 @@ DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7
 EBUILD musl-1.2.3-r7.ebuild 5787 BLAKE2B e561ae500abddac9886731a2e44b7e82aaf0d8f4c0433e209a3c7f68977956de06caa77185086929b802badcbd555729a28be49e91ffa66783a94f146fc406b2 SHA512 f481d373f5fdc81a210569684a2d9cac896d85969bf2b1be91177f83c3b292657e3d28e0efa16dc375f581b5adebec19b3b73c933173116f250fd15fb2c5d472
 EBUILD musl-1.2.3-r8.ebuild 5943 BLAKE2B 7ac8fa3c1ba248ff3ec2404ba6f97b8fdf3a75c74a230a085223f0496410125edecb4f119e9879a535cea0a45ac894fdc57b2f47346d9c04bfa0d619a0981857 SHA512 5b0ea16d3304a6abb52d3ecd71ab24e5727abe3f874ca17c7c67c2afaf12a0818e66ec21a3efd55ab1f6843bb127dc4185b984406abbbe4ca357be9a76fe9aaf
 EBUILD musl-1.2.3.ebuild 4854 BLAKE2B 3dc5660be02d1fc55ad28dc687cdc08cf6533d36ca2c3dcbfb53761fc1cbc298520a61c0fb83706daa7bac01990eaf000f0a434209205e8e1e5848ae1945d934 SHA512 f87dff05d04b965d49fe005d0dd277ad3effc41f3c049c8ce376207fc7bf7da4e108a7f5f08e67c6a67ebe7a5b788fe1b782aa8b6b838d1296508de1989ea086
-EBUILD musl-1.2.4.ebuild 5936 BLAKE2B afc35786072b14cbb199afc7ff0b1406436f18ab3dfd68e71d1c2191f75c146273408261aebcdfd06da0453b84b534f4db79a4d9a22573250b9c7e3a70e34a70 SHA512 40db75d29a621a3a2168cbc891937b0410f92be9f7df76df5a5f0f8649a4c10102ee2e6113cc2324acaafc41433a0e82eec550e461cbf889a1e56326e3644451
-EBUILD musl-9999.ebuild 5943 BLAKE2B 7ac8fa3c1ba248ff3ec2404ba6f97b8fdf3a75c74a230a085223f0496410125edecb4f119e9879a535cea0a45ac894fdc57b2f47346d9c04bfa0d619a0981857 SHA512 5b0ea16d3304a6abb52d3ecd71ab24e5727abe3f874ca17c7c67c2afaf12a0818e66ec21a3efd55ab1f6843bb127dc4185b984406abbbe4ca357be9a76fe9aaf
+EBUILD musl-1.2.4.ebuild 5673 BLAKE2B 801404431cbc7d40e386eb6dc8ccba4fcef44797bf631b03f6600a615c1371d5fd6e77cb6366e9510ef2fb23f825b84f4651430f37caefee8637ec4b6523f7ed SHA512 954c0c4f815d7a84f5d4cc9434c26990ea421ecbcc3674bfd405ae6f428bf009985b0c31678e8ad7fdaa4aadf8ccc74f35dde906de3b2c912a0b89ecfc794d0c
+EBUILD musl-9999.ebuild 5673 BLAKE2B 801404431cbc7d40e386eb6dc8ccba4fcef44797bf631b03f6600a615c1371d5fd6e77cb6366e9510ef2fb23f825b84f4651430f37caefee8637ec4b6523f7ed SHA512 954c0c4f815d7a84f5d4cc9434c26990ea421ecbcc3674bfd405ae6f428bf009985b0c31678e8ad7fdaa4aadf8ccc74f35dde906de3b2c912a0b89ecfc794d0c
 MISC metadata.xml 559 BLAKE2B 8b1093a5278f716b8e21467b325e373a790f54c8ab71b92adc4c87dd569a92b20e08009372065f0f27ced39e3361c9e5e5a2e1bff271753d280439fabbddd3a4 SHA512 a35c13ea32ac8f26984bdb0d70d28a4285f34e32a2b0b17ad98fe3f357fb46c87a1e853377630d4da58fd5953de3fdeb02ee89181394e1815f5e0bbba4cd9f92
diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
index a0653436a844..20b3c7f93d59 100644
--- a/sys-libs/musl/musl-1.2.4.ebuild
+++ b/sys-libs/musl/musl-1.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic toolchain-funcs prefix
+inherit crossdev flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.musl-libc.org/musl"
 	inherit git-r3
@@ -25,14 +25,6 @@ SRC_URI+="
 	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 "
 
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
 DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
 HOMEPAGE="https://musl.libc.org"
 
@@ -49,19 +41,15 @@ QA_PRESTRIPPED="usr/lib/crtn.o"
 # built as part as crossdev. Also, elide the blockers when in cross-*,
 # as it doesn't make sense to block the normal CBUILD libxcrypt at all
 # there when we're installing into /usr/${CHOST} anyway.
-if [[ ${CATEGORY} == cross-* ]] ; then
+if is_crosspkg ; then
 	IUSE="${IUSE/crypt/+crypt}"
 else
 	RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
 	PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
 fi
 
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
 just_headers() {
-	use headers-only && is_crosscompile
+	use headers-only && target_is_not_host
 }
 
 pkg_setup() {
@@ -74,7 +62,7 @@ pkg_setup() {
 
 	# fix for #667126, copied from glibc ebuild
 	# make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
+	if target_is_not_host || tc-is-cross-compiler ; then
 		CHOST=${CTARGET} strip-unsupported-flags
 	fi
 }
@@ -86,7 +74,7 @@ src_unpack() {
 		# We only verify the release; not the additional (fixed, safe) files
 		# we download.
 		# (Seem to get IPC error on verifying in cross?)
-		! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+		! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
 	fi
 
 	default
@@ -108,7 +96,7 @@ src_configure() {
 	just_headers && export CC=true
 
 	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
+	target_is_not_host && sysroot=/usr/${CTARGET}
 	./configure \
 		--target=${CTARGET} \
 		--prefix="${EPREFIX}${sysroot}/usr" \
@@ -121,7 +109,7 @@ src_compile() {
 	just_headers && return 0
 
 	emake
-	if [[ ${CATEGORY} != cross-* ]] ; then
+	if ! is_crosspkg ; then
 		emake -C "${T}" getconf getent iconv \
 			CC="$(tc-getCC)" \
 			CFLAGS="${CFLAGS}" \
@@ -142,7 +130,7 @@ src_install() {
 
 	# musl provides ldd via a sym link to its ld.so
 	local sysroot=
-	is_crosscompile && sysroot=/usr/${CTARGET}
+	target_is_not_host && sysroot=/usr/${CTARGET}
 	local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
 	dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
 
@@ -152,7 +140,7 @@ src_install() {
 		rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
 	fi
 
-	if [[ ${CATEGORY} != cross-* ]] ; then
+	if ! is_crosspkg ; then
 		# Fish out of config:
 		#   ARCH = ...
 		#   SUBARCH = ...
@@ -187,7 +175,7 @@ src_install() {
 		doenvd "${T}"/00musl
 	fi
 
-	if is_crosscompile ; then
+	if target_is_not_host ; then
 		into /usr/${CTARGET}
 		dolib.a libssp_nonshared.a
 	else
@@ -204,7 +192,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	is_crosscompile && return 0
+	target_is_not_host && return 0
 
 	[ -n "${ROOT}" ] && return 0
 
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index a72d5929d386..20b3c7f93d59 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
+inherit crossdev flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.musl-libc.org/musl"
 	inherit git-r3
@@ -13,7 +13,7 @@ else
 
 	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
 fi
@@ -25,14 +25,6 @@ SRC_URI+="
 	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 "
 
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
 DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
 HOMEPAGE="https://musl.libc.org"
 
@@ -49,19 +41,15 @@ QA_PRESTRIPPED="usr/lib/crtn.o"
 # built as part as crossdev. Also, elide the blockers when in cross-*,
 # as it doesn't make sense to block the normal CBUILD libxcrypt at all
 # there when we're installing into /usr/${CHOST} anyway.
-if [[ ${CATEGORY} == cross-* ]] ; then
+if is_crosspkg ; then
 	IUSE="${IUSE/crypt/+crypt}"
 else
 	RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
 	PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
 fi
 
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
 just_headers() {
-	use headers-only && is_crosscompile
+	use headers-only && target_is_not_host
 }
 
 pkg_setup() {
@@ -74,7 +62,7 @@ pkg_setup() {
 
 	# fix for #667126, copied from glibc ebuild
 	# make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
+	if target_is_not_host || tc-is-cross-compiler ; then
 		CHOST=${CTARGET} strip-unsupported-flags
 	fi
 }
@@ -86,7 +74,7 @@ src_unpack() {
 		# We only verify the release; not the additional (fixed, safe) files
 		# we download.
 		# (Seem to get IPC error on verifying in cross?)
-		! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+		! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
 	fi
 
 	default
@@ -108,7 +96,7 @@ src_configure() {
 	just_headers && export CC=true
 
 	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
+	target_is_not_host && sysroot=/usr/${CTARGET}
 	./configure \
 		--target=${CTARGET} \
 		--prefix="${EPREFIX}${sysroot}/usr" \
@@ -121,7 +109,7 @@ src_compile() {
 	just_headers && return 0
 
 	emake
-	if [[ ${CATEGORY} != cross-* ]] ; then
+	if ! is_crosspkg ; then
 		emake -C "${T}" getconf getent iconv \
 			CC="$(tc-getCC)" \
 			CFLAGS="${CFLAGS}" \
@@ -142,9 +130,9 @@ src_install() {
 
 	# musl provides ldd via a sym link to its ld.so
 	local sysroot=
-	is_crosscompile && sysroot=/usr/${CTARGET}
+	target_is_not_host && sysroot=/usr/${CTARGET}
 	local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
-	dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
+	dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
 
 	if ! use crypt ; then
 		# Allow sys-libs/libxcrypt[system] to provide it instead
@@ -152,7 +140,7 @@ src_install() {
 		rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die
 	fi
 
-	if [[ ${CATEGORY} != cross-* ]] ; then
+	if ! is_crosspkg ; then
 		# Fish out of config:
 		#   ARCH = ...
 		#   SUBARCH = ...
@@ -187,7 +175,7 @@ src_install() {
 		doenvd "${T}"/00musl
 	fi
 
-	if is_crosscompile ; then
+	if target_is_not_host ; then
 		into /usr/${CTARGET}
 		dolib.a libssp_nonshared.a
 	else
@@ -204,7 +192,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	is_crosscompile && return 0
+	target_is_not_host && return 0
 
 	[ -n "${ROOT}" ] && return 0
 
-- 
cgit v1.2.3