Version bumped.

(Portage version: 2.0.51.22-r1)

6 files changed, 32 insertions, 28 deletions

diff --git a/app-i18n/rskkserv/ChangeLog b/app-i18n/rskkserv/ChangeLog
index 7714a0df61e0..e9c93b9f1ccf 100644
--- a/app-i18n/rskkserv/ChangeLog
+++ b/app-i18n/rskkserv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/rskkserv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/ChangeLog,v 1.14 2005/01/01 14:37:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/ChangeLog,v 1.15 2005/07/02 09:40:50 usata Exp $
+
+*rskkserv-2.95.4 (02 Jul 2005)
+
+  02 Jul 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -rskkserv-2.94.13-r2.ebuild, rskkserv-2.95.3-r1.ebuild,
+  +rskkserv-2.95.4.ebuild:
+  Version bumped.
 
   11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> rskkserv-2.95.3.ebuild:
   Stable on alpha.
diff --git a/app-i18n/rskkserv/Manifest b/app-i18n/rskkserv/Manifest
index 853a56f50ae9..f17e8bceca2b 100644
--- a/app-i18n/rskkserv/Manifest
+++ b/app-i18n/rskkserv/Manifest
@@ -1,12 +1,14 @@
+MD5 9824259863bdc01438c0717b026dabbd rskkserv-2.95.4.ebuild 1595
 MD5 407f2f2bd8f691b95d2a87f2a4ba5c23 ChangeLog 2220
+MD5 3ba8da6bb61e8af509f8b9a58858c2a5 rskkserv-2.95.3-r1.ebuild 1888
 MD5 c90dd470dc467aece7b8ac23c8771009 metadata.xml 174
 MD5 45ed056be923e358c9c95862fda29f49 rskkserv-2.94.13-r2.ebuild 1851
 MD5 89eaa60bc21cb2e6e5276b267a8bd182 rskkserv-2.95.3.ebuild 1747
-MD5 3ba8da6bb61e8af509f8b9a58858c2a5 rskkserv-2.95.3-r1.ebuild 1888
+MD5 5b2e771eebc8e3662c9a657cbd446116 files/rskkserv-2.95.initd 753
+MD5 2c629d87dc7e3062a71fc992d0a6591b files/rskkserv.initd 715
+MD5 2190c8b10ef55c0d9622eb187f76c7e4 files/digest-rskkserv-2.95.4 66
+MD5 db345ea9205680884d04619ab10d3792 files/rskkserv-2.94.13-conf-gentoo.diff 1595
+MD5 cbef41424aca56798bb75696718641b6 files/rskkserv-2.94.13-gentoo.diff 295
 MD5 e6d30875bbd368e05ebb14e228bd9aac files/digest-rskkserv-2.95.3 66
 MD5 66e1b2204668b263930a40639c60dac7 files/digest-rskkserv-2.94.13-r2 68
 MD5 e6d30875bbd368e05ebb14e228bd9aac files/digest-rskkserv-2.95.3-r1 66
-MD5 db345ea9205680884d04619ab10d3792 files/rskkserv-2.94.13-conf-gentoo.diff 1595
-MD5 cbef41424aca56798bb75696718641b6 files/rskkserv-2.94.13-gentoo.diff 295
-MD5 5b2e771eebc8e3662c9a657cbd446116 files/rskkserv-2.95.initd 753
-MD5 2c629d87dc7e3062a71fc992d0a6591b files/rskkserv.initd 715
diff --git a/app-i18n/rskkserv/files/digest-rskkserv-2.94.13-r2 b/app-i18n/rskkserv/files/digest-rskkserv-2.94.13-r2
deleted file mode 100644
index 243d0e2d4ea9..000000000000
--- a/app-i18n/rskkserv/files/digest-rskkserv-2.94.13-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a78835f66c85d27e88596d6ed03bd93 rskkserv-2.94.13.tar.gz 467983
diff --git a/app-i18n/rskkserv/files/digest-rskkserv-2.95.4 b/app-i18n/rskkserv/files/digest-rskkserv-2.95.4
new file mode 100644
index 000000000000..bb5bbab144b7
--- /dev/null
+++ b/app-i18n/rskkserv/files/digest-rskkserv-2.95.4
@@ -0,0 +1 @@
+MD5 f4a148c90093103b3f72358cbb260b30 rskkserv-2.95.4.tar.gz 60634
diff --git a/app-i18n/rskkserv/rskkserv-2.95.3-r1.ebuild b/app-i18n/rskkserv/rskkserv-2.95.3-r1.ebuild
index 77426d596422..e7f8aa136f10 100644
--- a/app-i18n/rskkserv/rskkserv-2.95.3-r1.ebuild
+++ b/app-i18n/rskkserv/rskkserv-2.95.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.95.3-r1.ebuild,v 1.2 2005/01/01 14:37:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.95.3-r1.ebuild,v 1.3 2005/07/02 09:40:50 usata Exp $
 
 inherit ruby eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.unixuser.org/~ysjj/rskkserv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc"
+KEYWORDS="x86 ~alpha ~ppc"
 IUSE=""
 
 DEPEND="dev-ruby/ruby-tcpwrap"
diff --git a/app-i18n/rskkserv/rskkserv-2.94.13-r2.ebuild b/app-i18n/rskkserv/rskkserv-2.95.4.ebuild
index e9e576abbd0d..42bd80645e9a 100644
--- a/app-i18n/rskkserv/rskkserv-2.94.13-r2.ebuild
+++ b/app-i18n/rskkserv/rskkserv-2.95.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.8 2005/01/01 14:37:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.95.4.ebuild,v 1.1 2005/07/02 09:40:50 usata Exp $
 
 inherit ruby eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.unixuser.org/~ysjj/rskkserv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha ~ppc"
+KEYWORDS="~x86 ~alpha ~ppc"
 IUSE=""
 
 DEPEND="dev-ruby/ruby-tcpwrap"
@@ -19,28 +19,15 @@ RDEPEND="${DEPEND}
 PROVIDE="virtual/skkserv"
 USE_RUBY="ruby16 ruby18 ruby19"
 
-S=${WORKDIR}/${PN}-cvs
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-conf-gentoo.diff
-
-	sed -i -e "s%with_RUBY%with_ruby%g" configure
-	sed -i -e "s%@datadir@%/usr/share%g" rskkserv.conf.in
-	sed -i -e "s%@VERSION@%${PV}%g" doc/*.in
-}
-
 src_compile() {
+	ruby -i -pe "gsub(/with_RUBY/,'with_ruby')" configure || die
 	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
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -48,12 +35,14 @@ src_install() {
 	einstall || die
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/rskkserv.initd rskkserv || die
+	newexe ${FILESDIR}/rskkserv-2.95.initd rskkserv || die
 
 	dodoc ChangeLog
 	cd doc
 	dodoc rskkserv.conf.sample
 	newdoc README.old README
+	insinto /usr/share/doc/${PF}
+	doins conf-o2n.rb
 	newman rskkserv.1.in rskkserv.1
 	insinto /usr/share/man/ja/man1
 	newins rskkserv.1.ja_JP.eucJP.in rskkserv.1
@@ -68,4 +57,10 @@ pkg_postinst() {
 	#einfo "See /usr/share/doc/${PF}/rskkserv.conf.sample.gz"
 	#einfo "for an example of multiple dictionaries."
 	einfo
+	draw_line
+	einfo
+	einfo "If you are upgrading from 2.94.x, you may want to use"
+	einfo "/usr/share/doc/${PF}/conf-o2n.rb to convert configuration"
+	einfo "file into new format."
+	einfo
 }