Set AR properly. #444376; Drop old version.

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

4 files changed, 36 insertions, 150 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 960db710ec4c..81a6174d78a1 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,9 @@
 # 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.78 2012/06/21 10:31:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.79 2012/11/25 22:01:55 naota Exp $
+
+  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.
 
   21 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> w3m-0.5.3-r2.ebuild:
   QA: don't use parallel build until bug #362249 is fixed.
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 511264209e58..2b70357739e8 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,32 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX w3m-0.5.2-ambwidth.patch 13634 RMD160 21d967a5b6816e55aac12a161e575121065a336f SHA1 a9a040d2e9b17ed5ca454a0133e525a0ec542ba2 SHA256 9cad290d4c0122964ecb674e636fb7551b400b4f32a2697ca15d68e2fe8cf4ce
-AUX w3m-0.5.2-form.patch 309 RMD160 8f208c562fdce59ef97009e373925a33815a3dcd SHA1 e703286d1a67e67b2b052ef9806e202a5ef434ec SHA256 a0e6084c82db55c746cd00410c8781887fd52b61eca86a8a61269570622c41bf
-AUX w3m-0.5.2-gc72.patch 769 RMD160 475b22c156c6be49729e9a563d5d5493ba249c4d SHA1 d0332b8dcdf3fac1f91485d6858ad8c8b25ada69 SHA256 6a6a736db1edc3936a604d7b63512510158b4decfbdadaff85f7bf14d6377a86
-AUX w3m-0.5.3-button.patch 14325 RMD160 06cf86a847065ab0527a015a4eee5151f41470ed SHA1 1ffab809894da7d504afd694d2808a2b0065c561 SHA256 acdc0032e213b610d5f6cf0ca15d7370572f736918c165e962badb5c73ac5982
-AUX w3m-0.5.3-gdk-pixbuf.patch 1938 RMD160 352030dd0bdf2a06c92880ea387ad064307ecf68 SHA1 e63b3a202b0fce0260cc5c911087c746b1ad9041 SHA256 29b1eaadc29f433616065460362bc5e7d5067f7b1dc1a2d0583d0ff2f5a5e5cf
-AUX w3m-0.5.3-glibc214.patch 1673 RMD160 ab4f6e18287a960e15350f0d90c3e564eda1c86b SHA1 c0270149250c180cbfc88eacb917cbe5f0ed5fa9 SHA256 9cad0a1ba6a15d28a705d43d7d82621d18e298d771c750b01809eed935b0370d
-AUX w3m-0.5.3-parallel-make.patch 351 RMD160 d253ca9e1e47e67c31ad1320573d034447022d42 SHA1 11fb11ba105cfbbf695eb9fa299a7ea0ea84c01c SHA256 606ecdf4b41a49f71efd76a24e6f69fb9aa2ef69d0d27f2e1a7ad42e3a1e47db
-AUX w3m-0.5.3-underlinking.patch 790 RMD160 10196f9f6c504786ff656a4cab9a812083af42d1 SHA1 8bc0324aa332b9318be30e8ef544509fb9d5cb0f SHA256 ce289ecf767af2a286e16e7ca03fc47cf2f68eaeab015cbbe48926b18dcb76a6
-AUX w3m-CVE-2010-2074.patch 1597 RMD160 2a0f198a18ddec42ac070a9433d39177a41860f1 SHA1 e7e9502af2e749fff7e173c5eb6e27158591f5b8 SHA256 3ceb88f635f2b26509acf99c4817d746f4bd50f2cb6ff3152e919fdfb234d0e2
-AUX w3m.mailcap 44 RMD160 86f571fda5a25bc7ffe2a2094c2bc590c0395ce0 SHA1 dccd475e42a34e132adfc2aa13c3c789cd2e6fff SHA256 5f3c243df65c4d2e5ceeb1fae285e0f9f6660c7b0fc66bb7e46803c1de1890b5
-DIST w3m-0.5.2.tar.gz 1906812 RMD160 09ce72d8ef5e621a2e49496b63e22f2773edbe79 SHA1 484522547ae6dbb342d3858a2a53a65451e273f9 SHA256 5ff3e5a1f50a4a8e6ddbfdeefbe13d3a7f63538595a8e29f5da504ea46eda646
-DIST w3m-0.5.3.tar.gz 2202328 RMD160 6a0153bc53f7c107c700404262ce1b4d02e6dd91 SHA1 444b6c8cf7094ee95f8e9de96b37f814b9d83237 SHA256 e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3
-EBUILD w3m-0.5.2-r4.ebuild 3339 RMD160 0a60af75cc1721f36f1ff7128da44494d6a85c90 SHA1 26f099cf0d2839db11ad32358e21c87ef22f5d85 SHA256 8cde8fb88826e40bbe02f5ea92222956ff1c65d7036be43c22e88a5a7d8d3a61
-EBUILD w3m-0.5.3-r1.ebuild 3394 RMD160 48760bd000a63d94a0dff2f03f20191513384b46 SHA1 9b5eb23a4c79fd1e8e7c5905c33a2e2c858839a2 SHA256 61008b2b6d65679181c7977c4bc7dfe09a0ed6e97ac4ec9869e96ea352d2fc77
-EBUILD w3m-0.5.3-r2.ebuild 3624 RMD160 05d51a7b8588e179b70878f22364e161c8d856b3 SHA1 666813c7fd03aaaec1cea5160dcf53a94f41e1fd SHA256 88d996d5df218e2f64a63e6c0f8978a057761c7136bce08b1f92513d27e46009
-EBUILD w3m-0.5.3.ebuild 3206 RMD160 340e06493c4f73a476bab19d3289da1dfcdd41c8 SHA1 cf3bd6d1d5223ddd80ce13496eb38fa696e343cd SHA256 d480a07179bb6b5c609d203cd6aa5f839ea2e7409965f6bb0026d883b3dd4d6c
-MISC ChangeLog 20923 RMD160 2bc4f4c8da62b10532f704519c82331ba7d65650 SHA1 783618f04463531b4ba32c2008323243a637671c SHA256 0893879fb9aba04c94f05bfd3e97ee646be71cea1e89588f5fc53953cf90b7d7
-MISC metadata.xml 237 RMD160 795d70d06b61c12bd15a97e596afed87747e7553 SHA1 a1a1f21305275c396fb2784bb261595fbf510a6f SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d
+AUX w3m-0.5.2-ambwidth.patch 13634 SHA256 9cad290d4c0122964ecb674e636fb7551b400b4f32a2697ca15d68e2fe8cf4ce SHA512 fc993befa8c18484bd66b68d70b6a23939a63591c79f1146f2673047b1c283b9e747813bc1bc39d36f0357a4bbd12474d831c5d24ee2443d24e920a25f8e29e0 WHIRLPOOL 3d7153c70b6b4c484495ed5c7d0dc9ca3ac504d0964e70e19ba868f736cd8181a06191527e5ae473ca65eac2adf5316f2b4b16ac8b8d7f6027e3f764601b09ba
+AUX w3m-0.5.2-form.patch 309 SHA256 a0e6084c82db55c746cd00410c8781887fd52b61eca86a8a61269570622c41bf SHA512 1be3d16b84642f00156a7f37d95bd206e1fe8e25a6132edec5d916223014a9cd42d50504cd3ead377763930b1c58b89211f3fe119eb6c87fab8f7896cff622e6 WHIRLPOOL 0536be1af2c262e8c27ebf6d71f82c0f597f6d4fde87b42c72916ccb5fba134cb9dc23919cf87e6ef1b4d7d8840d54e76d8d6e9d2ac4b8df072264b9d3e4ff53
+AUX w3m-0.5.2-gc72.patch 769 SHA256 6a6a736db1edc3936a604d7b63512510158b4decfbdadaff85f7bf14d6377a86 SHA512 ec08f5568e2f7e4c764fc95ff14bad296dd6d7a818acbc2721f2d2e7eb0018beb07bab009b4e3c963bd9204d1f98edb12ae2a24a139086116b9858a3fdbecd7a WHIRLPOOL 07958cb8d2e59e7aecf7f81c1118d12c6d13b2ddc2b4b9648bfd8292cec683e952f720e8f0b962dbef4655c5a1c1739644b2894a28ec25478fc24f9fcea4ad28
+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-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
+AUX w3m.mailcap 44 SHA256 5f3c243df65c4d2e5ceeb1fae285e0f9f6660c7b0fc66bb7e46803c1de1890b5 SHA512 a66ef535a62f593910c1c99865363e7fc8af1815d24f2ccda86a72c0b777ff388100677f0e14e6f57a6786fdbde62cfc3fea554e659d54663f44cfba3e5c67d2 WHIRLPOOL b788b2d793e8fd4f385cabbd80b0ee56fcb87a22f48237066fe5163313f4eb887a0b2f85ad9c8ed01848f49fd766048eece33fd23dbc5601d8cbb88015135d8c
+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.ebuild 3206 SHA256 d480a07179bb6b5c609d203cd6aa5f839ea2e7409965f6bb0026d883b3dd4d6c SHA512 af582e8390d092ca3fcc9a026ab46078caf75a278770c98bdaa8232192fd274a2d9b8f9abc3ca7eeb292449c487ae2e7871240e3978ffe00ee553eeaba93f9de WHIRLPOOL ad474ef85bff58c03f24ceac34ba7efdf33e10c33a1f0d0677d2443659b639a33c729b840951cfd9a5fde87377ff0fc489b32ba0a02081eba12552d912505802
+MISC ChangeLog 21044 SHA256 5a51a75c8ced8b6afd5d84d661cb121b9f62e4c129da203f20c5ae05662b76b9 SHA512 d454e70429a14b8059b39002b5d634dc83cac78cab1e2d0c444a266e1a5368e9933942b68e62ef350c1a6c4928988b58467b7b10c1b443a512bfacd588c5de1c WHIRLPOOL 53618eb60a2475b9e263ac6357c9fc9a0f98279ba50b76c36a8c7c22216e117049b5c9797d16ff5fd1d913cce8058be051e26ad8d16f18d6c86f443d3ca5c877
+MISC metadata.xml 237 SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d SHA512 12a76610bfe35e83c0939d8a21f552bb1bd6deea528c6c703562316df02d0fccf13c9c96598c748b542649e72aac19c15f3356f20ec08b9271dff059b1f271d1 WHIRLPOOL 4cd733feacdce05513aa74f49a7362aef6e1cf1debbcf2ca1e9e39a597e3b513753490d858feead5ea9fb768f8d05ec2032a9f790734bb836e670053af585817
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP4vgAAAoJEBzRPIrUMBNC8VUIAJgAArgkalcxm7Jlj/va3E0c
-jLAvla3eBly6+Q6N2THUpo59do3c2yeuDEgpt/xrsTqsDqsGmoB0pOUWFFKlVps3
-3zQCuCpzrLXhNf77/H5qZfbaWJ2/37WB4a84YBeV13vuUJle+Y3/yO/dq3inrrjE
-R/OPQNDTKZld8XWmM9+7run+0pRIdhRt/n68Ktokf+SNveEvpAygn2qukRjBpKNv
-yrGIdcg2CEKw0jXuyGl35QhaDTzv4Yxi2xEGQSVzmx4KjKQs3UJp94n8Lqmcyzyv
-xostUQY0PctQJamS67HActG7zMDB1FGxNvIQ7vnsIuWazwwTfYHzO+cPjzuTFGk=
-=nZbs
+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
 -----END PGP SIGNATURE-----
diff --git a/www-client/w3m/w3m-0.5.2-r4.ebuild b/www-client/w3m/w3m-0.5.2-r4.ebuild
deleted file mode 100644
index e25c1743c667..000000000000
--- a/www-client/w3m/w3m-0.5.2-r4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.2-r4.ebuild,v 1.10 2012/05/29 13:39:31 naota Exp $
-
-EAPI="2"
-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"
-IUSE="X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode 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? ( x11-libs/gtk+:2 )
-	!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 )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ambwidth.patch"
-	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200708.month/4286.html
-	epatch "${FILESDIR}/${P}-form.patch"
-	epatch "${FILESDIR}/${P}-gc72.patch"
-	# from w3m-0.5.2-149.1.src.rpm(openSUSE)
-	epatch "${FILESDIR}/${PN}-CVE-2010-2074.patch"
-}
-
-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 /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=/usr/bin/vi \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/firefox \
-		--with-termlib=curses \
-		--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() {
-	# parallel make borks, bug #215394.
-	emake -j1 || die "emake failed"
-}
-
-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
-
-	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 "${D}"/usr/share/man/ja
-	fi
-}
diff --git a/www-client/w3m/w3m-0.5.3-r2.ebuild b/www-client/w3m/w3m-0.5.3-r2.ebuild
index 3e4fefb36af2..54617010f0d1 100644
--- a/www-client/w3m/w3m-0.5.3-r2.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r2.ebuild,v 1.6 2012/06/21 10:31:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r2.ebuild,v 1.7 2012/11/25 22:01:55 naota Exp $
 
 EAPI="3"
 inherit eutils
@@ -40,6 +40,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-0.5.3-button.patch \
 			"${FILESDIR}"/${P}-gdk-pixbuf.patch
 	find . -name CVS -type d | xargs rm -r
+	sed -i -e "/^AR=/s/ar/$(tc-getAR)/" {.,w3mimg,libwc}/Makefile.in || die
 }
 
 src_configure() {