public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jörg Bornkessel" <hd_brummy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/vdr-channel-logos/
Date: Tue, 16 Feb 2021 16:13:35 +0000 (UTC)	[thread overview]
Message-ID: <1613491984.8586a60cec6a891d0e464f36b5b1da4352ca5d13.hd_brummy@gentoo> (raw)

commit:     8586a60cec6a891d0e464f36b5b1da4352ca5d13
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 16:13:04 2021 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 16:13:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8586a60c

x11-themes/vdr-channel-logos: fixed install for musl

cleanup buggy version
this will fix bug 715694

Closes: https://bugs.gentoo.org/715694
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 ...nel-logos-0.2-r2.ebuild => vdr-channel-logos-0.2-r3.ebuild} | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
similarity index 81%
rename from x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild
rename to x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
index 7baf764c285..427c4822d44 100644
--- a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild
+++ b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,9 +30,11 @@ _test_charmap() {
 src_prepare() {
 	default
 
-	_test_charmap
-
-	convmv --notest --replace -f iso-8859-1 -t utf-8 -r "${S}"/
+	# bug 715684
+	if [[ ${CHOST} != *-musl* ]] ; then
+		_test_charmap
+	fi
+		convmv --notest --replace -f iso-8859-1 -t utf-8 -r "${S}"/
 }
 
 src_install() {


             reply	other threads:[~2021-02-16 16:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-16 16:13 Jörg Bornkessel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-22  6:40 [gentoo-commits] repo/gentoo:master commit in: x11-themes/vdr-channel-logos/ Jakov Smolić
2021-10-21 23:28 Sam James
2021-10-21 23:28 Sam James
2019-12-24 13:00 Jörg Bornkessel
2019-07-15 15:28 Michał Górny
2017-11-26 23:33 David Seifert

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=1613491984.8586a60cec6a891d0e464f36b5b1da4352ca5d13.hd_brummy@gentoo \
    --to=hd_brummy@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