Fix building against sys-libs/ncurses[tinfo] (bug #504588).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 163 insertions, 16 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index eb9769c6a2a2..6b688c2a9e83 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3m
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.81 2013/11/06 10:53:28 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.82 2014/03/14 13:56:30 jer Exp $
+
+*w3m-0.5.3-r5 (14 Mar 2014)
+
+  14 Mar 2014; Jeroen Roovers <jer@gentoo.org> +w3m-0.5.3-r5.ebuild,
+  +files/w3m-0.5.3-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #504588).
 
 *w3m-0.5.3-r4 (06 Nov 2013)
 
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index bdc56a67e80f..b9186e0a77e2 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -9,6 +9,7 @@ AUX w3m-0.5.3-gdk-pixbuf.patch 1938 SHA256 29b1eaadc29f433616065460362bc5e7d5067
 AUX w3m-0.5.3-glibc214.patch 1673 SHA256 9cad0a1ba6a15d28a705d43d7d82621d18e298d771c750b01809eed935b0370d SHA512 cf64ac4b62285585941f23861a9928881b6418a36d2488fd9ad8731f4c3145b915310562648a4b45e4572c740be7feafd2ca59185db3da91179f11a1350adb3a WHIRLPOOL 031782753e989aeede0ac23c154f486d9d8482f35dcb71e2a0e1990db7cd92a36d4dc017384d8f4f118a033e541784464858e710c0c2fab3b341ddd582b4c2e2
 AUX w3m-0.5.3-input-type-default.patch 359 SHA256 a8d593ded6fe3852c9ea95c10f8fc4aab98495615f79cd646a547e830a351c4b SHA512 9b402199888508a6b3a6c57a7753d53b642b8e06bcfd669fa20557233476c3205442872c00f260b482cd1c640ce82eab4c5ed17bf2dc9a840006f6458925d69b WHIRLPOOL afc8b68a17b25833941a6c143802cba9d29915d07384908092233583278099793cdb3909cb51c6013c32bbe19db436aecaa6526176f2b42277a85e5b09b3ddb0
 AUX w3m-0.5.3-parallel-make.patch 351 SHA256 606ecdf4b41a49f71efd76a24e6f69fb9aa2ef69d0d27f2e1a7ad42e3a1e47db SHA512 0c52391e3f538b4b3bfce4dc93ef0982ab37a78101051d28115ab997e68e2accc2b346e5d2f28c5ee3a460acdd0bc58d6bd1096b9b259b19e94274dd8ab3b79c WHIRLPOOL ebd3138922c42a127385381eb637b2dff3f6d49da1669b0d27c2302c87454fd0258ec452022b185a35e20c8db4c2deffd93a2f0b0decf4514479c84d7f61cd15
+AUX w3m-0.5.3-tinfo.patch 634 SHA256 4eedad736f07f7a719f6fed5ec02b9cff045a8e95aceb2319b6865bb58545f4b SHA512 7c821635e684c1d511446d1a06e80dfe03aef1f4d342d89154aa929d91df28bc5bcb13a4522527cacdf4047bc648742b41f0cff07aeff24a2e24d252006de8b8 WHIRLPOOL 014e09e021df08b63887cc5d60ee5624a6ee39e1ba1c057097f380f6b9f22c880ada61c6ab6e7aa56342b9ae4206695fe4f405f99aa3ce8396d30131f41a937a
 AUX w3m-0.5.3-underlinking.patch 790 SHA256 ce289ecf767af2a286e16e7ca03fc47cf2f68eaeab015cbbe48926b18dcb76a6 SHA512 a9848610fbaf124453dc77640617785f5a3b3eb3f3c761cf0e29ea26c9481156339ef6d9efa4977d8dc0b28696bda8b5a2bef87150f86a0f516fa93e4efa2ee8 WHIRLPOOL 6b1354d132743df6285e88205fdbd0ca5f7d06ece6b9c7379d94e1983f2798c9c503d0bcbaca3b5417c99ac21389afb8ac6eb57a94d58e617c096720f9a32907
 AUX w3m-0.5.3-url-schema.patch 3093 SHA256 8442b44860cc420d3e4083f15c76f6282da568073d2fc6e0a92a33de927e0dcb SHA512 a2acded3dd2924c511bdfe3c344a74780e52928301cbe2819479a3d937c74928e62269e018e9387ccac11a55c912e88a5473561c1be05ff61ae9babea9e34005 WHIRLPOOL a9a4089e5e3800235f0773d2cc913dc709726b44f7523e7e58aa3c00e251626fe7c9a7d486e57d3e0dbee56d22570f3829e0b57115f34f9e6f9d0ec1ef5ef2de
 AUX w3m-CVE-2010-2074.patch 1597 SHA256 3ceb88f635f2b26509acf99c4817d746f4bd50f2cb6ff3152e919fdfb234d0e2 SHA512 013a27841c7dadee23fae3a972559e48dc11ee4ee9ef89711ac8f57ebf0eb4ec80a5c759011240d6b1fe59757120b8c849910d2120c31f431007d50c68533c47 WHIRLPOOL 744a5d8c8babe75703f1c293285eee48a4e071784979938956ba17b2d8a1afc542d7b9bcc05578c723f341eee2d04d9828b3679c68a7255a917aab8057560937
@@ -18,23 +19,14 @@ EBUILD w3m-0.5.3-r1.ebuild 3394 SHA256 61008b2b6d65679181c7977c4bc7dfe09a0ed6e97
 EBUILD w3m-0.5.3-r2.ebuild 3693 SHA256 fa99e25117037d53eed5e80f0cc0b0ead84e6f0a3e410dc582cf24b45f709323 SHA512 f331f5cecb978905b1a06243b5dde40ceb492b2bc07fba31fd69094d7297eba6187aed07404fe759d3ef5fca70328f060c107aa591cc1d5b9d9b51d2cd280f27 WHIRLPOOL df7daa1c0dd74293835f430cafdb82f22483695f09c7e474bf02056123ce1d288d84b230ab2528b4cf57ce850a811210d7a1eadf225382b602e3d74dd87eaa5b
 EBUILD w3m-0.5.3-r3.ebuild 3742 SHA256 71fe0693cc3c24bb2aae9753b9e25e211b184ee6e174b388fbc82ff83e3fec31 SHA512 4bfe43998e7bd0e54591808e25b034a3a4a027625a2dc513608aaa64b09faae3011b3aff88ba83aaf16bc5831c4ecf182e11fa370780c6391e4c06f4ba4d661f WHIRLPOOL 94f20e1fb391804a8ae7be5f957673eda77fcf94b16f6e0ddf5741c3e4ef890503bd8eb74e770571a7d75bf78285bedace2f9d71402556f2d44c038900fc93ad
 EBUILD w3m-0.5.3-r4.ebuild 3888 SHA256 20f4b4c81bdf4ef7b44c4c8d2b9f93fe6c2b7b8812d9268379751780c8d5783d SHA512 85bb6b5951407c209a17182dca04fbb265ec2d7cc4b41872b75697a3e00b4659633f3ff521ff7523ef07968c39c9eacef669eb30a1db6a757d2d05fe34ed9882 WHIRLPOOL abd9cf62c503817bce42ffab77fed4a27be43075f9563db03763eb9786b7c25118d735aab1d401982bcb22d5c28355ba701c4927a1d737ea36b22b25dc758240
+EBUILD w3m-0.5.3-r5.ebuild 3779 SHA256 620c482797f1b836f4a596c86cc64bcb43177d803a1081e044dbd20efb9b3d8e SHA512 9258c78bf3c945a694175905ebbefe4509e4c4c03de3dc739cdce3f71b10bd6be7977c2430c2935705d745a4f167a856f27cbfe93bca1b0332cabf3363d6606a WHIRLPOOL 625fedb7052017674f821a476eea0aaa4faf9a6f10d5de4cd47bf5651de4627bef9eae7493ab7bc573d39905a9b422027a094c96cc63def36c0165bc31888500
 EBUILD w3m-0.5.3.ebuild 3206 SHA256 d480a07179bb6b5c609d203cd6aa5f839ea2e7409965f6bb0026d883b3dd4d6c SHA512 af582e8390d092ca3fcc9a026ab46078caf75a278770c98bdaa8232192fd274a2d9b8f9abc3ca7eeb292449c487ae2e7871240e3978ffe00ee553eeaba93f9de WHIRLPOOL ad474ef85bff58c03f24ceac34ba7efdf33e10c33a1f0d0677d2443659b639a33c729b840951cfd9a5fde87377ff0fc489b32ba0a02081eba12552d912505802
-MISC ChangeLog 21422 SHA256 7228e6ac0b047428838b2c34dbd1c8161bddcbfee39b35e0801af57ef22e352a SHA512 0883456aa1ecf5b78682d300466ed8bf277b70939b7f96d528eacdc5f2c19603ce557b455021383399ea0da4848424abfc65ddf991f5e3da10772e6085eb240d WHIRLPOOL 6649e4ff7b3ffc76dd72963a3013db8e9016522e1866176affcc30f49b5d5f2fd710d7f978dc21eade533a1112ae649760f450638b94cd906e03abacdabbe379
+MISC ChangeLog 21613 SHA256 b9449f795a852f70fb9976efbbe15234ba4d75eae031ce0bbb3a40b42f38a1b8 SHA512 3f47d2c5833cbd00d2c9f136709c737058fac420e602003f7c8bfa03591d0bd627b48d58f23ac3b320da8550e43e58c27602f6e9441da4300c02084ad80bed74 WHIRLPOOL 0afea6ec2463c516537acacca5ac38cf7be03aea290baf2881f5704990dc1810ff1a4459215c9311fd45e19ee32b7eba26c2c720e88ac3a39bdb1f06b5bced0c
 MISC metadata.xml 237 SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d SHA512 12a76610bfe35e83c0939d8a21f552bb1bd6deea528c6c703562316df02d0fccf13c9c96598c748b542649e72aac19c15f3356f20ec08b9271dff059b1f271d1 WHIRLPOOL 4cd733feacdce05513aa74f49a7362aef6e1cf1debbcf2ca1e9e39a597e3b513753490d858feead5ea9fb768f8d05ec2032a9f790734bb836e670053af585817
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSeh+xAAoJEDYO1FT4VRUU0XsP/jZvH4dA4L0UQWQjg7Cf3cdU
-PZIu4WDjfn+ZQ2MNjgwPF4uBx523pBYNVH4jqSktMhf2j8Ur3cK7CzQ+3MmAqASz
-C3BjwDaUGdj/5u+UGZf+Xeung6wTj3F47sXbae/kfPajNIovxopa2yfDjRy8vbEB
-5dOeem9vQSmFF0MWJQQ652m+bhDx5+jwUk0EU5qn1/eeXzg6C/OEzrDk6Y8qd3m5
-d3/A8m4gRoKz/i6f/wwemAOlykgki1PBafvXpO/5OQwYG7cTU9dJkx/fiHL3Ddh1
-zddld26Md8kVuakRvgjsf8g3lvUUfgibnDbt0zKe0BF7qZadlQ+Za8+qdEgnDS66
-/3dB+dwY4oB1sCs/UzInevuEftRDk8k8Fe3Wrkq1m+6q+4CVJkwZYIPNLuafgZPf
-OKvsJE3jnH27QZPdt/DZphWXX1G8fpVWz1RHZpv5mHO5ryhDjC45aLKw6JW/s1E3
-9t4+8OoY0Zm0Q2TxzRbUzHDPa0T6LyTarblS02tchYsHIWn4L0bgRqA16V3L1KAZ
-bkCFzJCD4Zl3zWhkjXDZvB19xS/gPmjtBeEa2FujXrwnW8qxZ50FNznjXUdc0DcN
-hFOnHC1pVZOiIDVvxyeembEvzYa2rW4rQxRr60T1/nu6CNG9cNIqE5RhGcpIey4r
-Y6T6i+bgpfLE6cy2V2rP
-=mtUo
+iEYEAREIAAYFAlMjCpAACgkQVWmRsqeSphMCgwCeL/bEMpqrulArq23QTxXLGKFv
+YqoAn3+W1xKh//FA5g0iGujJiz1prfzu
+=NSjo
 -----END PGP SIGNATURE-----
diff --git a/www-client/w3m/files/w3m-0.5.3-tinfo.patch b/www-client/w3m/files/w3m-0.5.3-tinfo.patch
new file mode 100644
index 000000000000..512f2cb10094
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-tinfo.patch
@@ -0,0 +1,15 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -400,10 +400,10 @@
+ AC_ARG_WITH(termlib,
+  [  --with-termlib[=LIBS]		terminal library
+ 				LIBS is space separated list of:
+-				  terminfo mytinfo termcap ncurses curses],,
++				  terminfo mytinfo termcap tinfo ncurses curses],,
+  [with_termlib="yes"])
+  AC_MSG_RESULT($with_termlib)
+- test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses"
++ test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap tinfo ncurses curses"
+  for lib in $with_termlib; do
+    AC_CHECK_LIB($lib, tgetent, [W3M_LIBS="$W3M_LIBS -l$lib"; break])
+  done
diff --git a/www-client/w3m/w3m-0.5.3-r5.ebuild b/www-client/w3m/w3m-0.5.3-r5.ebuild
new file mode 100644
index 000000000000..d0eebd4fda11
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3-r5.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r5.ebuild,v 1.1 2014/03/14 13:56:30 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="http://w3m.sourceforge.net/"
+SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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 lynxkeymap migemo nls nntp ssl unicode vanilla xface linguas_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
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	X? ( x11-libs/libXext x11-libs/libXdmcp )
+	gtk? (
+		vanilla? ( x11-libs/gtk+:2 )
+		!vanilla? ( 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 )
+	migemo? ( >=app-text/migemo-0.40 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-0.5.2-gc72.patch" \
+		"${FILESDIR}/${PN}-0.5.3-parallel-make.patch" \
+		"${FILESDIR}/${PN}-0.5.3-glibc214.patch" \
+		"${FILESDIR}/${PN}-0.5.3-underlinking.patch" \
+		"${FILESDIR}/${PN}-0.5.3-tinfo.patch"
+	use vanilla || \
+		epatch "${FILESDIR}"/${PN}-0.5.3-button.patch \
+			"${FILESDIR}"/${P}-gdk-pixbuf.patch \
+			"${FILESDIR}"/${P}-input-type-default.patch \
+			"${FILESDIR}"/${P}-url-schema.patch
+	find . -name CVS -type d | xargs rm -r
+	sed -i -e "/^AR=/s/ar/$(tc-getAR)/" {.,w3mimg,libwc}/Makefile.in || die
+	eautoconf
+}
+
+src_configure() {
+	local myconf migemo_command imagelibval imageval
+
+	if use gtk ; then
+		imagelibval="gtk2"
+	elif use imlib ; then
+		imagelibval="imlib2"
+	fi
+
+	if [ ! -z "${imagelibval}" ] ; then
+		use X && imageval="${imageval}${imageval:+,}x11"
+		use X && use fbcon && imageval="${imageval}${imageval:+,}fb"
+	fi
+
+	if use migemo ; then
+		migemo_command="migemo -t egrep ${EPREFIX}/usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	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 linguas_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"
+	else
+		myconf="${myconf} --with-charset=US-ASCII"
+	fi
+
+	# lynxkeymap IUSE flag. bug #49397
+	if use lynxkeymap ; then
+		myconf="${myconf} --enable-keymap=lynx"
+	else
+		myconf="${myconf} --enable-keymap=w3m"
+	fi
+
+	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}" \
+		--with-migemo="${migemo_command}" \
+		--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}
+}
+
+src_compile() {
+	# bug #362249
+	emake -j1
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	# 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/*
+	dodoc README NEWS TODO ChangeLog
+	docinto doc-en ; dodoc doc/*
+	if use linguas_ja ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf "${ED}"/usr/share/man/ja || die
+	fi
+}