gentoo resync : 05.04.2018

7 files changed, 222 insertions, 87 deletions

diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index aa9119ccc746..07ed7e3e52f1 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,6 +1,8 @@
-AUX w3m-0.5.3-fix-missing-time.patch 308 BLAKE2B a9df10a5d61c43d2f02817588aeba1773a73bffb6993f01a5168fb0b4fd9879157dbaebeff0fc41f8596d788a2384455931ec480d4e2f04d51a24b6c2bba3bb7 SHA512 2a95bca1c2679e1c73c40238f3649a9ef35417d745d33e9c72fa3b6fd945484bd90b13f8fc7351ffd3d63485df380ae10cd6f06a8e29528aebc0230ce58c792d
-AUX w3m-0.5.3-underlinking.patch 790 BLAKE2B 8739298c6773395d1f240ab23a09333922f0a37098a6a23dfddfb4a48ce4d46bf6ae1c8262e0ce4ad395a3d71d5e275b3c78038a284b229b3e8e405607c4983f SHA512 a9848610fbaf124453dc77640617785f5a3b3eb3f3c761cf0e29ea26c9481156339ef6d9efa4977d8dc0b28696bda8b5a2bef87150f86a0f516fa93e4efa2ee8
+AUX w3m-img-fb.patch 292 BLAKE2B 3e292f5607b97d49143be54bb2ef31aaf43e9ab599a4b63069b3aca8567abb6bed6f08f88d43b77710932031303a8fabae07296f6cf176a7f4898653816ff7db SHA512 3b2bdc1c72548ab75f98743c7855bf1a7a40d2bda2252ca1f1475b1eb982b5494a42478f7b544365195d2bf2e3214d697aabe0b7a5d208bd06f26ae379163f18
+AUX w3m-time.patch 249 BLAKE2B 2c27382e48b3a2809f68aca9c8fca6a2dd2f05011134f5a99e330a4fd114ed579a57682a9f88a1dc8bd359bbd99ed55975288f40dc203567a23214668d7c6f14 SHA512 b3e68a99aea3a05f837511dbaae4766a018913d7c89daa62209cc9f0806f150dd9e7b3bc42c8be882c0b1f06b562f48f9cc0064978fc6c954359672c5ddf6d64
 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.git20161120.tar.gz 2177917 BLAKE2B 48e7d9fee00431d65e4ae486d1cf5a376542fb0655215d95455d6f0e3ba63a6dfb243a858e0bb5e745ac75713091b17fa5c5a63c91a3e837c911ef1f576ce497 SHA512 81ecf9e5d9067a82efa5464e5f9396327a6333f9e414458a972b2b7bff138bd17c490b5258e34cb1e338c7a6c0dd6105a1bfd1e0d02edfadead79caa39106a5c
-EBUILD w3m-0.5.3-r9.ebuild 3219 BLAKE2B d7877ab94c11f4011e5a3734b253a12fd259a34c8ab173458236026c10114398eba0fc908d1e6ac6bd3c054213b8433df4d53b72b547de8c7d2c2fb18f3c2f18 SHA512 f159b03a9c50276b4f90bd3655d108cbd49d8f6f67c7445261e1511d14c6c5ac15cd132221fa436fde13c913a15e00a5992933bd378c7a54a01021be692bfd4b
-MISC metadata.xml 439 BLAKE2B 07628d4420012e2d592a6e53a530aba00b8659dcfa5fb440b0ad4ef42013608842d6bf9ef7f7253e4d05da73e1f1390afccf2e7f559bea1a544841b0864b04f4 SHA512 a51eb2e908d9f231b0817f237bb40e42e9e39c0a9f07dc8e7ffbd054ba3ae3a8b6b1a4c443eeef0b28a13008134a20764e6d3234df9215f35f0359fefb8dc67b
+EBUILD w3m-0.5.3-r9.ebuild 3245 BLAKE2B 2676bf8570023cd1799890f669a5f48dc13002391fe2f39164f02528998787c930ecd18cb82680ea63c51d70fc4e3f7f464bee245a97f206663d9257651a5f51 SHA512 da84bf3215255f01edae8a98e5eb76c29c48ee3b021ad219d2d443fa4f6525ba11259fcde39bcc9bdc9ad02a6ef83a1a306eb4898ee992f8fcf6e9c5fec8d3f9
+EBUILD w3m-0.5.3_p20180125.ebuild 3207 BLAKE2B 1caf44026b4b32d4efe4c3ddf3f35764448279cdafe6624f4426c0193903bbbca24ef1613c0253c96e0e51c559b36923b925d5d77ed66eeaa22adcacd2fe6995 SHA512 8f65138b152193179e4bc2f8aacda03bd03aae43dcf30c47618281ca7b032c5ef1eff737acb73c25bae423c49cd39481a7b2ef4217b8968742739ad791ed8761
+MISC metadata.xml 522 BLAKE2B 4f89e2d965f7cc320983d501b67f2dda0134745d63e98b488fb3bdcfd6dfd2ce2e0fe12f8b6fea88818166298906c661db47405ab4de1f27cbbec37ca52fdedc SHA512 1fb6f6e6121f5673e809a626f840ff524b6e58260a9e2ac5b537e1f3d04cf2371b1ff03808da757848931275751a09fdc872f431b9162927fabc0b3e64305317
diff --git a/www-client/w3m/files/w3m-0.5.3-underlinking.patch b/www-client/w3m/files/w3m-0.5.3-underlinking.patch
deleted file mode 100644
index 1b034b46cb13..000000000000
--- a/www-client/w3m/files/w3m-0.5.3-underlinking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
-
---- w3m-0.5.3.orig/Makefile.in	2011-01-04 18:22:18.000000000 +0900
-+++ w3m-0.5.3/Makefile.in	2011-02-06 12:05:40.000000000 +0900
-@@ -199,7 +199,7 @@
- 	$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
- 
- $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
--	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
-+	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS)
- 
- w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
- 	$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
diff --git a/www-client/w3m/files/w3m-img-fb.patch b/www-client/w3m/files/w3m-img-fb.patch
new file mode 100644
index 000000000000..677d89d3bcd1
--- /dev/null
+++ b/www-client/w3m/files/w3m-img-fb.patch
@@ -0,0 +1,10 @@
+--- a/w3mimg/fb/fb_imlib2.c
++++ b/w3mimg/fb/fb_imlib2.c
+@@ -3,7 +3,6 @@
+                 fb_imlib2.c 0.3 Copyright (C) 2002, hito
+  **************************************************************************/
+ 
+-#include <X11/Xlib.h>
+ #include <Imlib2.h>
+ #include "fb.h"
+ #include "fb_img.h"
diff --git a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch b/www-client/w3m/files/w3m-time.patch
index 03efd85d6536..8489eee3fae9 100644
--- a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
+++ b/www-client/w3m/files/w3m-time.patch
@@ -1,5 +1,3 @@
-diff --git a/html.h b/html.h
-index c490655..2a9a431 100644
 --- a/html.h
 +++ b/html.h
 @@ -8,6 +8,8 @@
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
index 329c6eb709a0..3a35f0fcc04c 100644
--- a/www-client/w3m/metadata.xml
+++ b/www-client/w3m/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -6,6 +6,7 @@
 		<name>Cjk</name>
 	</maintainer>
 	<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>
 	</use>
 	<upstream>
diff --git a/www-client/w3m/w3m-0.5.3-r9.ebuild b/www-client/w3m/w3m-0.5.3-r9.ebuild
index 9fef12101d50..61d0335e9167 100644
--- a/www-client/w3m/w3m-0.5.3-r9.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r9.ebuild
@@ -1,122 +1,132 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils prefix vcs-snapshot
+EAPI="6"
+
+inherit autotools prefix vcs-snapshot
 
 MY_REL="git20161120"
 MY_P="${P}.${MY_REL}"
 
 DESCRIPTION="Text based WWW browser, supports tables and frames"
 HOMEPAGE="https://github.com/tats/w3m"
-SRC_URI="https://github.com/tats/w3m/archive/v${PV}+${MY_REL}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/tats/${PN}/archive/v${PV}+${MY_REL}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="w3m"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="X fbcon gpm gtk imlib libressl lynxkeymap nls nntp ssl unicode xface l10n_ja"
-
-# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
-# allow us to build w/o X, so we have to give up framebuffer w3mimg....
-RDEPEND=">=sys-libs/ncurses-5.2-r3:0=
-	>=sys-libs/zlib-1.1.3-r2
-	>=dev-libs/boehm-gc-6.2:=
-	X? ( x11-libs/libXext x11-libs/libXdmcp )
-	gtk? ( x11-libs/gdk-pixbuf )
-	!gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) )
-	xface? ( media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja libressl lynxkeymap nls nntp ssl unicode xface"
+
+RDEPEND="dev-libs/boehm-gc:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	X? (
+		x11-libs/libXdmcp
+		x11-libs/libXext
+	)
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[X?] )
+	!gdk-pixbuf? (
+		imlib? ( media-libs/imlib2[X?] )
+	)
+	gpm? ( sys-libs/gpm )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
-	)"
+	)
+	xface? ( media-libs/compface )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
+	fbcon? ( ?? ( gdk-pixbuf imlib ) )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-underlinking.patch"
-	"${FILESDIR}/${P}-fix-missing-time.patch"
+	"${FILESDIR}/${PN}-img-fb.patch"
+	"${FILESDIR}/${PN}-time.patch"
 )
 
-S="${WORKDIR}"/${MY_P}
 src_prepare() {
 	default
-	ecvs_clean
-	sed -i -e "/^AR=/s:ar:$(tc-getAR):" {.,w3mimg,libwc}/Makefile.in || die
+	sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in
 	hprefixify acinclude.m4
 	eautoconf
 }
 
 src_configure() {
-	local myconf imagelibval imageval
+	local myconf=()
+	local image imagelib
 
-	if use gtk ; then
-		imagelibval="gtk2"
-	elif use imlib ; then
-		imagelibval="imlib2"
+	if use gdk-pixbuf; then
+		imagelib="gtk2"
+	elif use imlib; then
+		imagelib="imlib2"
 	fi
-
-	if [ ! -z "${imagelibval}" ] ; then
-		use X && imageval="${imageval}${imageval:+,}x11"
-		use X && use fbcon && imageval="${imageval}${imageval:+,}fb"
+	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
-		if use unicode ; then
-			myconf="${myconf} --enable-japanese=U"
-		else
-			myconf="${myconf} --enable-japanese=E"
-		fi
-	elif use unicode ; then
-		myconf="${myconf} --with-charset=UTF-8"
+	if use l10n_ja; then
+		myconf+=( --enable-japanese=$(usex unicode U E) )
 	else
-		myconf="${myconf} --with-charset=US-ASCII"
+		myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
 	fi
-
 	# lynxkeymap IUSE flag. bug #49397
-	if use lynxkeymap ; then
-		myconf="${myconf} --enable-keymap=lynx"
-	else
-		myconf="${myconf} --enable-keymap=w3m"
-	fi
+	myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
 
 	econf \
-		--with-editor="${EPREFIX}/usr/bin/vi" \
-		--with-mailer="${EPREFIX}/bin/mail" \
-		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
-		--with-termlib=yes \
-		--enable-image=${imageval:-no} \
-		--with-imagelib="${imagelibval:-no}" \
-		--without-migemo \
-		--enable-m17n \
-		--enable-unicode \
 		$(use_enable gpm mouse) \
 		$(use_enable nls) \
 		$(use_enable nntp) \
 		$(use_enable ssl digest-auth) \
-		$(use_with ssl) \
 		$(use_enable xface) \
-		${myconf}
+		$(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() {
-
 	emake DESTDIR="${D}" install
+	einstalldocs
 
 	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
 	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}.mailcap" mailcap
+	newins "${FILESDIR}"/${PN}.mailcap mailcap
 
 	insinto /usr/share/${PN}/Bonus
-	doins Bonus/*
-	dodoc README NEWS TODO ChangeLog
-	docinto doc-en ; dodoc doc/*
-	if use l10n_ja ; then
-		docinto doc-jp ; dodoc doc-jp/*
+	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
+	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
+		rm -rf "${ED}"/usr/share/man/ja
 	fi
 }
diff --git a/www-client/w3m/w3m-0.5.3_p20180125.ebuild b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
new file mode 100644
index 000000000000..efc1e7d370ee
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools prefix vcs-snapshot
+
+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/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja libressl lynxkeymap nls nntp ssl unicode xface"
+
+RDEPEND="dev-libs/boehm-gc:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	X? (
+		x11-libs/libXdmcp
+		x11-libs/libXext
+	)
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[X?] )
+	!gdk-pixbuf? (
+		imlib? ( media-libs/imlib2[X?] )
+	)
+	gpm? ( sys-libs/gpm )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	xface? ( media-libs/compface )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
+	fbcon? ( ?? ( gdk-pixbuf imlib ) )"
+
+PATCHES=( "${FILESDIR}/${PN}-img-fb.patch" )
+
+src_prepare() {
+	default
+	sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in
+	hprefixify acinclude.m4
+	eautoconf
+}
+
+src_configure() {
+	local myconf=()
+	local image imagelib
+
+	if use gdk-pixbuf; then
+		imagelib="gtk2"
+	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() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
+	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
+	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
+	fi
+}