Fixed #171636, #179672.

(Portage version: 2.1.2.7)

5 files changed, 78 insertions, 3 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/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
+}