inherit eutils for epatch. Marked stable on x86. Removed old ebuilds.

7 files changed, 11 insertions, 332 deletions

diff --git a/net-www/w3mmee/ChangeLog b/net-www/w3mmee/ChangeLog
index 69ad0acd3710..1f6efb625a54 100644
--- a/net-www/w3mmee/ChangeLog
+++ b/net-www/w3mmee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/w3mmee
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/ChangeLog,v 1.8 2004/04/11 23:59:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/ChangeLog,v 1.9 2004/04/25 15:25:55 usata Exp $
+
+  26 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> w3mmee-0.3.2_p24-r1.ebuild,
+  w3mmee-0.3.2_p24-r2.ebuild, w3mmee-0.3.2_p24-r3.ebuild,
+  w3mmee-0.3.2_p24-r4.ebuild:
+  inherit eutils for epatch. Marked stable on x86. Removed old ebuilds.
 
   11 Apr 2004; Jason Wever <weeve@gentoo.org> w3mmee-0.3.2_p24-r3.ebuild:
   Stable on sparc.
diff --git a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r1 b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r1
deleted file mode 100644
index 5b16104ea753..000000000000
--- a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4bad740a3ac0e6d91b1bc6027106478f w3mmee-p24-18.tar.gz 686460
-MD5 15492b14ca7b9a9e035238611e9cd1e3 gc6.2.tar.gz 750883
diff --git a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r2 b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r2
deleted file mode 100644
index a9d66d2155eb..000000000000
--- a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 da1df0292cfc3f7c661f3916d013fe10 w3mmee-p24-19.tar.gz 686742
-MD5 15492b14ca7b9a9e035238611e9cd1e3 gc6.2.tar.gz 750883
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild
deleted file mode 100644
index c1d6293140bb..000000000000
--- a/net-www/w3mmee/w3mmee-0.3.2_p24-r1.ebuild
+++ /dev/null
@@ -1,161 +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/w3mmee/w3mmee-0.3.2_p24-r1.ebuild,v 1.2 2003/12/06 12:16:27 usata Exp $
-
-inherit alternatives
-
-IUSE="cjk gpm imlib nls ssl"
-
-MY_PV=${PV##*_}-18
-MY_P=${PN}-${MY_PV}
-GC_PV="6.2"
-MY_GC=gc${GC_PV}
-
-DESCRIPTION="A variant of w3m with support for multiple character encodings"
-SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz
-	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${MY_GC}.tar.gz"
-HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="x86 -alpha ppc sparc"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	dev-lang/perl
-	cjk? ( >=dev-libs/libmoe-1.5.3 )
-	imlib? ( >=media-libs/imlib-1.9.8
-		media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	nls? ( sys-devel/gettext )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser
-	virtual/w3m"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-
-	# w3mmee doesn't come with boehm-gc unlike w3m and w3m-m17n.
-	# However, w3mmee cannot be compiled with system gc
-	# (Debian is the only Linux distribution that can compile it)
-	unpack ${MY_GC}.tar.gz
-	mv ${MY_GC} gc
-
-	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-}
-
-src_compile() {
-
-	local myconf myuse mylang
-	myuse="use_cookie=y use_ansi_color=y use_history=y
-		display_code=E system_code=E"
-
-	if [ -n "`use ssl`" ] ; then
-		myconf="${myconf} --ssl-includedir=/usr/include/openssl
-			--ssl-libdir=/usr/lib"
-		myuse="${myuse} use_ssl=y use_ssl_verify=y
-			use_digest_auth=y"
-	else
-		myuse="${myuse} use_ssl=n"
-	fi
-
-	if [ -n "`use gpm`" ] ; then
-		myuse="${myuse} use_mouse=y"
-	else
-		myuse="${myuse} use_mouse=n"
-	fi
-
-	if [ -n "`use nls`" ] ; then
-		myconf="${myconf} -locale_dir=/usr/share/locale"
-	else
-		myconf="${myconf} -locale_dir='(NONE)'"
-	fi
-
-	if [ -n "`use imlib`" ] ; then
-		myuse="${myuse} use_image=y use_w3mimg_x11=y
-		use_w3mimg_fb=n w3mimgdisplay_setuid=n use_xface=y"
-	else
-		myuse="${myuse} use_image=n"
-	fi
-
-	if [ -n "`use cjk`" ] ; then
-		myconf="${myconf} -libmoe=/usr/lib
-		-mb_h=/usr/include/moe -mk_btri=/usr/libexec/moe"
-		mylang=MANY
-	else
-		mylang=EN
-	fi
-
-	cat >>config.param<<-EOF
-	lang=${mylang}
-	accept_lang=en
-	EOF
-
-	env ${myuse} ./configure -nonstop \
-		-prefix=/usr \
-		-suffix=mee \
-		-auxbindir=/usr/lib/w3mmee \
-		-libdir=/usr/lib/w3mmee/cgi-bin \
-		-helpdir=/usr/share/w3mmee \
-		-mandir=/usr/share/man \
-		-sysconfdir=/etc/w3mmee \
-		-model=custom \
-		-cflags=${CFLAGS} -ldflags=${LDFLAGS} \
-		${myconf} || die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	einstall DESTDIR=${D}
-
-	# w3mman and manpages conflict with those from w3m
-	mv ${D}/usr/bin/w3m{,mee}man
-	mv ${D}/usr/share/man/ja/man1/w3m{,mee}.1
-	mv ${D}/usr/share/man/man1/w3m{,mee}.1
-	mv ${D}/usr/share/man/man1/w3mman{,mee}.1
-
-	dodoc 00INCOMPATIBLE.html ChangeLog NEWS* README
-	docinto en
-	dodoc doc/*
-	docinto jp
-	dodoc doc-jp/*
-}
-
-pkg_postinst() {
-
-	w3m_alternatives
-	einfo
-	einfo "If you want to render multilingual text, please refer to"
-	einfo "/usr/share/doc/${P}/en/README.mee or"
-	einfo "/usr/share/doc/${P}/jp/README.mee"
-	einfo "and set W3MLANG variable respectively."
-	einfo
-}
-
-pkg_postrm() {
-
-	w3m_alternatives
-}
-
-w3m_alternatives() {
-
-	if [ ! -f /usr/bin/w3m ] ; then
-		alternatives_makesym /usr/bin/w3m \
-			/usr/bin/w3m{m17n,mee}
-		alternatives_makesym /usr/bin/w3mman \
-			/usr/bin/w3m{man-m17n,meeman}
-		alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \
-			/usr/share/man/ja/man1/w3m{m17n,mee}.1.gz
-		alternatives_makesym /usr/share/man/man1/w3m.1.gz \
-			/usr/share/man/man1/w3m{m17n,mee}.1.gz
-		alternatives_makesym /usr/share/man/man1/w3mman.1.gz \
-			/usr/share/man/man1/w3m{man-m17n,meeman}.1.gz
-	fi
-}
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild
deleted file mode 100644
index 44ea8b4533df..000000000000
--- a/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24-r2.ebuild,v 1.4 2004/03/23 04:48:18 weeve Exp $
-
-inherit alternatives
-
-IUSE="cjk gpm imlib nls ssl"
-
-MY_PV=${PV##*_}-19
-MY_P=${PN}-${MY_PV}
-GC_PV="6.2"
-MY_GC=gc${GC_PV}
-
-DESCRIPTION="A variant of w3m with support for multiple character encodings"
-SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz
-	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${MY_GC}.tar.gz"
-HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="x86 -alpha sparc"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	dev-lang/perl
-	cjk? ( >=dev-libs/libmoe-1.5.3 )
-	imlib? ( >=media-libs/imlib-1.9.8
-		media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	nls? ( sys-devel/gettext )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser
-	virtual/w3m"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-
-	# w3mmee doesn't come with boehm-gc unlike w3m and w3m-m17n.
-	# However, w3mmee cannot be compiled with system gc
-	# (Debian is the only Linux distribution that can compile it)
-	unpack ${MY_GC}.tar.gz
-	mv ${MY_GC} gc
-
-	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-}
-
-src_compile() {
-
-	local myconf myuse mylang
-	myuse="use_cookie=y use_ansi_color=y use_history=y
-		display_code=E system_code=E"
-
-	if [ -n "`use ssl`" ] ; then
-		myconf="${myconf} --ssl-includedir=/usr/include/openssl
-			--ssl-libdir=/usr/lib"
-		myuse="${myuse} use_ssl=y use_ssl_verify=y
-			use_digest_auth=y"
-	else
-		myuse="${myuse} use_ssl=n"
-	fi
-
-	if [ -n "`use gpm`" ] ; then
-		myuse="${myuse} use_mouse=y"
-	else
-		myuse="${myuse} use_mouse=n"
-	fi
-
-	if [ -n "`use nls`" ] ; then
-		myconf="${myconf} -locale_dir=/usr/share/locale"
-	else
-		myconf="${myconf} -locale_dir='(NONE)'"
-	fi
-
-	if [ -n "`use imlib`" ] ; then
-		myuse="${myuse} use_image=y use_w3mimg_x11=y
-		use_w3mimg_fb=n w3mimgdisplay_setuid=n use_xface=y"
-	else
-		myuse="${myuse} use_image=n"
-	fi
-
-	if [ -n "`use cjk`" ] ; then
-		myconf="${myconf} -libmoe=/usr/lib
-		-mb_h=/usr/include/moe -mk_btri=/usr/libexec/moe"
-		mylang=MANY
-	else
-		mylang=EN
-	fi
-
-	cat >>config.param<<-EOF
-	lang=${mylang}
-	accept_lang=en
-	EOF
-
-	env ${myuse} ./configure -nonstop \
-		-prefix=/usr \
-		-suffix=mee \
-		-auxbindir=/usr/lib/w3mmee \
-		-libdir=/usr/lib/w3mmee/cgi-bin \
-		-helpdir=/usr/share/w3mmee \
-		-mandir=/usr/share/man \
-		-sysconfdir=/etc/w3mmee \
-		-model=custom \
-		-cflags=${CFLAGS} -ldflags=${LDFLAGS} \
-		${myconf} || die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	einstall DESTDIR=${D}
-
-	# w3mman and manpages conflict with those from w3m
-	mv ${D}/usr/bin/w3m{,mee}man
-	mv ${D}/usr/share/man/ja/man1/w3m{,mee}.1
-	mv ${D}/usr/share/man/man1/w3m{,mee}.1
-	mv ${D}/usr/share/man/man1/w3mman{,mee}.1
-
-	dodoc 00INCOMPATIBLE.html ChangeLog NEWS* README
-	docinto en
-	dodoc doc/*
-	docinto jp
-	dodoc doc-jp/*
-}
-
-pkg_postinst() {
-
-	w3m_alternatives
-	einfo
-	einfo "If you want to render multilingual text, please refer to"
-	einfo "/usr/share/doc/${P}/en/README.mee or"
-	einfo "/usr/share/doc/${P}/jp/README.mee"
-	einfo "and set W3MLANG variable respectively."
-	einfo
-}
-
-pkg_postrm() {
-
-	w3m_alternatives
-}
-
-w3m_alternatives() {
-
-	if [ ! -f /usr/bin/w3m ] ; then
-		alternatives_makesym /usr/bin/w3m \
-			/usr/bin/w3m{m17n,mee}
-		alternatives_makesym /usr/bin/w3mman \
-			/usr/bin/w3m{man-m17n,meeman}
-		alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \
-			/usr/share/man/ja/man1/w3m{m17n,mee}.1.gz
-		alternatives_makesym /usr/share/man/man1/w3m.1.gz \
-			/usr/share/man/man1/w3m{m17n,mee}.1.gz
-		alternatives_makesym /usr/share/man/man1/w3mman.1.gz \
-			/usr/share/man/man1/w3m{man-m17n,meeman}.1.gz
-	fi
-}
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild
index 59ad5e309ba3..d6116a3e5b12 100644
--- a/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild,v 1.4 2004/04/11 23:59:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild,v 1.5 2004/04/25 15:25:55 usata Exp $
 
-inherit alternatives
+inherit alternatives eutils
 
 IUSE="gpm imlib nls ssl"
 
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24-r4.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
index f7856e970828..76b6c93f70e8 100644
--- a/net-www/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24-r4.ebuild,v 1.1 2004/03/24 18:18:44 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24-r4.ebuild,v 1.2 2004/04/25 15:25:55 usata Exp $
 
-inherit alternatives
+inherit alternatives eutils
 
 IUSE="gpm imlib nls ssl"
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~x86 -alpha ~sparc"
+KEYWORDS="x86 -alpha ~sparc"
 
 DEPEND=">=sys-libs/ncurses-5.2-r3
 	>=sys-libs/zlib-1.1.3-r2