w3mmee-p24-20 was released.

6 files changed, 56 insertions, 29 deletions

diff --git a/net-www/w3mmee/ChangeLog b/net-www/w3mmee/ChangeLog
index 66e967ad1b45..3d93cfd1a45d 100644
--- a/net-www/w3mmee/ChangeLog
+++ b/net-www/w3mmee/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2004/03/23 04:48:18 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/ChangeLog,v 1.7 2004/03/24 18:18:44 usata Exp $
+
+*w3mmee-0.3.2_p24-r4 (25 Mar 2004)
+
+  25 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> w3mmee-0.3.2_p24-r3.ebuild,
+  w3mmee-0.3.2_p24-r4.ebuild, w3mmee-0.3.2_p24.ebuild:
+  w3mmee-p24-20 was released.
 
   22 Mar 2004; Jason Wever <weeve@gentoo.org> w3mmee-0.3.2_p24-r2.ebuild,
   w3mmee-0.3.2_p24-r3.ebuild:
@@ -21,7 +27,7 @@
   06 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> metadata.xml,
   w3mmee-0.3.2_p24-r1.ebuild, w3mmee-0.3.2_p24-r2.ebuild,
   w3mmee-0.3.2_p24.ebuild, files/w3mmee-w3mman-gentoo.diff:
-  w3mmee-0.4.2-p24.19 was released.
+  w3mmee-p24-19 was released.
 
 *w3mmee-0.3.2_p24-r1 (22 Aug 2003)
 
diff --git a/net-www/w3mmee/Manifest b/net-www/w3mmee/Manifest
index a5f62851dea1..392939bdd603 100644
--- a/net-www/w3mmee/Manifest
+++ b/net-www/w3mmee/Manifest
@@ -1,11 +1,11 @@
-MD5 eea7f0483baae9b4a9c7d2d3db3ead28 ChangeLog 1437
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 66968049a165433c1cbcde1e1ca4ebee w3mmee-0.3.2_p24-r1.ebuild 3803
 MD5 1f53f791cac740d94282bf9d82790a8d w3mmee-0.3.2_p24-r2.ebuild 3799
-MD5 c063fc528249a47ca165c2d80e25c840 w3mmee-0.3.2_p24.ebuild 3190
-MD5 20415c390788e94531d2873607ec8f50 w3mmee-0.3.2_p24-r3.ebuild 3705
-MD5 11b8aad1ed8c0a1c9fee654d930d70d8 files/digest-w3mmee-0.3.2_p24 122
+MD5 66968049a165433c1cbcde1e1ca4ebee w3mmee-0.3.2_p24-r1.ebuild 3803
+MD5 a4a943ad301022aab58765ea32d88c61 ChangeLog 1630
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 b15dceae45a8f5ea2731286cb0dab681 w3mmee-0.3.2_p24-r3.ebuild 3704
+MD5 76a2feebf8a1fcd04765ccee716b7bee w3mmee-0.3.2_p24-r4.ebuild 3705
 MD5 11b8aad1ed8c0a1c9fee654d930d70d8 files/digest-w3mmee-0.3.2_p24-r1 122
 MD5 60d6392393f2f69cea53fbacc9447fe0 files/digest-w3mmee-0.3.2_p24-r2 122
 MD5 ea771adfe70c29aec2c33d9cc4717eb3 files/w3mmee-w3mman-gentoo.diff 1037
 MD5 60d6392393f2f69cea53fbacc9447fe0 files/digest-w3mmee-0.3.2_p24-r3 122
+MD5 06e2f7d92b34d5dad6ae24fba7b1abe8 files/digest-w3mmee-0.3.2_p24-r4 122
diff --git a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24 b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24
deleted file mode 100644
index 5b16104ea753..000000000000
--- a/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24
+++ /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-r4 b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r4
new file mode 100644
index 000000000000..cce5ccc21af7
--- /dev/null
+++ b/net-www/w3mmee/files/digest-w3mmee-0.3.2_p24-r4
@@ -0,0 +1,2 @@
+MD5 82cd0a79d5a24332556f610bc54c0412 w3mmee-p24-20.tar.gz 686907
+MD5 15492b14ca7b9a9e035238611e9cd1e3 gc6.2.tar.gz 750883
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 d54b74f9ea48..1edff5ae5b30 100644
--- a/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2004/03/23 04:48:18 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mmee/w3mmee-0.3.2_p24-r3.ebuild,v 1.3 2004/03/24 18:18:44 usata Exp $
 
 inherit alternatives
 
@@ -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
diff --git a/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild b/net-www/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
index 9507267f527f..f7856e970828 100644
--- a/net-www/w3mmee/w3mmee-0.3.2_p24.ebuild
+++ b/net-www/w3mmee/w3mmee-0.3.2_p24-r4.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.ebuild,v 1.3 2003/12/06 12:16:27 usata Exp $
+# $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 $
 
-IUSE="cjk gpm imlib nls ssl"
+inherit alternatives
 
-MY_PV=${PV##*_}-18
+IUSE="gpm imlib nls ssl"
+
+MY_PV=${PV##*_}-20
 MY_P=${PN}-${MY_PV}
 GC_PV="6.2"
 MY_GC=gc${GC_PV}
@@ -16,12 +18,12 @@ HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="x86 -alpha ppc ~sparc"
+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 )
+	>=dev-libs/libmoe-1.5.3
 	imlib? ( >=media-libs/imlib-1.9.8
 		media-libs/compface )
 	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
@@ -43,6 +45,8 @@ src_unpack() {
 	# (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() {
@@ -79,16 +83,8 @@ src_compile() {
 		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}
+	lang=MANY
 	accept_lang=en
 	EOF
 
@@ -101,10 +97,13 @@ src_compile() {
 		-mandir=/usr/share/man \
 		-sysconfdir=/etc/w3mmee \
 		-model=custom \
+		-libmoe=/usr/lib \
+		-mb_h=/usr/include/moe \
+		-mk_btri=/usr/libexec/moe \
 		-cflags=${CFLAGS} -ldflags=${LDFLAGS} \
 		${myconf} || die
 
-	emake || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -112,7 +111,7 @@ src_install() {
 	einstall DESTDIR=${D}
 
 	# w3mman and manpages conflict with those from w3m
-	mv ${D}/usr/bin/w3mman ${D}/usr/bin/w3mmeeman
+	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
@@ -126,6 +125,7 @@ src_install() {
 
 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"
@@ -133,3 +133,24 @@ pkg_postinst() {
 	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
+}