[gentoo-commits] repo/gentoo:master commit in: x11-themes/vdr-channel-logos/

[Jörg Bornkessel]

commit:     86a43424a970a109c45a55a773f14e16210a392c
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 13:00:07 2019 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 13:00:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a43424

x11-themes/vdr-channel-logos: fixed failed install on no UTF-8 systems

this versions needs to set the locale to UTF-8

Bug: https://bugs.gentoo.org/362069
Closes: https://bugs.gentoo.org/362069
Package-Manager: Portage-2.3.82, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 x11-themes/vdr-channel-logos/metadata.xml              |  4 ++++
 ...s-0.2-r1.ebuild => vdr-channel-logos-0.2-r2.ebuild} | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/x11-themes/vdr-channel-logos/metadata.xml b/x11-themes/vdr-channel-logos/metadata.xml
index 984a01fab26..19717edee84 100644
--- a/x11-themes/vdr-channel-logos/metadata.xml
+++ b/x11-themes/vdr-channel-logos/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>hd_brummy@g.o</email>
+		<name>Joerg Bornkessel</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>vdr@g.o</email>
 		<name>Gentoo VDR Project</name>

diff --git a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r1.ebuild b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild
similarity index 70%
rename from x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r1.ebuild
rename to x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild
index 17184e4f08e..7baf764c285 100644
--- a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r1.ebuild
+++ b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 MY_P=${PN#vdr-channel-}-${PV}
 
@@ -18,9 +16,21 @@ IUSE=""
 
 S=${WORKDIR}/logos
 
-RDEPEND="app-text/convmv"
+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}"/
 }