8 files changed, 57 insertions, 76 deletions
diff --git a/app-i18n/skktools/ChangeLog b/app-i18n/skktools/ChangeLog
index dfc62e10fb9b..4891900757bf 100644
--- a/app-i18n/skktools/ChangeLog
+++ b/app-i18n/skktools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/skktools
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skktools/ChangeLog,v 1.10 2007/09/20 18:57:04 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skktools/ChangeLog,v 1.11 2007/09/22 23:32:04 matsuu Exp $
+
+*skktools-1.3 (22 Sep 2007)
+
+  22 Sep 2007; MATSUU Takuto <matsuu@gentoo.org>
+  -files/skktools-1.1-gentoo.diff, +files/skktools-1.3-gentoo.patch,
+  -skktools-1.1.ebuild, -skktools-1.2.ebuild, +skktools-1.3.ebuild:
+  Version bumped.
+  Clean up.
 
   20 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   skktools-1.2-r1.ebuild:
diff --git a/app-i18n/skktools/files/digest-skktools-1.1 b/app-i18n/skktools/files/digest-skktools-1.1
deleted file mode 100644
index 78496dc48729..000000000000
--- a/app-i18n/skktools/files/digest-skktools-1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed185d76062089bca5c698f8872b7544 skktools-1.1.tar.gz 179963
-RMD160 90301566fbbe5d54bb82ae8a317f0d99bc72c447 skktools-1.1.tar.gz 179963
-SHA256 1c8743722514224f3a8ca81f661c0f9bb08486cc56b6ce1d337d859693b6307b skktools-1.1.tar.gz 179963
diff --git a/app-i18n/skktools/files/digest-skktools-1.2 b/app-i18n/skktools/files/digest-skktools-1.2
deleted file mode 100644
index 8a3d31a1ecc1..000000000000
--- a/app-i18n/skktools/files/digest-skktools-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eec35c1ce3fedf9b5d3939d4e625cf4d skktools-1.2.tar.gz 206799
-RMD160 cb157d231bf3132b6a9476fcafbeb30ec019811d skktools-1.2.tar.gz 206799
-SHA256 e68b6b2b3f6a62bc37e35aca42bbff69ab5bcd4d7e7061354f1a6f3419f14e80 skktools-1.2.tar.gz 206799
diff --git a/app-i18n/skktools/files/digest-skktools-1.3 b/app-i18n/skktools/files/digest-skktools-1.3
new file mode 100644
index 000000000000..996b34c0b934
--- /dev/null
+++ b/app-i18n/skktools/files/digest-skktools-1.3
@@ -0,0 +1,3 @@
+MD5 2f9fb6446b440fdd5fae35a6ed358241 skktools-1.3.tar.gz 290087
+RMD160 20a6775a1af51acc3f23aea67343c0361c976043 skktools-1.3.tar.gz 290087
+SHA256 c4098008ff045146455e8e9c79b19721df8b86092d56046a3c4b4ffe41a474c4 skktools-1.3.tar.gz 290087
diff --git a/app-i18n/skktools/files/skktools-1.1-gentoo.diff b/app-i18n/skktools/files/skktools-1.1-gentoo.diff
deleted file mode 100644
index 4aad1bc9059e..000000000000
--- a/app-i18n/skktools/files/skktools-1.1-gentoo.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.in.orig	2003-08-17 17:32:15.000000000 +0900
-+++ Makefile.in	2005-04-23 21:20:37.000000000 +0900
-@@ -97,11 +97,11 @@
- 	./config.status --recheck
- 
- install: $(TARGETS)
--	$(srcdir)/mkinstalldirs $(bindir)
-+	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	@list="$(TARGETS)"; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(INSTALL_PROGRAM) $$p $(bindir)/"; \
--             $(INSTALL_PROGRAM) $$p $(bindir)/; \
-+	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/"; \
-+             $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/; \
-           else :; fi; \
-         done
- 
-@@ -110,8 +110,8 @@
- 
- uninstall:
- 	@list="$(TARGETS)"; for p in $$list; do \
--	echo " rm -f $(bindir)/$$p"; \
--	rm -f $(bindir)/$$p; \
-+	echo " rm -f $(DESTDIR)$(bindir)/$$p"; \
-+	rm -f $(DESTDIR)$(bindir)/$$p; \
-         done
- 
- clean:
diff --git a/app-i18n/skktools/files/skktools-1.3-gentoo.patch b/app-i18n/skktools/files/skktools-1.3-gentoo.patch
new file mode 100644
index 000000000000..eac41e53621d
--- /dev/null
+++ b/app-i18n/skktools/files/skktools-1.3-gentoo.patch
@@ -0,0 +1,25 @@
+diff -Naur skktools-1.3.orig/skkdic-expr2.c skktools-1.3/skkdic-expr2.c
+--- skktools-1.3.orig/skkdic-expr2.c	2006-01-04 19:35:06.000000000 +0900
++++ skktools-1.3/skkdic-expr2.c	2007-09-23 08:14:02.000000000 +0900
+@@ -254,10 +254,10 @@
+ 
+ static GSList *splitCandidates(gchar *str)
+ {
+-	unsigned char *p, *q;
++	guchar *p, *q;
+ 	GSList *list = NULL;
+ 
+-	p = str;
++	p = (guchar *)str;
+ 	while(*p >= 0x20) {
+ 		if(*p == '/') {
+ 			q = ++p;
+@@ -273,7 +273,7 @@
+ 				if(*q == '\0') break;
+ 				q++;
+ 			}
+-			list = g_slist_append(list, g_strndup(p, (int)q - (int)p));
++			list = g_slist_append(list, g_strndup((gchar *)p, q - p));
+ 			p = q;
+ 		} else {
+ 			p++;
diff --git a/app-i18n/skktools/skktools-1.1.ebuild b/app-i18n/skktools/skktools-1.1.ebuild
deleted file mode 100644
index 411ae52ab706..000000000000
--- a/app-i18n/skktools/skktools-1.1.ebuild
+++ /dev/null
@@ -1,35 +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/skktools/skktools-1.1.ebuild,v 1.7 2005/04/23 12:25:34 usata Exp $
-
-inherit elisp-common eutils
-
-DESCRIPTION="SKK utilities to manage dictionaries"
-HOMEPAGE="http://openlab.jp/skk/"
-SRC_URI="http://openlab.ring.gr.jp/skk/tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="ruby emacs"
-
-DEPEND="virtual/libc
-	>=dev-libs/glib-2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	use ruby && dobin saihenkan.rb
-	use emacs && elisp-site-file-install skk-xml.el
-
-	insinto /usr/share/skk
-	doins unannotation.awk
-
-	dodoc ChangeLog README READMEs/*
-}
diff --git a/app-i18n/skktools/skktools-1.2.ebuild b/app-i18n/skktools/skktools-1.3.ebuild
index 81675bf85c0e..eeba92c91e49 100644
--- a/app-i18n/skktools/skktools-1.2.ebuild
+++ b/app-i18n/skktools/skktools-1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skktools/skktools-1.2.ebuild,v 1.2 2007/09/20 00:04:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skktools/skktools-1.3.ebuild,v 1.1 2007/09/22 23:32:04 matsuu Exp $
 
-inherit elisp-common
+inherit elisp-common eutils
 
 DESCRIPTION="SKK utilities to manage dictionaries"
 HOMEPAGE="http://openlab.jp/skk/"
@@ -11,15 +11,29 @@ SRC_URI="http://openlab.ring.gr.jp/skk/tools/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ruby emacs"
+IUSE="emacs gdbm"
 
-DEPEND="virtual/libc
+DEPEND="emacs? ( virtual/emacs )
+	gdbm? ( sys-libs/gdbm )
+	!gdbm? ( sys-libs/db )
 	>=dev-libs/glib-2"
 
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+src_compile() {
+	econf $(use_with gdbm) || die
+	emake || die
+}
+
 src_install() {
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die
 
-	use ruby && dobin saihenkan.rb
+	dobin saihenkan.rb
 	use emacs && elisp-site-file-install skk-xml.el
 
 	insinto /usr/share/skk