public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/
Date: Sun, 22 Oct 2017 21:31:09 +0000 (UTC)	[thread overview]
Message-ID: <1508707831.f2b5a73faaab68f9e6b6bc9e20ab75c6127c8c29.dilfridge@gentoo> (raw)

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	other threads:[~2017-10-22 21:31 UTC|newest]

Thread overview: 123+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-22 21:31 Andreas Hüttel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-13  9:45 [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/ Sam James
2025-04-23 15:18 Sam James
2025-04-22  0:36 Sam James
2025-04-21 16:15 Arthur Zamarin
2025-04-21  6:22 Sam James
2025-04-20  2:10 Sam James
2025-02-04 16:58 James Le Cuirot
2025-01-24  6:33 Arthur Zamarin
2025-01-24  6:33 Arthur Zamarin
2025-01-24  6:33 Arthur Zamarin
2025-01-24  2:23 Sam James
2025-01-24  2:23 Sam James
2025-01-24  2:23 Sam James
2024-11-19 14:10 Sam James
2024-11-19 14:10 Sam James
2024-11-08 11:57 Sam James
2024-11-08 10:59 Sam James
2024-11-08  6:31 Sam James
2024-11-08  3:54 Sam James
2024-10-17  7:35 Sam James
2024-10-17  7:24 Sam James
2024-10-17  7:19 Sam James
2024-10-17  7:13 Sam James
2024-09-18 13:12 Arsen Arsenović
2024-07-16 22:46 Sam James
2024-07-16 21:28 Conrad Kostecki
2024-07-14 14:03 Conrad Kostecki
2024-06-02  0:55 Sam James
2024-06-02  0:55 Sam James
2024-02-29  0:51 Sam James
2024-02-29  0:27 Sam James
2023-10-27 15:20 Michał Górny
2023-09-09  9:51 Sam James
2023-09-09  9:51 Sam James
2023-09-09  9:51 Sam James
2023-09-09  9:44 Sam James
2023-09-09  9:44 Sam James
2023-09-09  9:42 Sam James
2023-09-09  9:28 Arthur Zamarin
2023-09-09  9:28 Arthur Zamarin
2023-05-27 15:55 Sam James
2023-05-21  6:01 Joonas Niilola
2023-05-21  6:01 Joonas Niilola
2023-05-21  0:50 Sam James
2023-05-20 13:00 Sam James
2023-05-10  1:31 Sam James
2023-05-01 10:02 Sam James
2023-05-01  9:39 Sam James
2023-05-01  7:39 Arthur Zamarin
2023-05-01  7:39 Arthur Zamarin
2023-05-01  7:23 Sam James
2023-05-01  7:23 Sam James
2023-05-01  6:45 Arthur Zamarin
2023-05-01  5:16 Sam James
2023-05-01  5:16 Sam James
2023-05-01  5:09 Sam James
2023-04-14 15:51 Michał Górny
2022-12-29 21:41 Sam James
2022-10-28 13:21 Sam James
2022-10-13 19:56 Sam James
2022-10-13  1:51 Sam James
2022-10-13  1:51 Sam James
2021-11-01  8:29 Arthur Zamarin
2021-04-30 18:30 Mikle Kolyada
2021-03-20  8:25 Joonas Niilola
2021-01-24  3:52 Sam James
2021-01-23 22:51 Sam James
2021-01-23 22:42 Sam James
2021-01-23  4:20 Sam James
2021-01-23  4:09 Sam James
2021-01-07 16:52 Sam James
2021-01-07 10:09 Sam James
2021-01-06 11:37 Fabian Groffen
2021-01-06  6:37 Sam James
2021-01-04 19:40 Sergei Trofimovich
2020-10-27 21:18 Sam James
2020-10-27 21:18 Sam James
2020-09-20 13:12 Thomas Deutschmann
2020-09-13 18:36 Sam James
2020-09-13  8:44 Sergei Trofimovich
2020-09-11 17:32 Sergei Trofimovich
2020-09-09 21:59 Sergei Trofimovich
2020-09-09 21:35 Sergei Trofimovich
2020-09-08 15:56 Thomas Deutschmann
2020-09-08  4:35 Sam James
2020-08-07 17:58 Sam James
2020-08-07 17:58 Sam James
2020-08-07 17:58 Sam James
2020-08-07 17:58 Sam James
2020-08-07 17:58 Sam James
2020-06-18  9:52 Andreas Sturmlechner
2019-11-25  7:30 Sergei Trofimovich
2019-11-23 15:51 Agostino Sarubbo
2019-08-29 13:40 Michał Górny
2019-07-28 19:54 Mikle Kolyada
2019-06-27  8:56 Agostino Sarubbo
2019-06-22  9:38 Sergei Trofimovich
2019-06-22  9:32 Sergei Trofimovich
2019-06-20  9:21 Mikle Kolyada
2019-06-18 18:24 Thomas Deutschmann
2019-06-15  9:28 Sergei Trofimovich
2019-04-26 17:59 Anthony G. Basile
2019-04-21  3:13 Anthony G. Basile
2018-08-15 10:33 Michał Górny
2018-03-03 14:52 Michał Górny
2018-03-03 14:52 Michał Górny
2018-02-18 17:25 Patrice Clement
2018-02-18 17:25 Patrice Clement
2018-02-18 17:25 Patrice Clement
2018-02-18 17:25 Patrice Clement
2017-10-22 16:55 Patrice Clement
2017-10-22 16:55 Patrice Clement
2017-10-22 16:55 Patrice Clement
2017-10-22 16:55 Patrice Clement
2017-10-22 16:55 Patrice Clement
2017-10-11 20:00 Jonas Stein
2017-04-21  7:33 David Seifert
2016-04-15 11:17 Anthony G. Basile
2016-04-15 11:17 Anthony G. Basile
2015-12-03  4:00 Mike Frysinger
2015-11-21  7:11 Anthony G. Basile
2015-10-07 18:56 Ian Stakenvicius

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1508707831.f2b5a73faaab68f9e6b6bc9e20ab75c6127c8c29.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox