Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

7 files changed, 7 insertions, 654 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 589f97f5f991..d677bb5f2901 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.89 2015/03/21 14:11:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.90 2015/03/29 00:01:58 mrueg Exp $
+
+  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,
+  -w3m-0.5.3.ebuild:
+  Remove old.
 
   21 Mar 2015; Justin Lecher <jlec@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 5fbc19ff0ccb..cc7ed547c567 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 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
@@ -16,30 +13,6 @@ 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 3367 SHA256 d81f8b7a9b2a129d9b90fd3a958fb4c0b9b3c3a5c7be4fad8a34c1081f03ab8a SHA512 ac5015eaac0feca957ea7becc242718c43d664d3e8112b6fb44afd06f5c0c7e12f4ca6d70e0f0e89b6a2d7939b8ee796a20c9ad089ee51ffb4eaa0ddc3274120 WHIRLPOOL fb91ba1edec4adef9131c8e89eea90cf15d43bcd4011784ae74cafbe34452da73d93706fabe9b5beaa798969b91baa64a697c44942c17d9c64ee03cbfd1d7e6a
-EBUILD w3m-0.5.3-r2.ebuild 3664 SHA256 b742f1141cc88e496eab422950850ecf45105dbad3de2b44bd5b1a26dc1f9d30 SHA512 5790c00ed74b545432844ce437ea7fe97cf4d381c9fd637726e13385a6357808fe25c8b794e7bab66195653a4d63ef7b701e4b639c99ca152d9a972cb2e7b757 WHIRLPOOL 1dc95eb837e31b04c03b2ca701745a438f21c8fffd280477b139ce54837e39b81dd85f8fd8e6264e2610f819a6c8de711091f1c9013064c5f43b1a2b661279df
-EBUILD w3m-0.5.3-r3.ebuild 3713 SHA256 b965a69076f540e03014a11b68d87a17ea2e82889f225350326c37d5eaf6fc3d SHA512 417f45e86bf7c0063a76d96d42407343f822a203216b20c438ebb2b8e6c1b7bdd16ca6952d0eceec78efbc621de08a8aa053b1778d844d41f64dd07858420c3b WHIRLPOOL f8eaa4621b23f2dd61a82a219ac551bec69ae9bf7fff558b2e37a26df9893a40f0ffb1add58fdc4f507db2b252c37acd6fbc988a923192cd0aafa64750a0cd7b
-EBUILD w3m-0.5.3-r4.ebuild 3859 SHA256 1d7e13c41a9e3505f0919eb753d44a3a52372a2f726998376ab0a7e14b8cf75c SHA512 03dfdb3de8ab805b469cc01945728e9de2bbedc57e17c320a27f671f856e10e449df1dbab19727bc010d153d1e57d2f17d101de3f1d86101bad1caa0bbedcfa9 WHIRLPOOL 40bfa607c42925fbcab5d831d0f5a02ece5b00f3a4f3e95d7929496bc844c14e4b7d39c6eb68eefa799fede84736f70025d5d4b23da6c1d4af60eb6363450ccf
 EBUILD w3m-0.5.3-r5.ebuild 3748 SHA256 f338ba278c70045f2b9f0c0577d745fbfe691f28d757b473b6979644eeba5eae SHA512 ba21ea856dc017be8875bd9b6c5f760c82173d19cd6221b2e8b20daad3189f1781a35456dab13880a2ca2815d73cfc5efe053d6099cebd3bd7cfc2a6acc05996 WHIRLPOOL 0f5896d4810dda0de18e9b55138aa36b6734560531320ceef3e3797ae2db09c11e3972e51810c29c62dc215ef8dfc347aa203b1ee051a84782a6e30b6ca82ffd
-EBUILD w3m-0.5.3.ebuild 3206 SHA256 d480a07179bb6b5c609d203cd6aa5f839ea2e7409965f6bb0026d883b3dd4d6c SHA512 af582e8390d092ca3fcc9a026ab46078caf75a278770c98bdaa8232192fd274a2d9b8f9abc3ca7eeb292449c487ae2e7871240e3978ffe00ee553eeaba93f9de WHIRLPOOL ad474ef85bff58c03f24ceac34ba7efdf33e10c33a1f0d0677d2443659b639a33c729b840951cfd9a5fde87377ff0fc489b32ba0a02081eba12552d912505802
-MISC ChangeLog 22518 SHA256 998162e92b0409828aaccdeb2ac8464c77c3d8c4b269a48fcbcd8b2d4a9436bb SHA512 dd93328f058fac9ac189cb667fe781d8a1c7a77d0f40e077cf7c645a592af1dd92167fa7228eb1272b33dba013ca63c54856030b83c83327b7ab4c1f2b1be599 WHIRLPOOL 21647344207e4a1664b53cbfe5eb4ecc0bf569d81701596bffb0c3705dbeaaca1604d5ff9412c7b692a1c9ba56a8d979f0bef25c25543123ebe9ce83b2865fcf
+MISC ChangeLog 22693 SHA256 a2ee0c222d6ea5e62871b46bdd842d14db63f350ecdaf7ec2027d1f8dd653d39 SHA512 8ae33694a67756c7f75a4a8e3c3cc50a66836dd55371a23ac4c3c69e8fe814273e7102d7a59038de593936ea860b3c3408264b1be44cc9b295af4d94558f17a4 WHIRLPOOL 8681d2790ac2c6858b84fe8811bcb326672ed36e7920e02e5f4b46126e8b1b6eb3026ea3729d011a388831a7d06eda01056b967018b500514ab8e155f54f0455
 MISC metadata.xml 237 SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d SHA512 12a76610bfe35e83c0939d8a21f552bb1bd6deea528c6c703562316df02d0fccf13c9c96598c748b542649e72aac19c15f3356f20ec08b9271dff059b1f271d1 WHIRLPOOL 4cd733feacdce05513aa74f49a7362aef6e1cf1debbcf2ca1e9e39a597e3b513753490d858feead5ea9fb768f8d05ec2032a9f790734bb836e670053af585817
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVDXwYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirKbQP/j8aq/3j8lLLqPdxd016sUlW
-PuMSztcq7pjriBkGV5vk8Xl0CbZxb3vYdq1FVh8ykPYlauRccYoi4diTPxPkvbmO
-f7ORekB4Wjo2j1q/uzQmB6frPL+2dSdrRhphzxYZpY/ccnJr0PTlewcz0HhTpQLS
-ge35jvH5sogVTJNIZx1hDwjSciCuBeBTPq3QCInv4a7RYusQSilOi/3Jl1SIhRVl
-4XljWcTEK51kTVJBIZpxZbyqREfhm5liPRoQ8auOY4Y5R++jaet7ReBRlTIYBbHJ
-5OaHPAr4rSU1x2otUk9WRso9Nq0xtGRC6q476gLBCgxd5L5zPfSRJpK/Hn0I+oQw
-qQeP+Rwze9+jy/zKwqXgzfxZqJLJbhBbq+EmL2xhk68c1iYw+VOAy+LNJgJusFPt
-WBHs2gKZvVIZbXyhDotvccUrLSUzm2VFmJUhvCfCaEnAmpM8bPt9de1XmRQk3mHt
-K9I/mVOnBiYNcLnPOJUnjTR0uEYQpZiZfwRvV7caXuH8YqJIR8CzgPz+RmetBwdz
-58f9nYEFAjUtIIyNBsK+y3R0kxetDEUGHVg4W+RWnB2aotpsNPQXvHXpBgqmlqpW
-6oqSTae5SYe8rIONDF/2/elwFsm4KPxlNLQ8SKyQmWzEF79uq9rVhIDf6csbn9+h
-RMzNxn73XaUMZKT4OccB
-=yM3C
------END PGP SIGNATURE-----
diff --git a/www-client/w3m/w3m-0.5.3-r1.ebuild b/www-client/w3m/w3m-0.5.3-r1.ebuild
deleted file mode 100644
index 403b58400b0e..000000000000
--- a/www-client/w3m/w3m-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.13 2015/03/21 14:11:35 jlec 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
-}
diff --git a/www-client/w3m/w3m-0.5.3-r2.ebuild b/www-client/w3m/w3m-0.5.3-r2.ebuild
deleted file mode 100644
index 8aec07e5d29c..000000000000
--- a/www-client/w3m/w3m-0.5.3-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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-r2.ebuild,v 1.8 2015/03/21 14:11:35 jlec 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
-	ecvs_clean
-	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
-}
diff --git a/www-client/w3m/w3m-0.5.3-r3.ebuild b/www-client/w3m/w3m-0.5.3-r3.ebuild
deleted file mode 100644
index 1ac58e8dc9d9..000000000000
--- a/www-client/w3m/w3m-0.5.3-r3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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-r3.ebuild,v 1.2 2015/03/21 14:11:35 jlec 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
-	ecvs_clean
-	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
-}
diff --git a/www-client/w3m/w3m-0.5.3-r4.ebuild b/www-client/w3m/w3m-0.5.3-r4.ebuild
deleted file mode 100644
index a655e831c5aa..000000000000
--- a/www-client/w3m/w3m-0.5.3-r4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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-r4.ebuild,v 1.2 2015/03/21 14:11:35 jlec 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}"
-DEPEND="virtual/pkgconfig
-	${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 \
-			"${FILESDIR}"/${P}-url-schema.patch
-	ecvs_clean
-	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
-
-	local termlib=$(pkg-config ncurses --libs|sed -e 's/-l//g')
-
-	econf \
-		--with-editor="${EPREFIX}/usr/bin/vi" \
-		--with-mailer="${EPREFIX}/bin/mail" \
-		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
-		--with-termlib="${termlib}" \
-		--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
-}
diff --git a/www-client/w3m/w3m-0.5.3.ebuild b/www-client/w3m/w3m-0.5.3.ebuild
deleted file mode 100644
index 159d6d908c55..000000000000
--- a/www-client/w3m/w3m-0.5.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 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.ebuild,v 1.4 2011/04/13 15:09:00 ulm 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 ) )
-	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"
-}
-
-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
-}