Added to ~alpha and ~ppc.

7 files changed, 11 insertions, 161 deletions

diff --git a/app-i18n/rskkserv/ChangeLog b/app-i18n/rskkserv/ChangeLog
index fbe18754d8e7..3ab516123ab9 100644
--- a/app-i18n/rskkserv/ChangeLog
+++ b/app-i18n/rskkserv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/rskkserv
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/ChangeLog,v 1.9 2004/06/24 21:53:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/ChangeLog,v 1.10 2004/11/03 09:07:07 usata Exp $
+
+  03 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/rskkserv-2.94.12a-gentoo.diff, -files/rskkserv-skk-jisyo-extra.diff,
+  files/rskkserv.initd, -rskkserv-2.94.12a.ebuild, rskkserv-2.94.13-r2.ebuild:
+  Added to ~alpha and ~ppc.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> rskkserv-2.94.13-r2.ebuild:
   Add inherit eutils
diff --git a/app-i18n/rskkserv/files/digest-rskkserv-2.94.12a b/app-i18n/rskkserv/files/digest-rskkserv-2.94.12a
deleted file mode 100644
index cc13e5b070d4..000000000000
--- a/app-i18n/rskkserv/files/digest-rskkserv-2.94.12a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7d7c49baa8ae6ab4ee87946bd288005 rskkserv-2.94.12a.tar.gz 40763
diff --git a/app-i18n/rskkserv/files/rskkserv-2.94.12a-gentoo.diff b/app-i18n/rskkserv/files/rskkserv-2.94.12a-gentoo.diff
deleted file mode 100644
index 4d1af1e2065f..000000000000
--- a/app-i18n/rskkserv/files/rskkserv-2.94.12a-gentoo.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN rskkserv-2.94.12a.ORIG/ext/extconf.rb.in rskkserv-2.94.12a/ext/extconf.rb.in
---- rskkserv-2.94.12a.ORIG/ext/extconf.rb.in	2001-08-14 01:06:08.000000000 +0900
-+++ rskkserv-2.94.12a/ext/extconf.rb.in	2003-09-20 16:00:37.000000000 +0900
-@@ -5,8 +5,8 @@
- # guessing `rubylibdir' and `rubyarchdir'
- prefix = "@prefix@"
- if prefix == CONFIG["prefix"]
--  rubylibdir = CONFIG["rubylibdir"]
--  rubyarchdir = CONFIG["archdir"]
-+  rubylibdir = CONFIG["sitelibdir"]
-+  rubyarchdir = CONFIG["sitearchdir"]
- else
-   rubylibdir = prefix + "/lib/ruby/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]
-   rubyarchdir = rubylibdir + "/" + CONFIG["arch"]
-diff -urN rskkserv-2.94.12a.ORIG/skkserv.rb.in rskkserv-2.94.12a/skkserv.rb.in
---- rskkserv-2.94.12a.ORIG/skkserv.rb.in	2001-11-19 20:25:39.000000000 +0900
-+++ rskkserv-2.94.12a/skkserv.rb.in	2003-09-20 16:02:08.000000000 +0900
-@@ -230,7 +230,7 @@
- 	  break
- 	when CLIENT_REQUEST
- #	  Logger::log(Logger::DEBUG, "message from client %s: WORD", peer)
--	  cmdend = cmdbuf.index(? ) or cmdend = cmdbuf.index(?\n) 
-+	  cmdend = cmdbuf.index(?\ ) or cmdend = cmdbuf.index(?\n) 
- 	  kana = cmdbuf[1 .. (cmdend - 1)]
- 	  ret = ""
- 	  if kanji = @dictionary.search(kana)
diff --git a/app-i18n/rskkserv/files/rskkserv-skk-jisyo-extra.diff b/app-i18n/rskkserv/files/rskkserv-skk-jisyo-extra.diff
deleted file mode 100644
index 6d89e7711348..000000000000
--- a/app-i18n/rskkserv/files/rskkserv-skk-jisyo-extra.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- rskkserv.conf.in.orig	2001-07-18 02:09:36.000000000 +0900
-+++ rskkserv.conf.in	2003-09-20 15:12:26.000000000 +0900
-@@ -16,6 +16,58 @@
-     CACHEDIR = "@cachedir@"
-     NOCACHE = false
-     KCODE = :eucjp
-+
-+#    module JIS2
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.JIS2"
-+#    end
-+
-+#    module JIS3_4
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.JIS3_4"
-+#    end
-+
-+#    module OMAEMONA_2CH
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.2ch"
-+#    end
-+
-+#    module ASSOC
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.assoc"
-+#    end
-+
-+#    module EDICT
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.edict"
-+#    end
-+
-+#    module FUKUGO
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.fukugo"
-+#    end
-+
-+#    module GEO
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.geo"
-+#    end
-+
-+#    module JINMEI
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.jinmei"
-+#    end
-+
-+#    module LAW
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.law"
-+#    end
-+
-+#    module MAZEGAKI
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.mazegaki"
-+#    end
-+
-+#    module PUBDICPlus
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.pubdic+"
-+#    end
-+
-+#    module ZIPCODE
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.zipcode"
-+#    end
-+
-+#    module OFFICE_ZIPCODE
-+#      DICFILE = "@skkdicdir@/SKK-JISYO.office.zipcode"
-+#    end
-   end
- end
- 
diff --git a/app-i18n/rskkserv/files/rskkserv.initd b/app-i18n/rskkserv/files/rskkserv.initd
index f2e66adaa477..ac4edf3efc83 100644
--- a/app-i18n/rskkserv/files/rskkserv.initd
+++ b/app-i18n/rskkserv/files/rskkserv.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/files/rskkserv.initd,v 1.3 2004/07/14 21:26:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/files/rskkserv.initd,v 1.4 2004/11/03 09:07:08 usata Exp $
 
 opts="${opts} reload"
 
@@ -18,7 +18,7 @@ start() {
 
 stop() {
 	ebegin "Stopping rskkserv"
-	start-stop-daemon --stop --quiet --pidfile /var/run/rskkserv.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/rskkserv.pid >/dev/null 2>&1
 	eend $?
 }
 
diff --git a/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild b/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild
deleted file mode 100644
index fc9cd638666b..000000000000
--- a/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.94.12a.ebuild,v 1.7 2004/07/14 01:11:21 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="rskkserv is an alternative version of skkserv implemented by Ruby"
-HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=rskkserv"
-SRC_URI="http://www.unixuser.org/~ysjj/rskkserv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/ruby
-	dev-ruby/ruby-tcpwrap"
-RDEPEND="${DEPEND}
-	app-i18n/skk-jisyo"
-PROVIDE="virtual/skkserv"
-
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${PN}-skk-jisyo-extra.diff
-}
-
-src_compile() {
-
-	mv rskkserv.conf.in rskkserv.conf.in.tmp
-	sed -e "s%@skkdicdir@%/usr/share/skk%g" \
-		rskkserv.conf.in.tmp > rskkserv.conf.in
-	econf --with-dicfile=/usr/share/skk/SKK-JISYO.L \
-		--with-cachedir=/var/lib/rskkserv \
-		--with-piddir=/var/run \
-		--with-logdir=/var/log \
-		|| die
-	emake || die
-}
-
-src_install() {
-
-	keepdir /var/lib/rskkserv
-	make DESTDIR=${D} install || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rskkserv.initd rskkserv || die
-
-	dodoc ChangeLog rskkserv.conf.sample
-	newdoc doc/README.old README
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "If you want to add auxiliary dictionaries (e.g. SKK-JISYO.JIS2,"
-	einfo "SKK-JISYO.jinmei, SKK-JISYO.2ch and so on) you need to emerge"
-	einfo "app-i18n/skk-jisyo-extra and uncomment dictionary entries in"
-	einfo "/etc/rskkserv.conf manually."
-	#einfo "See /usr/share/doc/${PF}/rskkserv.conf.sample.gz"
-	#einfo "for an example of multiple dictionaries."
-	einfo
-}
diff --git a/app-i18n/rskkserv/rskkserv-2.94.13-r2.ebuild b/app-i18n/rskkserv/rskkserv-2.94.13-r2.ebuild
index 6493641b0b21..47dc77aeb9a3 100644
--- a/app-i18n/rskkserv/rskkserv-2.94.13-r2.ebuild
+++ b/app-i18n/rskkserv/rskkserv-2.94.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.94.13-r2.ebuild,v 1.5 2004/09/23 23:54:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.94.13-r2.ebuild,v 1.6 2004/11/03 09:07:07 usata Exp $
 
 inherit ruby eutils
 
@@ -10,11 +10,10 @@ SRC_URI="http://www.unixuser.org/~ysjj/rskkserv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~alpha ~ppc"
 IUSE=""
 
-DEPEND="virtual/ruby
-	dev-ruby/ruby-tcpwrap"
+DEPEND="dev-ruby/ruby-tcpwrap"
 RDEPEND="${DEPEND}
 	app-i18n/skk-jisyo"
 PROVIDE="virtual/skkserv"