Fixed Qt4 issue, bug #349859. Fixed gtk issue, bug #350207. These patches are submitted by Muneyuki Noguchi. Respect CXX and LDFLAGS, bug #349689.

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

10 files changed, 228 insertions, 494 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 79a9bc729c9e..cc3f00ecbc6c 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-i18n/uim
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.225 2010/12/26 17:29:08 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.226 2011/01/05 11:17:11 matsuu Exp $
+
+*uim-1.6.0-r2 (05 Jan 2011)
+
+  05 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> -uim-1.5.6-r1.ebuild,
+  -uim-1.5.6-r4.ebuild, -files/uim-1.5.6-toplevel-delete-event.patch,
+  -uim-1.6.0.ebuild, +uim-1.6.0-r2.ebuild, +files/uim-1.6.0-gettext.patch,
+  +files/uim-1.6.0-linker.patch, +files/uim-1.6.0-xcompose.patch,
+  -files/uim-disable-notify.diff:
+  Fixed Qt4 issue, bug #349859. Fixed gtk issue, bug #350207. These patches are
+  submitted by Muneyuki Noguchi. Respect CXX and LDFLAGS, bug #349689. Removed
+  old versions.
 
   26 Dec 2010; Jeroen Roovers <jer@gentoo.org> uim-1.6.0.ebuild,
   uim-1.6.0-r1.ebuild:
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 2489e2eaffd7..219ab2580f73 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,24 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50uim-gentoo.el 113 RMD160 4830acc8f32525aaae156cf0252d9e93cd41cc2c SHA1 64b0c88335dbfdab07938a8d92218407ebec2db1 SHA256 58a536e5b7d0ffac6802e60d348b092623601d25c8917d64a51347efab9e4cb7
 AUX uim-1.5.4-gcc43.patch 404 RMD160 99bb3adb856b82b7efcf5e9e07dfe1a647cde83d SHA1 5ec9d1ffbd7eb44568795b9e532e05e7caf59457 SHA256 560494a526ab30d7524d769f359a592c1a73671b51491e426d48306cc537707a
 AUX uim-1.5.4-gentoo.patch 1366 RMD160 2ff73cab38b95772245ed78c06166ca865aa4474 SHA1 cb729594bd9d1cf56c084050ed954bf07fac0e8d SHA256 5b9639144848e42a049426172d7a4b53cbc74532e9787881a807511ab8b6552b
 AUX uim-1.5.4-zhTW.patch 1034 RMD160 8d9102b0937d2746a1b4bad5470b1480b94b5eb8 SHA1 d93cf2c1f7e253fefdbdb80f2207b2080d2d1768 SHA256 82afb0a1cc1c2e706ac02da71084fe16655bbcb9719710ae37057ab6c14b9196
-AUX uim-1.5.6-toplevel-delete-event.patch 870 RMD160 397d29ab572a0a5aabfa18dce56670f0ee6b998f SHA1 6bea0229eaa4187f0eac4b97d5ee284320876b0c SHA256 4a1b9bc9bbb4742e5a9fb0da2b19b985e711df7afeabef7ee3edc065692ccde6
 AUX uim-1.5.7-kde4-applet.patch 426 RMD160 6a94e138421e65484337827e3ddd8e0d257af5ec SHA1 9a9e64864c7f47ac23b8a9c792de1d8ee2e2c8be SHA256 ca178782cf9b7b84a6b81a90f654ed0078a8dee76b7275895098c41208762a7d
 AUX uim-1.5.7-kde4.patch 6397 RMD160 df19bf38df9146c7adaadbb3c590c8670b716a49 SHA1 1bc8ed999a17831360d083478bee91f5cc3a8aa3 SHA256 f587331dd97031e94e11dff08f64bb2ef4aee7bccf7d7d970ddfdc0590b73ee1
 AUX uim-1.5.7-qt4.7.patch 478 RMD160 823e323e03d514b529d8c70ce871b7264d71378b SHA1 320dd7576788aba98c87313d60f1bcdf7f5224e7 SHA256 f2b57414e3c8f2189d279df4e15b86f0166196714505a7307b28be4784e794c6
 AUX uim-1.6.0-gentoo.patch 381 RMD160 b1be11c6cda393fac0c9d7848d52c0421e7fee77 SHA1 be3ab78b9262862f7b8e461f118dfd5e94700757 SHA256 c44e97d8c4d2125e17fe0d8107ce3d258c930b9dda3329eec170cfb291ae6c80
+AUX uim-1.6.0-gettext.patch 449 RMD160 2b60687cc2d0adf6c2e8a958b4c042379a8b48b3 SHA1 f2fc59fad678023ac516ccdab54a086a5621fbb7 SHA256 e6f0bf1c99a5e1a96a106e2dd04bd3bd58a640f659e2f2d6c2d98a5e582a77b7
+AUX uim-1.6.0-linker.patch 5969 RMD160 a6e60d17606a1bede3bb159b0ed34bf2705877a3 SHA1 eded83ebc0dc5ac4bffad982b64f7cd7895ec695 SHA256 432d51518a51aeca563ec9ae0a8b84b3968032afe5b0313c403a2fe872a883d0
 AUX uim-1.6.0-sandbox-violation.patch 7290 RMD160 376e25f36c4757b43bdb814c7c31efc18d2d45b3 SHA1 36425bfb3e923a660ebf258c4aaa3a7139b83767 SHA256 a3c4afa9af03c85fc4cb8457c07dfe4641cda4c5534cbbad7ffe2adddc84f573
-AUX uim-disable-notify.diff 1738 RMD160 a19b315a0b5f1408c543535886665562e90dd666 SHA1 023ce4cb996ddcd50ce19892a202c6d09dcab522 SHA256 05325e441d0c7d6ae241976ac0e432e4cb7f56c9c4b2d37eddfd081e45490848
+AUX uim-1.6.0-xcompose.patch 428 RMD160 d9f0800edbee447b79da7cc05a1150ce13e3b1df SHA1 27d407df9d97617f44655f2e3f0decada84c4e11 SHA256 9fab26881d5318c856daeab20c98b9278bf31dc2c6c5131bec914f2c038b5756
 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
-DIST uim-1.5.6.tar.bz2 3343584 RMD160 01774ff38e64436945290a5c3b2e1dc1a14d6771 SHA1 24b33991db4813fe82af7862c5e0d0f6d6b284dd SHA256 ce6b7218c3b79e5d100d52fa745e51abc83a1fe7668b3b759584b9ec7a00c28f
 DIST uim-1.5.7.tar.bz2 3330555 RMD160 037677cd583c2b69293fbbc1c0393756d7c7adac SHA1 fbea2590286ddc857a7824d8544cb08842f4299f SHA256 f404b274c4b7e71b4b912912c758606585af476fcc5f3d602a08564187ad4e46
 DIST uim-1.6.0.tar.bz2 6154925 RMD160 14881fe9ff1af64cee1317d0b51af69294377e47 SHA1 d27f2ca8136da0702c82f0522911d06b2b8f8ea7 SHA256 2a34dca2091eb6d61f05dabd8512c6658d8cefa8db14b7a684fbb10caea4a3aa
 EBUILD uim-1.4.2.ebuild 3999 RMD160 43c80abb4398057ef4530d51b1cbc592d3d7ba3e SHA1 39939cf9710cd84f2304d346f97a3d2f0021227a SHA256 49ab526a6383f7922802d4b721543745e2dd987408ac4fa2a7effd5f76da378d
-EBUILD uim-1.5.6-r1.ebuild 5169 RMD160 e82f2e8c8f34bc4d791bb75d19e34c67a9982bd5 SHA1 701b76f6e22e3951d36b9f1c4e2da550c920b4dd SHA256 574c5354750de42007dd70e3fe8eecef4e4826ff665028e554d409b46e66891b
-EBUILD uim-1.5.6-r4.ebuild 5266 RMD160 3cef3cd7d431d22935bb172a95628a0ede220e73 SHA1 c3dd334ae92aca209ededf97ec522ca6edb706e6 SHA256 06adc9371af5449f669bc4f23e0bcb6d3e11b1b8288895a3dcbbeb54f78c4f13
 EBUILD uim-1.5.7-r1.ebuild 5416 RMD160 804d1e87f0ef3fb4520cb0d07006c67d370bc267 SHA1 5c829d661aa9d4e0d6629b97562e276b4feacf07 SHA256 dc3230d6fe189071eba7bfde988359dd58ecf52832e73b0417979dbefe520e22
 EBUILD uim-1.5.7.ebuild 5296 RMD160 23fb62b18eb84c7792b45d7951c97a1fe193b7cd SHA1 d81dfdd0169c9eae48c1328bb685d905f9d9a13e SHA256 95d7baf47b0c95a4c001d95e79da044343401aa50be2753a86059ab166937af5
 EBUILD uim-1.6.0-r1.ebuild 5833 RMD160 fa35a4d75761a7e2e86a0ae2928b96e56a99f401 SHA1 fe0a07f3a671a2bd2416e30d61835f65b58935a4 SHA256 0fb2884e759968c3ddfb124140eb2f70641ead98daabbe9c5c54f1590d6471f0
-EBUILD uim-1.6.0.ebuild 5783 RMD160 66a884ec96805024ab504a9bc15a25d9810faa67 SHA1 e67eebc49fd439db0a436aa0c6a4a6f0a803a232 SHA256 0ddf2760b93f555536e0dbcc5aedb5ed599b85b5c45c006196d7763fca2c17cf
-MISC ChangeLog 31712 RMD160 8d36095727bb65884338cdfb7c1428110dbca842 SHA1 5f29e9a24249ef050f3a4fcea07d8d22ca3c1bb9 SHA256 a1e111bcd266aa8c028773799ba6039b69aa4a9f709284dedc6cc688180ea969
+EBUILD uim-1.6.0-r2.ebuild 5927 RMD160 9ed1c763be52f1806f917439593f1782179a7a93 SHA1 f717971bce659a93e1743499e093f404b7452040 SHA256 bf25ab578f53b0cc49317ed16263d652bd607eeee349c5fd784a3ea659e6d0d6
+MISC ChangeLog 32236 RMD160 30be1accc063af41684896840d9709bf7825cce7 SHA1 0dde4fffc339c566679d5060e1c5f1dafdb936dc SHA256 c20e7281d50c0a7467c343e5b310d09237c2d01b3e5379664aa3f80e5d307701
 MISC metadata.xml 961 RMD160 74d29238a618f2307a09fc3061f0652ceb305073 SHA1 665044f11f9f9b7e16b6b580a379b4138ffd2f1c SHA256 f1ca51e0e41161ec077f759a0e139bf523ace99a60e769b51e6a67fd549f075a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNJFNAAAoJECaGw+YFKA1peI4P/jQBX5drNN3kkOKs/o2UfNfI
++FAaUDwXi2C0Hml6ekosjViTLbUuA2ljWSzcyW2Pvv+V6pelH3C/I0/fdqn57bTj
+/4/ZmNK6+cX+sdUzsglmHmF3HF1R3nqCeWj3s6E7hg5iFStmA3eRG5Ql28Lus3G+
+4xLhm/6pKXy6Bho+PAp2QqIUv1T48P1U5adIRK/F1x0vIiPbj2rt1E1gh22Fli2a
+NxaW2vFq2d1mldMMM/yGO9VPxSsi5wXjoG2T4PifKCoIQOZSPUZtuIfEB19sOIYE
+HUpnT3jOaH4J08ho2VmUY7StO1NLpU/2y+Tklc3MMiAx/B+SBZq29j8INUgSD8YT
+YoddtAt9IgGsErU1yi4SrspSAL2ers9ZbxgpSOyrxFRzv8Q7o3z5cQeob5ddcGAN
+97SeXXenZDH0VW1TP0z8eOFenFaW+0CElFWa77EdqquUxnv2qjys/d3+tEFVfXOf
+QqqXWOgiwnqSFrW2Q6RjN6RPnWj5NnwIt91AIYCc5udnYrWwntOewfnQZJgrUwwC
+Icpld+BKv/vCaxdRREyLWL8jWo/YDmc3mt8n2PteDXi80UMwxtZtSAlYf3r0bWzR
+4Mii2jJDkqz5lnwhTO4AePsmSA7PAymqiMgR8TANNaVxQOWrtnbNog34Qa8WrBRM
+oFhdt5amQlU/iLwnr15D
+=DcKl
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/files/uim-1.5.6-toplevel-delete-event.patch b/app-i18n/uim/files/uim-1.5.6-toplevel-delete-event.patch
deleted file mode 100644
index adc0902d8059..000000000000
--- a/app-i18n/uim/files/uim-1.5.6-toplevel-delete-event.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: gtk/gtk-im-uim.c
-===================================================================
---- gtk/gtk-im-uim.c	(revision 6061)
-+++ gtk/gtk-im-uim.c	(revision 6062)
-@@ -329,6 +329,12 @@
- }
- 
- static void
-+cur_toplevel_deleted(GtkWidget *widget, gpointer data)
-+{
-+  cur_toplevel = NULL;
-+}
-+
-+static void
- update_cur_toplevel(IMUIMContext *uic)
- {
-   /* Don't set our candwin's text widget as cur_toplevel */
-@@ -358,6 +364,9 @@
- 	cur_key_release_handler_id = g_signal_connect(cur_toplevel,
- 			"key-release-event",
- 			G_CALLBACK(handle_key_on_toplevel), uic);
-+	g_signal_connect(cur_toplevel,
-+			"delete_event",
-+			G_CALLBACK(cur_toplevel_deleted), NULL);
-       }
-     } else
-       remove_cur_toplevel();
-
-Property changes on: gtk
-___________________________________________________________________
-Added: svn:mergeinfo
-   Merged /trunk/gtk:r5963,5967,6039,6061
-
diff --git a/app-i18n/uim/files/uim-1.6.0-gettext.patch b/app-i18n/uim/files/uim-1.6.0-gettext.patch
new file mode 100644
index 000000000000..aa3a056cec61
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.6.0-gettext.patch
@@ -0,0 +1,16 @@
+Index: qt4/qtgettext.h
+===================================================================
+--- qt4/qtgettext.h	(revision 6847)
++++ qt4/qtgettext.h	(revision 6848)
+@@ -61,6 +61,11 @@
+ #else /* ENABLE_NLS */
+ 
+ #define mygettext(String) QString::fromLocal8Bit(String)
++/* undef original _(String) macro to use QString */
++#ifdef _
++#undef _
++#endif
++#define _(String) mygettext(String)
+ #define UIC_(String, dummy) (String)
+ #endif /* ENABLE_NLS */
+ 
diff --git a/app-i18n/uim/files/uim-1.6.0-linker.patch b/app-i18n/uim/files/uim-1.6.0-linker.patch
new file mode 100644
index 000000000000..ada64cacefac
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.6.0-linker.patch
@@ -0,0 +1,149 @@
+diff -Naur uim-1.6.0.orig/configure.ac uim-1.6.0/configure.ac
+--- uim-1.6.0.orig/configure.ac	2010-08-02 09:30:14.000000000 +0900
++++ uim-1.6.0/configure.ac	2011-01-03 11:43:06.375239564 +0900
+@@ -1826,6 +1826,7 @@
+ 		 qt4/chardict/uim-chardict-qt4.pro
+ 		 qt4/chardict/po/Makefile.in
+ 		 qt4/edittest/Makefile
++		 qt4/edittest/edittest.pro
+ 		 qt4/immodule/quiminputcontextplugin.pro
+ 		 qt4/immodule/Makefile
+ 		 qt4/pref/uim-pref-qt4.pro
+diff -Naur uim-1.6.0.orig/qt4/candwin/uim-candwin-qt4.pro.in uim-1.6.0/qt4/candwin/uim-candwin-qt4.pro.in
+--- uim-1.6.0.orig/qt4/candwin/uim-candwin-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
++++ uim-1.6.0/qt4/candwin/uim-candwin-qt4.pro.in	2011-01-05 09:27:14.905438175 +0900
+@@ -16,6 +16,9 @@
+ QMAKE_CXX               = @CXX@
+ QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
++QMAKE_LINK              = @CXX@
++QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
++QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
+ 
+ QMAKE_STRIP =
+ 
+diff -Naur uim-1.6.0.orig/qt4/chardict/uim-chardict-qt4.pro.in uim-1.6.0/qt4/chardict/uim-chardict-qt4.pro.in
+--- uim-1.6.0.orig/qt4/chardict/uim-chardict-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
++++ uim-1.6.0/qt4/chardict/uim-chardict-qt4.pro.in	2011-01-05 09:27:14.905438175 +0900
+@@ -16,6 +16,9 @@
+ QMAKE_CXX               = @CXX@
+ QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
++QMAKE_LINK              = @CXX@
++QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
++QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
+ 
+ QMAKE_STRIP =
+ 
+diff -Naur uim-1.6.0.orig/qt4/edittest/Makefile.am uim-1.6.0/qt4/edittest/Makefile.am
+--- uim-1.6.0.orig/qt4/edittest/Makefile.am	2010-03-30 13:24:26.000000000 +0900
++++ uim-1.6.0/qt4/edittest/Makefile.am	2011-01-03 11:41:06.643957761 +0900
+@@ -12,8 +12,8 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
+ 	$(MAKE) $(AM_MAKEFLAGS) distclean-am
+ endif
+-	-rm -f Makefile
++	-rm -f Makefile edittest.pro
+ 
+ FORCE:
+ 
+-EXTRA_DIST = README edittest.pro main.cpp
++EXTRA_DIST = README edittest.pro.in main.cpp
+diff -Naur uim-1.6.0.orig/qt4/edittest/edittest.pro uim-1.6.0/qt4/edittest/edittest.pro
+--- uim-1.6.0.orig/qt4/edittest/edittest.pro	2010-08-09 13:09:35.000000000 +0900
++++ uim-1.6.0/qt4/edittest/edittest.pro	1970-01-01 09:00:00.000000000 +0900
+@@ -1,14 +0,0 @@
+-######################################################################
+-# Automatically generated by qmake (1.08a) Tue Aug 24 01:02:27 2004
+-######################################################################
+-
+-TEMPLATE = app
+-CONFIG -= moc
+-DEPENDPATH += .
+-INCLUDEPATH += .
+-CONFIG += qt warn_on debug
+-
+-QMAKE_STRIP =
+-
+-# Input
+-SOURCES += main.cpp
+diff -Naur uim-1.6.0.orig/qt4/edittest/edittest.pro.in uim-1.6.0/qt4/edittest/edittest.pro.in
+--- uim-1.6.0.orig/qt4/edittest/edittest.pro.in	1970-01-01 09:00:00.000000000 +0900
++++ uim-1.6.0/qt4/edittest/edittest.pro.in	2011-01-05 09:27:14.909438151 +0900
+@@ -0,0 +1,24 @@
++######################################################################
++# Automatically generated by qmake (1.08a) Tue Aug 24 01:02:27 2004
++######################################################################
++
++TEMPLATE = app
++CONFIG -= moc
++DEPENDPATH += .
++INCLUDEPATH += .
++CONFIG += qt warn_on debug
++
++QMAKE_CC                = @CC@
++QMAKE_CFLAGS_DEBUG     += @CFLAGS@   @X_CFLAGS@
++QMAKE_CFLAGS_RELEASE   += @CFLAGS@   @X_CFLAGS@
++QMAKE_CXX               = @CXX@
++QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
++QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
++QMAKE_LINK              = @CXX@
++QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
++QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
++
++QMAKE_STRIP =
++
++# Input
++SOURCES += main.cpp
+diff -Naur uim-1.6.0.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.6.0/qt4/immodule/quiminputcontextplugin.pro.in
+--- uim-1.6.0.orig/qt4/immodule/quiminputcontextplugin.pro.in	2010-08-09 13:09:35.000000000 +0900
++++ uim-1.6.0/qt4/immodule/quiminputcontextplugin.pro.in	2011-01-05 09:27:14.913438127 +0900
+@@ -22,6 +22,9 @@
+ QMAKE_CXX               = @CXX@
+ QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
++QMAKE_LINK              = @CXX@
++QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
++QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
+ 
+ QMAKE_STRIP =
+ 
+diff -Naur uim-1.6.0.orig/qt4/pref/uim-pref-qt4.pro.in uim-1.6.0/qt4/pref/uim-pref-qt4.pro.in
+--- uim-1.6.0.orig/qt4/pref/uim-pref-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
++++ uim-1.6.0/qt4/pref/uim-pref-qt4.pro.in	2011-01-05 09:27:14.913438127 +0900
+@@ -16,6 +16,9 @@
+ QMAKE_CXX               = @CXX@
+ QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
++QMAKE_LINK              = @CXX@
++QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
++QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
+ 
+ QMAKE_STRIP =
+ QMAKE_UIC = $$QMAKE_UIC -tr UIC_
+diff -Naur uim-1.6.0.orig/qt4/switcher/uim-im-switcher-qt4.pro.in uim-1.6.0/qt4/switcher/uim-im-switcher-qt4.pro.in
+--- uim-1.6.0.orig/qt4/switcher/uim-im-switcher-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
++++ uim-1.6.0/qt4/switcher/uim-im-switcher-qt4.pro.in	2011-01-05 09:27:14.917438104 +0900
+@@ -16,6 +16,9 @@
+ QMAKE_CXX               = @CXX@
+ QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
++QMAKE_LINK              = @CXX@
++QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
++QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
+ 
+ QMAKE_STRIP =
+ 
+diff -Naur uim-1.6.0.orig/qt4/toolbar/uim-toolbar-qt4.pro.in uim-1.6.0/qt4/toolbar/uim-toolbar-qt4.pro.in
+--- uim-1.6.0.orig/qt4/toolbar/uim-toolbar-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
++++ uim-1.6.0/qt4/toolbar/uim-toolbar-qt4.pro.in	2011-01-05 09:27:14.917438104 +0900
+@@ -16,6 +16,9 @@
+ QMAKE_CXX               = @CXX@
+ QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
++QMAKE_LINK              = @CXX@
++QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
++QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
+ 
+ QMAKE_STRIP =
+ 
diff --git a/app-i18n/uim/files/uim-1.6.0-xcompose.patch b/app-i18n/uim/files/uim-1.6.0-xcompose.patch
new file mode 100644
index 000000000000..48a56c32921c
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.6.0-xcompose.patch
@@ -0,0 +1,16 @@
+Index: gtk/compose.c
+===================================================================
+--- gtk/compose.c	(revision 6879)
++++ gtk/compose.c	(revision 6880)
+@@ -621,7 +621,10 @@
+     {
+ 	char *result;
+ 	result = g_locale_to_utf8(rhs_string_mb, -1, NULL, NULL, NULL);
+-	rhs_string_utf8 = strdup(result);
++	if (!result)
++	    rhs_string_utf8 = strdup("");
++	else
++	    rhs_string_utf8 = strdup(result);
+ 	g_free(result);
+     }
+ 
diff --git a/app-i18n/uim/files/uim-disable-notify.diff b/app-i18n/uim/files/uim-disable-notify.diff
deleted file mode 100644
index cbb33a82494d..000000000000
--- a/app-i18n/uim/files/uim-disable-notify.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: uim/uim-notify.c
-===================================================================
---- uim/uim-notify.c	(revision 5997)
-+++ uim/uim-notify.c	(working copy)
-@@ -111,6 +111,8 @@
- 
-   if (strcmp(agent->desc()->name, name) == 0) {
-     return UIM_TRUE;
-+  } if (getenv("UIM_DISABLE_NOTIFY") != NULL) {
-+    return UIM_TRUE;
-   } else if (strcmp(name, "stderr") == 0) {
-     agent->quit();
-     if (notify_dlhandle)
-@@ -238,6 +240,10 @@
- 		    MAKE_STR(desc->name),
- 		    MAKE_STR(desc->desc)),
- 	      uim_scm_null());
-+
-+  if (getenv("UIM_DISABLE_NOTIFY") != NULL)
-+    return uim_scm_callf("reverse", "o", ret_);
-+
-   dirp = opendir(NOTIFY_PLUGIN_PATH);
-   if (dirp) {
-     while ((dp = readdir(dirp)) != NULL) {
-Index: scm/Makefile.am
-===================================================================
---- scm/Makefile.am	(revision 5997)
-+++ scm/Makefile.am	(working copy)
-@@ -97,7 +97,8 @@
- UIM_MODULE_MANAGER_ENV = \
-         LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \
-         LIBUIM_SCM_FILES=$(abs_srcdir) \
--        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs
-+        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs \
-+        UIM_DISABLE_NOTIFY=1
- 
- installed-modules.scm loader.scm: $(SCM_FILES)
- 	$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/uim uim-module-manager && \
---- scm/Makefile.in.orig	Tue Sep 15 02:01:18 2009
-+++ scm/Makefile.in	Tue Sep 15 02:01:36 2009
-@@ -363,7 +363,8 @@
- UIM_MODULE_MANAGER_ENV = \
-         LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \
-         LIBUIM_SCM_FILES=$(abs_srcdir) \
--        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs
-+        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs \
-+        UIM_DISABLE_NOTIFY=1
- 
- all: all-am
- 
diff --git a/app-i18n/uim/uim-1.5.6-r1.ebuild b/app-i18n/uim/uim-1.5.6-r1.ebuild
deleted file mode 100644
index ba889349534c..000000000000
--- a/app-i18n/uim/uim-1.5.6-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild,v 1.11 2010/01/04 03:58:18 yngwin Exp $
-
-EAPI="2"
-inherit autotools eutils multilib elisp-common flag-o-matic
-
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://code.google.com/p/uim/"
-SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXrender
-	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
-	canna? ( app-i18n/canna )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt4? ( x11-libs/qt-gui:4[qt3support] )
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-#	mana? ( app-i18n/mana )
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
-#	wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/gettext-0.15
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-RDEPEND="${RDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		linguas_zh_CN? (
-			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
-		)
-		linguas_zh_TW? (
-			media-fonts/intlfonts
-		)
-		linguas_ja? (
-			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
-		)
-		linguas_ko? (
-			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
-		)
-	)"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.5.4-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-1.5.4-gcc43.patch"
-	epatch "${FILESDIR}/${PN}-1.5.4-zhTW.patch"
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
-	else
-		myconf="${myconf} --without-anthy"
-	fi
-
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
-	fi
-
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with prime) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4-immodule) \
-		$(use_with xft) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	if use emacs; then
-		elisp-install uim-el emacs/*.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
-			|| die "elisp-site-file-install failed"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	elog
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk"
-	elog "or uim-im-switcher-qt."
-	elog
-	elog "If you upgrade from a version of uim older than 1.4.0,"
-	elog "you should run revdep-rebuild."
-
-	use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	if use emacs; then
-		elisp-site-regen
-		echo
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.5.6-r4.ebuild b/app-i18n/uim/uim-1.5.6-r4.ebuild
deleted file mode 100644
index cd10bbe56a47..000000000000
--- a/app-i18n/uim/uim-1.5.6-r4.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r4.ebuild,v 1.3 2010/01/04 03:58:18 yngwin Exp $
-
-EAPI="2"
-inherit autotools eutils multilib elisp-common flag-o-matic
-
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://code.google.com/p/uim/"
-SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXrender
-	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
-	canna? ( app-i18n/canna )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt4? ( x11-libs/qt-gui:4[qt3support] )
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-#	mana? ( app-i18n/mana )
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
-#	wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/gettext-0.15
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-RDEPEND="${RDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		linguas_zh_CN? (
-			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
-		)
-		linguas_zh_TW? (
-			media-fonts/intlfonts
-		)
-		linguas_ja? (
-			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
-		)
-		linguas_ko? (
-			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
-		)
-	)"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.5.4-gentoo.patch" \
-		"${FILESDIR}/${PN}-1.5.4-gcc43.patch" \
-		"${FILESDIR}/${PN}-1.5.4-zhTW.patch" \
-		"${FILESDIR}/${PN}-disable-notify.diff" \
-		"${FILESDIR}/${P}-toplevel-delete-event.patch"
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
-	else
-		myconf="${myconf} --without-anthy"
-	fi
-
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
-	fi
-
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with prime) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4-immodule) \
-		$(use_with xft) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	if use emacs; then
-		elisp-install uim-el emacs/*.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
-			|| die "elisp-site-file-install failed"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	elog
-	elog "New input method switcher has been introduced. You need to set"
-	elog
-	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
-	elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	elog
-	elog "If you would like to use uim-anthy as default input method, put"
-	elog "(define default-im-name 'anthy)"
-	elog "to your ~/.uim."
-	elog
-	elog "All input methods can be found by running uim-im-switcher-gtk"
-	elog "or uim-im-switcher-qt."
-	elog
-	elog "If you upgrade from a version of uim older than 1.4.0,"
-	elog "you should run revdep-rebuild."
-
-	use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	if use emacs; then
-		elisp-site-regen
-		echo
-		elog "uim is autoloaded with Emacs with a minimal set of features:"
-		elog "There is no keybinding defined to call it directly, so please"
-		elog "create one yourself and choose an input method."
-		elog "Integration with LEIM is not done with this ebuild, please have"
-		elog "a look at the documentation how to achieve this."
-	fi
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.6.0.ebuild b/app-i18n/uim/uim-1.6.0-r2.ebuild
index 891dad31a376..cb8d76277e9c 100644
--- a/app-i18n/uim/uim-1.6.0.ebuild
+++ b/app-i18n/uim/uim-1.6.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.0.ebuild,v 1.2 2010/12/26 17:29:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.0-r2.ebuild,v 1.1 2011/01/05 11:17:11 matsuu Exp $
 
 EAPI="3"
 inherit autotools eutils multilib elisp-common flag-o-matic
@@ -12,7 +12,6 @@ SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+anthy canna curl eb emacs ffi gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
 
 RESTRICT="test"
@@ -95,11 +94,16 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${P}-gentoo.patch" \
-		"${FILESDIR}/${PN}-1.5.4-zhTW.patch"
+		"${FILESDIR}/${PN}-1.5.4-zhTW.patch" \
+		"${FILESDIR}/${P}-sandbox-violation.patch" \
+		"${FILESDIR}/${P}-gettext.patch" \
+		"${FILESDIR}/${P}-xcompose.patch" \
+		"${FILESDIR}/${P}-linker.patch"
 
 	# bug 275420
 	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
-	eautoconf
+	#./autogen.sh
+	AT_NO_RECURSIVE=1 eautoreconf
 }
 
 src_configure() {