gentoo resync : 20.03.2022

3 files changed, 135 insertions, 5 deletions

diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index ed8cca52a1b4..f24ec0f8d560 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -2,5 +2,7 @@ AUX w3m-0.5.3_p20210102-fix-configure-gettext.patch 635 BLAKE2B c7bb5fca7188a355
 AUX w3m-0.5.3_p20210102-restore-gettext-macro.patch 1076 BLAKE2B 8ba58bee28e506e20306a98e26af624fecfead21976cb0f0fc06ed443aab339c8c2f4c376b2bdbbe5d3232c7f3f88d1793e5059ec9fb22af8e2f34992ea1e15a SHA512 3c58ad896c711a41ecb915fa32318c69f9326a795d0f071120f5cecb8dfc2e7cc7a9174143b34ae7cd8b854037a5b6506bde4c063213bc9cc4a78a5090e3e83c
 AUX w3m.mailcap 44 BLAKE2B ae8bde48a638a61bcac9c6b3a0e001666e0c17a3e6fff2d2b4da870fde8a5fc0eb8314d9b818399ae502209a2fa4fbdf4bfb07e56e29a275cb2133656da52dfc SHA512 a66ef535a62f593910c1c99865363e7fc8af1815d24f2ccda86a72c0b777ff388100677f0e14e6f57a6786fdbde62cfc3fea554e659d54663f44cfba3e5c67d2
 DIST w3m-0.5.3+git20210102.tar.gz 2189272 BLAKE2B f82c13c26b1c83cda90655abdcf30422e257a5c2e48c32d5636a70f895078d11a95fc6ce623fa94624bb2a1125b71e7654d872dfb91fd86c4290278de3cf88f8 SHA512 357eeecf0f63bfd5174c9670533882323879657bdecefd0758d853ca645e368331bfdf91e99c0917f19829e184ce892ecdc99bd865851707d93baccfb4b97632
+DIST w3m-0.5.3_p20220216.tar.gz 2306347 BLAKE2B d312aee587d76d077ddae27c97a20957083785a269080ec2a4896f2bd9b4c90cc356a3b6d6c9a435458cf4c16b749d0b1e1c403f7bc5028a0b463c352f75ad2a SHA512 2b661eca0f1e2ff0d7646ce062cc736a30950b41e3e056061d0d65feb869fbea8f6668255c403b460d6b2786a4fd24be6e98d9eb99b8948b3113f7d4ec866a12
 EBUILD w3m-0.5.3_p20210102.ebuild 3273 BLAKE2B 3a1224bc9807f749d8cc8136a73bd7cca2d654b48116786a1017269ccbede2c347ddeeac7f1d40a4ff93a501458454d83c8367d0efaee7f5a70b0196d88ae297 SHA512 1bd9d4ebf1f3f473010ca715abffa6b8dbb946366ca7e75cbb4c88c2da33b8488b11e26419c8d5810285e153ddf5a710077bc0015a66ad688549c91301670fa1
-MISC metadata.xml 523 BLAKE2B b38836a568ff6d8dc713a3b4e7c41d73301dce1e73bd507ac9b6b527ab5550c39982a4b9996856f3e2fdc6aa8bf46fb7775877ba0a9b22b268d9bb5435af57f6 SHA512 e0bc230ecea256da426acf9bf8fdc34f69d79dcc57e9e717e9061790bd8bba69b087d99051b491184d3a7f11f6e1100fa75ecade445afb219414d8b70bb379f2
+EBUILD w3m-0.5.3_p20220216.ebuild 3146 BLAKE2B fe7503e80d848183bac100a7733c85ab26907b385ff45495cca9938e9af38f828f65567579bd072e1e802385c19c5fa8203fdbcd73ea27a642b89de15ed214b1 SHA512 d7e0826a204ce294cdbeeac3c07111d46feb5b9b8090bdc3c9bd01ba575d443824ea9ff5c5fb7c4e5bc8f62e9c074a6df81ff7fa51648d8f00457b4c5f746cb8
+MISC metadata.xml 455 BLAKE2B 7f7e3bec15699c0cbbdbea94b343577e7bd2095f6511849c8f45555a4d4f793b6f31807162a069c80bfddd9a625a8123bf02adfb9fd0b2fffc1e9e5599f1b1d3 SHA512 3d3b269428023e456ea0d4fd0a022a9bd54c0d582b223e122bf048c926d522988f4d303f8879435a03f674799438bb54992cc86ea060f561712433b3bd0fb098
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
index b7d92b163a89..db06b4f7b6c8 100644
--- a/www-client/w3m/metadata.xml
+++ b/www-client/w3m/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<use>
 		<flag name="gdk-pixbuf">Enable support for <pkg>x11-libs/gdk-pixbuf</pkg></flag>
 		<flag name="lynxkeymap">If you prefer Lynx-like key binding</flag>
diff --git a/www-client/w3m/w3m-0.5.3_p20220216.ebuild b/www-client/w3m/w3m-0.5.3_p20220216.ebuild
new file mode 100644
index 000000000000..18cf2094f243
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3_p20220216.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools prefix toolchain-funcs
+
+COMMIT="53d323453d78a6d449f9957586c33dddfffa5616"
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="https://github.com/tats/w3m"
+SRC_URI="https://github.com/tats/w3m/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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_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-base/xorg-proto
+		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
+
+	docinto de
+	dodoc doc-de/README*
+	docinto html/de
+	dodoc doc-de/*.html
+
+	docinto ja
+	dodoc doc-jp/{HISTORY,README,keymap,menu}*
+	newdoc Bonus/README README.Bonus
+	docinto html/ja
+	dodoc doc-jp/*.html
+}