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() {

Reply via email to