From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1275196-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 1E87B1382C5
for <garchives@archives.gentoo.org>; Mon, 26 Apr 2021 14:14:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 73AF2E085E;
Mon, 26 Apr 2021 14:14:28 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 53E1AE085E
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Apr 2021 14:14:28 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 D5A8F341441
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Apr 2021 14:14:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1727FC3
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Apr 2021 14:14:25 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1619441733.a2b0043db4a6af646e549feb68b50c3dccff7708.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/w3m/, www-client/w3m/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-client/w3m/files/w3m-0.5.3_p20210102-fix-configure-gettext.patch www-client/w3m/w3m-0.5.3_p20210102.ebuild
X-VCS-Directories: www-client/w3m/files/ www-client/w3m/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: a2b0043db4a6af646e549feb68b50c3dccff7708
X-VCS-Branch: master
Date: Mon, 26 Apr 2021 14:14:25 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d425c772-7c8e-4cbb-bad5-733cd4da8bb6
X-Archives-Hash: fc4756e0aa721ab861cb804385c138f5
commit: a2b0043db4a6af646e549feb68b50c3dccff7708
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 26 11:48:36 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 26 12:55:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b0043d
www-client/w3m: fix gettext with eautoreconf
Thanks-to: David Seifert <soap <AT> gentoo.org>
Bug: https://bugs.gentoo.org/785760
Signed-off-by: Sam James <sam <AT> gentoo.org>
...w3m-0.5.3_p20210102-fix-configure-gettext.patch | 26 ++++++++++++++++++++++
www-client/w3m/w3m-0.5.3_p20210102.ebuild | 6 ++---
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/www-client/w3m/files/w3m-0.5.3_p20210102-fix-configure-gettext.patch b/www-client/w3m/files/w3m-0.5.3_p20210102-fix-configure-gettext.patch
new file mode 100644
index 00000000000..4212b5aa4c9
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3_p20210102-fix-configure-gettext.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/785760
+https://savannah.gnu.org/bugs/?60201
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,9 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
++AC_PROG_MKDIR_P
++mkdir_p="${MKDIR_P}"
++AC_SUBST([mkdir_p])
+ AC_PATH_PROGS(PERL, perl, /usr/local/bin/perl)
+ AC_PATH_PROGS(NKF, nkf, /usr/local/bin/nkf)
+ AC_PATH_PROGS(MAN, man, /usr/bin/man)
+@@ -42,9 +45,8 @@
+ AC_DEFINE_UNQUOTED(W3M_TARGET, $W3M_TARGET)
+
+ AC_W3M_M17N
+-if test x$enable_messagel10n = xno; then
+- AM_GNU_GETTEXT([external])
+-fi
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.18])
++AM_GNU_GETTEXT([external])
+
+ NLSTARGET=""
+ if test x"$USE_NLS" = xyes; then
diff --git a/www-client/w3m/w3m-0.5.3_p20210102.ebuild b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
index 9a715d6d57c..dfc11d716e2 100644
--- a/www-client/w3m/w3m-0.5.3_p20210102.ebuild
+++ b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
@@ -42,14 +42,14 @@ RDEPEND="
)
xface? ( media-libs/compface )
"
-
+DEPEND="${RDEPEND}"
BDEPEND="
- ${RDEPEND}
virtual/pkgconfig
"
PATCHES=(
"${FILESDIR}"/${PN}-0.5.3_p20210102-restore-gettext-macro.patch
+ "${FILESDIR}"/${PN}-0.5.3_p20210102-fix-configure-gettext.patch
)
src_prepare() {
@@ -58,7 +58,7 @@ src_prepare() {
sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in || die
hprefixify acinclude.m4
- AT_M4DIR="m4" eautoconf
+ AT_M4DIR="m4" eautoreconf
}
src_configure() {