Convert to ruby-ng. Added ~amd64.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

7 files changed, 133 insertions, 126 deletions

diff --git a/app-i18n/rskkserv/ChangeLog b/app-i18n/rskkserv/ChangeLog
index b38456f6ad5b..8b446bb5cf75 100644
--- a/app-i18n/rskkserv/ChangeLog
+++ b/app-i18n/rskkserv/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/rskkserv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/ChangeLog,v 1.22 2009/08/22 22:07:45 a3li Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/ChangeLog,v 1.23 2010/05/29 10:31:52 matsuu Exp $
+
+*rskkserv-2.95.4-r1 (29 May 2010)
+
+  29 May 2010; MATSUU Takuto <matsuu@gentoo.org>
+  -files/rskkserv-2.94.13-conf-gentoo.diff,
+  -files/rskkserv-2.94.13-gentoo.diff, +rskkserv-2.95.4-r1.ebuild,
+  +files/rskkserv-2.95.4-gentoo.patch, files/rskkserv-2.95.initd,
+  -files/rskkserv.initd:
+  Convert to ruby-ng. Added ~amd64.
 
   22 Aug 2009; Alex Legler <a3li@gentoo.org> rskkserv-2.95.3-r1.ebuild,
   rskkserv-2.95.4.ebuild:
diff --git a/app-i18n/rskkserv/files/rskkserv-2.94.13-conf-gentoo.diff b/app-i18n/rskkserv/files/rskkserv-2.94.13-conf-gentoo.diff
deleted file mode 100644
index 66f426d7d448..000000000000
--- a/app-i18n/rskkserv/files/rskkserv-2.94.13-conf-gentoo.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- rskkserv.conf.in.orig	2003-04-12 21:35:52.000000000 +0900
-+++ rskkserv.conf.in	2004-03-03 02:36:21.351996072 +0900
-@@ -1,6 +1,7 @@
- # rskkserv.conf --- rskkserv configuration file -*- ruby -*-
- 
- module SKKServerConfig
-+  HOST = "localhost"
-   PORT = 1178
-   MAX_CLIENTS = 32
- 
-@@ -16,7 +17,59 @@
-     CACHEDIR = "@cachedir@"
-     NOCACHE = false
-     KCODE = :eucjp
--  end
-+
-+#      module JIS2
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.JIS2"
-+#      end
-+
-+#      module JIS3_4
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.JIS3_4"
-+#      end
-+
-+#      module PUBDICPlus
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.pubdic+"
-+#      end
-+
-+#      module ZIPCODE
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.zipcode"
-+#      end
-+
-+#      module OFFICE_ZIPCODE
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.office.zipcode"
-+#      end
-+
-+#      module OMAEMONA_2CH
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.2ch"
-+#      end
-+
-+#      module ASSOC
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.assoc"
-+#      end
-+
-+#      module EDICT
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.edict"
-+#      end
-+
-+#      module FUKUGO
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.fukugo"
-+#      end
-+
-+#      module GEO
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.geo"
-+#      end
-+
-+#      module JINMEI
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.jinmei"
-+#      end
-+
-+#      module LAW
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.law"
-+#      end
-+
-+#      module MAZEGAKI
-+#        DICFILE = "@datadir@/skk/SKK-JISYO.mazegaki"
-+#      end
-+  end # SKKDic
- end
- 
- # rskkserv.conf ends here
diff --git a/app-i18n/rskkserv/files/rskkserv-2.94.13-gentoo.diff b/app-i18n/rskkserv/files/rskkserv-2.94.13-gentoo.diff
deleted file mode 100644
index bc704052535a..000000000000
--- a/app-i18n/rskkserv/files/rskkserv-2.94.13-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- skkserv.rb.in.orig	2003-09-24 23:05:05.000000000 +0900
-+++ skkserv.rb.in	2004-02-18 03:04:48.048347464 +0900
-@@ -392,7 +392,7 @@
-     def each_module
-       constants.reverse_each do |s|
- 	m = const_get(s)
--	next if m.type != Module
-+	next if m.class != Module
- 	yield m
-       end
-     end
diff --git a/app-i18n/rskkserv/files/rskkserv-2.95.4-gentoo.patch b/app-i18n/rskkserv/files/rskkserv-2.95.4-gentoo.patch
new file mode 100644
index 000000000000..d4a52c7c267f
--- /dev/null
+++ b/app-i18n/rskkserv/files/rskkserv-2.95.4-gentoo.patch
@@ -0,0 +1,35 @@
+diff -Naur rskkserv-2.95.4.orig/Makefile.in rskkserv-2.95.4/Makefile.in
+--- rskkserv-2.95.4.orig/Makefile.in	2005-06-19 19:53:43.000000000 +0900
++++ rskkserv-2.95.4/Makefile.in	2010-05-29 17:22:16.000000000 +0900
+@@ -29,7 +29,7 @@
+ 
+ 
+ all: $(SKKSERV) $(CONFFILE) ext/Makefile # README INSTALL
+-	cd ext; make $@; cd ..
++	cd ext; $(MAKE) $@; cd ..
+ 
+ $(SKKSERV): $(SKKSERV).in @CONFIG_STATUS@
+ 	$(RUBY) -p -e 'sub %r%@RUBY\@%, %q%$(RUBY)%' \
+@@ -61,7 +61,7 @@
+ 	cd ext; $(RUBY) extconf.rb
+ 
+ distclean: clean
+-	cd ext; make $@; cd ..
++	cd ext; $(MAKE) $@; cd ..
+ 	rm -f ext/extconf.rb ext/depend
+ 	rm -f config.* configure Makefile README INSTALL rskkserv.spec
+ 	rm -rf autom4te.cache
+@@ -69,11 +69,11 @@
+ 
+ clean:
+ 	find ./ -name "*~" -exec rm {} \;
+-	cd ext; make $@; cd ..
++	cd ext; $(MAKE)$@; cd ..
+ 	rm -f $(SKKSERV) $(CONFFILE)
+ 
+ install: all installdirs
+-	cd ext; make DESTDIR=$(DESTDIR) rss-install; cd ..
++	cd ext; $(MAKE) DESTDIR=$(DESTDIR) rss-install; cd ..
+ 	$(INSTALL) -m0755 $(SKKSERV) $(DESTDIR)$(sbindir)/$(SKKSERV)
+ 	if [ ! -f $(DESTDIR)$(sysconfdir)/$(CONFFILE) ]; then \
+ 	    $(INSTALL) -m0644 $(CONFFILE) $(DESTDIR)$(sysconfdir)/; \
diff --git a/app-i18n/rskkserv/files/rskkserv-2.95.initd b/app-i18n/rskkserv/files/rskkserv-2.95.initd
index 9e493a420de1..a99ba28499cf 100755
--- a/app-i18n/rskkserv/files/rskkserv-2.95.initd
+++ b/app-i18n/rskkserv/files/rskkserv-2.95.initd
@@ -1,29 +1,30 @@
 #!/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-2.95.initd,v 1.1 2004/11/17 04:08:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/files/rskkserv-2.95.initd,v 1.2 2010/05/29 10:31:52 matsuu Exp $
 
 opts="${opts} reload"
 
 depend() {
-	need net
+	need localmount net
 }
 
 start() {
 	ebegin "Starting rskkserv"
-	start-stop-daemon --start --quiet --exec /usr/sbin/skkserv.rb
-	eend $?
+	start-stop-daemon --start --quiet \
+		--pidfile /var/run/rskkserv.pid \
+		--exec /usr/sbin/skkserv.rb
+	eend $? "Failed to start rskkserv"
 }
 
 stop() {
 	ebegin "Stopping rskkserv"
-	if [ -r /var/run/rskkserv.pid ] ; then
-		kill -KILL `cat /var/run/rskkserv.pid`
-	else
-		eerror "rskkserv not running. Please run /etc/init.d/rskkserv zap"
-		die
-	fi
-	eend $?
+        start-stop-daemon --stop --quiet \
+        	--pidfile /var/run/rskkserv.pid
+	local ret=$?
+	eend ${ret} "Failed to stop rskkserv"
+	rm -f "var/run/rskkserv.pid"
+	eend ${ret}
 }
 
 reload() {
diff --git a/app-i18n/rskkserv/files/rskkserv.initd b/app-i18n/rskkserv/files/rskkserv.initd
deleted file mode 100644
index ac4edf3efc83..000000000000
--- a/app-i18n/rskkserv/files/rskkserv.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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.4 2004/11/03 09:07:08 usata Exp $
-
-opts="${opts} reload"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting rskkserv"
-	start-stop-daemon --start --quiet --exec /usr/sbin/skkserv.rb || true
-	pgrep skkserv.rb >/dev/null 2>&1 || false
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping rskkserv"
-	start-stop-daemon --stop --quiet --pidfile /var/run/rskkserv.pid >/dev/null 2>&1
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading rskkserv"
-	if [ -r /var/run/rskkserv.pid ] ; then
-		kill -HUP `cat /var/run/rskkserv.pid`
-	fi
-	eend $?
-}
diff --git a/app-i18n/rskkserv/rskkserv-2.95.4-r1.ebuild b/app-i18n/rskkserv/rskkserv-2.95.4-r1.ebuild
new file mode 100644
index 000000000000..b5f69f21f38d
--- /dev/null
+++ b/app-i18n/rskkserv/rskkserv-2.95.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.95.4-r1.ebuild,v 1.1 2010/05/29 10:31:52 matsuu Exp $
+
+EAPI="2"
+# dev-ruby/ruby-tcpwrap doesn't work with jruby
+# rskkserv doesn't work with ruby19
+USE_RUBY="ruby18 ree18"
+
+inherit eutils ruby-ng
+
+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="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend dev-ruby/ruby-tcpwrap
+RDEPEND="${DEPEND}
+	app-i18n/skk-jisyo"
+
+PROVIDE="virtual/skkserv"
+
+RUBY_PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
+all_src_prepare() {
+	sed -i -e "s:with_RUBY:with_ruby:" configure || die
+}
+
+each_ruby_configure() {
+	econf \
+		--with-dicfile=/usr/share/skk/SKK-JISYO.L \
+		--with-cachedir=/var/lib/rskkserv \
+		--with-piddir=/var/run \
+		--with-logdir=/var/log \
+		|| die "econf failed"
+	cd ext; ${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake || die "emake failed"
+}
+
+each_ruby_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+all_ruby_install() {
+	newinitd "${FILESDIR}"/rskkserv-2.95.initd rskkserv || die
+
+	keepdir /var/lib/rskkserv || die
+
+	dodoc ChangeLog TODO || die
+	cd doc
+	dodoc rskkserv.conf.sample conf-o2n.rb || die
+	newdoc README.old README || die
+	doman rskkserv.1 || die
+	cp rskkserv.1.ja_JP.eucJP "${T}"/rskkserv.1 || die
+	doman -i18n=ja "${T}"/rskkserv.1 || die
+}
+
+pkg_postinst() {
+	elog
+	elog "If you want to add auxiliary dictionaries (e.g. SKK-JISYO.JIS2,"
+	elog "SKK-JISYO.jinmei, SKK-JISYO.2ch and so on) you need to emerge"
+	elog "app-i18n/skk-jisyo-extra and uncomment dictionary entries in"
+	elog "/etc/rskkserv.conf manually."
+	elog
+	elog "If you are upgrading from 2.94.x, you may want to use"
+	elog "conf-o2n.rb in /usr/share/doc/${PF} to convert configuration"
+	elog "file into new format."
+	elog
+}