Add optional patch to assume default input type to text #413795

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 167 insertions, 16 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 81a6174d78a1..1710cac88a7e 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3m
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.79 2012/11/25 22:01:55 naota Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.80 2013/04/06 01:52:14 naota Exp $
+
+*w3m-0.5.3-r3 (06 Apr 2013)
+
+  06 Apr 2013; Naohiro Aota <naota@gentoo.org>
+  +files/w3m-0.5.3-input-type-default.patch, +w3m-0.5.3-r3.ebuild:
+  Add optional patch to assume default input type to text #413795
 
   25 Nov 2012;  <naota@gentoo.org> -w3m-0.5.2-r4.ebuild, w3m-0.5.3-r2.ebuild:
   Set AR properly. #444376; Drop old version.
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 2b70357739e8..19af538a2ebd 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -7,6 +7,7 @@ AUX w3m-0.5.2-gc72.patch 769 SHA256 6a6a736db1edc3936a604d7b63512510158b4decfbda
 AUX w3m-0.5.3-button.patch 14325 SHA256 acdc0032e213b610d5f6cf0ca15d7370572f736918c165e962badb5c73ac5982 SHA512 9b5e924b619b832cb7d4ff26bbcf62e610f619363c9323b6ed066d86ddb2559df3c270d1b3ead3516308f823c52e7dbe4666ee2d2a476c1068319095c45c6c74 WHIRLPOOL 808df908e9e090548de6eca23dc72b30a194a758fe7af8d0296042b32c56775b3371a4129d5073ab054f3c985f85f15406c90e3c2bca49a2a0065874bbbdbc65
 AUX w3m-0.5.3-gdk-pixbuf.patch 1938 SHA256 29b1eaadc29f433616065460362bc5e7d5067f7b1dc1a2d0583d0ff2f5a5e5cf SHA512 05d8d20631832bc04195bddf7eed99df15c5e4b6df70b5b98fb415b08dedc46cf3b6ac870ad51d1f74830a0f5efe65fc6411fa50f2ff483ab6ca2b5c39177701 WHIRLPOOL b397fcdb3e6b0d69fe68217d5cf50c23cca790cc0e4004345246592cc3736c19a241b490fe0a30bf14fa306306fa3f18c19b88216615f17626ccd819c84f5a3b
 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-underlinking.patch 790 SHA256 ce289ecf767af2a286e16e7ca03fc47cf2f68eaeab015cbbe48926b18dcb76a6 SHA512 a9848610fbaf124453dc77640617785f5a3b3eb3f3c761cf0e29ea26c9481156339ef6d9efa4977d8dc0b28696bda8b5a2bef87150f86a0f516fa93e4efa2ee8 WHIRLPOOL 6b1354d132743df6285e88205fdbd0ca5f7d06ece6b9c7379d94e1983f2798c9c503d0bcbaca3b5417c99ac21389afb8ac6eb57a94d58e617c096720f9a32907
 AUX w3m-CVE-2010-2074.patch 1597 SHA256 3ceb88f635f2b26509acf99c4817d746f4bd50f2cb6ff3152e919fdfb234d0e2 SHA512 013a27841c7dadee23fae3a972559e48dc11ee4ee9ef89711ac8f57ebf0eb4ec80a5c759011240d6b1fe59757120b8c849910d2120c31f431007d50c68533c47 WHIRLPOOL 744a5d8c8babe75703f1c293285eee48a4e071784979938956ba17b2d8a1afc542d7b9bcc05578c723f341eee2d04d9828b3679c68a7255a917aab8057560937
@@ -14,23 +15,24 @@ AUX w3m.mailcap 44 SHA256 5f3c243df65c4d2e5ceeb1fae285e0f9f6660c7b0fc66bb7e46803
 DIST w3m-0.5.3.tar.gz 2202328 SHA256 e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3 SHA512 43508c76d07b4d8f19c19f975c0b870aeb94abf0744b6128ee01c759d4e409a8b57bc866baeaf990f309ff73e9a7b02ca455d272b1dd0a93fafb8c72b1fe6d14 WHIRLPOOL 8f7dcaca362091227e29d7a6583ed796711904681a60e01d5838e45de003d60a9d88361d39b4d04056b67a14e51fe09e9d5b39fc8da18e83086484c974010cfe
 EBUILD w3m-0.5.3-r1.ebuild 3394 SHA256 61008b2b6d65679181c7977c4bc7dfe09a0ed6e97ac4ec9869e96ea352d2fc77 SHA512 9612cdc8dbc214ec77619265a31f2015bfc8608b1264c1afb6047b7ddef056606ad7d593b7a2d87780c3a96a9133d995c83d4f4b1f107f36cfcec71e493fe380 WHIRLPOOL 0b9693097d42fa08d7f0a9dacd5b0f72dd7f76a0cb12941a2c6804617b1f7f612cbb248eb96c68523200c763af29635838a9febe076aa6e6e39bda89fe6aae54
 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.ebuild 3206 SHA256 d480a07179bb6b5c609d203cd6aa5f839ea2e7409965f6bb0026d883b3dd4d6c SHA512 af582e8390d092ca3fcc9a026ab46078caf75a278770c98bdaa8232192fd274a2d9b8f9abc3ca7eeb292449c487ae2e7871240e3978ffe00ee553eeaba93f9de WHIRLPOOL ad474ef85bff58c03f24ceac34ba7efdf33e10c33a1f0d0677d2443659b639a33c729b840951cfd9a5fde87377ff0fc489b32ba0a02081eba12552d912505802
-MISC ChangeLog 21044 SHA256 5a51a75c8ced8b6afd5d84d661cb121b9f62e4c129da203f20c5ae05662b76b9 SHA512 d454e70429a14b8059b39002b5d634dc83cac78cab1e2d0c444a266e1a5368e9933942b68e62ef350c1a6c4928988b58467b7b10c1b443a512bfacd588c5de1c WHIRLPOOL 53618eb60a2475b9e263ac6357c9fc9a0f98279ba50b76c36a8c7c22216e117049b5c9797d16ff5fd1d913cce8058be051e26ad8d16f18d6c86f443d3ca5c877
+MISC ChangeLog 21254 SHA256 ba45368d94fc3679fd28b4d2e9ff74060c5e4049e864077f535d7ef3fc287cc3 SHA512 b19ec5ee068f92148f4c10b9b78cf8454af62ddbe5e0a82347cb1a68c21c43dc97979f4239ac6bc6176eac0e15aece43930a9ba33809ee284747942cc628dc83 WHIRLPOOL 32970ffc0182854387249cd796de701a85c05417b7ea1a0a1c0cb2df76af7fcf6ea81a113a5a4683aeeee3f4f285b929e367594669dce10d41751f602f198b0b
 MISC metadata.xml 237 SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d SHA512 12a76610bfe35e83c0939d8a21f552bb1bd6deea528c6c703562316df02d0fccf13c9c96598c748b542649e72aac19c15f3356f20ec08b9271dff059b1f271d1 WHIRLPOOL 4cd733feacdce05513aa74f49a7362aef6e1cf1debbcf2ca1e9e39a597e3b513753490d858feead5ea9fb768f8d05ec2032a9f790734bb836e670053af585817
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQspVbAAoJEDYO1FT4VRUUfo0P/iynTl4ezsIbOX6hhNsIN2ZR
-Le1EhZYjUX0T8oVvqqC9lwP8xzquInke3jnvMIakMGf66GXz+IUzPExb9QtXpyVU
-M9I+PGyGfNs313wtMPCGn8VdDPG7fM4q8wrY+alNqNskquPYihvsiHpj03pwg6aZ
-mA3BKf6ogbjRCWmv5eBaGSlxVHWySiYau/WZEFOzl7GOzi2XryHv014XRYgQYxzY
-Uv8QVx+tdBRfqems7eHq6TtXJI4n5EiMZg4XJRk9SUMFrn7KlTHEEhdqA7oYsMnd
-ThcOcVJ31gmqx825pv3BL8x0PnYnvUiuU1eRK6Zgo+t2h51Kl0hKjf7sval8V1+D
-gVZh2w7+OWNhEe5EJRr9Wnp0SPChQDUssCvdq6afjQTJlrfJh1CjMUgTiXdGNW/w
-r4vK5QBxV7Np47YvarLUuOvIAVQLW/Gaj1KWB7livq/m9XcB9MXFsKEQr2V0WBGx
-oin525vBnDIJdBFgHxu2TheD1ouKNn98wzd7WrIfI9RmWiz9LI+A+Sg3bg7L6okQ
-Nid5Z6R2YjohAelZaJNEOlSgO4AybhgXwkxBbE7nCZ4KGCajjJQ7xL4vqSzZSNAV
-y3fedoBxQk3Lmj/ttm1y4XpopeSCFTS1RsIfXDqZ7HIOZagPQmlG4HewrvIGZqsR
-b0v7AFim8dcefxPKKkUk
-=01hH
+iQIcBAEBCAAGBQJRX3/QAAoJEDYO1FT4VRUUG8IP/25fmiq7zDY7B3vfzJyqEzp8
+evLSOel55XIx6wQHYyTnjRBJ4CAKuPx/3ou6FhKUFsmtSHiBCp61gUxG/xnfXq/9
+GcC+jnLwmJZ3fTA51XkhGoJpJQu0rsTHxQZ6LSs+faZdyr4qcwO5MJ1W0Rb7owun
+r7Joaz3c+pcaS1pYcHAS6Y7ZPNPrFbRBZ0u5JoZFwcgh8rcYHcfLcrEs1/NIv4Av
+nMpm7YNxaL8MBNujd7+DXs707F1gAiFWDgcP2+OiH12qaJrbY8z7qv8oQrBHkodB
++JLBjeS0hv0NuByvJ67aqvuSHkc22GNP+WwkQdX0ejwt5ywTw/tSSxDpNP+JWag8
+koR1LhnoJYWPmOtnfEK1KokSP2KZ/ww3298KA4k9YHGiPbLfoKobG6q6pS+MageW
+kPXmok7qH97+Wss0FeKnOMFQYi4t1DWyvPiOQtX15UeykBDg5hz1uPRV6RsG99QQ
+tumili++G5rW9XJYdiJOPMOMK62tnC6cNshXPAvANOwTzPFEqRt3zSufPj1IMQ5H
+mq2VM1iVKEirZKAJeXkcupzhBtRlQZ8jVxn9C7pIn98hZiW3nh5axf60IsK1CdTT
+xZl4q1kVGWHW36KpCaQ/BfGeNwH067y9pFpvQlUpirL/IhITGRuIPyzaN5Q7c34Q
+jFPjkv8eI51IDjMnw6e9
+=1GAF
 -----END PGP SIGNATURE-----
diff --git a/www-client/w3m/files/w3m-0.5.3-input-type-default.patch b/www-client/w3m/files/w3m-0.5.3-input-type-default.patch
new file mode 100644
index 000000000000..016d2a575ec2
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-input-type-default.patch
@@ -0,0 +1,13 @@
+Index: w3m-git/form.c
+===================================================================
+--- w3m-git.orig/form.c	2011-02-28 15:03:36.000000000 +0100
++++ w3m-git/form.c	2011-02-28 15:32:33.000000000 +0100
+@@ -196,7 +196,7 @@
+ 	if (!strcasecmp(typestr, _formtypetbl[i]))
+ 	    return i;
+     }
+-    return FORM_UNKNOWN;
++    return FORM_INPUT_TEXT;
+ }
+ 
+ void
diff --git a/www-client/w3m/w3m-0.5.3-r3.ebuild b/www-client/w3m/w3m-0.5.3-r3.ebuild
new file mode 100644
index 000000000000..db1378dc8670
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3-r3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/04/06 01:52:14 naota Exp $
+
+EAPI="3"
+inherit 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....
+DEPEND=">=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 )"
+RDEPEND="${DEPEND}"
+
+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"
+	use vanilla || \
+		epatch "${FILESDIR}"/${PN}-0.5.3-button.patch \
+			"${FILESDIR}"/${P}-gdk-pixbuf.patch \
+			"${FILESDIR}"/${P}-input-type-default.patch
+	find . -name CVS -type d | xargs rm -r
+	sed -i -e "/^AR=/s/ar/$(tc-getAR)/" {.,w3mimg,libwc}/Makefile.in || die
+}
+
+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=ncurses \
+		--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} || die
+}
+
+src_compile() {
+	# bug #362249
+	emake -j1 || die
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}.mailcap" mailcap || die
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/* || die
+	dodoc README NEWS TODO ChangeLog || die
+	docinto doc-en ; dodoc doc/* || die
+	if use linguas_ja ; then
+		docinto doc-jp ; dodoc doc-jp/* || die
+	else
+		rm -rf "${ED}"/usr/share/man/ja || die
+	fi
+}