Fixed bug #124631 and bug #216446.

Package-Manager: portage-2.1.5_rc6

4 files changed, 26 insertions, 26 deletions

diff --git a/app-dicts/gjiten/ChangeLog b/app-dicts/gjiten/ChangeLog
index b68c27799da2..f7ee8da87599 100644
--- a/app-dicts/gjiten/ChangeLog
+++ b/app-dicts/gjiten/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-dicts/gjiten
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/ChangeLog,v 1.17 2008/03/12 09:51:29 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/ChangeLog,v 1.18 2008/05/14 16:37:30 matsuu Exp $
+
+*gjiten-2.6-r1 (14 May 2008)
+
+  14 May 2008; MATSUU Takuto <matsuu@gentoo.org> gjiten-2.3.ebuild,
+  -gjiten-2.4.ebuild, +gjiten-2.6-r1.ebuild:
+  Fixed bug #124631 and bug #216446. Removed old version.
 
   12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Josh Glover (jmglov, #206782) from metadata.xml.
diff --git a/app-dicts/gjiten/Manifest b/app-dicts/gjiten/Manifest
index 78bad39d84d9..5bdd9f305035 100644
--- a/app-dicts/gjiten/Manifest
+++ b/app-dicts/gjiten/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gjiten-2.3.tar.gz 526530 RMD160 d8d59400ea53d771411b610ae48372dc2617b783 SHA1 8280fab66ac5450169fd5aecc347daaea4b9dc4b SHA256 b3f30cd066869401c8432de4395a78a582d818920c0528a14de10861aabe0534
-DIST gjiten-2.4.tar.gz 545748 RMD160 bacb46f6fd00c78414a37f5d1519367c47bf267c SHA1 f3bd0f59fd7663f3b23cb714d210a7869b98d65f SHA256 5207159b055576ef136fbf382b8d88d6ff285d7d1d81f9c2885e90e407d23cee
 DIST gjiten-2.6.tar.gz 564845 RMD160 41a837b62ce354e13ba8795926f102c06892d9d4 SHA1 034ce08e082ed21fc61bec97baf43589edb2e42f SHA256 f6c0cc69e1e59ed8c3a946a1ee3e4a5e2e1deb16890bfc5f67c055adb10a71dd
-EBUILD gjiten-2.3.ebuild 1381 RMD160 06e5ec3fa5f89e4004e90454320db0914cbfae48 SHA1 e9d21f0ac1d4f0297cf076a9573c6af8089c4a4a SHA256 36bfd7a57dd18bac353da1bedced024d2b0806ff64045babc85d76bea527b7c0
-EBUILD gjiten-2.4.ebuild 1384 RMD160 d88af5bc243861158a9b12a3bc73056ffca31bf4 SHA1 6c6a7bea9dfd03095adbdde6d487dc947386bcbe SHA256 f248ad9b2022afe5fb5412789d64bdf78ff9b033a8036300c8adf2d46b431484
+EBUILD gjiten-2.3.ebuild 1400 RMD160 2f450b7bf55188fea0bfef9e9d87b797697ea478 SHA1 9d258cb3c2041d10e5f43aaa0aa0953797400a00 SHA256 f622233136cf4d6af29999710cf070e614c43440cb5835b6312904f5121a66d9
+EBUILD gjiten-2.6-r1.ebuild 1455 RMD160 316e246379a2c648b8f5d28bfa5fd5ae73882d8c SHA1 8b53a93a7c49bbfbf50c7610834840bb1151a37e SHA256 fa1c7a81f195d49dce06e9e6f18693f335bd70f856a07a661400a31a24f65c5d
 EBUILD gjiten-2.6.ebuild 1349 RMD160 8c71b01c737fe542acdc6e89dce512537148de59 SHA1 ba400d7d429d8eb82d550c9c7d8a61624ace8177 SHA256 481a2b2117192c9a1de6aa145a9105c5a69c2cedb4a01a8fc72e18c0007eae6d
-MISC ChangeLog 2245 RMD160 bebbe77763e226d10659e5210fbb1991aac59d1f SHA1 4d045dda1ed222e8e220643f2272f1a1dcce5247 SHA256 73670e39da1e9c114699981493adc28afdba5dbeb4348882b66288fe7deb98c0
+MISC ChangeLog 2447 RMD160 150becd0f370f8ef780a61e6df432a4264c961fb SHA1 88f72b33f65ba53fbc101231634058e67c77c6f4 SHA256 819a273d26c32ed91dc485df2d98b884f452b8c584dbcbbce210f6c5a5f38c8d
 MISC metadata.xml 378 RMD160 d120fb3279adda49c4b3161f9b4dd9e867f53ade SHA1 e5a3665972439c8c125bfe4e5f9fe08f7b15fef0 SHA256 6704ee5210709c9bc43d9957f857da009c85a81c3344e33d075a94d26be11fd7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH16emyuNVb5qfaOYRAvNIAJ9bhjsAD2GGlhD5G84dCGkHP940WwCgkzRB
-q7PuKjZl1FkzpkJ/XLZvALM=
-=B5vP
------END PGP SIGNATURE-----
diff --git a/app-dicts/gjiten/gjiten-2.3.ebuild b/app-dicts/gjiten/gjiten-2.3.ebuild
index dfb15f82f0d0..cc1a6b354428 100644
--- a/app-dicts/gjiten/gjiten-2.3.ebuild
+++ b/app-dicts/gjiten/gjiten-2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/gjiten-2.3.ebuild,v 1.6 2007/01/05 16:06:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/gjiten-2.3.ebuild,v 1.7 2008/05/14 16:37:30 matsuu Exp $
 
 inherit gnome2
 
@@ -19,13 +19,14 @@ RDEPEND=">=gnome-base/libgnome-2.2
 	>=gnome-base/libglade-2.0"
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
-	>=dev-util/intltool-0.22"
+	>=dev-util/intltool-0.22
+	dev-util/pkgconfig"
 
 DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README TODO"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; gnome2_omf_fix help/omf.make
+	cd "${S}"; gnome2_omf_fix help/omf.make
 }
 
 pkg_postinst() {
diff --git a/app-dicts/gjiten/gjiten-2.4.ebuild b/app-dicts/gjiten/gjiten-2.6-r1.ebuild
index a3979de4c113..da17694935fc 100644
--- a/app-dicts/gjiten/gjiten-2.4.ebuild
+++ b/app-dicts/gjiten/gjiten-2.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/gjiten-2.4.ebuild,v 1.2 2007/01/05 16:06:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/gjiten-2.6-r1.ebuild,v 1.1 2008/05/14 16:37:30 matsuu Exp $
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A Japanese dictionary program for Gnome"
 HOMEPAGE="http://gjiten.sourceforge.net/"
@@ -19,13 +19,17 @@ RDEPEND=">=gnome-base/libgnome-2.2
 	>=gnome-base/libglade-2.0"
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
-	>=dev-util/intltool-0.22"
+	>=dev-util/intltool-0.22
+	app-text/xmlto
+	dev-util/pkgconfig"
 
-DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}; gnome2_omf_fix help/omf.make
+	gnome2_src_unpack
+	cd "${S}"
+	# bug #124631
+	AM_OPTS="--foreign" eautoreconf
 }
 
 pkg_postinst() {