gentoo resync : 28.04.2021

4 files changed, 199 insertions, 0 deletions

diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 2226d49b48a7..dccd8a9ed805 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,7 +1,11 @@
+AUX w3m-0.5.3_p20210102-fix-configure-gettext.patch 635 BLAKE2B c7bb5fca7188a35517fd2006a27cf20dea2fdeef729dd4cde2dd4fd330f546fbaf7891ab7212324016d5cc428576d1f4ba4e5e1200b8fbecbe03aeace1f65b27 SHA512 d2a41844951c25f96fb7f50a7b74badf3f8a6c112a80ca3bb9c3ae57d64cea2dc17278b1d21f53c18ffe228e5293fe68824c8f213b02da36a7a25da52480cce8
+AUX w3m-0.5.3_p20210102-restore-gettext-macro.patch 1076 BLAKE2B 8ba58bee28e506e20306a98e26af624fecfead21976cb0f0fc06ed443aab339c8c2f4c376b2bdbbe5d3232c7f3f88d1793e5059ec9fb22af8e2f34992ea1e15a SHA512 3c58ad896c711a41ecb915fa32318c69f9326a795d0f071120f5cecb8dfc2e7cc7a9174143b34ae7cd8b854037a5b6506bde4c063213bc9cc4a78a5090e3e83c
 AUX w3m-img-fb.patch 292 BLAKE2B 3e292f5607b97d49143be54bb2ef31aaf43e9ab599a4b63069b3aca8567abb6bed6f08f88d43b77710932031303a8fabae07296f6cf176a7f4898653816ff7db SHA512 3b2bdc1c72548ab75f98743c7855bf1a7a40d2bda2252ca1f1475b1eb982b5494a42478f7b544365195d2bf2e3214d697aabe0b7a5d208bd06f26ae379163f18
 AUX w3m.mailcap 44 BLAKE2B ae8bde48a638a61bcac9c6b3a0e001666e0c17a3e6fff2d2b4da870fde8a5fc0eb8314d9b818399ae502209a2fa4fbdf4bfb07e56e29a275cb2133656da52dfc SHA512 a66ef535a62f593910c1c99865363e7fc8af1815d24f2ccda86a72c0b777ff388100677f0e14e6f57a6786fdbde62cfc3fea554e659d54663f44cfba3e5c67d2
 DIST w3m-0.5.3+git20180125.tar.gz 2181743 BLAKE2B d0766fa215be971ba280e4933ee9521ac4b7806f77ced5be4de58a5e28fa478e29a9102d101174f8d216cb982827b347c0fbcbfc494068d1cb8e443e73df7228 SHA512 61b8498b927569937c509460e291eeba6eb302d34ccd6e1bf4d1eb07ac73a3ac5a477161727d310324625be04b907f8c3e970382d08c9fa0846b371699f04e14
 DIST w3m-0.5.3+git20190105.tar.gz 2183651 BLAKE2B 624fe3b8c1daa2a6d4ce21e051ee363a29114bdb64e0e0d9864b8098f2a12bcb27e293fa3dfa4dc1dff691fa40046f4878b7d39c321f591d3689d00e3ed42bad SHA512 b63b15d0bea82f50bcaa9fc0826c2d3c265a3ad73069b4a020812f28b552cdf08618ab877280c9f3a43bd64f51b80b7a526098e6395ea121c0981a3fcd2562b4
+DIST w3m-0.5.3+git20210102.tar.gz 2189272 BLAKE2B f82c13c26b1c83cda90655abdcf30422e257a5c2e48c32d5636a70f895078d11a95fc6ce623fa94624bb2a1125b71e7654d872dfb91fd86c4290278de3cf88f8 SHA512 357eeecf0f63bfd5174c9670533882323879657bdecefd0758d853ca645e368331bfdf91e99c0917f19829e184ce892ecdc99bd865851707d93baccfb4b97632
 EBUILD w3m-0.5.3_p20180125.ebuild 3235 BLAKE2B 9ce3b377fbeb7213dd10c4b7565d2e4b326c23fb5884b15d36b7e025d5515751e989b3f09f9073f5fbbe732e7160101c68c742cccbac1710b430dcb41f060116 SHA512 ae92d29065851462fb00561ccab1d05d801faca8c94aafdfb06fd0e29435d66dbd96332a589bf63d6d700419c0472a8cb7dd8762d380aaa27e4f518bec1c9165
 EBUILD w3m-0.5.3_p20190105.ebuild 3194 BLAKE2B 6e61be8d39d2c8d4c036488ad29f3d76b12779e6ef1307886535e0fd5a0aeb49a1c525a0df4dc8762c4a8ed52f9bf7be58075e13906b9e5cc71a0cce0637a05b SHA512 899c1f471ffd83d08673671098aaf209422dd01c7363024db912b16327a95c3df98672157a5deab703ea99520f63941f6eeceb68ac59431a3c0ef78051bc9415
+EBUILD w3m-0.5.3_p20210102.ebuild 3273 BLAKE2B 9af449b3c9ba507d7b145e02ab00830433d67157d8fa2a547d11ebff0b9255e9121e2d1fc7fdc9725d6a101cc8ef5825e6d50f64dd97c769db55fcec5521ac58 SHA512 e25d6df3bf88179925fd1b98e7fa3f6a861d709aa33525ede6c8abf649e8426c5f7b1b97976627f155b743bb0c324aee22a18ca1b090724fb5fb7d244cc8358a
 MISC metadata.xml 522 BLAKE2B 4f89e2d965f7cc320983d501b67f2dda0134745d63e98b488fb3bdcfd6dfd2ce2e0fe12f8b6fea88818166298906c661db47405ab4de1f27cbbec37ca52fdedc SHA512 1fb6f6e6121f5673e809a626f840ff524b6e58260a9e2ac5b537e1f3d04cf2371b1ff03808da757848931275751a09fdc872f431b9162927fabc0b3e64305317
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 000000000000..4212b5aa4c98
--- /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/files/w3m-0.5.3_p20210102-restore-gettext-macro.patch b/www-client/w3m/files/w3m-0.5.3_p20210102-restore-gettext-macro.patch
new file mode 100644
index 000000000000..ffd30c62a5dc
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3_p20210102-restore-gettext-macro.patch
@@ -0,0 +1,31 @@
+https://sources.debian.org/patches/gnokii/0.6.30+dfsg-1.3/0001-Add-codeset.m4-to-m4-to-prevent-build-failure-with-g.patch/
+https://bugs.gentoo.org/778482
+--- /dev/null
++++ b/m4/codeset.m4
+@@ -0,0 +1,25 @@
++# codeset.m4 serial 5 (gettext-0.18.2)
++dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation,
++dnl Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl From Bruno Haible.
++
++AC_DEFUN([AM_LANGINFO_CODESET],
++[
++  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
++    [AC_LINK_IFELSE(
++       [AC_LANG_PROGRAM(
++          [[#include <langinfo.h>]],
++          [[char* cs = nl_langinfo(CODESET); return !cs;]])],
++       [am_cv_langinfo_codeset=yes],
++       [am_cv_langinfo_codeset=no])
++    ])
++  if test $am_cv_langinfo_codeset = yes; then
++    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
++      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
++  fi
++])
++
+--
diff --git a/www-client/w3m/w3m-0.5.3_p20210102.ebuild b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
new file mode 100644
index 000000000000..011761a3ca84
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools prefix toolchain-funcs
+
+MY_P="${P/_p/+git}"
+MY_PV="${PV/_p/+git}"
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="https://github.com/tats/w3m"
+SRC_URI="https://github.com/tats/w3m/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${P/_p/-git}"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja lynxkeymap nls nntp ssl unicode X xface"
+
+REQUIRED_USE="
+	fbcon? ( ?? ( gdk-pixbuf imlib ) )
+	X? ( ?? ( gdk-pixbuf imlib ) )
+"
+
+RDEPEND="
+	dev-libs/boehm-gc:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf
+		X? ( x11-libs/gdk-pixbuf-xlib )
+	)
+	!gdk-pixbuf? (
+		imlib? ( media-libs/imlib2[X?] )
+	)
+	gpm? ( sys-libs/gpm )
+	ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-libs/libXdmcp
+		x11-libs/libXext
+	)
+	xface? ( media-libs/compface )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	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() {
+	default
+
+	sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in || die
+	hprefixify acinclude.m4
+
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	local image imagelib
+
+	if use gdk-pixbuf ; then
+		imagelib="gtk3"
+	elif use imlib ; then
+		imagelib="imlib2"
+	fi
+	if [[ -n "${imagelib}" ]] ; then
+		use X     && image="${image}${image:+,}x11"
+		use fbcon && image="${image}${image:+,}fb"
+	fi
+	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+	# so we better enable or disable both. Default to enable
+	# m17n and unicode, see bug #47046.
+	if use l10n_ja ; then
+		myconf+=( --enable-japanese=$(usex unicode U E) )
+	else
+		myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
+	fi
+	# lynxkeymap IUSE flag. bug #49397
+	myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
+
+	econf \
+		$(use_enable gpm mouse) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable ssl digest-auth) \
+		$(use_enable xface) \
+		$(use_with ssl) \
+		--enable-image=${image:-no} \
+		--enable-m17n \
+		--enable-unicode \
+		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
+		--with-editor="${EPREFIX}/usr/bin/vi" \
+		--with-imagelib="${imagelib:-no}" \
+		--with-mailer="${EPREFIX}/bin/mail" \
+		--without-migemo \
+		--with-termlib=yes \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}"/${PN}.mailcap mailcap
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/{*.{cgi,rb},html*,makeref}
+
+	docinto en
+	dodoc doc/{HISTORY,README,keymap,menu}*
+	newdoc Bonus/README.eng README.Bonus
+	docinto html/en
+	dodoc doc/*.html
+	if use l10n_de ; then
+		docinto de
+		dodoc doc-de/README*
+		docinto html/de
+		dodoc doc-de/*.html
+	else
+		rm -rf "${ED}"/usr/share/man/de || die
+	fi
+	if use l10n_ja ; then
+		docinto ja
+		dodoc doc-jp/{HISTORY,README,keymap,menu}*
+		newdoc Bonus/README README.Bonus
+		docinto html/ja
+		dodoc doc-jp/*.html
+	else
+		rm -rf "${ED}"/usr/share/man/ja || die
+	fi
+}