Version bumped.

Package-Manager: portage-2.1.3.9

9 files changed, 73 insertions, 109 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/Manifest b/app-i18n/skktools/Manifest
index 6f6ea2c5cd1c..83b07cd9bc62 100644
--- a/app-i18n/skktools/Manifest
+++ b/app-i18n/skktools/Manifest
@@ -1,49 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX skktools-1.1-gentoo.diff 836 RMD160 ace04ff9cc26f3469305d7dc56c6b628eedb1053 SHA1 b2b9e16168891d0042c1a5ecd339e6fc7a65dce8 SHA256 5c3d5059dfeadcb1118eeaed2dcf5d0576a741e7886fd245f4711d55d4d2c1df
-MD5 047d7cb40f9c877538f8926f3af6b968 files/skktools-1.1-gentoo.diff 836
-RMD160 ace04ff9cc26f3469305d7dc56c6b628eedb1053 files/skktools-1.1-gentoo.diff 836
-SHA256 5c3d5059dfeadcb1118eeaed2dcf5d0576a741e7886fd245f4711d55d4d2c1df files/skktools-1.1-gentoo.diff 836
 AUX skktools-1.2-CVE-2007-3916.patch 2711 RMD160 f9e0b034deedcecdaa1a045f7420d47081e65d56 SHA1 af89b2e43f77c17b536d9977dd2d73c73f37850c SHA256 e5c584586dd7dae05acd2f215b826d5760cf87033dfa9d90b1936fe51aa741e0
 MD5 0391d8a193ad106d3516dea509ff37dc files/skktools-1.2-CVE-2007-3916.patch 2711
 RMD160 f9e0b034deedcecdaa1a045f7420d47081e65d56 files/skktools-1.2-CVE-2007-3916.patch 2711
 SHA256 e5c584586dd7dae05acd2f215b826d5760cf87033dfa9d90b1936fe51aa741e0 files/skktools-1.2-CVE-2007-3916.patch 2711
-DIST skktools-1.1.tar.gz 179963 RMD160 90301566fbbe5d54bb82ae8a317f0d99bc72c447 SHA1 47b76dd74cf0be2e9772c3f141a6e8a6e08069bd SHA256 1c8743722514224f3a8ca81f661c0f9bb08486cc56b6ce1d337d859693b6307b
+AUX skktools-1.3-gentoo.patch 658 RMD160 ec57fb7c5c9ea78ede019c8501975ac0cc56cbac SHA1 870d7e54a9a004b219650028dd4168d78f9fe46c SHA256 39405759464f16b786e2061af3562d6ed0061cf1046109687419d48e4a4f2ed1
+MD5 ec324d2e56f47a31f2f7b2aadbdcb96a files/skktools-1.3-gentoo.patch 658
+RMD160 ec57fb7c5c9ea78ede019c8501975ac0cc56cbac files/skktools-1.3-gentoo.patch 658
+SHA256 39405759464f16b786e2061af3562d6ed0061cf1046109687419d48e4a4f2ed1 files/skktools-1.3-gentoo.patch 658
 DIST skktools-1.2.tar.gz 206799 RMD160 cb157d231bf3132b6a9476fcafbeb30ec019811d SHA1 c6cb43b224ade486ec25d6684d69465063c75b3f SHA256 e68b6b2b3f6a62bc37e35aca42bbff69ab5bcd4d7e7061354f1a6f3419f14e80
-EBUILD skktools-1.1.ebuild 792 RMD160 a5d35452e7c9f5a705193f82f6acc5d86cec2658 SHA1 2a10d301551f56c23bed0a177092cf36dd330cc7 SHA256 d31088132e11da1599a10cd031efe65218dc3efa56379d90fd13586cc65cf588
-MD5 b54ad752c843fc90b2908f0c34469503 skktools-1.1.ebuild 792
-RMD160 a5d35452e7c9f5a705193f82f6acc5d86cec2658 skktools-1.1.ebuild 792
-SHA256 d31088132e11da1599a10cd031efe65218dc3efa56379d90fd13586cc65cf588 skktools-1.1.ebuild 792
+DIST skktools-1.3.tar.gz 290087 RMD160 20a6775a1af51acc3f23aea67343c0361c976043 SHA1 eb2964dc8e39be63287fa488444ef63b69f52f21 SHA256 c4098008ff045146455e8e9c79b19721df8b86092d56046a3c4b4ffe41a474c4
 EBUILD skktools-1.2-r1.ebuild 814 RMD160 816cde91ae1be9067e6f770299494bbd43d876b0 SHA1 9a3cd40f9808ec405f1b1b6336b93ad6689ab478 SHA256 914eeb272bbc22086f21c7416305e05e7fae0e3819ba3483bff63af00a2654dc
 MD5 010e1e69ebad0e3422592749de0f1a2c skktools-1.2-r1.ebuild 814
 RMD160 816cde91ae1be9067e6f770299494bbd43d876b0 skktools-1.2-r1.ebuild 814
 SHA256 914eeb272bbc22086f21c7416305e05e7fae0e3819ba3483bff63af00a2654dc skktools-1.2-r1.ebuild 814
-EBUILD skktools-1.2.ebuild 718 RMD160 bb03e507f668b31fcd63ea8733f9db648f095c41 SHA1 f16f87159f95fc3268d6e1c492c016fcef5b5419 SHA256 15ae79083086454234c090f3fc378f0709a76ce9d1ca946337110b850e7942ba
-MD5 0afd50e71d3bf12dba434ae01072ff45 skktools-1.2.ebuild 718
-RMD160 bb03e507f668b31fcd63ea8733f9db648f095c41 skktools-1.2.ebuild 718
-SHA256 15ae79083086454234c090f3fc378f0709a76ce9d1ca946337110b850e7942ba skktools-1.2.ebuild 718
-MISC ChangeLog 1203 RMD160 37bf6f0cae580a2136721d9fab84265cca63fcf2 SHA1 a8f08c66a9a04fb4174e2af9b18ea66e37435f9c SHA256 8f585d656f4838253932248ae11e8f1cc4e441364c64e8361f4c6f67073530f6
-MD5 4969a71f07076912e654cd54c7a6dcd0 ChangeLog 1203
-RMD160 37bf6f0cae580a2136721d9fab84265cca63fcf2 ChangeLog 1203
-SHA256 8f585d656f4838253932248ae11e8f1cc4e441364c64e8361f4c6f67073530f6 ChangeLog 1203
+EBUILD skktools-1.3.ebuild 924 RMD160 76e840323bc8b86f0c2b9758ca2deff8ce619404 SHA1 e719ad7b70aa7b82cf1b78f2e1d4e23b990ee689 SHA256 40d8ab1443fb280e65b33f0782c9e26683a1cc5b46bf35de6c732bd228d5c319
+MD5 84ea683c1ceb87d52cbe8d51f557435c skktools-1.3.ebuild 924
+RMD160 76e840323bc8b86f0c2b9758ca2deff8ce619404 skktools-1.3.ebuild 924
+SHA256 40d8ab1443fb280e65b33f0782c9e26683a1cc5b46bf35de6c732bd228d5c319 skktools-1.3.ebuild 924
+MISC ChangeLog 1450 RMD160 497655827a5029f2153bb941a6e6bc01ebef34c8 SHA1 711a6928ab3ed489a58a8044589943c45cdfd384 SHA256 acf8cbbedb507aa7f63ab8108503351ffd42f73bd7e090c1ce5d279b50dee4fe
+MD5 24ad592d99d829d34f052085124f9f82 ChangeLog 1450
+RMD160 497655827a5029f2153bb941a6e6bc01ebef34c8 ChangeLog 1450
+SHA256 acf8cbbedb507aa7f63ab8108503351ffd42f73bd7e090c1ce5d279b50dee4fe ChangeLog 1450
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
-MD5 935a9a65460cf8df49fb2e5cf39ed44b files/digest-skktools-1.1 238
-RMD160 cd30fdb2f71f3a58227c70305982ddbb72d9f634 files/digest-skktools-1.1 238
-SHA256 f8e597743f1630542695622fa0232f6754a810b43d9fd5ffe9bbc9a0b704d48f files/digest-skktools-1.1 238
-MD5 e7a91252ab3d9e0bf81669c9f69ae43d files/digest-skktools-1.2 238
-RMD160 7dafca55a3888d484a869a8110e5a2b1c74576dd files/digest-skktools-1.2 238
-SHA256 d6b21e6b9486e5e9a716cf94c8504fb4c78bd57da40f45df1a88a660a248231e files/digest-skktools-1.2 238
 MD5 e7a91252ab3d9e0bf81669c9f69ae43d files/digest-skktools-1.2-r1 238
 RMD160 7dafca55a3888d484a869a8110e5a2b1c74576dd files/digest-skktools-1.2-r1 238
 SHA256 d6b21e6b9486e5e9a716cf94c8504fb4c78bd57da40f45df1a88a660a248231e files/digest-skktools-1.2-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFG8sKHNQqtfCuFneMRAsKLAJ0erBHqMOSZYlvdFlAuu87q9ExvPwCghjmN
-z34eNkIOSusNwQelcqw5JTM=
-=GS7z
------END PGP SIGNATURE-----
+MD5 733cb787eaf8754e1121a6c3539ec731 files/digest-skktools-1.3 238
+RMD160 84a265d69c28ccbe671001c77fd162bf1ad035e7 files/digest-skktools-1.3 238
+SHA256 3d80d965bab359a409b0f2ca42e5d0cef72dcc3394ed85121efb2c29a4a90543 files/digest-skktools-1.3 238
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