stable on x86 and amd64.

Package-Manager: portage-2.0.51.22-r2

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 768e166660d4e4ce931a8f4e4c25ff17fbaee5e1..0ca5329ee031989c479634b47b43a5bc6f0261d9 100644 (file)
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/w3m
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.11 2005/09/21 16:04:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.12 2005/09/25 00:09:19 matsuu Exp $
+
+  23 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> -w3m-0.5.1-r2.ebuild,
+  w3m-0.5.1-r3.ebuild:
+  Stable on x86 and amd64.
 
 *w3m-0.5.1-r3 (21 Sep 2005)
 

diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index c68e7fe849cb27ab14cb6df074c662c958feebd9..59f81193d32941798c81b733027296eea6872639 100644 (file)
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,13 +1,11 @@
 MD5 a256d4b0c2ea4055801f91dc9af9729f w3m-0.4.2-r10.ebuild 2952
 MD5 ef673798787980429901d8a8c9e8933a w3m-0.5.1-r1.ebuild 3500
-MD5 71ea5b99b461ed166c083fa40da967af w3m-0.5.1-r3.ebuild 3606
+MD5 ed684625a75aef8b412dce9bf128107a w3m-0.5.1-r3.ebuild 3596
 MD5 6dbb19793ae901d3aa90c1ef1dabdabb w3m-0.4.2.ebuild 1887
-MD5 b12821e2010d938e9f3f087bb34eab93 ChangeLog 12943
+MD5 98ac93f69eb4f5a908527356eba39c38 ChangeLog 13065
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 bd173fd6509462ad462969ae96d43b22 w3m-0.5.1-r2.ebuild 3872
 MD5 f91cc75929689839efc1a8dfb0dcbd83 files/w3m-0.4.2-imglib-gentoo.diff 5019
 MD5 3734d8d1d8c19bfa94a11477e6cc38cd files/digest-w3m-0.5.1-r1 201
-MD5 c6c17e9ab9b7b1e694542f4fb51fa8f2 files/digest-w3m-0.5.1-r2 205
 MD5 c6c17e9ab9b7b1e694542f4fb51fa8f2 files/digest-w3m-0.5.1-r3 205
 MD5 f818841f47776f4cdfe686de95223019 files/digest-w3m-0.4.2-r10 210
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059

diff --git a/www-client/w3m/files/digest-w3m-0.5.1-r2 b/www-client/w3m/files/digest-w3m-0.5.1-r2
deleted file mode 100644 (file)
index cbce1bf..0000000
--- a/www-client/w3m/files/digest-w3m-0.5.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0678b72e07e69c41709d71ef0fe5da13 w3m-0.5.1.tar.gz 1892121
-MD5 7abde0e5f0dc04352ebf3969a4a2c75c w3m-cvs-1.942-async-7.diff.gz 79535
-MD5 291a22d15e5c465615b31ba41a4198f7 w3m-0.5.1-cvs1.938.diff.gz 20040

diff --git a/www-client/w3m/w3m-0.5.1-r2.ebuild b/www-client/w3m/w3m-0.5.1-r2.ebuild
deleted file mode 100644 (file)
index ac770e2..0000000
--- a/www-client/w3m/w3m-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r2.ebuild,v 1.6 2005/07/09 15:03:19 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Text based WWW browser, supports tables and frames"
-HOMEPAGE="http://w3m.sourceforge.net/
-       http://www.page.sannet.ne.jp/knabe/w3m/w3m.html"
-PATCH_PATH="http://www.page.sannet.ne.jp/knabe/w3m/"
-SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
-       async? ( ${PATCH_PATH}/w3m-cvs-1.942-async-7.diff.gz )
-       http://dev.gentoo.org/~usata/distfiles/${P}-cvs1.938.diff.gz"
-# w3m color patch:
-#      http://homepage3.nifty.com/slokar/w3m/${P}_256-005.patch.gz
-# w3n canna inline patch:
-#      canna? ( http://www.j10n.org/files/w3m-cvs-1.914-canna.patch )
-# w3m bookmark charset patch:
-#      nls? ( ${PATCH_PATH}/w3m-cvs-1.942-nls-2.diff.gz )
-
-LICENSE="w3m"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ppc64 ~ia64 ~ppc-macos"
-IUSE="X async cjk gpm gtk gtk2 imlib2 lynxkeymap migemo nls ssl xface"
-#IUSE="canna unicode"
-
-# canna? ( app-i18n/canna )
-# 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? (
-               !ppc-macos? (
-                       gtk? ( gtk2? ( >=x11-libs/gtk+-2 )
-                               !gtk2? ( >=media-libs/gdk-pixbuf-0.22.0 ) )
-                       !gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0 )
-                               !imlib2? ( >=media-libs/imlib-1.9.8 ) )
-               )
-               ppc-macos? ( >=media-libs/imlib2-1.1.2 )
-       )
-       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/textbrowser
-       virtual/w3m"
-
-src_unpack() {
-       unpack ${P}.tar.gz
-       cd ${S}
-       epatch ${DISTDIR}/${P}-cvs1.938.diff.gz
-       epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-
-       use async && epatch ${DISTDIR}/w3m-cvs-1.942-async-7.diff.gz
-
-       #epatch ${DISTDIR}/${P}_256-005.patch.gz
-       #use canna && epatch ${DISTDIR}/w3m-cvs-1.914-canna.patch
-}
-
-src_compile() {
-
-       local myconf migemo_command imagelib fb
-
-       if use X ; then
-               # fb depends on Linux
-               use ppc-macos || fb=",fb"
-               myconf="${myconf} --enable-image=x11${fb} $(use_enable xface)"
-
-               if use ppc-macos ; then
-                       # ppc-macos doesn't support gtk2, gtk and imlib
-                       imagelib="imlib2"
-               elif use gtk2 ; then
-                       imagelib="gtk2"
-               elif use gtk ; then
-                       imagelib="gdk-pixbuf"
-               elif use imlib2 ; then
-                       imagelib="imlib2"
-               else
-                       imagelib="imlib"
-               fi
-       else    # no X
-               myconf="${myconf} --enable-image=no"
-               imagelib="no"
-       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 cjk ; then
-               myconf="${myconf}
-                       --enable-japanese=E
-                       --with-charset=EUC-JP"
-       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/nano \
-               --with-mailer=/bin/mail \
-               --with-browser=/usr/bin/mozilla \
-               --with-termlib=ncurses \
-               --with-imagelib="${imagelib}" \
-               --with-migemo="${migemo_command}" \
-               --enable-m17n \
-               --enable-unicode \
-               $(use_enable gpm mouse) \
-               $(use_enable ssl digest-auth) \
-               $(use_with ssl) \
-               $(use_enable nls) \
-               ${myconf} "$@" || die
-               # $(use_with canna)
-
-       # emake borked
-       emake -j1 all || die "make failed"
-}
-
-src_install() {
-
-       make DESTDIR=${D} install || die "make install failed"
-
-       insinto /usr/share/${PN}/Bonus
-       doins Bonus/*
-       dodoc README NEWS TODO ChangeLog
-       docinto doc-en ; dodoc doc/*
-       if use cjk ; 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.1-r3.ebuild b/www-client/w3m/w3m-0.5.1-r3.ebuild
index 6be3a133afb051ecea30d08218d2e85a54a21a78..c596bc0d57f8f2d60916987b842e32c885026859 100644 (file)
--- a/www-client/w3m/w3m-0.5.1-r3.ebuild
+++ b/www-client/w3m/w3m-0.5.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r3.ebuild,v 1.1 2005/09/21 16:04:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r3.ebuild,v 1.2 2005/09/25 00:09:19 matsuu Exp $
 
 inherit eutils
 
@@ -20,9 +20,9 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ppc64 ~ia64 ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~ppc-macos ~sparc x86"
 IUSE="X async fbcon gpm gtk imlib lynxkeymap migemo nls ssl unicode xface"
-#IUSE="canna unicode"
+#IUSE="canna"
 
 # canna? ( app-i18n/canna )
 # We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't