Fix makefile to respect parallel compile; Respect LDFLAGS #336943; Move eof check around to get the data generated properly #390007

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

5 files changed, 276 insertions, 20 deletions

diff --git a/app-i18n/xsim/ChangeLog b/app-i18n/xsim/ChangeLog
index ab5ddbfd04e1..86b48123a6cc 100644
--- a/app-i18n/xsim/ChangeLog
+++ b/app-i18n/xsim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/xsim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.23 2013/04/15 05:36:34 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.24 2013/05/04 03:47:12 naota Exp $
+
+  04 May 2013; Naohiro Aota <naota@gentoo.org> +files/xsim-0.3.9.4-eof.patch,
+  +files/xsim-0.3.9.4-makefile.patch, xsim-0.3.9.4-r5.ebuild:
+  Fix makefile to respect parallel compile; Respect LDFLAGS #336943; Move eof
+  check around to get the data generated properly #390007
 
   15 Apr 2013; Naohiro Aota <naota@gentoo.org> files/xsim-0.3.9.4-gcc-3.4.patch:
   Re-generate xsim-0.3.9.5-gcc-3.4.patch not to include relative path.
diff --git a/app-i18n/xsim/Manifest b/app-i18n/xsim/Manifest
index 588e1447263a..aaca25800975 100644
--- a/app-i18n/xsim/Manifest
+++ b/app-i18n/xsim/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 AUX xsim-0.3.9.4-64bit.patch 2225 SHA256 29d45cb320876ed4e5b832766fcaf26078a98eefefe357f675f3c274cc5e579f SHA512 3e2d1b7c076085d4dce8b4d7dbe1d299f8576e91b8508de2ab9ae3ff673d018bc1ea1af2cf6405056223c362b5d3d538a8b1ab14e9071cfc934ca2c516f7c052 WHIRLPOOL f86eeb726755db691c54575ffd8cc73961c3f5fbcd5fb006d41749927c62b20af069db8bf4608fafc800911e22ee27254dd83998a1ecb9552a2d9aa6fb28ee5d
 AUX xsim-0.3.9.4-compile-fix.patch 2563 SHA256 01849d3dc7d685e14a20d3d0228550e1b680b5cdb829e30bccd1c1beb7b67f03 SHA512 0f5eafb3d966ff084e975cbb01c83d75f30f173203d8d32f5d3f32a7b268de694a21ebf3714548234e20a91bb49d7506574469fcee7ab6c37d670f2789060167 WHIRLPOOL 8a3c385266584bf0b164a391d0c1a0d5e82f45c9da0e4ddb2bc5aa00b09a1dade24f3500bb460a1c5bfc5f73aeef5a7980abad31793a551128e618c8dbb47a73
+AUX xsim-0.3.9.4-eof.patch 2527 SHA256 a1ef6d1899cb6a195801f43bffc16268b5208303443d1b89e8c8e3a3e83ce117 SHA512 f474c9179ff97c966183a853e07c4acc5493ded8a38665ef9f1d3f2e56d969b1383db6b5a74fe5812f79e0f9e89df1eaad78a2d35dada706b9ebd7d17f294d20 WHIRLPOOL b163d02569c43853e5b0c147bab420f67590e0b554fd8367e1780191ae5d294b635943f1396b68b64b4d837ddcf8552cb90f77a34efa6e88f75e607388cbdeb5
 AUX xsim-0.3.9.4-gcc-3.4.patch 3081 SHA256 f238d60fa34c300e3c22a2439ce7b68df7ded3cb6ffe1be4ca996d891573ddc9 SHA512 9044cfc58649e70d8dd87c8e60ba73ccac064ff5f474a7b86e4a1f9ca1b352f510be1569a60600fa6bef0e485bc8504ae5d804179c9bf9b67136c29f50b0049e WHIRLPOOL 562729e2786c2b818b4bab2bbc7c27defb1577e4ffe5f2b574d1057996afb5cd95f73eea56374bc60359613b57c0612c93ee0f0f183343d94e129fb798c3818d
 AUX xsim-0.3.9.4-gcc-4.3.patch 1692 SHA256 2357f14808902c7147c6183c074ffdafd64b4c7e23e49eb95e3ca5d669659582 SHA512 f3fd9b209c4d678cd6ef3252ed0db75597a1607b19ea5851d87a968550b22039e1eaa480bec30787b17e748763135fc6c97a510ffa8728d70b47a74fc1bb7f7b WHIRLPOOL 3c7ac2eb3c2d048c3574aae2badf3ee6633dff09bbaa57454acac2db0580a07cb0c87bef4b795678a09b7d7c56fb3a7a9b61258294cac1ef18b74613f73bb97c
+AUX xsim-0.3.9.4-makefile.patch 3877 SHA256 59e6c6f58ed521162f61f95c532e7e8cb80557f7e4f5acf0754f403ac77830a7 SHA512 b1eca37fade58aabe82a837b2916027f71941f5551f3acd26f769ebee114187c10a7b7be895e18ee31b92e8ce6a855c27550656735e83d0fe36749ea2eaba1db WHIRLPOOL 154d10d63ef38b32f1355c5b9ad4fca9246bed5fc2882e6666be9d2fc0b2159770fac15908203b819dca1acb51fcca65d47442febf6849f373ac6c473248b341
 DIST xsim-0.3.9.4.tar.gz 1025640 SHA256 048f23527543b21c4d52dc98967ec7253c34eb704056767364c6dc5007971b2c SHA512 07955cf68cc060724db5fdf04f2f55a93dfe29064b63170bb3c090443aa617de5d76ddd5cda971b16833fd2e090aa78a3bbc0c85e9eb2b4716dfa90c994fc8d3 WHIRLPOOL 9de70a58279849d8e370d96f97459d866ca213feeeed16f00ddcd48d003f994999da26e635c718ffd9da8291c8c97bfe043df851ef809ee6e888492f7bcda8e7
-EBUILD xsim-0.3.9.4-r5.ebuild 1915 SHA256 acaa87713c77edd4c7c7f261b30f939c7384010fa5ec27a9fc7c0d25f9add38c SHA512 dfe33a9b136eab58676fcf0566a89cdc33f331b62f378f391e53752ffc278995be85a69e4f8b923e5651b1194018dd0c42cc0eba1fd427350f3953b1024caf9b WHIRLPOOL 3456a6ee896fdfbe98b4ff90e5bda6a1612135fda4a331d374ee9a8c7bc42bb036ede7c5e0d9a4dbd31045854305d529aff6c20bb02ee94241ae48ed7a351cbe
-MISC ChangeLog 3029 SHA256 863813ce43712e48cd57a3e8f31dd5124ac605528ddefa90f032e075f14b6f45 SHA512 86a7306e57a4470b02c5dcdb8ae26b9eea481b60213c9049d2ecf5d90ec956d6d9924893005e29ae444a1983dd8f623813487b4a6f176ef5810bc666ebd6fc7d WHIRLPOOL acd5702cb11c3ce2dc9b336c5c39677c505b853b972bf54d629350e6d8fc6792db380f72a2344e370f13e4764076ac6756f9c3e5aa4fdacf7f1b8f563791122b
+EBUILD xsim-0.3.9.4-r5.ebuild 2052 SHA256 3e49b4cd4654822f8163e0f7ce804be2e2d5980597fc9cce8b6b6f2cc06124e2 SHA512 2baf5b6b476a328e79e7ed366992e8fb5bd7ae0f4024ce7b73f83840129c7036e15f0f71ef5d5ae882ebb657ab01ba2bf51ddea1c0c7cb619c68078f68882f46 WHIRLPOOL 6c66989506d241947f001968d9180175056ebe4785a77e90c9e4e2ed5feceaeecc02ef1c338cd6495e699b7229ca59078116dbca2b0cc4cca4e065f56409eb77
+MISC ChangeLog 3306 SHA256 cdf69563a0e449ceb2a9603ab215bdba30a9dc8890fc26a80d20cc3c23dc7f61 SHA512 4c55f2d41b06aaee16cdc75e6ad38dbe3a31cea05f0e8e532b672782aa0e538baa5bffeafd7273db2e9020a05b25a2399de03929acd6b5f4871393c600f5231b WHIRLPOOL 1cb2348bf583822aad20a02806449d38e32411adb3c5f21eae47b30fdbca9ceda3d57bac856db45217974391f9b28de1f1147f8d27598b012fe4cedd97d87e11
 MISC metadata.xml 158 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8 SHA512 6198c41a4d69a5ca0029aa9a593cc0ea553dc957fc0bdcd7bcd3bd1af7f84c5feaaf785160b60b8ed75282987818a6367f6092523cacd45f0c35494036043550 WHIRLPOOL 478bed9e1c3fbbcb13f17ffeebc2b9da5f3c48368e8a95c2802a88dbef4773f992fa254e4dc460248d5669021fe4e37b37be522d186da9d97321a58437679662
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRa5HpAAoJEDYO1FT4VRUUvngP/j/+/7yLnX149JFGmBhCyjfc
-R0yEDrY5XV8Qvs7CA1kWzNaQJTJPW2foZhNOo3UR5VJ33IRQ2hJhyZYfAvkLjFcW
-oPjP+sz8SRrkys8HJwJsFSwsLDX8LoQ4Xm2Ad7sBS7/Jywea3illjJQx6XZLCYSx
-Mx0f4JXAYN2tFQCYJzFHs8via1UDnxqwdKnm+C8NRTztRRzbp5Mrdird8U8jhkMQ
-hHyfTMR5ufLEalPCjccdfdNmj0N9Ihva7THSQXi1NN2nT9wITpP7dotZAihrs+pC
-ILwTbCRXwOZLdSIcbGvfdiG2m4djvUOeOyaPXan+FBr6YuRIWNgrCP15Yn70kBf3
-Sn0j7cyhNR0y5p/iJWeN4yoXibyBqaT0dqHA7oDIPBJQ1QCkIlUzctRaZVu4Y5/+
-2YShttt0+W6tNqUQIfzKokxWfaq+dhS2Q6+2y6V/rC8/EYj75dS8MpJoMSpNhpo1
-dGHjcJD/qUp1mtHJDVE0vKt/5xu2HUXK5RUSVp2PJ9ZEGN9xT/ByczM/p36b3hEL
-g/xIZ/9ClEK27YFfe9E5+S/7i9gdS+ZxEJotHoYNc7iQrTXEtnQmWKXrgUw0dxAt
-yAKfz8hoR6/psFVzly+JtkIDUe+0B1+aavh60MD/tiuqCUvztfxLXIgHUZW8npqt
-7/bHQ08ZNlU5WPgzosmP
-=Ai5I
+iQIcBAEBCAAGBQJRhITCAAoJEDYO1FT4VRUUhsUP/RK1LwrVY9GBviNGXdVdW2mc
+ANa+Nk/Zl2jblmwkmRFeN+7hSuSS7ROyLzluwiJWz4+ohhLdXk4VlfIps5uVh8+M
+VuiTLr3KMJqsY2coQafg2kNcYauEvQs28EsSblBVkqAeCtGWUiwODuL+HODbCTHj
+VPNJGq8ZTB6j6cFkmmMkjuvZIjITioay/5Viz0B2obycXHfzqSLcsZgHeNDMPbLR
+1Zs6dx+RrNrzHkRgjftrDBRUFeh3UjZdZBsJfD7sLxzDevT1VpHiRl69ziTU8+sK
+rAkt50XsCo3sLXIMzVF2fi7LKdL3ZyhIJLGhIe+1kZTUhEApWIfomQwlHS+2PrjH
+yFeoM4rtk3/JSgTRsfYhu15Kc+tOS9aJ8fR/U7Jc+5LsohiL/eBovdLxh8m5IyKf
+7C91Ixnd8n3QaviUkHFdzek/DCvR4Vgjn51QaU8bFS/wOhxTW2RqZ05j2peoYy+D
+qBkBcYuqqyRmrcdHlrmmHlav9E5QO7LKGHarVxsleruZvrzTdXpPs6Fd+C8iS9hD
+kerZV5rYfmxhW9IPGhN1/pL53QBjixaL3EZQ1FnNjIA3MyazyqOGEcui9Y4/5Xpf
+6K0JdQcxehN1xLVsZr1ieNCNWV4G23f2s2N7lWtViOY99mKPTJ05T8/UpT3s9kWC
+7b3x44YR6UkJEiRnzdtu
+=MwdL
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/xsim/files/xsim-0.3.9.4-eof.patch b/app-i18n/xsim/files/xsim-0.3.9.4-eof.patch
new file mode 100644
index 000000000000..3982bf2703c9
--- /dev/null
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-eof.patch
@@ -0,0 +1,92 @@
+diff --git a/plugins/IMs/jianpin/dict/char2db.cpp b/plugins/IMs/jianpin/dict/char2db.cpp
+index f36dda9..fb17c6e 100644
+--- a/plugins/IMs/jianpin/dict/char2db.cpp
++++ b/plugins/IMs/jianpin/dict/char2db.cpp
+@@ -166,6 +166,8 @@ int main(int argc, char * argv[])
+ 	int i = 0;
+ 	for (;;){
+ 		in >> mark;
++		if (in.eof())
++			break;
+ 		in.unget();
+ 		if (mark == '%'){			//for comments
+ 			in.getline(dummy, 255);
+@@ -175,9 +177,6 @@ int main(int argc, char * argv[])
+ 			}
+ 		in >> ckey.py >> c;
+ 
+-		if (in.eof())
+-			break;
+-
+ 		if (strlen(c) != 2){
+ 			cout << "error on line: " << i << endl;
+ 			exit(1);
+diff --git a/plugins/IMs/jianpin/dict/word2db.cpp b/plugins/IMs/jianpin/dict/word2db.cpp
+index 6b6b8e0..f9a6d0b 100644
+--- a/plugins/IMs/jianpin/dict/word2db.cpp
++++ b/plugins/IMs/jianpin/dict/word2db.cpp
+@@ -103,6 +103,8 @@ int main(int argc, char * argv[])
+ 	rec.access_count = MAX_ACCESS_COUNT;
+ 	for (;;){
+ 		in >> mark;
++		if (in.eof())
++			break;
+ 		in.unget();
+ 		if (mark == '%'){			//for comments
+ 			in.getline(wk.py, sizeof(wk.py));
+@@ -113,9 +115,6 @@ int main(int argc, char * argv[])
+ 
+ 		in >> w >> wk.py;
+ 
+-		if (in.eof())
+-			break;
+-
+ 		if ((wk.py[0] < 'a') || (wk.py[0] > 'z')){
+ 			cerr << " error on line:" << i << endl;
+ 			db.close(0);
+diff --git a/plugins/IMs/table/dict/word2db.cpp b/plugins/IMs/table/dict/word2db.cpp
+index aa19a60..f0368ce 100644
+--- a/plugins/IMs/table/dict/word2db.cpp
++++ b/plugins/IMs/table/dict/word2db.cpp
+@@ -112,6 +112,8 @@ int main(int argc, char * argv[])
+ 	for (;;){
+ 		j++;
+ 		in >> mark;
++		if (in.eof())
++			break;
+ 		in.unget();
+ 		if ((mark == '%') || (mark == '#')){			//for comments
+ 			in.getline((char *)wbuf, 1000);
+@@ -123,9 +125,6 @@ int main(int argc, char * argv[])
+ 
+ 		in >> wk.key >> w;
+ 
+-		if (in.eof())
+-			break;
+-
+ 		if ((wk.key[0] < 'a') || (wk.key[0] > 'z')){
+ 			//cerr << " error on line:" << j << endl;
+ 			errcnt ++;
+diff --git a/plugins/IMs/wubi/dict/word2db.cpp b/plugins/IMs/wubi/dict/word2db.cpp
+index a1df52b..3fe1e3e 100644
+--- a/plugins/IMs/wubi/dict/word2db.cpp
++++ b/plugins/IMs/wubi/dict/word2db.cpp
+@@ -103,6 +103,8 @@ int main(int argc, char * argv[])
+ 	for (;;){
+ 		j++;
+ 		in >> mark;
++		if (in.eof())
++			break;
+ 		in.unget();
+ 		if (mark == '%'){			//for comments
+ 			in.getline(wk.key, sizeof(wk.key));
+@@ -114,9 +116,6 @@ int main(int argc, char * argv[])
+ 
+ 		in >> wk.key >> w;
+ 
+-		if (in.eof())
+-			break;
+-
+ 		if ((wk.key[0] < 'a') || (wk.key[0] > 'z')){
+ 			//cerr << " error on line:" << j << endl;
+ 			errcnt ++;
diff --git a/app-i18n/xsim/files/xsim-0.3.9.4-makefile.patch b/app-i18n/xsim/files/xsim-0.3.9.4-makefile.patch
new file mode 100644
index 000000000000..8488d1bf135b
--- /dev/null
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-makefile.patch
@@ -0,0 +1,153 @@
+diff --git a/Makefile.in b/Makefile.in
+index 6a7a195..6d2b4e6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -36,7 +36,7 @@ distclean: clean
+ 	done && test -z "$$fail"
+ 
+ install-data:
+-	cd plugins/IMs;make install-data
++	cd plugins/IMs;$(MAKE) install-data
+ 
+ uninstall:
+ 	@for dir in ${subdirs}; do \
+diff --git a/plugins/IMs/jianpin/Makefile.in b/plugins/IMs/jianpin/Makefile.in
+index cbbac33..50d7ef0 100644
+--- a/plugins/IMs/jianpin/Makefile.in
++++ b/plugins/IMs/jianpin/Makefile.in
+@@ -25,7 +25,7 @@ OBJS=simpleim.o simpleimc.o pyphraser.o
+ TARGET=jianpin.so
+ 
+ all:$(TARGET)
+-	cd dict; make
++	cd dict; $(MAKE)
+ 
+ jianpin.so:$(OBJS)
+ 	$(LD_SHAREEXE) -shared -o $(TARGET) $(OBJS) $(LDFLAGS) -L$(bdblibs) $(LIBS) -l$(bdblib) $(gcclib)
+@@ -41,20 +41,20 @@ pyphraser.o:pyphraser.cpp pyphraser.h simpleimc.h $(include_path)wstring.h
+ 
+ clean:
+ 	rm -f *.o $(TARGET) core *~ *.bak
+-	cd dict; make clean
++	cd dict; $(MAKE) clean
+ 
+ distclean:clean
+ 	rm -rf Makefile
+-	cd dict; make distclean
++	cd dict; $(MAKE) distclean
+ 
+ install:all
+ 	$(topdir)/mkinstalldirs $(xsim_libp)
+ 	cp -f $(TARGET) $(xsim_libp)
+-	cd dict; make install
++	cd dict; $(MAKE) install
+ 
+ install-data:
+-	cd dict;make install-data
++	cd dict;$(MAKE) install-data
+ 
+ uninstall:
+ 	cd $(xsim_libp); rm -f $(TARGET)
+-	cd dict;make uninstall
++	cd dict;$(MAKE) uninstall
+diff --git a/plugins/IMs/table/Makefile.in b/plugins/IMs/table/Makefile.in
+index a747560..cbc67bc 100644
+--- a/plugins/IMs/table/Makefile.in
++++ b/plugins/IMs/table/Makefile.in
+@@ -25,7 +25,7 @@ OBJS=tableim.o tableimc.o
+ TARGET=table.so
+ 
+ all:$(TARGET)
+-	cd dict; make
++	cd dict; $(MAKE)
+ 
+ $(TARGET):$(OBJS)
+ 	$(LD_SHAREEXE) -shared -o $(TARGET) $(OBJS) $(LDFLAGS) -L$(bdblibs) $(LIBS) -l$(bdblib) $(gcclib)
+@@ -38,20 +38,20 @@ tableimc.o:tableimc.h tableimc.cpp $(include_path)wstring.h $(include_path)imc.h
+ 
+ clean:
+ 	rm -f *.o $(TARGET) core *~ *.bak
+-	cd dict; make clean
++	cd dict; $(MAKE) clean
+ 
+ distclean:clean
+ 	rm -rf Makefile
+-	cd dict; make distclean
++	cd dict; $(MAKE) distclean
+ 
+ install:all
+ 	$(topdir)/mkinstalldirs $(xsim_libp)
+ 	cp -f $(TARGET) $(xsim_libp)
+-	cd dict; make install
++	cd dict; $(MAKE) install
+ 
+ install-data:
+-	cd dict;make install-data
++	cd dict;$(MAKE) install-data
+ 
+ uninstall:
+ 	cd $(xsim_libp); rm -f $(TARGET)
+-	cd dict; make uninstall
++	cd dict; $(MAKE) uninstall
+diff --git a/plugins/IMs/wubi/Makefile.in b/plugins/IMs/wubi/Makefile.in
+index 031f1a7..c3d0f88 100644
+--- a/plugins/IMs/wubi/Makefile.in
++++ b/plugins/IMs/wubi/Makefile.in
+@@ -25,7 +25,7 @@ OBJS=wubiim.o wubiimc.o
+ TARGET=wubi.so
+ 
+ all:$(TARGET)
+-	cd dict; make
++	cd dict; $(MAKE)
+ 
+ $(TARGET):$(OBJS)
+ 	$(LD_SHAREEXE) -shared -o $(TARGET) $(OBJS) $(LDFLAGS) -L$(bdblibs) $(LIBS) -l$(bdblib) $(gcclib)
+@@ -38,20 +38,20 @@ wubiimc.o:wubiimc.h wubiimc.cpp $(include_path)wstring.h $(include_path)imc.h
+ 
+ clean:
+ 	rm -f *.o $(TARGET) core *~ *.bak
+-	cd dict; make clean
++	cd dict; $(MAKE) clean
+ 
+ distclean:clean
+ 	rm -rf Makefile
+-	cd dict; make distclean
++	cd dict; $(MAKE) distclean
+ 
+ install:all
+ 	$(topdir)/mkinstalldirs $(xsim_libp)
+ 	cp -f $(TARGET) $(xsim_libp)
+-	cd dict; make install
++	cd dict; $(MAKE) install
+ 
+ install-data:
+-	cd dict;make install-data
++	cd dict;$(MAKE) install-data
+ 
+ uninstall:
+ 	cd $(xsim_libp); rm -f $(TARGET)
+-	cd dict; make uninstall
++	cd dict; $(MAKE) uninstall
+diff --git a/xsim/Makefile.in b/xsim/Makefile.in
+index d618a2c..bbe1599 100644
+--- a/xsim/Makefile.in
++++ b/xsim/Makefile.in
+@@ -58,15 +58,15 @@ wstring.o:wstring.h wstring.cpp
+ 	$(CXX) -c wstring.cpp $(CXXFLAGS) -I./IMdkit
+ 
+ IMdkit/libXimd.a:
+-	cd IMdkit;make
++	cd IMdkit;$(MAKE)
+ 
+ clean:
+ 	rm -f *.o xsim core *~ *.bak
+-	cd IMdkit; make clean
++	cd IMdkit; $(MAKE) clean
+ 
+ distclean:clean
+ 	rm -rf Makefile tags
+-	cd IMdkit; make distclean
++	cd IMdkit; $(MAKE) distclean
+ 
+ install:all
+ 	$(topdir)/mkinstalldirs $(xsim_binp)
diff --git a/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild b/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
index 98226b1ff7ae..005c9d9619fa 100644
--- a/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
+++ b/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild,v 1.3 2009/10/21 15:11:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild,v 1.4 2013/05/04 03:47:12 naota Exp $
 
 EAPI=2
 inherit db-use eutils flag-o-matic multilib
@@ -26,11 +26,15 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-64bit.patch
 	# bug 227117
 	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-eof.patch
 
-	append-flags -DPIC -fPIC -fno-strict-aliasing
+	append-cppflags -DPIC
+	append-flags -fPIC -fno-strict-aliasing
 
 	dbver="$(db_findver sys-libs/db)"
 	sed -i -e "s/\(CFLAGS.*\)-O2/\1${CFLAGS}/" \
+		-e "s/LDFLAGS=\"/LDFLAGS=\"${LDFLAGS} /" \
 		-e "s/libdb_cxx.so/libdb_cxx-${dbver}.so/" \
 		-e "s/bdblib=\"db_cxx\"/bdblib=\"db_cxx-${dbver}\"/" configure* || die
 
@@ -57,7 +61,7 @@ src_install() {
 		xsim_libp="${D}"usr/$(get_libdir)/xsim/plugins \
 		xsim_binp="${D}"/usr/bin \
 		xsim_etcp="${D}"/etc \
-		install-data install || die
+		install install-data || die
 
 	dodoc ChangeLog KNOWNBUG README* TODO
 }