From 463397cf1e064185110fe57c568d73f99a06f5d1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 17 Feb 2021 10:35:54 +0000
Subject: gentoo resync : 17.02.2021

---
 x11-themes/vdr-channel-logos/Manifest              |  2 +-
 .../vdr-channel-logos-0.2-r2.ebuild                | 41 ---------------------
 .../vdr-channel-logos-0.2-r3.ebuild                | 43 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 42 deletions(-)
 delete mode 100644 x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild
 create mode 100644 x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild

(limited to 'x11-themes/vdr-channel-logos')

diff --git a/x11-themes/vdr-channel-logos/Manifest b/x11-themes/vdr-channel-logos/Manifest
index c4d2357864b8..300f38807c27 100644
--- a/x11-themes/vdr-channel-logos/Manifest
+++ b/x11-themes/vdr-channel-logos/Manifest
@@ -1,4 +1,4 @@
 DIST logos-0.2.tar.gz 659476 BLAKE2B ed882e950fb5d1a8c1fea6194dc5311c43f68f92d25cb2e2b9298c2ef86ec165f30217b58f470cbc81d8122cedd1fa8441f6ab7249a448e3160f5d0c4f797810 SHA512 27b961a9c4da2e3d11e932f0ed69e85f5cac5e06666b1cff116cae483a32ab45c794ebb225900153745cb75ae51d211dbdb5a8dafb28997a5420859dd8ef55ad
-EBUILD vdr-channel-logos-0.2-r2.ebuild 854 BLAKE2B f821c2891561a014b246036b459ae215109705764cd1d89afc26f708eabf87d94e768cef680eddebfa226503477269d9c675825c49e2b4ec370876ac89740fc6 SHA512 40e87afb419c81fff097e1b0f3d0cc328a61c259deda43fe92ec139f5f103377ff4f260770a27d50b04d2e4ba5eb1db8fea1e5ff7e45a26780128955ef531b63
+EBUILD vdr-channel-logos-0.2-r3.ebuild 910 BLAKE2B daf250c2bcb73700ce4858a94a9d4264f1e5c62e5ca5424178def751a286c619a52752f21fa55e57d97401ad41c45bbbadebedbf618c2e8169baa69a42555751 SHA512 351c3aa40973793ac44cdb8f6443c00600f7ad4d6a38af76009afb415b625761705a5653568f832e8902878d855e1b46b5ec0cf51ffc2f3682f071ba948a8159
 EBUILD vdr-channel-logos-0.2.ebuild 544 BLAKE2B ce3f3ae3048b889ff6959fca03af9d7298544cea927c4ed4678bec1f396acebc3b342ed0446df011be759af9842f121e89fb7f19aef7be2aba21edfc0a96f89b SHA512 b51d52c716a1c4d411ce68408ebf7c8628135f942ced4968cb15f539ba478ff6c6532994f8a9ff4f4b5eb22970192d77f9b42dea5813db0d3aade90fb1c84297
 MISC metadata.xml 362 BLAKE2B adf483a7a510a8722e3f2a466c6cd79412ae0c87835a1dc29ff866ccaa43822ea8746ab699e5c3513e9aca22c183857f5918437fa20ac171e06a69b6112158ca SHA512 5e450b3909bef6baa28baae73ed91476826137a8b2f244d5543f4b428bcca42d1bfa52bd32cbca3df3abd4b2fc45175ac78adb786c01b8b604f54a3b5a6633f1
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-r2.ebuild
deleted file mode 100644
index 7baf764c285f..000000000000
--- a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN#vdr-channel-}-${PV}
-
-DESCRIPTION="Logos for vdr-skin*"
-HOMEPAGE="http://www.vdrskins.org/"
-SRC_URI="http://www.vdrskins.org/vdrskins/albums/userpics/10138/${MY_P}.tar.gz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/logos
-
-BDEPEND="app-text/convmv"
-
-_test_charmap() {
-	local charmap=$(locale charmap)
-
-	if [ "${charmap}" != "UTF-8" ]; then
-		eerror "You need locale UTF-8 to use the logos"
-		die "missing locale UTF-8 on your system"
-	fi
-}
-
-src_prepare() {
-	default
-
-	_test_charmap
-
-	convmv --notest --replace -f iso-8859-1 -t utf-8 -r "${S}"/
-}
-
-src_install() {
-	insinto /usr/share/vdr/channel-logos
-	find -maxdepth 1 -name "*.xpm" -print0|xargs -0 cp -a --target="${D}/usr/share/vdr/channel-logos/"
-}
diff --git a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
new file mode 100644
index 000000000000..427c4822d44b
--- /dev/null
+++ b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN#vdr-channel-}-${PV}
+
+DESCRIPTION="Logos for vdr-skin*"
+HOMEPAGE="http://www.vdrskins.org/"
+SRC_URI="http://www.vdrskins.org/vdrskins/albums/userpics/10138/${MY_P}.tar.gz"
+
+LICENSE="fairuse"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/logos
+
+BDEPEND="app-text/convmv"
+
+_test_charmap() {
+	local charmap=$(locale charmap)
+
+	if [ "${charmap}" != "UTF-8" ]; then
+		eerror "You need locale UTF-8 to use the logos"
+		die "missing locale UTF-8 on your system"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# bug 715684
+	if [[ ${CHOST} != *-musl* ]] ; then
+		_test_charmap
+	fi
+		convmv --notest --replace -f iso-8859-1 -t utf-8 -r "${S}"/
+}
+
+src_install() {
+	insinto /usr/share/vdr/channel-logos
+	find -maxdepth 1 -name "*.xpm" -print0|xargs -0 cp -a --target="${D}/usr/share/vdr/channel-logos/"
+}
-- 
cgit v1.2.3