Fixed to work with gcc-4.3*, bug #227689.

(Portage version: 2.1.5_rc6)

3 files changed, 104 insertions, 2 deletions

diff --git a/app-i18n/scim-pinyin/ChangeLog b/app-i18n/scim-pinyin/ChangeLog
index 33c147f96ee6..65364fdc6558 100644
--- a/app-i18n/scim-pinyin/ChangeLog
+++ b/app-i18n/scim-pinyin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-pinyin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/ChangeLog,v 1.26 2007/07/22 09:25:03 calchan Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/ChangeLog,v 1.27 2008/06/21 04:41:44 matsuu Exp $
+
+*scim-pinyin-0.5.91-r2 (21 Jun 2008)
+
+  21 Jun 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-pinyin-0.5.91-gcc43.patch, +scim-pinyin-0.5.91-r2.ebuild:
+  Fixed to work with gcc-4.3*, bug #227689.
 
   22 Jul 2007; Denis Dupeyron <calchan@gentoo.org>
   scim-pinyin-0.5.91.ebuild, scim-pinyin-0.5.91-r1.ebuild:
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch
new file mode 100644
index 000000000000..6f9bd3879eb0
--- /dev/null
+++ b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch
@@ -0,0 +1,44 @@
+diff -Naur scim-pinyin-0.5.91.orig/src/scim_phrase.cpp scim-pinyin-0.5.91/src/scim_phrase.cpp
+--- scim-pinyin-0.5.91.orig/src/scim_phrase.cpp	2005-01-06 22:30:58.000000000 +0900
++++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-06-21 13:16:32.000000000 +0900
+@@ -27,6 +27,7 @@
+ 
+ #define SCIM_PHRASE_MAX_RELATION 1000
+ 
++#include <cstring>
+ #include <scim.h>
+ #include "scim_pinyin_private.h"
+ #include "scim_phrase.h"
+diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp scim-pinyin-0.5.91/src/scim_pinyin.cpp
+--- scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp	2005-08-08 15:11:16.000000000 +0900
++++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-06-21 13:16:30.000000000 +0900
+@@ -28,6 +28,7 @@
+ #define Uses_SCIM_CONFIG_PATH
+ #define Uses_SCIM_LOOKUP_TABLE
+ 
++#include <cstring>
+ #include <scim.h>
+ #include "scim_pinyin.h"
+ 
+diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
+--- scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp	2005-08-06 21:06:49.000000000 +0900
++++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-06-21 13:21:13.000000000 +0900
+@@ -26,6 +26,7 @@
+ #define Uses_SCIM_CONFIG_PATH
+ #define Uses_SCIM_LOOKUP_TABLE
+ 
++#include <cstring>
+ #include <scim.h>
+ #include "scim_pinyin_private.h"
+ #include "scim_phrase.h"
+diff -Naur scim-pinyin-0.5.91.orig/src/scim_special_table.cpp scim-pinyin-0.5.91/src/scim_special_table.cpp
+--- scim-pinyin-0.5.91.orig/src/scim_special_table.cpp	2005-01-06 22:31:02.000000000 +0900
++++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-06-21 13:25:25.000000000 +0900
+@@ -20,6 +20,7 @@
+ #define Uses_STL_IOMANIP
+ #define Uscs_C_STRING
+ 
++#include <cstring>
+ #include <time.h>
+ #include <scim.h>
+ #include "scim_pinyin_private.h"
diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r2.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r2.ebuild
new file mode 100644
index 000000000000..2df53eea9900
--- /dev/null
+++ b/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r2.ebuild,v 1.1 2008/06/21 04:41:44 matsuu Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit kde-functions eutils autotools
+
+DESCRIPTION="Smart Common Input Method (SCIM) Smart Pinyin Input Method"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+IUSE="kde nls"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="x11-libs/libXt
+	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
+	kde? ( app-i18n/skim )
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fixconfigure.patch"
+	epatch "${FILESDIR}/${PN}-qt335.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
+	AT_M4DIR=m4 AT_NO_RECURSIVE=yes eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable kde skim-support) \
+		--without-arts \
+		--disable-static \
+		--disable-depedency-tracking \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHROS NEWS README ChangeLog
+}