Fixed #171636, #179672.

Package-Manager: portage-2.1.2.7

6 files changed, 97 insertions, 11 deletions

diff --git a/app-i18n/scim-tomoe/ChangeLog b/app-i18n/scim-tomoe/ChangeLog
index 2b39a19a8b6d..a412c6e63701 100644
--- a/app-i18n/scim-tomoe/ChangeLog
+++ b/app-i18n/scim-tomoe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/scim-tomoe
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/ChangeLog,v 1.5 2007/03/12 00:15:13 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/ChangeLog,v 1.6 2007/06/02 00:26:52 matsuu Exp $
+
+*scim-tomoe-0.5.0-r2 (02 Jun 2007)
+
+  02 Jun 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-tomoe-0.5.0-gentoo.patch, scim-tomoe-0.5.0-r1.ebuild,
+  +scim-tomoe-0.5.0-r2.ebuild:
+  Fixed wrong path, bug #171636.
+  Fixed dependency, bug #179672.
 
 *scim-tomoe-0.5.0-r1 (12 Mar 2007)
 
diff --git a/app-i18n/scim-tomoe/Manifest b/app-i18n/scim-tomoe/Manifest
index 06ed3e79fac0..821eea131ee8 100644
--- a/app-i18n/scim-tomoe/Manifest
+++ b/app-i18n/scim-tomoe/Manifest
@@ -1,17 +1,25 @@
+AUX scim-tomoe-0.5.0-gentoo.patch 1297 RMD160 d24a70ba73b05ad269003aab96c5c5d9ffa7d878 SHA1 1c6c9aded727b2ebccf366e0e5a5682bdb4cfca5 SHA256 f1414dc8c5d0def91217d5b0618f7bc20695fab5969107b7105422caf77ddd3d
+MD5 0825294c61ff90d16f149b433c0158ed files/scim-tomoe-0.5.0-gentoo.patch 1297
+RMD160 d24a70ba73b05ad269003aab96c5c5d9ffa7d878 files/scim-tomoe-0.5.0-gentoo.patch 1297
+SHA256 f1414dc8c5d0def91217d5b0618f7bc20695fab5969107b7105422caf77ddd3d files/scim-tomoe-0.5.0-gentoo.patch 1297
 DIST scim-tomoe-0.4.0.tar.gz 505168 RMD160 e09595c9c0e0d51d63bef0387df3db67ec4afcce SHA1 b3846d6447b68d1c8dba0685c5d2eb332ac3f71f SHA256 797e71c482dd7b56ebc1a1c3aa97a568b11974dcc8afb0e4a5a9d5a623738650
 DIST scim-tomoe-0.5.0.tar.gz 506966 RMD160 793535393171c36b86ab9bac5763b1c3f44ab2df SHA1 81d81c093ac9f9996f998e2cebeea7d835bc82bd SHA256 9523a34006aab3b8a005dcef2e9f5c2bbc35d66363bd60cd8dcc3bd4b1f56a41
 EBUILD scim-tomoe-0.4.0.ebuild 710 RMD160 47ba90bc02f5327c9b5a5b70bc9216e34cd8616e SHA1 97a0113bea3354126b15529e4ac2072898e43c75 SHA256 7d6c41977647cd84d2e30b70aae27b51341940e8d4b54892b31998302ef89c67
 MD5 d1a06e67216bb29c7a5cf62d50c4213c scim-tomoe-0.4.0.ebuild 710
 RMD160 47ba90bc02f5327c9b5a5b70bc9216e34cd8616e scim-tomoe-0.4.0.ebuild 710
 SHA256 7d6c41977647cd84d2e30b70aae27b51341940e8d4b54892b31998302ef89c67 scim-tomoe-0.4.0.ebuild 710
-EBUILD scim-tomoe-0.5.0-r1.ebuild 859 RMD160 06ae0653682a9c89048b6768cf1fee1a3acbe312 SHA1 cc04c90c9e4488d71253863b4898962a82e5440e SHA256 176eeecbe6f71b5e3568d6a6cf0d772d3ea93909854fcf265e9ee14a2120b3bc
-MD5 2f34958c256721d7439b2a1f9da3c6a9 scim-tomoe-0.5.0-r1.ebuild 859
-RMD160 06ae0653682a9c89048b6768cf1fee1a3acbe312 scim-tomoe-0.5.0-r1.ebuild 859
-SHA256 176eeecbe6f71b5e3568d6a6cf0d772d3ea93909854fcf265e9ee14a2120b3bc scim-tomoe-0.5.0-r1.ebuild 859
-MISC ChangeLog 1019 RMD160 679037f5491ca42dc5d9968a976d6159549bf927 SHA1 ae5e66a92bd1b11eedaa782b701b0200b1727f70 SHA256 9e969ae85f6f0454e8e9c7c89119faf9bf02b41fe200be371e159e9931c9dbcc
-MD5 418f091f0d64830ea87606d65202dab1 ChangeLog 1019
-RMD160 679037f5491ca42dc5d9968a976d6159549bf927 ChangeLog 1019
-SHA256 9e969ae85f6f0454e8e9c7c89119faf9bf02b41fe200be371e159e9931c9dbcc ChangeLog 1019
+EBUILD scim-tomoe-0.5.0-r1.ebuild 859 RMD160 4dc4151e96c133a5847b31d5601d9ea83d3eb3e1 SHA1 b8acdf7d82399ff38224d97628d31b6d646f8eb8 SHA256 b3cb1b938fe540fbde56c3314a6ab03aac4ae080377e6e556fd430b443a6f57d
+MD5 571cc48fd9597355d8985b683af2af50 scim-tomoe-0.5.0-r1.ebuild 859
+RMD160 4dc4151e96c133a5847b31d5601d9ea83d3eb3e1 scim-tomoe-0.5.0-r1.ebuild 859
+SHA256 b3cb1b938fe540fbde56c3314a6ab03aac4ae080377e6e556fd430b443a6f57d scim-tomoe-0.5.0-r1.ebuild 859
+EBUILD scim-tomoe-0.5.0-r2.ebuild 811 RMD160 fbf1d0b54b03a2832097e7b29c5de6a61ab36257 SHA1 69602bf35a4f6655f9724b7d4310bfb105be9e09 SHA256 9ba55cbad6f119a26f76f89ef6924c36cb8f47c722f1727bf293202d8c4df3c1
+MD5 ac041436eb9289db60db7d32057cc476 scim-tomoe-0.5.0-r2.ebuild 811
+RMD160 fbf1d0b54b03a2832097e7b29c5de6a61ab36257 scim-tomoe-0.5.0-r2.ebuild 811
+SHA256 9ba55cbad6f119a26f76f89ef6924c36cb8f47c722f1727bf293202d8c4df3c1 scim-tomoe-0.5.0-r2.ebuild 811
+MISC ChangeLog 1270 RMD160 1f565180c5483f88eab77539a307104ed14abf50 SHA1 a23405e026424274fe299ac95bcc8ef2b8e75c75 SHA256 69b514f1806297eb7e296fb4d2bf055844f22699a354d3f59fdd6ce515b59c53
+MD5 0562c8fd441207ac465612e246102bd6 ChangeLog 1270
+RMD160 1f565180c5483f88eab77539a307104ed14abf50 ChangeLog 1270
+SHA256 69b514f1806297eb7e296fb4d2bf055844f22699a354d3f59fdd6ce515b59c53 ChangeLog 1270
 MISC metadata.xml 157 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 SHA1 e11f0d9b1f8c57c4f50e453a89d2e61cf737329a SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89
 MD5 5a9deb1f29e94497a4ec6ccca8ccdeb3 metadata.xml 157
 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 metadata.xml 157
@@ -22,3 +30,6 @@ SHA256 4af3e9785ecfdba0f8ecf6b8d04a30d60538b6c180f0029e78749c72cf6e0439 files/di
 MD5 694984ec23eada408c624a7b98254fd8 files/digest-scim-tomoe-0.5.0-r1 250
 RMD160 ba4f9a3034068f1cb087b30a280c854ddec84b32 files/digest-scim-tomoe-0.5.0-r1 250
 SHA256 eda5e4f98b5cd6b4c6b30522f11721713ec9de76124c694c3c68e631e67a6917 files/digest-scim-tomoe-0.5.0-r1 250
+MD5 694984ec23eada408c624a7b98254fd8 files/digest-scim-tomoe-0.5.0-r2 250
+RMD160 ba4f9a3034068f1cb087b30a280c854ddec84b32 files/digest-scim-tomoe-0.5.0-r2 250
+SHA256 eda5e4f98b5cd6b4c6b30522f11721713ec9de76124c694c3c68e631e67a6917 files/digest-scim-tomoe-0.5.0-r2 250
diff --git a/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.5.0-r2 b/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.5.0-r2
new file mode 100644
index 000000000000..39bdf656b2e0
--- /dev/null
+++ b/app-i18n/scim-tomoe/files/digest-scim-tomoe-0.5.0-r2
@@ -0,0 +1,3 @@
+MD5 9d18a485faff3bc2aa18537d0115ca51 scim-tomoe-0.5.0.tar.gz 506966
+RMD160 793535393171c36b86ab9bac5763b1c3f44ab2df scim-tomoe-0.5.0.tar.gz 506966
+SHA256 9523a34006aab3b8a005dcef2e9f5c2bbc35d66363bd60cd8dcc3bd4b1f56a41 scim-tomoe-0.5.0.tar.gz 506966
diff --git a/app-i18n/scim-tomoe/files/scim-tomoe-0.5.0-gentoo.patch b/app-i18n/scim-tomoe/files/scim-tomoe-0.5.0-gentoo.patch
new file mode 100644
index 000000000000..f86c971f925e
--- /dev/null
+++ b/app-i18n/scim-tomoe/files/scim-tomoe-0.5.0-gentoo.patch
@@ -0,0 +1,35 @@
+diff -Naur scim-tomoe-0.5.0.orig/configure scim-tomoe-0.5.0/configure
+--- scim-tomoe-0.5.0.orig/configure	2006-12-18 16:40:23.000000000 +0900
++++ scim-tomoe-0.5.0/configure	2007-06-02 08:56:26.000000000 +0900
+@@ -30623,7 +30623,7 @@
+ SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
+ SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
+ SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
+-SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim`
++SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=libdir scim`/scim-1.0
+ 
+ if test "x$SCIM_DATADIR" = "x"; then
+   SCIM_DATADIR=${datadir}/scim
+@@ -30637,6 +30637,10 @@
+   SCIM_MODULEDIR=${libdir}/scim-1.0
+ fi
+ 
++if test "x$SCIM_LIBEXECDIR" = "x/scim-1.0"; then
++  SCIM_MODULEDIR=${libdir}/scim-1.0
++fi
++
+ SCIM_TOMOE_DATADIR=${SCIM_DATADIR}/tomoe
+ 
+ 
+diff -Naur scim-tomoe-0.5.0.orig/src/Makefile.in scim-tomoe-0.5.0/src/Makefile.in
+--- scim-tomoe-0.5.0.orig/src/Makefile.in	2006-12-18 16:40:22.000000000 +0900
++++ scim-tomoe-0.5.0/src/Makefile.in	2007-06-02 08:39:13.000000000 +0900
+@@ -262,7 +262,7 @@
+ 	scim_tomoe_prefs.h \
+ 	scim_tomoe_prefs_widget.h
+ 
+-moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper
++moduledir = @SCIM_MODULEDIR@/Helper
+ module_LTLIBRARIES = tomoe.la
+ tomoe_la_SOURCES = \
+ 	scim_tomoe.cpp \
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r1.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r1.ebuild
index 7c20230d82d3..30942609f090 100644
--- a/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r1.ebuild
+++ b/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r1.ebuild,v 1.1 2007/03/12 00:15:13 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r1.ebuild,v 1.2 2007/06/02 00:26:52 matsuu Exp $
 
 DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
 HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMTomoe"
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 )
-	>=app-i18n/libtomoe-gtk-0.4.0"
+	>=app-i18n/libtomoe-gtk-0.5.0"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r2.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..292083da7a2e
--- /dev/null
+++ b/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tomoe/scim-tomoe-0.5.0-r2.ebuild,v 1.1 2007/06/02 00:26:52 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
+HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMTomoe"
+SRC_URI="mirror://sourceforge.jp/scim-imengine/23343/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( >=app-i18n/scim-1.2.0 >=app-i18n/scim-cvs-1.2.0 )
+	>=app-i18n/libtomoe-gtk-0.5.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}