Fixed build error with gcc-4 and modular X dependencies. Thanks to Gilles Dartiguelongue <dartigug@esiee.fr>. This closes bug #148961.

Package-Manager: portage-2.1.1

5 files changed, 73 insertions, 10 deletions

diff --git a/dev-libs/wnn7sdk/ChangeLog b/dev-libs/wnn7sdk/ChangeLog
index e1cd1cba617d..a5a161051e1b 100644
--- a/dev-libs/wnn7sdk/ChangeLog
+++ b/dev-libs/wnn7sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/wnn7sdk
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.2 2005/02/11 15:10:18 usata Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.3 2006/11/05 16:36:07 usata Exp $
+
+  05 Nov 2006; Mamoru KOMACHI <usata@gentoo.org> +files/wnn7sdk-gcc4.patch,
+  wnn7sdk-20011017.ebuild:
+  Fixed build error with gcc-4 and modular X dependencies. Thanks to Gilles
+  Dartiguelongue <dartigug@esiee.fr>. This closes bug #148961.
 
   12 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> wnn7sdk-20011017.ebuild:
   Marked as stable.
diff --git a/dev-libs/wnn7sdk/Manifest b/dev-libs/wnn7sdk/Manifest
index f99400405922..0b7a4bfafbba 100644
--- a/dev-libs/wnn7sdk/Manifest
+++ b/dev-libs/wnn7sdk/Manifest
@@ -1,6 +1,28 @@
-MD5 c2b14423b46986a286e7073f949d6f88 ChangeLog 443
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 109e9d27b39967ed889d746d3f133d1f wnn7sdk-20011017.ebuild 926
-MD5 1fd4dd7288e0c8d1f42dfd875fe119ec files/digest-wnn7sdk-20011017 56
+AUX wnn7sdk-gcc4.patch 810 RMD160 6f0d874cde11b8543e37f69c797611e885c942c7 SHA1 48b3ac72ce0d057f1c8a035ff1d3e92faff8d81d SHA256 d1085e03efba5f4bb1980b9b2cfbf0293337965270707b396205b3f8163f3e9d
+MD5 6261eb766af596c893e77ca6bb364f3d files/wnn7sdk-gcc4.patch 810
+RMD160 6f0d874cde11b8543e37f69c797611e885c942c7 files/wnn7sdk-gcc4.patch 810
+SHA256 d1085e03efba5f4bb1980b9b2cfbf0293337965270707b396205b3f8163f3e9d files/wnn7sdk-gcc4.patch 810
+AUX wnn7sdk-gentoo.patch 2120 RMD160 d96790197b0c2259abccbcfca6b198735a155ab7 SHA1 f0b5ead7d201abb1f1fb9997ba6d4f6d6dc6d4b6 SHA256 929c62d76b77185cb9a08a6e39f7f213a8e44b4627d7e01409c5ad53814bf410
 MD5 c9df75b0d1aadb453be3069fe5dfa76e files/wnn7sdk-gentoo.patch 2120
+RMD160 d96790197b0c2259abccbcfca6b198735a155ab7 files/wnn7sdk-gentoo.patch 2120
+SHA256 929c62d76b77185cb9a08a6e39f7f213a8e44b4627d7e01409c5ad53814bf410 files/wnn7sdk-gentoo.patch 2120
+AUX wnn7sdk-malloc.patch 366 RMD160 3b65396baa9d905d4dffebff43b224644d000a69 SHA1 aeb200ddcda68a5dd031c0ae2d7e2c64bb7bc625 SHA256 fd3a1c04445c1eb6fcfd6b1822b03f2e9f3214bcbb5c95459cdb85a84cd8d330
 MD5 52d3238ee0990e2aea9cdd862da1ce46 files/wnn7sdk-malloc.patch 366
+RMD160 3b65396baa9d905d4dffebff43b224644d000a69 files/wnn7sdk-malloc.patch 366
+SHA256 fd3a1c04445c1eb6fcfd6b1822b03f2e9f3214bcbb5c95459cdb85a84cd8d330 files/wnn7sdk-malloc.patch 366
+DIST Wnn7SDK.tgz 178403 RMD160 73c82084f4e3d7c512e3e4fd25998085fa9bf6e2 SHA1 5ce2884216f492077e31501c4afbcf69e5837ee8 SHA256 725d2900707076a0aeb6f793e01e2deade45c28daf4a6a37049b48bb6a6e561a
+EBUILD wnn7sdk-20011017.ebuild 989 RMD160 d626d142af5adb5eba0fc592ef66d2597d59243f SHA1 b7823aa42342bbe81d3bc67e3957c77d71fc34e9 SHA256 d7758cd27824667d713019942c4a6f8162afe8a38739b50ef7e3f47f3fbb7156
+MD5 2137b2e1d9e8dbfa092266f669fa09c4 wnn7sdk-20011017.ebuild 989
+RMD160 d626d142af5adb5eba0fc592ef66d2597d59243f wnn7sdk-20011017.ebuild 989
+SHA256 d7758cd27824667d713019942c4a6f8162afe8a38739b50ef7e3f47f3fbb7156 wnn7sdk-20011017.ebuild 989
+MISC ChangeLog 686 RMD160 71a4ef8bed43273b01f4eb5626ab2e02136a961b SHA1 90993ca8162f995e592dbfe4dbf9feafeb01dce5 SHA256 bace172d58b40e472eb2958427dcf3382250ff9b81bfae3c7d276188fec5ba93
+MD5 5533d6e2a59781d0e8b0f82acc3e64c7 ChangeLog 686
+RMD160 71a4ef8bed43273b01f4eb5626ab2e02136a961b ChangeLog 686
+SHA256 bace172d58b40e472eb2958427dcf3382250ff9b81bfae3c7d276188fec5ba93 ChangeLog 686
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+MD5 4510bb0f80765106da3fba5822c41541 files/digest-wnn7sdk-20011017 214
+RMD160 c8543bbe09c3de37dcbae888f5e173bee631e951 files/digest-wnn7sdk-20011017 214
+SHA256 9b895245a0364a362b5de2d5d1f62ce5ce4edd30b5d341d89aa27a98bb88a29c files/digest-wnn7sdk-20011017 214
diff --git a/dev-libs/wnn7sdk/files/digest-wnn7sdk-20011017 b/dev-libs/wnn7sdk/files/digest-wnn7sdk-20011017
index 08750f2c09f8..0cc634c028fb 100644
--- a/dev-libs/wnn7sdk/files/digest-wnn7sdk-20011017
+++ b/dev-libs/wnn7sdk/files/digest-wnn7sdk-20011017
@@ -1 +1,3 @@
 MD5 19b41bf2ef86d7f4cb889c7f689602fb Wnn7SDK.tgz 178403
+RMD160 73c82084f4e3d7c512e3e4fd25998085fa9bf6e2 Wnn7SDK.tgz 178403
+SHA256 725d2900707076a0aeb6f793e01e2deade45c28daf4a6a37049b48bb6a6e561a Wnn7SDK.tgz 178403
diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch b/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch
new file mode 100644
index 000000000000..f97845f449f1
--- /dev/null
+++ b/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch
@@ -0,0 +1,30 @@
+diff -urN Wnn/etc/bdic.c Wnn-gcc4/etc/bdic.c
+--- Wnn/etc/bdic.c	2001-10-17 10:37:17.000000000 +0900
++++ Wnn-gcc4/etc/bdic.c	2006-11-06 01:31:31.000000000 +0900
+@@ -177,6 +177,14 @@
+ #define max(a, b) ((a < b)? b:a)
+ #endif
+ 
++#ifdef WNN_CHECK_INODE
++static int change_file_uniq1();
++#else
++#ifdef JS
++static int change_file_uniq1();
++#endif
++#endif
++
+ /*:::DOC_START
+  *
+  *    Function Name: dic_fopen
+diff -urN Wnn/jlib/jl.c Wnn-gcc4/jlib/jl.c
+--- Wnn/jlib/jl.c	2001-10-17 10:37:17.000000000 +0900
++++ Wnn-gcc4/jlib/jl.c	2006-11-06 01:33:13.000000000 +0900
+@@ -297,6 +297,8 @@
+ static int insert_dai_or_ikeiji();
+ static int jl_dic_save_all_e_body();
+ 
++static void jl_disconnect_if_server_dead_body_by_jsid();
++
+ static struct wnn_buf *jl_open_lang_core();
+ static struct wnn_env *jl_connect_lang_core();
+ 
diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild
index 643e98b5c38b..38f57b5f5609 100644
--- a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild
+++ b/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild,v 1.2 2005/02/11 15:10:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild,v 1.3 2006/11/05 16:36:07 usata Exp $
 
 inherit eutils
 
@@ -15,8 +15,11 @@ KEYWORDS="x86"
 IUSE=""
 
 # x11 is required for imake
-DEPEND="virtual/x11
-	virtual/libc"
+DEPEND="|| (
+			x11-misc/imake
+			virtual/x11
+	)"
+RDEPEND=""
 
 S="${WORKDIR}/src"
 
@@ -25,6 +28,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-malloc.patch
 	epatch ${FILESDIR}/${PN}-gentoo.patch
+	epatch ${FILESDIR}/${PN}-gcc4.patch
 }
 
 src_compile() {