From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD8E3138334 for ; Tue, 24 Dec 2019 13:00:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2884E0BCF; Tue, 24 Dec 2019 13:00:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA496E0BCF for ; Tue, 24 Dec 2019 13:00:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B71E34DB21 for ; Tue, 24 Dec 2019 13:00:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9A9F2C for ; Tue, 24 Dec 2019 13:00:44 +0000 (UTC) From: "Jörg Bornkessel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jörg Bornkessel" Message-ID: <1577192407.86a43424a970a109c45a55a773f14e16210a392c.hd_brummy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/vdr-channel-logos/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-themes/vdr-channel-logos/metadata.xml x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r1.ebuild x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r2.ebuild X-VCS-Directories: x11-themes/vdr-channel-logos/ X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Jörg Bornkessel X-VCS-Revision: 86a43424a970a109c45a55a773f14e16210a392c X-VCS-Branch: master Date: Tue, 24 Dec 2019 13:00:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fc453460-4a75-4a89-8e02-a9c319016fb9 X-Archives-Hash: 608c40087c82f83b0e94ff73c3a068a4 commit: 86a43424a970a109c45a55a773f14e16210a392c Author: Joerg Bornkessel gentoo org> AuthorDate: Tue Dec 24 13:00:07 2019 +0000 Commit: Jörg Bornkessel gentoo 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 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 @@ + + hd_brummy@gentoo.org + Joerg Bornkessel + vdr@gentoo.org Gentoo VDR Project 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}"/ }