Fixed gcc-4.3 issue, bug #295733. clean up.

Package-Manager: portage-2.1.7.11/cvs/Linux x86_64

4 files changed, 91 insertions, 3 deletions

diff --git a/app-i18n/scim-wnn/ChangeLog b/app-i18n/scim-wnn/ChangeLog
index 050c816e3ab0..8ab1232b0d89 100644
--- a/app-i18n/scim-wnn/ChangeLog
+++ b/app-i18n/scim-wnn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-wnn
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-wnn/ChangeLog,v 1.10 2007/01/05 16:32:48 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-wnn/ChangeLog,v 1.11 2009/12/08 11:31:57 matsuu Exp $
+
+*scim-wnn-1.0.0-r1 (08 Dec 2009)
+
+  08 Dec 2009; MATSUU Takuto <matsuu@gentoo.org> +scim-wnn-1.0.0-r1.ebuild,
+  +files/scim-wnn-1.0.0-gcc43.patch:
+  Fixed gcc-4.3 issue, bug #295733. clean up.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> scim-wnn-0.2.4.ebuild,
   scim-wnn-1.0.0.ebuild:
diff --git a/app-i18n/scim-wnn/Manifest b/app-i18n/scim-wnn/Manifest
index 7475ab3abe93..36e46488a4fb 100644
--- a/app-i18n/scim-wnn/Manifest
+++ b/app-i18n/scim-wnn/Manifest
@@ -1,6 +1,8 @@
+AUX scim-wnn-1.0.0-gcc43.patch 987 RMD160 6ea9c9537e79dbf0554e1da2ec276be65a6ddfaf SHA1 214b152022c5ace4759902f91c7bff3bcdaa5aff SHA256 de08e6da7694e672af632b5d2fc4a298cf9c199e76e27c5c192b6e404081c3c7
 DIST scim-wnn-0.2.4.tar.gz 524325 RMD160 8537baf0d0971c4635b9bddfdc1e55dafd6785a4 SHA1 3d40b100fe0be4ff3039c10aaf861cd16fb2bf0b SHA256 2e261006f13bdeaa2801ab73f54bbd95c78a63dbeb88c0c4aa9d10fb20c4a996
 DIST scim-wnn-1.0.0.tar.gz 536488 RMD160 a344bfa9119f3721816d7c43e73fd89a1ec8fef3 SHA1 1e032ad84aa8eb547dfe7117e078466b51ed6a9f SHA256 c209d3dd0a58ed053a2541040da1e9ff1b4be3d1795ed5f9ced43b197dc82cdd
 EBUILD scim-wnn-0.2.4.ebuild 1274 RMD160 75489ba7b9538be76e44b38b5ed77ebbf23bb97e SHA1 9b7195066e7d1533ec55f0918ff7343d99dadf0f SHA256 a155b239447a0c36a5f9de9927fc353ee051502db17e85ac55ea7a12da999ae3
+EBUILD scim-wnn-1.0.0-r1.ebuild 1550 RMD160 0dc9e7aae37cc6dce84f99f9d3bdefe5b16c0893 SHA1 8fbf3d6143662ec7cc843eb8b74ea628007e8528 SHA256 8cbd0268637bd6c004120ebddf0e3fe61b560df4ee7392fa31d787fe4e6affc7
 EBUILD scim-wnn-1.0.0.ebuild 1414 RMD160 4dd9e4d144322e28af0357edf3ba39226a86302b SHA1 3b05daf04e6f43a6b2296326d21edf0c09d4d5d2 SHA256 bf9584520e40c852fc76f939b2a078f752ca9e5ca41be92527ad3543d6536b4c
-MISC ChangeLog 1673 RMD160 cbb58bbc68a7d24984d69635bc3b5408c3c70388 SHA1 ddd555a39f3042a96d97ae1e7871de72fe0eeaf2 SHA256 ccb9241f046c0789193dbd98d4c316fc47041589c19d62c518a36b9ca79b0f46
+MISC ChangeLog 1864 RMD160 3006d58dac9d8404ac4ee83a28b48489529ae93c SHA1 794de0f0868e5bc971db11a398b9a5bffd8c9f12 SHA256 84d2f872cc8efa4b40d6c3d1671cdad5df8edd3f5b2d245028b263bf1641e2b4
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch b/app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch
new file mode 100644
index 000000000000..489f2d9064e2
--- /dev/null
+++ b/app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch
@@ -0,0 +1,22 @@
+diff -Naur scim-wnn-1.0.0.orig/src/scim_wnn_imengine_setup.cpp scim-wnn-1.0.0/src/scim_wnn_imengine_setup.cpp
+--- scim-wnn-1.0.0.orig/src/scim_wnn_imengine_setup.cpp	2006-03-28 12:07:31.000000000 +0900
++++ scim-wnn-1.0.0/src/scim_wnn_imengine_setup.cpp	2009-12-08 19:32:27.000000000 +0900
+@@ -26,6 +26,7 @@
+ 
+ #define Uses_SCIM_CONFIG_BASE
+ 
++#include <cstring>
+ #include <gtk/gtk.h>
+ 
+ #ifdef HAVE_CONFIG_H
+diff -Naur scim-wnn-1.0.0.orig/src/wnnconversion.cpp scim-wnn-1.0.0/src/wnnconversion.cpp
+--- scim-wnn-1.0.0.orig/src/wnnconversion.cpp	2006-03-28 11:34:46.000000000 +0900
++++ scim-wnn-1.0.0/src/wnnconversion.cpp	2009-12-08 19:50:26.000000000 +0900
+@@ -17,6 +17,7 @@
+  *   Free Software Foundation, Inc.,                                       *
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
++#include <cstring>
+ #include "wnnconversion.h"
+ #include <scim_wnn_def.h>
+ 
diff --git a/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild b/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..0f6bd6d7a3ce
--- /dev/null
+++ b/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild,v 1.1 2009/12/08 11:31:57 matsuu Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Japanese input method Wnn IMEngine for SCIM"
+HOMEPAGE="http://nop.net-p.org/modules/pukiwiki/index.php?%5B%5Bscim-wnn%5D%5D"
+SRC_URI="http://nop.net-p.org/files/scim-wnn/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+freewnn"
+
+RDEPEND=">=app-i18n/scim-1.4
+	dev-libs/wnn7sdk
+	freewnn? ( app-i18n/freewnn )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-apps/sed-4"
+
+src_prepare() {
+	# bug #140794
+	sed -i -e 's:$LDFLAGS conftest.$ac_ext $LIBS:conftest.$ac_ext $LIBS $LDFLAGS:g' \
+		configure || die "ldflags sed failed"
+
+#	sed -i -e "s:/usr/lib/wnn7:/usr/$(get_libdir)/wnn:g" \
+	sed -i -e "s:/usr/lib/wnn7:/usr/lib/wnn:g" \
+		src/scim_wnn_def.h src/wnnconversion.cpp || die "sed failed"
+
+	# bug #295733
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+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
+	if ! use freewnn ; then
+	ewarn
+	ewarn "You disabled freewnn USE flag."
+	ewarn "Please make sure you have wnnenvrc visible to scim-wnn."
+	ewarn
+	fi
+}