Convert to ruby-ng. Added ~amd64.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 151 insertions, 135 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/Manifest b/app-i18n/rskkserv/Manifest
index b68923b17cce..fbe80879de9f 100644
--- a/app-i18n/rskkserv/Manifest
+++ b/app-i18n/rskkserv/Manifest
@@ -1,20 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX rskkserv-2.94.13-conf-gentoo.diff 1595 RMD160 62096c0dc32a681e25cedf82128c1341ec173d9e SHA1 b7390381c97513f64619da2756a40b571ed314e8 SHA256 a67f2349dd40c11e8995ff5acf206a7105a2f36afba446542bb493da3425a8eb
-AUX rskkserv-2.94.13-gentoo.diff 295 RMD160 09df52d8846676cf0975b6c245540eba4234ad5e SHA1 756162a41e0a514ffbbbc87540414acd563cd3b9 SHA256 fa38c34d6c5f93b38c702470224d0ed174caa5e0dffd638547ba534083ee4017
-AUX rskkserv-2.95.initd 753 RMD160 bfd2d6539b1251c4f9f52a25be8d2687f08d010c SHA1 42856f77302f2153319deadb04d1202cfbb357f7 SHA256 f507e96b1c66ec538d8b04d7baf680dfa2d091da7a946527efc7c8df8126abbf
-AUX rskkserv.initd 715 RMD160 8b7b148338163f45dc6766aa918af72ee8c813b7 SHA1 89cf88d904206bcef6d577a38c5b51941ffbffcb SHA256 f14d77d188d8eac77fb2e21436bfbce2e8b2038f80382cdb9a19cd8832a74898
+AUX rskkserv-2.95.4-gentoo.patch 1155 RMD160 43a9b8bd42094fa65bbcd6f5a973961584cea338 SHA1 1e06d05d321be9643863f78a48d6ec7c192e6625 SHA256 f26881dc140681248258f31275005bd8e2c479ecb7ce220af24ef7a0b760d23e
+AUX rskkserv-2.95.initd 837 RMD160 6bed38145d3e6f110eee382224b5300748a12083 SHA1 8c1c325d0ddb6ea58d86141f83456aae66f9b0bc SHA256 abe558fe93c349fbd443b0efeea9cb50c2592bac2056abea24ff12893c228f6f
 DIST rskkserv-2.95.3.tar.gz 58419 RMD160 3aa8271d7db126bf9f19273e94789aa077cba400 SHA1 2283e523ca0e7e32eb3a602cf29c3241bc67fbc2 SHA256 6082ddf2757fbcbd7b3c6c5b7c0256c262e34a96df3343063bf049a7a46d832c
 DIST rskkserv-2.95.4.tar.gz 60634 RMD160 08049bee0ac2a5f933516a6b581bcb06461d40c0 SHA1 6443ba27c2f017f3a776a547034faff3d679c905 SHA256 cd0cd014f1034d0974e4094ad5de67120d593e3cd5cb7fda2c52d9057432f9a5
 EBUILD rskkserv-2.95.3-r1.ebuild 1778 RMD160 4dda24e2683639a1c2e6c5213c5e589f32be4f2c SHA1 8ae4be9e275a491348381e5f2300ff51e16e4ed1 SHA256 923d40642ba136b13b1eabd763a8b055fd6dacdf8ec894e5eb10d43b310ca8fe
+EBUILD rskkserv-2.95.4-r1.ebuild 2065 RMD160 f75830436e2674f64a2fbca7d2b9091fae6a936b SHA1 0d86f5ae03589d384c57e6d45e1d5ea369525530 SHA256 90cac8b074c85f35a9d6052feb17448d5e99244e3b9b1bd4b9e3339b66f5cea1
 EBUILD rskkserv-2.95.4.ebuild 1777 RMD160 d640e975ffb24b17420552d51b4be91fc7b7ccdd SHA1 6019459dc2b14d9d6ccca9ec935b4ad60b0f3b45 SHA256 730eb2da8825e3a8af13aa2388a559bd16305f086e4a002e47db3de4a67e5130
-MISC ChangeLog 3416 RMD160 09ab934da000b0cea3fb4ead89245604977094a8 SHA1 d205fa09ace5b7f19cbcfda6b6f8f1926b150b10 SHA256 a3bc0f438f43443e842772d0ada438fbd1c12e1a5d45f5fd717531876a301c65
+MISC ChangeLog 3741 RMD160 a2606ba174b78d1cfe98a24a448efdd261fae731 SHA1 10dee8cf7bb1089a6101e5673526a8f791ea88c7 SHA256 ca0d0a19da795a050230ff355ae9656efacd22254001016f3f481bc1ff7cfa3a
 MISC metadata.xml 174 RMD160 2f13cc4c87390b439f676477845eaf315e8b2104 SHA1 32703273ad00b2032e6d595a522877c7c793104f SHA256 090494515f02f940c2ed356045a2469aec2334ffc4ca8e0b2797fce7162ae4b7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkqQbCQACgkQaGsKqSU7eCSX3QCgh8BaewBuTO58a96og3tbU46l
-1+4AoIsQZdkDpnQ2rdwUd7MI3BwS7UOf
-=5KVp
+iQIcBAEBAgAGBQJMAO0jAAoJECaGw+YFKA1pybwP/A9IixjE886bRgcfI+8NFj24
+HefmNF7LktgkIPh5/HX4NtkGBlFh/7ewB5CwxDrOrpP2+eOrHghO1gukCHv8/JeO
+FrtTFyrQzoUJIyByOf6debam/tCt9TNV3rgAUaVjn8Hxs4vYZuwZRWFDAwmfZm/K
+8vtTwGbXyToqyLai0dil2rS5bQeHPCJka94XR2NkDNWExFtbmwI+GwvJdCd+Jr2r
+A7A8AEkdAtaibEUHNBuVKFL0/Rad1tH1XsbSgqizpSGcVG7ykZUn8Uw+O8ZAJFy0
+alADiYnFcSmlIdnEytRBoq3waEbaA1OKNTrblDdfShqefqktiiC7r3h1geMta5Dm
+hpiqyqWQ8n+OI1x2Uedn2fx++OzcqKtRQJiV08wGktl56vVFcaKyzBaXFIFBxvSy
+fuXoLakJyNKmoqPMiyUMgwYh2xzpTDDVu/AUPtfnlTWQyN6snzfHkECcGU8uK03J
+bYnEKZ7OLkWCYocVeHQ9vlxK3GYwf7/hNxbQgHq+8QF/6QWZJtFbWsVqDpxGruae
+1z1q0wCekxC+lZkbL2mx9x/p7nbmm4II6NDglyGNkqYLjY+v6Y+pUeXPu7Z3B4rZ
++7vMnr0cgznNRz59KXmCo0xHc2bsQyhkJ2kWycbrBHYunjreS1Wv7u/bD5Lwjw69
+Q4dGSjXytIoLubE5tQ+M
+=HV2x
 -----END PGP SIGNATURE-----
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
+}