Fixed to work with >=uim-1.5. the patch is from http://gist.github.com/333944.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 35 insertions, 12 deletions

diff --git a/app-i18n/scim-uim/ChangeLog b/app-i18n/scim-uim/ChangeLog
index fc9395e4bd24..b07b8d1b3ac4 100644
--- a/app-i18n/scim-uim/ChangeLog
+++ b/app-i18n/scim-uim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim-uim
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/ChangeLog,v 1.32 2009/06/01 16:20:12 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/ChangeLog,v 1.33 2010/04/03 03:10:52 matsuu Exp $
+
+*scim-uim-0.2.0-r2 (03 Apr 2010)
+
+  03 Apr 2010; MATSUU Takuto <matsuu@gentoo.org> -scim-uim-0.2.0.ebuild,
+  +scim-uim-0.2.0-r2.ebuild, +files/scim-uim-0.2.0-uim-1.5.patch:
+  Fixed to work with >=uim-1.5. the patch is from
+  http://gist.github.com/333944.
 
   01 Jun 2009; nixnut <nixnut@gentoo.org> scim-uim-0.2.0-r1.ebuild:
   ppc stable #268943
diff --git a/app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch b/app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch
new file mode 100644
index 000000000000..d186b441bb8d
--- /dev/null
+++ b/app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch
@@ -0,0 +1,12 @@
+--- scim-uim-0.2.0/src/scim_uim_imengine.cpp
++++ scim-uim-0.2.0/src/scim_uim_imengine.cpp
+@@ -35,7 +35,8 @@
+ #include <cstring>
+ #include <scim.h>
+ #include "scim_uim_imengine.h"
+-#include <uim/uim-compat-scm.h>
++#include <uim/uim-scm.h>
++#include <uim/uim-util.h>
+
+ #define scim_module_init uim_LTX_scim_module_init
+ #define scim_module_exit uim_LTX_scim_module_exit
\ No newline at end of file
diff --git a/app-i18n/scim-uim/scim-uim-0.2.0.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
index baecf3b54abc..cc7b9f217079 100644
--- a/app-i18n/scim-uim/scim-uim-0.2.0.ebuild
+++ b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/scim-uim-0.2.0.ebuild,v 1.5 2008/06/10 16:59:12 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild,v 1.1 2010/04/03 03:10:52 matsuu Exp $
+
+EAPI="2"
+inherit eutils
 
 DESCRIPTION="scim-uim is an input module for Smart Common Input Method (SCIM) which uses uim as backend"
 HOMEPAGE="http://www.scim-im.org/"
@@ -8,22 +11,23 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/uim-1.1.0
-	<app-i18n/uim-1.5
-	|| (
-		>=app-i18n/scim-1.4.0
-		>=app-i18n/scim-cvs-1.4.0
-	)"
+RDEPEND=">=app-i18n/uim-1.5.0
+	>=app-i18n/scim-1.4.0"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc43.patch" \
+		"${FILESDIR}/${P}-uim-1.5.patch"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	dodoc AUTHORS ChangeLog README THANKS
+	dodoc AUTHORS ChangeLog README THANKS || die
 }
 
 pkg_postinst() {