Fixed build failure with gcc-4.3, the patch is from debian bug #455270.

Package-Manager: portage-2.1.5_rc6

4 files changed, 76 insertions, 3 deletions

diff --git a/app-i18n/scim-skk/ChangeLog b/app-i18n/scim-skk/ChangeLog
index 65645b6912cf..af664e004ea0 100644
--- a/app-i18n/scim-skk/ChangeLog
+++ b/app-i18n/scim-skk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-skk
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-skk/ChangeLog,v 1.18 2007/01/05 16:31:32 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-skk/ChangeLog,v 1.19 2008/05/07 15:29:02 matsuu Exp $
+
+*scim-skk-0.5.2-r1 (07 May 2008)
+
+  07 May 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-skk-0.5.2-gcc43.patch, +scim-skk-0.5.2-r1.ebuild:
+  Fixed build failure with gcc-4.3, the patch is from debian bug #455270.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> scim-skk-0.5.2.ebuild:
   Convert to use elog.
diff --git a/app-i18n/scim-skk/Manifest b/app-i18n/scim-skk/Manifest
index 463eaf2c3dff..4eeea8e78346 100644
--- a/app-i18n/scim-skk/Manifest
+++ b/app-i18n/scim-skk/Manifest
@@ -1,4 +1,6 @@
+AUX scim-skk-0.5.2-gcc43.patch 235 RMD160 d6ada7c87fd6a2ec91405a1c35b28a7fc32f2e6d SHA1 a0cb44751f6c7296ddc09a11114d7b8e90659c19 SHA256 0b574be70be974213b874fba8160ef48eafef7d3e38d9267ad0a834d2289107a
 DIST scim-skk-0.5.2.tar.gz 534157 RMD160 9afa61e0316bef6348186a9c1d4671ff7462546e SHA1 0ddcad937bbed9d94a0076fded26e197e7d24d21 SHA256 17e755db22cd135a47381eae6f924f68f2c8d2991cec1a4b635ad294653d7b2d
+EBUILD scim-skk-0.5.2-r1.ebuild 1373 RMD160 c0087a00916a3cd3e2c3181c32e15f52e6009df7 SHA1 8b09f6d9287200c2072aea3577a6e5d4b8dfd8a6 SHA256 6cd2f2b1ed848249c6903ae0898bd63f82508495ee02b36f6fe3da1f247725f8
 EBUILD scim-skk-0.5.2.ebuild 1260 RMD160 3ea893c027d15b51845f3efc1024e1cb2c026ac0 SHA1 62e82ae74559ff0a823d15aac45189845d66a069 SHA256 86a617487ccd0cd6cd5ec9153424f76e797cd8c3690321f7895181d5f822d822
-MISC ChangeLog 2581 RMD160 0e42a0d3267921181003d3c922cd8bb869c4b235 SHA1 f85a6cfb7de3f46b66007cf027b0f513da263520 SHA256 a5bab807d4b273e335750a0778a03aef3035fc0339b5a3b34869cd56cefce967
+MISC ChangeLog 2800 RMD160 2780a41c570d49274832f60cbdfb253c6ca87278 SHA1 c76ba94a0fee26ef5fd91d8691a72449ffefd7c3 SHA256 1e70c8d7e8e98492a2b3cc132e4c4e3ca1a37c99470a40d0209e272e76407c12
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/scim-skk/files/scim-skk-0.5.2-gcc43.patch b/app-i18n/scim-skk/files/scim-skk-0.5.2-gcc43.patch
new file mode 100644
index 000000000000..8223eb3502ce
--- /dev/null
+++ b/app-i18n/scim-skk/files/scim-skk-0.5.2-gcc43.patch
@@ -0,0 +1,11 @@
+--- a/src/scim_skk_imengine_setup.cpp
++++ b/src/scim_skk_imengine_setup.cpp
+@@ -39,6 +39,8 @@
+ #include "scim_skk_intl.h"
+ #include "scim_skk_setup_dictionaries.h"
+ 
++#include <cstring>
++
+ using namespace scim;
+ 
+ namespace scim_skk {
diff --git a/app-i18n/scim-skk/scim-skk-0.5.2-r1.ebuild b/app-i18n/scim-skk/scim-skk-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..924479402271
--- /dev/null
+++ b/app-i18n/scim-skk/scim-skk-0.5.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-skk/scim-skk-0.5.2-r1.ebuild,v 1.1 2008/05/07 15:29:02 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="Japanese input method SKK IMEngine for SCIM"
+HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMSKK"
+SRC_URI="mirror://sourceforge.jp/scim-imengine/18121/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="|| ( >=app-i18n/scim-1.2 >=app-i18n/scim-cvs-1.2 )"
+RDEPEND="${DEPEND}
+	|| ( app-i18n/skk-jisyo virtual/skkserv )
+	nls? ( virtual/libintl )"
+DEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		--disable-dependency-tracking \
+		--disable-static || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README* TODO
+}
+
+pkg_postinst() {
+	elog
+	elog "To use SCIM, you should use the following in your user startup scripts"
+	elog "such as .gnomerc or .xinitrc:"
+	elog
+	elog "LANG='your_language' scim -d"
+	elog "export XMODIFIERS=@im=SCIM"
+	elog "export GTK_IM_MODULE=scim"
+	elog "export QT_IM_MODULE=scim"
+	elog
+}