Fixed gcc-4.3 issue, bug #230333.

Package-Manager: portage-2.1.4.4

5 files changed, 30 insertions, 44 deletions

diff --git a/app-i18n/scim-m17n/ChangeLog b/app-i18n/scim-m17n/ChangeLog
index da93ff0cbdc8..6f061798ae25 100644
--- a/app-i18n/scim-m17n/ChangeLog
+++ b/app-i18n/scim-m17n/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/scim-m17n
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/ChangeLog,v 1.31 2007/11/01 12:57:09 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/ChangeLog,v 1.32 2008/08/09 01:11:59 matsuu Exp $
+
+  09 Aug 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-m17n-0.2.2-gcc43.patch, -scim-m17n-0.1.3.ebuild,
+  scim-m17n-0.2.2.ebuild:
+  Fixed gcc-4.3 issue, bug #230333. Removed old version.
 
   01 Nov 2007; Raúl Porcel <armin76@gentoo.org> scim-m17n-0.2.2.ebuild:
   alpha stable wrt #189292
diff --git a/app-i18n/scim-m17n/Manifest b/app-i18n/scim-m17n/Manifest
index dc4283bf214d..f635c853a1cc 100644
--- a/app-i18n/scim-m17n/Manifest
+++ b/app-i18n/scim-m17n/Manifest
@@ -1,6 +1,5 @@
-DIST scim-m17n-0.1.3.tar.gz 321827 RMD160 8edacda8fc8baf5a7c1d23d4c1d095ac32f5400a SHA1 9622b15b1ea2b931ec491e6dd555633b9b348a04 SHA256 d0083bc740e124b6c598ac65b7b844f2b7c73e7bbb315519b6a113ca35bacc6b
+AUX scim-m17n-0.2.2-gcc43.patch 265 RMD160 694580769e23d8ad0b7e0b0c62bd44e29a36858d SHA1 944b7a0052f647f634d6d1ad717b649b228cdd5d SHA256 351f80ea1a61afe6010a2b0464091e49aec936b0d055e3e407cb83143da67126
 DIST scim-m17n-0.2.2.tar.gz 343103 RMD160 2777c6bc1d3495280829860a0b34c3b0dba9e213 SHA1 3294820028e1637029b3c6f9156346018953e4d5 SHA256 cc88ece9460c25960c092c8cc088162a56c52a9d211c929ecadc15c8aca986ce
-EBUILD scim-m17n-0.1.3.ebuild 1023 RMD160 b50c53c193f65c5cc7b31accdf3f6ad7e508c604 SHA1 22e9d538a307a93ace4064a3d7e170d0760e1b10 SHA256 bd45c504c32b12397bdaaac4982d8a50b8d137818c57dbc9174eb2de106a951f
-EBUILD scim-m17n-0.2.2.ebuild 1004 RMD160 eaae5a466130573d62f1e6540d6779c9413fc8b2 SHA1 9eadeb9e2e45a70aefec08bf00f8a3e202dede9d SHA256 4f0528d313ecedb117d9d83d3dab0039128ff3e507aa083902aa81cf4b3afe8e
-MISC ChangeLog 4017 RMD160 bf83dff8abd016a32d133d41cf23cb401391050a SHA1 12a853074e1ed8b75623a29e7c525f6972072d2c SHA256 0ddd5a3bab45d01411660623c267e9291c532ea8ae1b847192df73b64c95332e
+EBUILD scim-m17n-0.2.2.ebuild 1101 RMD160 614cb58a01432b1685a1b72df8ccd38b2a9e0dbd SHA1 0ffd4a6cb90a9701ab237884f8b0791b8e9f59a5 SHA256 217c60a6754fb2942da133b6ea8478fce3e05b37125abd04a4311a37d224d3ea
+MISC ChangeLog 4212 RMD160 6b2c38b3fcde780b38a260170f18bd12fd00337f SHA1 ecb7d9be11f2fae80026374efa3fbd9155a3a206 SHA256 32a1b214498ce1800c908599b64a2c37d9a482467c4263bfaebf18ca04802307
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/scim-m17n/files/scim-m17n-0.2.2-gcc43.patch b/app-i18n/scim-m17n/files/scim-m17n-0.2.2-gcc43.patch
new file mode 100644
index 000000000000..e3d9fb6749fd
--- /dev/null
+++ b/app-i18n/scim-m17n/files/scim-m17n-0.2.2-gcc43.patch
@@ -0,0 +1,10 @@
+--- src/scim_m17n_imengine.cpp.orig	2008-06-27 13:57:31.000000000 +0200
++++ src/scim_m17n_imengine.cpp	2008-06-27 13:59:02.000000000 +0200
+@@ -33,6 +33,7 @@
+   #include <config.h>
+ #endif
+ 
++#include <string.h>
+ #include <scim.h>
+ #include "scim_m17n_imengine.h"
+ 
diff --git a/app-i18n/scim-m17n/scim-m17n-0.1.3.ebuild b/app-i18n/scim-m17n/scim-m17n-0.1.3.ebuild
deleted file mode 100644
index a46423c568c9..000000000000
--- a/app-i18n/scim-m17n/scim-m17n-0.1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/scim-m17n-0.1.3.ebuild,v 1.8 2007/01/05 16:29:00 flameeyes Exp $
-
-DESCRIPTION="scim-m17n is an input module for Smart Common Input Method (SCIM) which uses m17n as backend"
-HOMEPAGE="http://freedesktop.org/~suzhe/"
-SRC_URI="http://freedesktop.org/~suzhe/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha amd64 ppc ppc64 ~sparc"
-IUSE=""
-
-DEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
-	>=dev-libs/m17n-lib-1.0.2-r1"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog THANKS README
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog
-}
diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild
index 4ece71bfb30b..b7c1097a2181 100644
--- a/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild
+++ b/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild,v 1.9 2007/11/01 12:57:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild,v 1.10 2008/08/09 01:11:59 matsuu Exp $
+
+inherit eutils
 
 DESCRIPTION="scim-m17n is an input module for Smart Common Input Method (SCIM) which uses m17n as backend"
 HOMEPAGE="http://www.scim-im.org/projects/imengines"
@@ -14,6 +16,12 @@ IUSE=""
 DEPEND="|| ( >=app-i18n/scim-1.4 >=app-i18n/scim-cvs-1.4 )
 	>=dev-libs/m17n-lib-1.2.0"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"