Merge updates from master

2026-09-24 04:59:14 -07:00 · 2023-06-15 20:47:11 +00:00
parent 24faf09085 caaf43dd02
commit 01014a51e0
3 changed files with 10 additions and 0 deletions
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Mike Gilbert <floppym@gentoo.org> (2023-06-15)
+# Conflicts with glibc.
+sys-apps/musl-locales
+
 # Sam James <sam@gentoo.org> (2023-06-06)
 # Only available on Linux.
 dev-libs/libaio
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Mike Gilbert <floppym@gentoo.org> (2023-06-15)
+# Reverse entry from base profile.
+-sys-apps/musl-locales
+
 # Maciej Barć <xgqt@gentoo.org> (2023-04-03)
 # Mask until execinfo.h use can be properly patched, bug #877721 and #903689.
 dev-scheme/guile-ssh
--- a/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
+++ b/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
@@ -13,6 +13,8 @@ LICENSE="LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64"

+RDEPEND="!sys-libs/glibc"
+
 src_configure() {
 	local mycmakeargs=(
 		-DLOCALE_PROFILE=OFF