Removed libungif dependency; bug #85720.

(Portage version: 2.0.51.19)

7 files changed, 8 insertions, 217 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 7b0a4c2782a8..bfb6f4faf4e4 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,11 @@
 # 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.8 2005/02/12 09:26:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.9 2005/03/18 14:25:05 usata Exp $
+
+  18 Mar 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -files/w3m-libwc-gentoo.diff, -files/w3m-0.4.2-async-m17n-gentoo.diff,
+  -files/w3m-m17n-search-gentoo.diff, w3m-0.4.2.ebuild, -w3m-0.5-r2.ebuild:
+  Removed libungif dependency; bug #85720.
 
   12 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5.1-r2.ebuild:
   Updated async patch; bug #67082.
diff --git a/www-client/w3m/files/digest-w3m-0.5-r2 b/www-client/w3m/files/digest-w3m-0.5-r2
deleted file mode 100644
index 43ccd5139db3..000000000000
--- a/www-client/w3m/files/digest-w3m-0.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 31e470bcb09bad3150d73af760febe0c w3m-0.5.tar.gz 1889076
-MD5 31e137778606614afe20e94eaea162ce w3m-cvs-1.912-async-1.diff.gz 76557
-MD5 83c4903221284ec5f92f19a285b2d86e w3m-cvs-1.912-nlscharset-1.diff 4027
diff --git a/www-client/w3m/files/w3m-0.4.2-async-m17n-gentoo.diff b/www-client/w3m/files/w3m-0.4.2-async-m17n-gentoo.diff
deleted file mode 100644
index ebc5fbb84768..000000000000
--- a/www-client/w3m/files/w3m-0.4.2-async-m17n-gentoo.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -urN w3m.orig/file.c w3m/file.c
---- w3m.orig/file.c	2004-02-17 19:10:27.055076000 +0900
-+++ w3m/file.c	2004-02-17 22:00:49.578016400 +0900
-@@ -652,13 +652,11 @@
- 		cont = TRUE;
- #ifdef USE_M17N
- 	    lineBuf2 = decodeMIME(lineBuf2, &mime_charset);
-+#endif
- 	    lineBuf2 = convertLine(NULL, lineBuf2, RAW_MODE,
- 				   mime_charset ? &mime_charset : &newBuf->document_charset,
- 				   mime_charset ? mime_charset
- 				   : DocumentCharset);
--#else
--	    lineBuf2 = convertLine(NULL, lineBuf2, &newBuf->document_code, RAW_MODE);
--#endif
- 	    /* separated with line and stored */
- 	    tmp = Strnew_size(lineBuf2->length);
- 	    for (p = lineBuf2->ptr; *p; p = q) {
-@@ -6772,13 +6770,11 @@
- 	}
- #endif
- 	if (!newBuf->internal) {
--#ifdef USE_M17N
- 	    lineBuf2 = convertLine(f, lineBuf2, HTML_MODE, &newBuf->document_charset, newBuf->document_charset);
-+#ifdef USE_M17N
- #ifdef USE_IMAGE
- 	    h_env->document_charset = newBuf->document_charset;
- #endif
--#else
--	    lineBuf2 = convertLine(f, lineBuf2, &newBuf->document_code, HTML_MODE);
- #endif
- 	}
- 	HTMLlineproc0(lineBuf2->ptr, h_env, newBuf->internal);
-@@ -7497,11 +7493,7 @@
- 	buf->nlines++;
- 	buf->linelen += lineBuf2->length;
- 	showProgressBuffer(buf);
--#ifdef USE_M17N
- 	lineBuf2 = convertLine(uf, lineBuf2, PAGER_MODE, &buf->document_charset, buf->document_charset);
--#else
--	lineBuf2 = convertLine(uf, lineBuf2, &buf->document_charset, PAGER_MODE);
--#endif
- 	if (squeezeBlankLine) {
- 	    squeeze_flag = FALSE;
- 	    if (lineBuf2->ptr[0] == '\n' && buf->pre_lbuf == '\n') {
diff --git a/www-client/w3m/files/w3m-libwc-gentoo.diff b/www-client/w3m/files/w3m-libwc-gentoo.diff
deleted file mode 100644
index 978bfa508aaa..000000000000
--- a/www-client/w3m/files/w3m-libwc-gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN libwc.ORIG/detect.c libwc/detect.c
---- libwc.ORIG/detect.c	2002-11-20 03:04:00.000000000 +0900
-+++ libwc/detect.c	2004-01-09 23:49:30.546004976 +0900
-@@ -63,7 +63,9 @@
- 	    for (i = 0; i < 0x20; i++)
- 		WC_DETECT_MAP[i] = 0;
- 	    WC_DETECT_MAP[WC_C_HZ_TILDA] = (ces == WC_CES_HZ_GB_2312) ? 1 : 0;
-+#ifdef USE_UNICODE
- 	    WC_DETECT_MAP[WC_C_UTF7_PLUS] = (ces == WC_CES_UTF_7) ? 1 : 0;
-+#endif
- 	}
- 	detect_ces = ces;
-     }
diff --git a/www-client/w3m/files/w3m-m17n-search-gentoo.diff b/www-client/w3m/files/w3m-m17n-search-gentoo.diff
deleted file mode 100644
index e5b1a5ef2b71..000000000000
--- a/www-client/w3m/files/w3m-m17n-search-gentoo.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- search.c.orig	2003-09-23 06:02:21.000000000 +0900
-+++ search.c	2003-11-30 16:33:33.000000000 +0900
-@@ -69,6 +69,12 @@
- 	}
-     }
-     tmp = Str_conv_from_system(Strfgets(migemor));
-+#ifdef USE_M17N
-+    if (SearchConv && !WcOption.pre_conv &&
-+	Currentbuf->document_charset != DisplayCharset)
-+	tmp = Strnew_charp(wtf_conv_fit(
-+	    tmp->ptr, Currentbuf->document_charset));
-+#endif
-     Strchop(tmp);
-     if (tmp->length == 0)
- 	goto err;
diff --git a/www-client/w3m/w3m-0.4.2.ebuild b/www-client/w3m/w3m-0.4.2.ebuild
index 5bc81068c50b..2d8b6f07d35f 100644
--- a/www-client/w3m/w3m-0.4.2.ebuild
+++ b/www-client/w3m/w3m-0.4.2.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.4.2.ebuild,v 1.2 2005/02/12 09:26:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.4.2.ebuild,v 1.3 2005/03/18 14:25:05 usata Exp $
 
 inherit eutils
 
@@ -19,8 +19,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r3
 	>=dev-libs/boehm-gc-6.2
 	gtk? ( =x11-libs/gtk+-1.2*
 		media-libs/gdk-pixbuf )
-	!gtk? ( imlib? ( >=media-libs/imlib-1.9.8
-		media-libs/libungif ) )
+	!gtk? ( imlib? ( >=media-libs/imlib-1.9.8 ) )
 	xface? ( media-libs/compface )
 	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
diff --git a/www-client/w3m/w3m-0.5-r2.ebuild b/www-client/w3m/w3m-0.5-r2.ebuild
deleted file mode 100644
index 986177be44f8..000000000000
--- a/www-client/w3m/w3m-0.5-r2.ebuild
+++ /dev/null
@@ -1,137 +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-r2.ebuild,v 1.2 2005/02/12 09:26:25 usata Exp $
-
-inherit eutils
-
-W3M_CVS_PV="1.912"
-W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
-
-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_P}-async-1.diff.gz )
-	nls? ( ${PATCH_PATH}/${W3M_CVS_P}-nlscharset-1.diff )"
-# w3m color patch:
-#	http://homepage3.nifty.com/slokar/w3m/${P}-cvs-1.895_256-001.patch.gz
-# w3n canna inline patch:
-#	canna? ( http://www.j10n.org/files/${W3M_CVS_P}-canna.patch )
-# w3m bookmark charset patch:
-#	nls? ( ${PATCH_PATH}/${W3M_CVS_P}-bkmknls-1.diff )
-
-LICENSE="w3m"
-SLOT="0"
-KEYWORDS="x86 alpha ~ppc sparc"
-IUSE="X gtk imlib imlib2 xface ssl migemo gpm cjk nls async"
-#IUSE="canna unicode"
-
-# canna? ( app-i18n/canna )
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	>=dev-libs/boehm-gc-6.2
-	X? ( gtk? ( >=media-libs/gdk-pixbuf-0.22.0 )
-		!gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0 )
-			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
-	)
-	!X? ( imlib2? ( >=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/textbrowser
-	virtual/w3m"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	epatch ${FILESDIR}/${PN}-m17n-search-gentoo.diff
-	epatch ${FILESDIR}/${PN}-libwc-gentoo.diff
-	if use nls ; then
-		#epatch ${DISTDIR}/${W3M_CVS_P}-bkmknls-1.diff
-		epatch ${DISTDIR}/${W3M_CVS_P}-nlscharset-1.diff
-	fi
-	if use async ; then
-		epatch ${DISTDIR}/${W3M_CVS_P}-async-1.diff.gz
-		epatch ${FILESDIR}/${PN}-0.4.2-async-m17n-gentoo.diff
-	fi
-	#epatch ${DISTDIR}/${P}-cvs-1.895_256-001.patch.gz
-	#use canna && epatch ${DISTDIR}/${W3M_CVS_P}-canna.patch
-}
-
-src_compile() {
-	local myconf migemo_command imagelib
-
-	if use X ; then
-		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
-		if use gtk ; then
-			imagelib="gdk-pixbuf"
-		elif use imlib2 ; then
-			imagelib="imlib2"
-		else
-			imagelib="imlib"
-		fi
-	else	# no X
-		if use imlib2 ; then
-			myconf="${myconf} --enable-image=fb"
-			imagelib="imlib2"
-		else
-			myconf="${myconf} --enable-image=no"
-			imagelib="no"
-		fi
-	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
-
-	econf --enable-keymap=w3m \
-		--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
-}