From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-979816-garchives=archives.gentoo.org@lists.gentoo.org>
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 5D8751396D9
for <garchives@archives.gentoo.org>; Sun, 22 Oct 2017 21:31:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9AD092BC011;
Sun, 22 Oct 2017 21:31:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 768CA2BC011
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Oct 2017 21:31:12 +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 1A3F433BEC0
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Oct 2017 21:31:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A981A309
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Oct 2017 21:31:09 +0000 (UTC)
From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" <dilfridge@gentoo.org>
Message-ID: <1508707831.f2b5a73faaab68f9e6b6bc9e20ab75c6127c8c29.dilfridge@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-client/elinks/elinks-0.12_pre6-r3.ebuild www-client/elinks/elinks-9999.ebuild
X-VCS-Directories: www-client/elinks/
X-VCS-Committer: dilfridge
X-VCS-Committer-Name: Andreas Hüttel
X-VCS-Revision: f2b5a73faaab68f9e6b6bc9e20ab75c6127c8c29
X-VCS-Branch: master
Date: Sun, 22 Oct 2017 21:31:09 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 378e8970-dc88-4ce8-8d0a-5167186742e2
X-Archives-Hash: 39e87ccda8e79eacffa716dc855acbe3
commit: f2b5a73faaab68f9e6b6bc9e20ab75c6127c8c29
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sun Oct 22 20:47:16 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 21:30:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b5a73f
www-client/elinks: prevent installation of *.alias files, bug 635090
Closes: https://bugs.gentoo.org/635090
Closes: https://github.com/gentoo/gentoo/pull/6019
www-client/elinks/elinks-0.12_pre6-r3.ebuild | 4 ++++
www-client/elinks/elinks-9999.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/www-client/elinks/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r3.ebuild
index 55c2f70a35f..b57789f25fd 100644
--- a/www-client/elinks/elinks-0.12_pre6-r3.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r3.ebuild
@@ -147,6 +147,10 @@ src_install() {
docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
docinto contrib/conv ; dodoc contrib/conv/*.*
docinto contrib/guile ; dodoc contrib/guile/*.scm
+
+ # elinks uses an internal copy of gettext which ships files that may
+ # colliding with the system's gettext (https://bugs.gentoo.org/635090)
+ rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
}
pkg_postinst() {
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 0cd77903130..f608a19718e 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -141,6 +141,10 @@ src_install() {
docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
docinto contrib/conv ; dodoc contrib/conv/*.*
docinto contrib/guile ; dodoc contrib/guile/*.scm
+
+ # elinks uses an internal copy of gettext which ships files that may
+ # colliding with the system's gettext (https://bugs.gentoo.org/635090)
+ rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
}
pkg_postinst() {