Version bumped, bug #336497.

(Portage version: 2.1.9.28/cvs/Linux x86_64)

5 files changed, 33 insertions, 369 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index fc29d0f2034d..7ca1061b31a0 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for www-client/w3m
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.60 2010/09/27 11:05:23 xmw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.61 2011/01/15 16:57:07 matsuu Exp $
+
+  15 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> -w3m-0.5.2.ebuild,
+  -w3m-0.5.2-r1.ebuild, -w3m-0.5.2-r2.ebuild, -w3m-0.5.2-r3.ebuild,
+  +w3m-0.5.3.ebuild:
+  Version bumped, bug #336497. Removed old versions.
+
+*w3m-0.5.3 (15 Jan 2011)
+
+  15 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> -w3m-0.5.2.ebuild,
+  -w3m-0.5.2-r1.ebuild, -w3m-0.5.2-r2.ebuild, -w3m-0.5.2-r3.ebuild,
+  +w3m-0.5.3.ebuild:
+  Version bumped. Removed old versions.
 
   26 Sep 2010; Michael Weber <xmw@gentoo.org> w3m-0.5.2-r4.ebuild:
   Added ~arm keyword
diff --git a/www-client/w3m/w3m-0.5.2-r1.ebuild b/www-client/w3m/w3m-0.5.2-r1.ebuild
deleted file mode 100644
index bb528199959e..000000000000
--- a/www-client/w3m/w3m-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.5 2008/04/03 16:17:42 matsuu Exp $
-
-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 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 ) )
-	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 )"
-PROVIDE="virtual/w3m"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ambwidth.patch"
-}
-
-src_compile() {
-
-	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
-
-	# parallel make borks, bug #215394.
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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.2-r3.ebuild b/www-client/w3m/w3m-0.5.2-r3.ebuild
deleted file mode 100644
index 6edfe5bbd780..000000000000
--- a/www-client/w3m/w3m-0.5.2-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/12/13 23:25:21 matsuu Exp $
-
-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 ~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 ) )
-	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 )"
-PROVIDE="virtual/w3m"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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"
-}
-
-src_compile() {
-
-	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
-
-	# 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.2.ebuild b/www-client/w3m/w3m-0.5.2.ebuild
deleted file mode 100644
index 7340a88057ef..000000000000
--- a/www-client/w3m/w3m-0.5.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.6 2007/10/15 15:10:51 corsair Exp $
-
-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 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 ) )
-	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 )"
-PROVIDE="virtual/w3m"
-
-src_compile() {
-
-	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
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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.2-r2.ebuild b/www-client/w3m/w3m-0.5.3.ebuild
index c3169713a6ca..b63a82543ac8 100644
--- a/www-client/w3m/w3m-0.5.2-r2.ebuild
+++ b/www-client/w3m/w3m-0.5.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2-r2.ebuild,v 1.6 2010/01/16 20:38:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3.ebuild,v 1.1 2011/01/15 16:57:07 matsuu Exp $
 
+EAPI="3"
 inherit eutils
 
 DESCRIPTION="Text based WWW browser, supports tables and frames"
@@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+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
@@ -25,18 +26,14 @@ DEPEND=">=sys-libs/ncurses-5.2-r3
 	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
 	migemo? ( >=app-text/migemo-0.40 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
+RDEPEND="${DEPEND}"
 PROVIDE="virtual/w3m"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ambwidth.patch"
-	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200708.month/4286.html
-	epatch "${FILESDIR}/${P}-form.patch"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.5.2-gc72.patch"
 }
 
-src_compile() {
-
+src_configure() {
 	local myconf migemo_command imagelibval imageval
 
 	if use gtk ; then
@@ -51,7 +48,7 @@ src_compile() {
 	fi
 
 	if use migemo ; then
-		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+		migemo_command="migemo -t egrep ${EPREFIX}/usr/share/migemo/migemo-dict"
 	else
 		migemo_command="no"
 	fi
@@ -79,10 +76,10 @@ src_compile() {
 	fi
 
 	econf \
-		--with-editor=/usr/bin/vi \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/firefox \
-		--with-termlib=curses \
+		--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}" \
@@ -95,9 +92,6 @@ src_compile() {
 		$(use_with ssl) \
 		$(use_enable xface) \
 		${myconf} || die
-
-	# parallel make borks, bug #215394.
-	emake -j1 || die "emake failed"
 }
 
 src_install() {
@@ -106,15 +100,15 @@ src_install() {
 
 	# http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
 	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}.mailcap" mailcap
+	newins "${FILESDIR}/${PN}.mailcap" mailcap || die
 
 	insinto /usr/share/${PN}/Bonus
-	doins Bonus/*
-	dodoc README NEWS TODO ChangeLog
-	docinto doc-en ; dodoc doc/*
+	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/*
+		docinto doc-jp ; dodoc doc-jp/* || die
 	else
-		rm -rf "${D}"/usr/share/man/ja
+		rm -rf "${ED}"/usr/share/man/ja || die
 	fi
 }