7 files changed, 20 insertions, 61 deletions
diff --git a/app-i18n/scim-wnn/ChangeLog b/app-i18n/scim-wnn/ChangeLog
index 3dddcb50aadf..f907ec2e964a 100644
--- a/app-i18n/scim-wnn/ChangeLog
+++ b/app-i18n/scim-wnn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-wnn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-wnn/ChangeLog,v 1.5 2005/03/21 09:17:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-wnn/ChangeLog,v 1.6 2005/03/30 06:23:48 usata Exp $
+
+*scim-wnn-0.2.4 (30 Mar 2005)
+
+  30 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> -scim-wnn-0.1.0.ebuild,
+  -scim-wnn-0.2.1.ebuild, +scim-wnn-0.2.4.ebuild:
+  Version bumped. Removed old versions.
 
 *scim-wnn-0.2.3 (21 Mar 2005)
 
diff --git a/app-i18n/scim-wnn/Manifest b/app-i18n/scim-wnn/Manifest
index 6ec75dfb3b50..cd1985be41f6 100644
--- a/app-i18n/scim-wnn/Manifest
+++ b/app-i18n/scim-wnn/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d5c02996b76321e89cdc933904fe4a31 scim-wnn-0.1.0.ebuild 1098
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 24fe98535d20ef96a7375bf4dfca98fe ChangeLog 854
-MD5 84ea68cd862a7c9b7fe613b5aa7cdc83 scim-wnn-0.2.1.ebuild 1115
 MD5 f1ecf416c0b325d6c3d65f825342b925 scim-wnn-0.2.2.ebuild 1115
 MD5 c6fbcfc86a6bf99ccc2d0d142432e86c scim-wnn-0.2.3.ebuild 1277
-MD5 883048f41756927b7310d8843af9e4ed files/digest-scim-wnn-0.1.0 67
-MD5 cf28f352d323cb0ee619791be11364b3 files/digest-scim-wnn-0.2.1 66
+MD5 7d55cd25dc26ad9d279503f2dea45498 scim-wnn-0.2.4.ebuild 1271
+MD5 80303a1a718cba9660336a1e52c597fd files/digest-scim-wnn-0.2.4 66
 MD5 03ff5991ff909fca64c5ac2c9721cb21 files/digest-scim-wnn-0.2.2 66
 MD5 9b684498ca5f5f85e78151a60cfa0172 files/digest-scim-wnn-0.2.3 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCPo78VWNWqTUmv+0RAjIpAKCxQuMeEimmN4rtIW/AL1+128iNKgCgn0B9
-wHvK6P5JibYg07zfjm1hdyU=
-=mrf7
------END PGP SIGNATURE-----
diff --git a/app-i18n/scim-wnn/files/digest-scim-wnn-0.1.0 b/app-i18n/scim-wnn/files/digest-scim-wnn-0.1.0
deleted file mode 100644
index b32289558af0..000000000000
--- a/app-i18n/scim-wnn/files/digest-scim-wnn-0.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e2bd919d09255867f769e084f0f22f5 scim-wnn-0.1.0.tar.bz2 359094
diff --git a/app-i18n/scim-wnn/files/digest-scim-wnn-0.2.1 b/app-i18n/scim-wnn/files/digest-scim-wnn-0.2.1
deleted file mode 100644
index bbe79b3ea4f4..000000000000
--- a/app-i18n/scim-wnn/files/digest-scim-wnn-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e457f28514593728c85ecf5dca35aac scim-wnn-0.2.1.tar.gz 378597
diff --git a/app-i18n/scim-wnn/files/digest-scim-wnn-0.2.4 b/app-i18n/scim-wnn/files/digest-scim-wnn-0.2.4
new file mode 100644
index 000000000000..6e9b874ffd22
--- /dev/null
+++ b/app-i18n/scim-wnn/files/digest-scim-wnn-0.2.4
@@ -0,0 +1 @@
+MD5 955da844f86a848228eae02dbbaedbed scim-wnn-0.2.4.tar.gz 524325
diff --git a/app-i18n/scim-wnn/scim-wnn-0.1.0.ebuild b/app-i18n/scim-wnn/scim-wnn-0.1.0.ebuild
deleted file mode 100644
index 62767caab7c3..000000000000
--- a/app-i18n/scim-wnn/scim-wnn-0.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-wnn/scim-wnn-0.1.0.ebuild,v 1.3 2005/01/21 11:18:38 usata Exp $
-
-DESCRIPTION="Japanese input method Wnn IMEngine for SCIM"
-HOMEPAGE="http://nop.net-p.org/modules/pukiwiki/index.php?%5B%5Bscim-wnn%5D%5D"
-SRC_URI="http://nop.net-p.org/files/scim-wnn/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
-	app-i18n/freewnn"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	sed -i -e "s:/usr/lib/wnn7:/usr/lib/wnn:g" \
-		scim_wnn_def.h wnnconversion.cpp || die "sed failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS THANKS README
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use SCIM with both GTK2 and XIM, you should use the following"
-	einfo "in your user startup scripts such as .gnomerc or .xinitrc:"
-	einfo
-	einfo "LANG='your_language' scim -d"
-	einfo "export XMODIFIERS=@im=SCIM"
-	einfo
-}
diff --git a/app-i18n/scim-wnn/scim-wnn-0.2.1.ebuild b/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild
index dd7f5e8f3d0c..0a9dad93d9aa 100644
--- a/app-i18n/scim-wnn/scim-wnn-0.2.1.ebuild
+++ b/app-i18n/scim-wnn/scim-wnn-0.2.4.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/app-i18n/scim-wnn/scim-wnn-0.2.1.ebuild,v 1.2 2005/02/11 15:10:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-wnn/scim-wnn-0.2.4.ebuild,v 1.1 2005/03/30 06:23:48 usata Exp $
 
 DESCRIPTION="Japanese input method Wnn IMEngine for SCIM"
 HOMEPAGE="http://nop.net-p.org/modules/pukiwiki/index.php?%5B%5Bscim-wnn%5D%5D"
@@ -8,12 +8,12 @@ SRC_URI="http://nop.net-p.org/files/scim-wnn/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
-RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
+RDEPEND="|| ( >=app-i18n/scim-1.0 >=app-i18n/scim-cvs-1.0 )
 	dev-libs/wnn7sdk
-	app-i18n/freewnn"
+	freewnn? ( app-i18n/freewnn )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
@@ -38,4 +38,10 @@ pkg_postinst() {
 	einfo "LANG='your_language' scim -d"
 	einfo "export XMODIFIERS=@im=SCIM"
 	einfo
+	if ! use freewnn ; then
+	ewarn
+	ewarn "You disabled freewnn USE flag."
+	ewarn "Please make sure you have wnnenvrc visible to scim-wnn."
+	ewarn
+	fi
 }