Fixed missing boehm-gc dependency.

Package-Manager: portage-2.0.51.22-r3

6 files changed, 170 insertions, 7 deletions

diff --git a/www-client/w3mmee/ChangeLog b/www-client/w3mmee/ChangeLog
index a476d18bb394..9f65a0c211d9 100644
--- a/www-client/w3mmee/ChangeLog
+++ b/www-client/w3mmee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3mmee
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.2 2005/02/12 16:08:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.3 2005/10/15 10:41:58 matsuu Exp $
+
+*w3mmee-0.3.2_p24-r6 (15 Oct 2005)
+
+  15 Oct 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +w3mmee-0.3.2_p24-r6.ebuild:
+  Fixed boehm-gc dependency issue. Bug 105982.
 
 *w3mmee-0.3.2_p24-r5 (13 Feb 2005)
 
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index 593c0cc1737a..f8a31cf4f9ee 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -1,7 +1,9 @@
-MD5 539ce98e3c40e0bc3d5ce65b89475f9a ChangeLog 2771
+MD5 ad950a9f3e42a15b0f9596edaf70c528 w3mmee-0.3.2_p24-r5.ebuild 3693
+MD5 66ab928675e2363835ee3071e335dada w3mmee-0.3.2_p24-r4.ebuild 3690
+MD5 022d4ff74924897de17a8794d45ccc6d w3mmee-0.3.2_p24-r6.ebuild 3580
+MD5 1ddc4b49f017c64e7a9932079e71731e ChangeLog 2936
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 55b5b1513326614c099bc34e891db87f w3mmee-0.3.2_p24-r4.ebuild 3664
-MD5 8a7eafa6615489d922421006fe32e33b w3mmee-0.3.2_p24-r5.ebuild 3667
 MD5 06e2f7d92b34d5dad6ae24fba7b1abe8 files/digest-w3mmee-0.3.2_p24-r4 122
-MD5 ea771adfe70c29aec2c33d9cc4717eb3 files/w3mmee-w3mman-gentoo.diff 1037
 MD5 a3c9ebac65b9616e938aff38000305b9 files/digest-w3mmee-0.3.2_p24-r5 122
+MD5 8558ba5866d1437f7ef0fd36ff54d865 files/digest-w3mmee-0.3.2_p24-r6 65
+MD5 ea771adfe70c29aec2c33d9cc4717eb3 files/w3mmee-w3mman-gentoo.diff 1037
diff --git a/www-client/w3mmee/files/digest-w3mmee-0.3.2_p24-r6 b/www-client/w3mmee/files/digest-w3mmee-0.3.2_p24-r6
new file mode 100644
index 000000000000..42f8a02daa14
--- /dev/null
+++ b/www-client/w3mmee/files/digest-w3mmee-0.3.2_p24-r6
@@ -0,0 +1 @@
+MD5 b57304e272fad1304eee1f0de28cacfe w3mmee-p24-22.tar.gz 690094
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
index 768c1313d3ae..2fe8a761b61f 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r4.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/w3mmee/w3mmee-0.3.2_p24-r4.ebuild,v 1.2 2005/02/12 16:08:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r4.ebuild,v 1.3 2005/10/15 10:41:58 matsuu Exp $
 
 inherit alternatives eutils
 
@@ -22,6 +22,7 @@ KEYWORDS="x86 -alpha sparc ppc"
 
 DEPEND=">=sys-libs/ncurses-5.2-r3
 	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
 	dev-lang/perl
 	>=dev-libs/libmoe-1.5.3
 	imlib? ( >=media-libs/imlib-1.9.8
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r5.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r5.ebuild
index d95270a963f4..1de6090f7c57 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r5.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r5.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/w3mmee/w3mmee-0.3.2_p24-r5.ebuild,v 1.1 2005/02/12 16:08:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r5.ebuild,v 1.2 2005/10/15 10:41:58 matsuu Exp $
 
 inherit alternatives eutils
 
@@ -22,6 +22,7 @@ KEYWORDS="~x86 -alpha ~sparc ~ppc"
 
 DEPEND=">=sys-libs/ncurses-5.2-r3
 	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
 	dev-lang/perl
 	>=dev-libs/libmoe-1.5.3
 	imlib? ( >=media-libs/imlib-1.9.8
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
new file mode 100644
index 000000000000..f76b995be4ef
--- /dev/null
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild,v 1.1 2005/10/15 10:41:58 matsuu Exp $
+
+inherit alternatives eutils
+
+IUSE="gpm imlib nls ssl xface"
+
+MY_PV=${PV##*_}-22
+MY_P=${PN}-${MY_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"
+HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	dev-lang/perl
+	>=dev-libs/libmoe-1.5.3
+	imlib? ( >=media-libs/imlib-1.9.8
+		xface? ( 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 ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+}
+
+src_compile() {
+
+	local myconf myuse
+	myuse="use_cookie=y use_ansi_color=y use_history=y
+		display_code=E system_code=E"
+
+	if use ssl ; then
+		myconf="${myconf} --ssl-includedir=/usr/include/openssl
+			--ssl-libdir=/usr/$(get_libdir)"
+		myuse="${myuse} use_ssl=y use_ssl_verify=y use_digest_auth=y"
+	else
+		myuse="${myuse} use_ssl=n"
+	fi
+
+	if use gpm ; then
+		myuse="${myuse} use_mouse=y"
+	else
+		myuse="${myuse} use_mouse=n"
+	fi
+
+	if use nls ; then
+		myconf="${myconf} -locale_dir=/usr/share/locale"
+	else
+		myconf="${myconf} -locale_dir='(NONE)'"
+	fi
+
+	if use imlib ; then
+		myuse="${myuse} use_image=y use_w3mimg_x11=y
+		use_w3mimg_fb=n w3mimgdisplay_setuid=n"
+		if use xface ; then
+			myuse="${myuse} use_xface=y"
+		else
+			myuse="${myuse} use_xface=n"
+		fi
+	else
+		myuse="${myuse} use_image=n"
+	fi
+
+	cat >>config.param<<-EOF
+	lang=MANY
+	accept_lang=en
+	EOF
+
+	env ${myuse} ./configure -nonstop \
+		-prefix=/usr \
+		-suffix=mee \
+		-auxbindir=/usr/$(get_libdir)/w3mmee \
+		-libdir=/usr/$(get_libdir)/w3mmee/cgi-bin \
+		-helpdir=/usr/share/w3mmee \
+		-mandir=/usr/share/man \
+		-sysconfdir=/etc/w3mmee \
+		-model=custom \
+		-libmoe=/usr/$(get_libdir) \
+		-mb_h=/usr/include/moe \
+		-mk_btri=/usr/libexec/moe \
+		-cflags=${CFLAGS} -ldflags=${LDFLAGS} \
+		${myconf} || die
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# w3mman and manpages conflict with those from w3m
+	mv ${D}/usr/share/man/ja/man1/w3m{,mee}.1 || die
+	mv ${D}/usr/share/man/man1/w3m{,mee}.1 || die
+
+	dodoc ChangeLog NEWS* README
+	dohtml 00INCOMPATIBLE.html
+
+	docinto en
+	dodoc doc/HISTORY doc/README* doc/keymap.* doc/menu.*
+	dohtml doc/*
+
+	docinto jp
+	dodoc doc-jp/HISTORY doc-jp/README* doc-jp/keymap* doc-jp/menu.*
+	dohtml doc-jp/*
+}
+
+pkg_postinst() {
+
+	w3m_alternatives
+	einfo
+	einfo "If you want to render multilingual text, please refer to"
+	einfo "/usr/share/doc/${PF}/en/README.mee or"
+	einfo "/usr/share/doc/${PF}/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
+}