Fixed Ctrl+Space problem when NumLock is on. Removed redundant version

7 files changed, 37 insertions, 47 deletions

diff --git a/app-i18n/skkinput/ChangeLog b/app-i18n/skkinput/ChangeLog
index 5e3407853d8a..cef80012d425 100644
--- a/app-i18n/skkinput/ChangeLog
+++ b/app-i18n/skkinput/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-i18n/skkinput
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/ChangeLog,v 1.14 2003/10/01 11:45:47 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/ChangeLog,v 1.15 2003/10/07 16:19:39 usata Exp $
 
 *skkinput-3.0.6.20030524 (20 Aug 2003)
 
@@ -14,6 +14,11 @@
 
 *skkinput-2.06.3-r1 (19 Aug 2003)
 
+  08 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> skkinput-2.05.ebuild,
+  skkinput-2.06.3-r1.ebuild, skkinput-2.06.3.ebuild,
+  files/skkinput-ignore-numlock.patch:
+  Fixed Ctrl+Space problem when NumLock is on. Deleted 2.06.3.
+
   19 Aug 2003; MATSUU Takuto <matsuu@gentoo.org> skkinput-2.06.3-r1.ebuild:
   Stable for sparc
 
diff --git a/app-i18n/skkinput/Manifest b/app-i18n/skkinput/Manifest
index f75d52359432..5a974371b133 100644
--- a/app-i18n/skkinput/Manifest
+++ b/app-i18n/skkinput/Manifest
@@ -1,11 +1,10 @@
-MD5 5d73a7f92d05a2db0dcdd3ecbb1519f3 ChangeLog 1667
-MD5 d4d897dee108468d057ca74011ee0a97 skkinput-2.05.ebuild 831
-MD5 079b7374aa724a96287a7ac1724d014c skkinput-2.06.3.ebuild 835
-MD5 45fdbf6fb5bcfcdd8e096b3a3b8304e4 skkinput-2.06.3-r1.ebuild 786
+MD5 ae1325f521dea596ea0e753b42f65205 ChangeLog 1895
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 d14130d96c2b27b96bcf22ce354aed40 skkinput-2.05.ebuild 892
+MD5 6130098f04fa5569dbe7a8e14029b579 skkinput-2.06.3-r1.ebuild 849
 MD5 e0ce958c1c440efb56e37c61d9a5f06c skkinput-3.0.6.20030524.ebuild 1016
 MD5 eb27246eb7a54d4960ad56cd1348a7dd files/digest-skkinput-2.05 65
-MD5 d3cb7e3ed09c5dd49411919e56238c56 files/digest-skkinput-2.06.3 67
 MD5 d3cb7e3ed09c5dd49411919e56238c56 files/digest-skkinput-2.06.3-r1 67
 MD5 99ff5091a16aa789bfb7c6e9ff7a563f files/digest-skkinput-3.0.6.20030524 75
 MD5 ed34dd9815e04babe3888b6bb879e801 files/skkinput-3.0.6-gentoo.diff 1961
+MD5 801123e23f3fbfbb292b802bafea7ae7 files/skkinput-ignore-numlock.patch 453
diff --git a/app-i18n/skkinput/files/digest-skkinput-2.06.3 b/app-i18n/skkinput/files/digest-skkinput-2.06.3
deleted file mode 100644
index 75a8fcd926d4..000000000000
--- a/app-i18n/skkinput/files/digest-skkinput-2.06.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ded482a51cabad6e76becebadac6f367 skkinput-2.06.3.tar.gz 417098
diff --git a/app-i18n/skkinput/files/skkinput-ignore-numlock.patch b/app-i18n/skkinput/files/skkinput-ignore-numlock.patch
new file mode 100644
index 000000000000..a33d83ab6d3b
--- /dev/null
+++ b/app-i18n/skkinput/files/skkinput-ignore-numlock.patch
@@ -0,0 +1,13 @@
+diff -urN skkinput-2.06.3.ORIG/cstyle.c skkinput-2.06.3/cstyle.c
+--- skkinput-2.06.3.ORIG/cstyle.c	2002-06-29 13:48:46.000000000 +0900
++++ skkinput-2.06.3/cstyle.c	2003-10-08 01:02:26.000000000 +0900
+@@ -175,8 +175,7 @@
+       break ;
+     }
+   } else {
+-    if( chara == 0x20 && ( xkev->state & ShiftMask ) &&
+-	!( xkev->state & ( ~ShiftMask ) ) ){
++    if( chara == 0x20 && ( xkev->state & ShiftMask )){
+       chara = CHARA_SHIFT_SPACE ;
+     }
+   }
diff --git a/app-i18n/skkinput/skkinput-2.05.ebuild b/app-i18n/skkinput/skkinput-2.05.ebuild
index 14fbdde2c3fc..436866cb7fbc 100644
--- a/app-i18n/skkinput/skkinput-2.05.ebuild
+++ b/app-i18n/skkinput/skkinput-2.05.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/skkinput-2.05.ebuild,v 1.6 2003/09/08 00:55:49 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/skkinput-2.05.ebuild,v 1.7 2003/10/07 16:19:39 usata Exp $
 
 S="${WORKDIR}/${P}"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
+
 DESCRIPTION="A SKK-like Japanese input method for X11"
 SRC_URI="http://downloads.sourceforge.jp/skkinput2/864/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.jp/projects/skkinput2"
+
 IUSE=""
 DEPEND="virtual/glibc
 	virtual/x11
@@ -16,6 +19,8 @@ DEPEND="virtual/glibc
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/skkinput-ignore-numlock.patch
 }
 
 src_compile() {
diff --git a/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild b/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild
index dec2fe900a2e..373120d6f8b2 100644
--- a/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild
+++ b/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild,v 1.3 2003/08/19 00:02:45 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkinput/skkinput-2.06.3-r1.ebuild,v 1.4 2003/10/07 16:19:39 usata Exp $
 
 DESCRIPTION="A SKK-like Japanese input method for X11"
 SRC_URI="http://downloads.sourceforge.jp/skkinput2/1815/${P}.tar.gz"
@@ -10,10 +10,14 @@ SLOT="0"
 IUSE=""
 KEYWORDS="x86 ~ppc sparc ~alpha"
 
-DEPEND="virtual/glibc
-		virtual/x11"
+DEPEND="virtual/x11"
 RDEPEND="${DEPEND}
-		virtual/skkserv"
+	virtual/skkserv"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/skkinput-ignore-numlock.patch
+}
 
 src_compile() {
 	xmkmf -a || die
diff --git a/app-i18n/skkinput/skkinput-2.06.3.ebuild b/app-i18n/skkinput/skkinput-2.06.3.ebuild
deleted file mode 100644
index c1a816179873..000000000000
--- a/app-i18n/skkinput/skkinput-2.06.3.ebuild
+++ /dev/null
@@ -1,35 +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/skkinput/skkinput-2.06.3.ebuild,v 1.3 2003/02/13 08:47:56 vapier Exp $
-
-DESCRIPTION="A SKK-like Japanese input method for X11"
-SRC_URI="http://downloads.sourceforge.jp/skkinput2/1815/${P}.tar.gz"
-HOMEPAGE="http://skkinput2.sourceforge.jp/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-
-DEPEND="virtual/glibc
-	virtual/x11"
-RDEPEND="${DEPEND}
-	app-i18n/skkserv"
-S="${WORKDIR}/${P}"
-
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	xmkmf -a || die
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} MANPATH=/usr/share/man install.man || die
-	dodoc ChangeLog GPL *.jis
-	insinto /etc/skel
-	newins dot.skkinput .skkinput
-}