Restore stable version for ppc64.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 126 insertions, 2 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index d677bb5f2901..fe95de0a548a 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/w3m
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.90 2015/03/29 00:01:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.91 2015/03/29 05:26:46 mrueg Exp $
+
+*w3m-0.5.3-r1 (29 Mar 2015)
+
+  29 Mar 2015; Manuel Rüger <mrueg@gentoo.org> +w3m-0.5.3-r1.ebuild:
+  Restore stable version for ppc64.
 
   29 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -w3m-0.5.3-r1.ebuild,
   -w3m-0.5.3-r2.ebuild, -w3m-0.5.3-r3.ebuild, -w3m-0.5.3-r4.ebuild,
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index cc7ed547c567..3550cbcfd223 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -13,6 +13,7 @@ AUX w3m-0.5.3-url-schema.patch 3093 SHA256 8442b44860cc420d3e4083f15c76f6282da56
 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 3368 SHA256 46e104d036ed269c0dcbc8b7136b03a9a6898e640d4be4e58ca67e97cf4756e5 SHA512 6c3faafa26f5093678905ffd98e08c351f40b05807a22ffa98d6bfe38585bf9ab5ad56d19bd4bd6b549285240f8abc62e83ecaa6962c27484c54a53aa46d4873 WHIRLPOOL 10b73b22f6ce92f48c7400597837ba5f6338a8b0fcac44ddc4b666d86ea7b884948bb31fb3f5c37fb8949738cef9a32114018ba9dd2761b0d2d4a3f0cc75fc76
 EBUILD w3m-0.5.3-r5.ebuild 3748 SHA256 f338ba278c70045f2b9f0c0577d745fbfe691f28d757b473b6979644eeba5eae SHA512 ba21ea856dc017be8875bd9b6c5f760c82173d19cd6221b2e8b20daad3189f1781a35456dab13880a2ca2815d73cfc5efe053d6099cebd3bd7cfc2a6acc05996 WHIRLPOOL 0f5896d4810dda0de18e9b55138aa36b6734560531320ceef3e3797ae2db09c11e3972e51810c29c62dc215ef8dfc347aa203b1ee051a84782a6e30b6ca82ffd
-MISC ChangeLog 22693 SHA256 a2ee0c222d6ea5e62871b46bdd842d14db63f350ecdaf7ec2027d1f8dd653d39 SHA512 8ae33694a67756c7f75a4a8e3c3cc50a66836dd55371a23ac4c3c69e8fe814273e7102d7a59038de593936ea860b3c3408264b1be44cc9b295af4d94558f17a4 WHIRLPOOL 8681d2790ac2c6858b84fe8811bcb326672ed36e7920e02e5f4b46126e8b1b6eb3026ea3729d011a388831a7d06eda01056b967018b500514ab8e155f54f0455
+MISC ChangeLog 22829 SHA256 479c7fb483c3ad21cdf8ebd0eb2c5e541f8414afedb80efc3d31bcf7a7e95f33 SHA512 d4e9e40bdbeaf02aedb4c9056f73cffec259ba433246d2f7423e2d2b6b67b1bdfc89085d109133b199618def6965295ea2c98d16390b54fe29115e4508d9ec0a WHIRLPOOL 4975125ea54ea642b17d9429d9f51b3c052db5526cc26ba45fcd7883e43c3dd03825c7e0491ffc6234ce826fe81c19d3cf78d4b904b3b882adbaa70a6b23774a
 MISC metadata.xml 237 SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d SHA512 12a76610bfe35e83c0939d8a21f552bb1bd6deea528c6c703562316df02d0fccf13c9c96598c748b542649e72aac19c15f3356f20ec08b9271dff059b1f271d1 WHIRLPOOL 4cd733feacdce05513aa74f49a7362aef6e1cf1debbcf2ca1e9e39a597e3b513753490d858feead5ea9fb768f8d05ec2032a9f790734bb836e670053af585817
diff --git a/www-client/w3m/w3m-0.5.3-r1.ebuild b/www-client/w3m/w3m-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..bb7001e91b84
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 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-r1.ebuild,v 1.15 2015/03/29 05:26:46 mrueg 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 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 )"
+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"
+	ecvs_clean
+}
+
+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_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
+}