Version bump. And clean up old versions.

9 files changed, 24 insertions, 66 deletions

diff --git a/app-i18n/nkf/ChangeLog b/app-i18n/nkf/ChangeLog
index f6e9c3ce8777..acd187fe9695 100644
--- a/app-i18n/nkf/ChangeLog
+++ b/app-i18n/nkf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/nkf
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.11 2003/10/11 03:38:59 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.12 2004/01/04 16:56:11 nakano Exp $
+
+*nkf-2.0.4 (04 Jan 2004)
+
+  04 Jan 2004; Masatomo Nakano <nakano@gentoo.org> nkf-1.92.ebuild,
+  nkf-2.0.2.ebuild, nkf-2.0.4.ebuild:
+  Version bump. And clean up old versions.
 
 *nkf-2.0.3 (11 Oct 2003)
 
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index bf64235b3d1b..ee81ed5d0dd0 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -1,11 +1,9 @@
-MD5 e7831c3e659f70c5ca9110696edc6e24 nkf-1.92.ebuild 1003
-MD5 c4f7c741504258be34878c178ef865fb nkf-2.0.2-r1.ebuild 1063
-MD5 6d3684d29f51e3b2384ea0fc71261325 nkf-2.0.3.ebuild 1042
-MD5 f60f4101ba82ab77e9d4df04d8b31c57 nkf-2.0.2.ebuild 1041
-MD5 d605bc082d1979504321d207496d3232 ChangeLog 1354
+MD5 e58fc33e2bb9c2b14000cdd619da93a9 nkf-2.0.2-r1.ebuild 1063
+MD5 0683593886158617336947e16d46efcc ChangeLog 1530
+MD5 5f16af3de649c7f078c68d847a925242 nkf-2.0.4.ebuild 1038
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 70d46319ed98a1beee9b96fcc8da2e90 nkf-2.0.3.ebuild 1042
 MD5 32daf6c9e1531d97fbf994f5a8cb622e files/nkf-1.92-msg00025.patch 999
-MD5 52b36a99fdd1e96ffc5c32d9978d62c0 files/digest-nkf-1.92 56
-MD5 88ee733143ae4eab90294a2470fbd16e files/digest-nkf-2.0.2 189
-MD5 270b2da56895ead8dd86b64bf65d4dd4 files/digest-nkf-2.0.3 55
 MD5 9cb8e05b1ef22ec8e3e5e7ad852e0f9c files/digest-nkf-2.0.2-r1 57
+MD5 270b2da56895ead8dd86b64bf65d4dd4 files/digest-nkf-2.0.3 55
+MD5 846425777c3e9f5dcb205262a1548d7a files/digest-nkf-2.0.4 58
diff --git a/app-i18n/nkf/files/digest-nkf-1.92 b/app-i18n/nkf/files/digest-nkf-1.92
deleted file mode 100644
index 3ab326140007..000000000000
--- a/app-i18n/nkf/files/digest-nkf-1.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e560387657d5d7c725875e548394b0f nkf192.shar 126349
diff --git a/app-i18n/nkf/files/digest-nkf-2.0.2 b/app-i18n/nkf/files/digest-nkf-2.0.2
deleted file mode 100644
index 558a669717b2..000000000000
--- a/app-i18n/nkf/files/digest-nkf-2.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 32daf6c9e1531d97fbf994f5a8cb622e /files/nkf-1.92-msg00025.patch 999
-MD5 4d0d83f6be83570f5464750034229886 /nkf-2.0.2.ebuild 1044
-MD5 5157b91879471b450997f4eec5af62e6 nkf202.tar.gz 98188
diff --git a/app-i18n/nkf/files/digest-nkf-2.0.4 b/app-i18n/nkf/files/digest-nkf-2.0.4
new file mode 100644
index 000000000000..af73f032c6c5
--- /dev/null
+++ b/app-i18n/nkf/files/digest-nkf-2.0.4
@@ -0,0 +1 @@
+MD5 e1e0624a81dbc8a6f4516307704f5f8a nkf204.tar.gz 107085
diff --git a/app-i18n/nkf/nkf-1.92.ebuild b/app-i18n/nkf/nkf-1.92.ebuild
deleted file mode 100644
index 8313b0f04b4f..000000000000
--- a/app-i18n/nkf/nkf-1.92.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-1.92.ebuild,v 1.7 2003/11/14 23:11:54 seemant Exp $
-
-use perl && inherit perl-module
-
-IUSE="perl"
-DESCRIPTION="Network Kanji code conversion Filter"
-SRC_URI="ftp://ftp.ie.u-ryukyu.ac.jp/pub/software/kono/${PN}${PV/./}.shar"
-HOMEPAGE="http://bw-www.ie.u-ryukyu.ac.jp/~kono/software.html"
-DEPEND=">=app-arch/sharutils-4.2.1-r5"
-KEYWORDS="x86 ppc sparc alpha"
-LICENSE="public-domain"
-SLOT="0"
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	mkdir -p ${S}
-	cd ${S}
-	mkdir NKF
-	unshar -c ${DISTDIR}/${A}
-	patch -s -p1 < ${FILESDIR}/${P}-msg00025.patch || die
-}
-
-src_compile() {
-	make CC=gcc CFLAGS="${CFLAGS}" PERL=perl nkf test || die
-	use perl && (
-		cd ${S}/NKF
-		perl-module_src_compile
-		perl-module_src_test
-	)
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe nkf
-	doman nkf.1
-	dodoc nkf.doc
-	use perl && (
-		cd ${S}/NKF
-		perl-module_src_install
-	)
-}
diff --git a/app-i18n/nkf/nkf-2.0.2-r1.ebuild b/app-i18n/nkf/nkf-2.0.2-r1.ebuild
index 4b2b214e2e37..bd2da3327e0d 100644
--- a/app-i18n/nkf/nkf-2.0.2-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/app-i18n/nkf/nkf-2.0.2-r1.ebuild,v 1.3 2003/09/08 00:50:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.2-r1.ebuild,v 1.4 2004/01/04 16:56:11 nakano Exp $
 
 use perl && inherit perl-module
 
diff --git a/app-i18n/nkf/nkf-2.0.3.ebuild b/app-i18n/nkf/nkf-2.0.3.ebuild
index 3e398a529b6c..fb9b7798afc9 100644
--- a/app-i18n/nkf/nkf-2.0.3.ebuild
+++ b/app-i18n/nkf/nkf-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# 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/app-i18n/nkf/nkf-2.0.3.ebuild,v 1.1 2003/10/11 03:38:59 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.3.ebuild,v 1.2 2004/01/04 16:56:11 nakano Exp $
 
 use perl && inherit perl-module
 
diff --git a/app-i18n/nkf/nkf-2.0.2.ebuild b/app-i18n/nkf/nkf-2.0.4.ebuild
index f04889819f2c..164b6d7768a0 100644
--- a/app-i18n/nkf/nkf-2.0.2.ebuild
+++ b/app-i18n/nkf/nkf-2.0.4.ebuild
@@ -1,6 +1,6 @@
-# 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/app-i18n/nkf/nkf-2.0.2.ebuild,v 1.5 2003/09/30 13:43:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.4.ebuild,v 1.1 2004/01/04 16:56:11 nakano Exp $
 
 use perl && inherit perl-module
 
@@ -10,10 +10,9 @@ SRC_URI="http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/${MY_P}.tar.gz"
 HOMEPAGE="http://sourceforge.jp/projects/nkf/"
 DEPEND="virtual/glibc
 	$DEPEND"
-RDEPEND="$DEPEND"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 IUSE="perl cjk"
-LICENSE="public-domain"
+LICENSE="as-is"
 SLOT="0"
 S=${WORKDIR}/${MY_P}
 
@@ -33,7 +32,8 @@ src_install () {
 	if [ `use cjk` ]; then
 		dodir /usr/share/man/ja/man1
 		insinto /usr/share/man/ja/man1
-		newins nkf.1j nkf.1
+		./nkf -e nkf.1j > nkf.1
+		doins nkf.1
 	fi
 	dodoc INSTALL* nkf.doc
 	if [ `use perl` ]; then