public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/features/musl/, profiles/base/
Date: Thu, 15 Jun 2023 20:44:09 +0000 (UTC)	[thread overview]
Message-ID: <1686861813.caaf43dd027f223daced92fbb6be723e688cd71c.floppym@gentoo> (raw)

commit:     caaf43dd027f223daced92fbb6be723e688cd71c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 20:43:33 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 20:43:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caaf43dd

profiles: add masks for sys-apps/musl-locales

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 profiles/base/package.mask          | 4 ++++
 profiles/features/musl/package.mask | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 13ebbc9bd1e6..f09a97d08bf5 100644
--- 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

diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 94bf8b9e00bc..3b525be68812 100644
--- 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


             reply	other threads:[~2023-06-15 20:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-15 20:44 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-03  2:25 [gentoo-commits] repo/gentoo:master commit in: profiles/features/musl/, profiles/base/ Sam James
2024-01-12 11:08 Sam James
2023-04-30  7:26 Sam James
2023-02-17  5:29 Sam James
2022-09-25  1:27 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1686861813.caaf43dd027f223daced92fbb6be723e688cd71c.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox