Marked as stable

5 files changed, 10 insertions, 122 deletions

diff --git a/net-www/w3m-m17n/ChangeLog b/net-www/w3m-m17n/ChangeLog
index be3dc969aa34..69ae976fb56b 100644
--- a/net-www/w3m-m17n/ChangeLog
+++ b/net-www/w3m-m17n/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for net-www/w3m-m17n
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.10 2003/10/04 22:21:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.11 2003/10/12 16:18:29 usata Exp $
 
 *w3m-m17n-0.4.2 (25 Sep 2003)
 
+  13 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-m17n-0.4.2.ebuild,
+  w3m-m17n-20030916.ebuild:
+  Considered as stable. Removed old CVS snapshot (It blocks upgrade to
+  0.4.2 for ~arch users).
+
   05 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-m17n-0.4.2.ebuild,
   files/w3m-m17n-0.4.2-gentoo.diff, files/w3m-m17n-0.4.2-imglib-gentoo.diff:
   Fixed compilation breakage (due to CVS Id expansion in a patch).
diff --git a/net-www/w3m-m17n/Manifest b/net-www/w3m-m17n/Manifest
index 8ae17d8d6f20..88e90494c7d3 100644
--- a/net-www/w3m-m17n/Manifest
+++ b/net-www/w3m-m17n/Manifest
@@ -1,10 +1,8 @@
-MD5 8c5aad8f065099f54f79bb55b974047b ChangeLog 2494
+MD5 5129b9dc80c51bcdb5b9bbf4027152d9 ChangeLog 2692
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 e98ed662d20aff454ace121087ce6801 w3m-m17n-20030916.ebuild 3015
-MD5 fb0316ea50d3d6bcdbef7b512c5249a2 w3m-m17n-0.4.2.ebuild 3644
+MD5 27bd246801cabfac6ed4d67aa40b781f w3m-m17n-0.4.2.ebuild 3640
 MD5 c2bb2e68c5a3b9e3e753aa39e9b1070c w3m-m17n-0.4.1.20030308-r2.ebuild 2715
 MD5 84a4529fdf4d9541fb3a111080687261 files/digest-w3m-m17n-0.4.2 210
 MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308-r2 146
-MD5 2df1dde324e4c58fe00c490180c587af files/digest-w3m-m17n-20030916 204
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
 MD5 f91cc75929689839efc1a8dfb0dcbd83 files/w3m-m17n-0.4.2-imglib-gentoo.diff 5019
diff --git a/net-www/w3m-m17n/files/digest-w3m-m17n-20030916 b/net-www/w3m-m17n/files/digest-w3m-m17n-20030916
deleted file mode 100644
index a0b5554de75a..000000000000
--- a/net-www/w3m-m17n/files/digest-w3m-m17n-20030916
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ff72d5990a1c5f580b677c37019d2083 w3m-cvs-1.860.tar.gz 666079
-MD5 41677a08822d49baaf7e28cfc66206e1 w3m-cvs-1.859-m17n-1.diff.gz 86023
-MD5 5d9dd2828ecab3214a87454bbc2b10b4 libwc-20030224.tar.gz 1150077
diff --git a/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild b/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
index b1d5e5c0c193..643af608d0ec 100644
--- a/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild,v 1.2 2003/10/04 22:21:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild,v 1.3 2003/10/12 16:18:29 usata Exp $
 
 IUSE="X imlib imlib2 gtk xface migemo gpm ssl"
 #IUSE="nls"
@@ -23,7 +23,7 @@ SRC_URI="http://dev.gentoo.org/~usata/distfiles/${W3M_P}.tar.gz
 
 SLOT="0"
 LICENSE="w3m"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ppc sparc"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
diff --git a/net-www/w3m-m17n/w3m-m17n-20030916.ebuild b/net-www/w3m-m17n/w3m-m17n-20030916.ebuild
deleted file mode 100644
index 911278d713ad..000000000000
--- a/net-www/w3m-m17n/w3m-m17n-20030916.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-20030916.ebuild,v 1.2 2003/09/25 08:58:57 usata Exp $
-
-IUSE="imlib gtk xface gpm ssl"
-#IUSE="nls"
-
-W3M_CVS_PV="1.860"
-W3M_P="w3m-cvs-${W3M_CVS_PV}"
-
-W3M_M17N_CVS_PV="1.859"
-W3M_M17N_P="w3m-cvs-${W3M_M17N_CVS_PV}-m17n"
-LIBWC_PV="20030224"
-
-DESCRIPTION="Lightweight text based WWW browser w3m with multilingual extension"
-HOMEPAGE="http://w3m.sourceforge.net/
-	http://www2u.biglobe.ne.jp/~hsaka/w3m/
-	http://www.page.sannet.ne.jp/knabe/w3m/w3m.html"
-SRC_URI="http://dev.gentoo.org/~usata/distfiles/${W3M_P}.tar.gz
-	http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-1.diff.gz
-	http://dev.gentoo.org/~usata/distfiles/libwc-${LIBWC_PV}.tar.gz"
-#	nls? ( http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-nls-1.diff.gz)
-
-SLOT="0"
-LICENSE="w3m"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	dev-lang/perl
-	>=dev-libs/boehm-gc-6.2
-	gtk? ( =x11-libs/gtk+-1.2*
-		media-libs/gdk-pixbuf )
-	!gtk? ( imlib? ( media-libs/imlib
-			media-libs/libungif ) )
-	xface? ( media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser
-	virtual/w3m"
-
-S="${WORKDIR}/${W3M_P}"
-
-src_unpack() {
-
-	unpack ${W3M_P}.tar.gz
-	cd ${S}
-
-	# libwc doesn't come with w3m-m17n now
-	unpack libwc-${LIBWC_PV}.tar.gz
-
-	epatch ${DISTDIR}/${W3M_M17N_P}-1.diff.gz
-	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
-	#use nls && epatch ${DISTDIR}/${W3M_M17N_P}-nls-1.diff.gz
-}
-
-src_compile() {
-
-	local myconf migemo_command
-
-	if [ -n "`use imlib`" -o -n "`use gtk`" ] ; then
-		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
-	else
-		myconf="${myconf} --enable-image=no"
-	fi
-
-	if has_version 'app-emacs/migemo' ; then
-		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
-	else
-		migemo_command="no"
-	fi
-
-	econf --program-suffix=-m17n \
-		--enable-keymap=w3m \
-		--with-editor=/usr/bin/nano \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/mozilla \
-		--with-termlib=ncurses \
-		--with-migemo="${migemo_command}" \
-		`use_enable gpm mouse` \
-		`use_enable ssl digest-auth` \
-		`use_with ssl` \
-		${myconf} || die
-
-	emake package=w3m-m17n W3M=w3m-m17n || die "make failed"
-}
-
-src_install() {
-
-	make package=w3m-m17n DESTDIR=${D} install || die
-
-	# w3mman and manpages conflict with those from w3m
-	mv ${D}/usr/bin/w3mman{,-m17n}
-	mv ${D}/usr/share/man/man1/w3mman{,-m17n}.1
-	#mv ${D}/usr/share/man/man1/w3m{,-m17n}.1
-	#mv ${D}/usr/share/man/ja/man1/w3m{,-m17n}.1
-
-	if ! has_version 'net-www/w3m' ; then
-		dosym /usr/bin/w3m{-m17n,}
-		dosym /usr/bin/w3mman{-m17n,}
-		dosym /usr/share/man/ja/man1/w3m{-m17n,}.1
-		dosym /usr/share/man/man1/w3m{-m17n,}.1
-		dosym /usr/share/man/man1/w3mman{-m17n,}.1
-	fi
-
-	insinto /usr/share/${PN}/Bonus
-	doins Bonus/*
-	dodoc README NEWS TODO ChangeLog
-	docinto doc-en ; dodoc doc/*
-	docinto doc-jp ; dodoc doc-jp/*
-}