| 1 |
commit: f2b5a73faaab68f9e6b6bc9e20ab75c6127c8c29 |
| 2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Sun Oct 22 20:47:16 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 22 21:30:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b5a73f |
| 7 |
|
| 8 |
www-client/elinks: prevent installation of *.alias files, bug 635090 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/635090 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/6019 |
| 12 |
|
| 13 |
www-client/elinks/elinks-0.12_pre6-r3.ebuild | 4 ++++ |
| 14 |
www-client/elinks/elinks-9999.ebuild | 4 ++++ |
| 15 |
2 files changed, 8 insertions(+) |
| 16 |
|
| 17 |
diff --git a/www-client/elinks/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r3.ebuild |
| 18 |
index 55c2f70a35f..b57789f25fd 100644 |
| 19 |
--- a/www-client/elinks/elinks-0.12_pre6-r3.ebuild |
| 20 |
+++ b/www-client/elinks/elinks-0.12_pre6-r3.ebuild |
| 21 |
@@ -147,6 +147,10 @@ src_install() { |
| 22 |
docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote} |
| 23 |
docinto contrib/conv ; dodoc contrib/conv/*.* |
| 24 |
docinto contrib/guile ; dodoc contrib/guile/*.scm |
| 25 |
+ |
| 26 |
+ # elinks uses an internal copy of gettext which ships files that may |
| 27 |
+ # colliding with the system's gettext (https://bugs.gentoo.org/635090) |
| 28 |
+ rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die |
| 29 |
} |
| 30 |
|
| 31 |
pkg_postinst() { |
| 32 |
|
| 33 |
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild |
| 34 |
index 0cd77903130..f608a19718e 100644 |
| 35 |
--- a/www-client/elinks/elinks-9999.ebuild |
| 36 |
+++ b/www-client/elinks/elinks-9999.ebuild |
| 37 |
@@ -141,6 +141,10 @@ src_install() { |
| 38 |
docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote} |
| 39 |
docinto contrib/conv ; dodoc contrib/conv/*.* |
| 40 |
docinto contrib/guile ; dodoc contrib/guile/*.scm |
| 41 |
+ |
| 42 |
+ # elinks uses an internal copy of gettext which ships files that may |
| 43 |
+ # colliding with the system's gettext (https://bugs.gentoo.org/635090) |
| 44 |
+ rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die |
| 45 |
} |
| 46 |
|
| 47 |
pkg_postinst() { |
Archives