old

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

9 files changed, 4 insertions, 947 deletions

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 73c2347c1bc0..a73de3d59b1b 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,45 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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.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-1.6.0-xcompose.patch 428 RMD160 d9f0800edbee447b79da7cc05a1150ce13e3b1df SHA1 27d407df9d97617f44655f2e3f0decada84c4e11 SHA256 9fab26881d5318c856daeab20c98b9278bf31dc2c6c5131bec914f2c038b5756
 AUX uim-1.6.1-libnotify-0.7.patch 661 RMD160 18ded31a4895abd2491fb470e20d8dfc8fbe5f1b SHA1 3130c041f0f62248b1ff0ae5f1a78a6953872f50 SHA256 f96f6fb81208a4a11382f08687bb92e0738ab54bb39a06146a284d8232edd8bb
 AUX xinput-uim 91 RMD160 88eece15af5524e1b1e1568fb0824b9e242eeb92 SHA1 37e09df5d915ff9ecbf645efbdd751d6bc2d2fd6 SHA256 ade06862ce4bf2705886d64be6c18bd97c3d5a981676a98a7daea94e9de02757
 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
 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
 DIST uim-1.6.1.tar.bz2 6192431 RMD160 26c4e30f59c8eb005189d6778333079c81f8489c SHA1 412bb2df6041185084e2f64fb73357389bf992b5 SHA256 ee23965e26e6e9c52bdc37d87e66da9de2a491221b5f1989942f3666e9a44914
 EBUILD uim-1.4.2.ebuild 3987 RMD160 d290986b0fbefcd7855237c56ac59ec7457de6d4 SHA1 01fd6a01801b0aa17335c7df5582ef460cb229f3 SHA256 02cf0e6dba0b37e028d5e5aedd0aed1b4091a7522e245d55c95ef455d0a81143
-EBUILD uim-1.5.7-r1.ebuild 5428 RMD160 5007526c97441ce9cf62767583faa22f46cc1369 SHA1 ad73e8105ac221d524736f18fa8fc01a5a235a29 SHA256 22e749d103e4c46e3efde09d7a031f419e1e52e809c15ff2b5d8644a5482f1d0
 EBUILD uim-1.5.7.ebuild 5311 RMD160 5c5f46ebbbcd126570aba7e3d530978c3fdcecd7 SHA1 1f4137b8d0fefaa4eb7e9636718e79e024d4f3ab SHA256 9ab18af73c08f150dbd8acde966f9418e2eaf42bf8cdf2f80a994e7c0cb13356
-EBUILD uim-1.6.0-r2.ebuild 5938 RMD160 583a9fcaf57fb73c5a4256d668ccf54adebedc07 SHA1 371cab3d0f3ee9ed63fc26d34aed01ac9401631b SHA256 9ac0fadf27e92621a2b9136fa535046513ba89f05d2e5106405c02d2bc8561ca
 EBUILD uim-1.6.1.ebuild 6001 RMD160 684885daddc35675be899fcd409ccb0ffbd59390 SHA1 fce90623f2f0f119dedb67c57fc3ca7fa4d521e8 SHA256 4f372578688a3ec393cfa8619d84d7189f0bdb6f23c0f03557616a0f02f8ffb1
 MISC ChangeLog 32908 RMD160 296fa49cc6dff6ea2bccc21014dfb51153676979 SHA1 750f3016655c13717780f4c96fc75b0a69923f11 SHA256 54a00353c6a4bec7874c69799bfa9179fdcb8873f91461fbb62310538f27d696
 MISC metadata.xml 961 RMD160 74d29238a618f2307a09fc3061f0652ceb305073 SHA1 665044f11f9f9b7e16b6b580a379b4138ffd2f1c SHA256 f1ca51e0e41161ec077f759a0e139bf523ace99a60e769b51e6a67fd549f075a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjyHRAAoJEO/kOhxWD91kFD8P/idNC4H0VzFn+GSpzJj5wn7e
-4n2AVQ5pLLFwsOkf6lM65KA5cWysaieN3U5GoNwK7oy5McYUdQorn0YVdWh4I3qC
-Ud/NFfDa/d+FnzDKND0lFcnTKw+WjUujktsnX2uS1+7vWgNEPue2idkRBJd/WWSR
-QDYlJC2/MMhvKM0QrO5gy+iRn1JOyep/w4fFGUoP3pcOhf17CAe0+WkF9+LYpPYP
-Thtu8YJ0b8btbHbQg7A6tX4TvvQsdjzwAramVZdLXfwttoVp33uUOOp47zgjHG94
-F7iihdbytu9Qr5Er8N2mcnMX2PRlCBAOhTgLzH5PlPyQyFdUSOh/6tZKiwy3clcy
-PQrWTKN/9FlQawU0gtlu11nYX/NYupd1nLjJWq41t5rly79npaXSjMrxEcChg1Pv
-09DAGn5ugrj2oQRD8hETrZWGR+NTkfdWtSk7DzCxlLMHtKpfDANwznawyD9U46ET
-bG3JfJlOL8fAD5WTO40cCi2D98f3u2XCMGgCCeb0yzNR387UMBmL218muMRNO6da
-x+14y/nUGbdFfPUMQEQ3Mz66EoZHqop7aqP6MHu0OUmWDkc1H1U93H8vYZCUEVVV
-WPRIc23ToV07dxS4XU5vN8y11iZpHD3YY5iz35e1ToXNhn3SDibOApa9TO7UqLG0
-iayopViWeCJNIILH8eRT
-=F0ZG
+iF4EAREIAAYFAk2RuHEACgkQXkR9YqOcLPF3LQD9FQ5KlJFfe4vBJewWXarAaUVD
+4GPhE+neUytXJIoqt1AA/jn3Q+FkS2Li8hsRIz3TxX5XwUSd4pDbZJUd3O5GdaaR
+=F8RB
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/files/uim-1.5.7-kde4-applet.patch b/app-i18n/uim/files/uim-1.5.7-kde4-applet.patch
deleted file mode 100644
index dde28e3c4b3f..000000000000
--- a/app-i18n/uim/files/uim-1.5.7-kde4-applet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur uim-1.5.7.orig/configure.ac uim-1.5.7/configure.ac
---- uim-1.5.7.orig/configure.ac	2009-11-21 21:55:15.000000000 +0900
-+++ uim-1.5.7/configure.ac	2010-02-05 01:00:37.000000000 +0900
-@@ -1259,7 +1259,7 @@
-             @<:@default=yes@:>@]),
-         enable_kde4_applet=$enableval,
-         enable_kde4_applet=yes)
--case "$enable_kde_applet" in
-+case "$enable_kde4_applet" in
-   no)
-     use_applet_kde4="no"
-     ;;
diff --git a/app-i18n/uim/files/uim-1.5.7-kde4.patch b/app-i18n/uim/files/uim-1.5.7-kde4.patch
deleted file mode 100644
index ed289ca1e38c..000000000000
--- a/app-i18n/uim/files/uim-1.5.7-kde4.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-Index: qt4/toolbar/common-uimstateindicator.cpp
-===================================================================
---- qt4/toolbar/common-uimstateindicator.cpp	(revision 6120)
-+++ qt4/toolbar/common-uimstateindicator.cpp	(working copy)
-@@ -40,6 +40,7 @@
- #include <QtCore/QTextCodec>
- #include <QtGui/QHBoxLayout>
- #include <QtGui/QImage>
-+#include <QtGui/QMouseEvent>
- #include <QtGui/QPixmap>
- 
- #include <cstring>
-@@ -171,11 +172,17 @@
-                 button->setToolTip( fields[ 3 ] );
- 
-                 // create popup
-+#ifdef PLASMA_APPLET_UIM
-+                popupMenu = new QHelperPopupMenu( 0 );
-+#else
-                 popupMenu = new QHelperPopupMenu( button );
-+#endif
-                 connect( popupMenu, SIGNAL( aboutToShow() ),
-                     this, SLOT( slotPopupMenuAboutToShow() ) );
-                 connect( popupMenu, SIGNAL( aboutToHide() ),
-                     this, SLOT( slotPopupMenuAboutToHide() ) );
-+                connect( button, SIGNAL( menuRequested( QMenu* ) ),
-+                    this, SIGNAL( menuRequested( QMenu* ) ) );
-                 button->setMenu( popupMenu );
-                 button->setPopupMode( QToolButton::InstantPopup );
- 
-@@ -264,7 +271,29 @@
- }
- 
- /**/
-+QHelperToolbarButton::QHelperToolbarButton( QWidget *parent )
-+    : QToolButton( parent )
-+{
-+    setAutoRaise( true );
-+}
- 
-+QSize QHelperToolbarButton::sizeHint() const
-+{
-+    return QSize( BUTTON_SIZE, BUTTON_SIZE );
-+}
-+
-+void QHelperToolbarButton::mousePressEvent( QMouseEvent *event )
-+{
-+#ifdef PLASMA_APPLET_UIM
-+    if ( event->button() == Qt::LeftButton )
-+        emit menuRequested( menu() );
-+#else
-+    QToolButton::mousePressEvent( event );
-+#endif
-+}
-+
-+/**/
-+
- QHelperPopupMenu::QHelperPopupMenu( QWidget *parent )
-     : QMenu( parent )
- {
-Index: qt4/toolbar/applet-kde4.h
-===================================================================
---- qt4/toolbar/applet-kde4.h	(revision 6120)
-+++ qt4/toolbar/applet-kde4.h	(working copy)
-@@ -50,6 +50,7 @@
- 
-     private slots:
-         void slotToolbarResized();
-+        void slotMenuRequested(QMenu *menu);
- 
-     private:
-         void initPopup();
-Index: qt4/toolbar/common-uimstateindicator.h
-===================================================================
---- qt4/toolbar/common-uimstateindicator.h	(revision 6120)
-+++ qt4/toolbar/common-uimstateindicator.h	(working copy)
-@@ -70,6 +70,7 @@
- 
- signals:
-     void indicatorResized();
-+    void menuRequested( QMenu *menu );
- 
- public slots:
-     void slotStdinActivated( int socket );
-@@ -91,14 +92,17 @@
- 
- class QHelperToolbarButton : public QToolButton
- {
-+    Q_OBJECT
- public:
--    explicit QHelperToolbarButton( QWidget *parent = 0 )
--        : QToolButton( parent ){ setAutoRaise( true ); }
-+    explicit QHelperToolbarButton( QWidget *parent = 0 );
- 
--    QSize sizeHint() const
--    {
--        return QSize( BUTTON_SIZE, BUTTON_SIZE );
--    }
-+    QSize sizeHint() const;
-+
-+signals:
-+    void menuRequested( QMenu *menu );
-+
-+private:
-+    void mousePressEvent( QMouseEvent *event );
- };
- 
- class QHelperPopupMenu : public QMenu
-Index: qt4/toolbar/common-quimhelpertoolbar.cpp
-===================================================================
---- qt4/toolbar/common-quimhelpertoolbar.cpp	(revision 6120)
-+++ qt4/toolbar/common-quimhelpertoolbar.cpp	(working copy)
-@@ -56,7 +56,10 @@
-     m_indicator = new UimStateIndicator( this );
-     m_layout->addWidget( m_indicator );
- 
--    connect( m_indicator, SIGNAL( indicatorResized() ), this, SLOT( slotIndicatorResized() ) );
-+    connect( m_indicator, SIGNAL( indicatorResized() ),
-+        this, SLOT( slotIndicatorResized() ) );
-+    connect( m_indicator, SIGNAL( menuRequested( QMenu* ) ),
-+        this, SIGNAL( menuRequested( QMenu* ) ) );
- 
-     QPixmap swicon = QPixmap( ICONDIR + "/im_switcher.png" );
-     QPixmap preficon = QPixmap( ACTION_ICONDIR + "/configure.png");
-@@ -87,7 +90,7 @@
-     exiticon = QPixmap::fromImage( exitimage.scaled( ICON_SIZE, ICON_SIZE,
-         Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
- 
--    m_contextMenu = new QMenu( this );
-+    m_contextMenu = new QMenu( isApplet ? 0 : this );
-     m_contextMenu->addAction( m_swicon, _("Switch input method"),
-         this, SLOT(slotExecImSwitcher()) );
-     m_contextMenu->addAction( m_preficon, _("Preference"),
-@@ -129,8 +132,13 @@
- {
-     if( m_contextMenu->isHidden() )
-     {
-+#ifdef PLASMA_APPLET_UIM
-+        Q_UNUSED( e );
-+        emit menuRequested( m_contextMenu );
-+#else
-         m_contextMenu->move( e->globalPos() );
-         m_contextMenu->exec();
-+#endif
-     }
- }
- 
-Index: qt4/toolbar/common-quimhelpertoolbar.h
-===================================================================
---- qt4/toolbar/common-quimhelpertoolbar.h	(revision 6120)
-+++ qt4/toolbar/common-quimhelpertoolbar.h	(working copy)
-@@ -80,6 +80,7 @@
- signals:
-     void quitToolbar();
-     void toolbarResized();
-+    void menuRequested( QMenu *menu );
- 
- protected:
-     UimStateIndicator *m_indicator;
-Index: qt4/toolbar/applet-kde4.cpp
-===================================================================
---- qt4/toolbar/applet-kde4.cpp	(revision 6120)
-+++ qt4/toolbar/applet-kde4.cpp	(working copy)
-@@ -61,6 +61,8 @@
-     m_toolbar->setAttribute(Qt::WA_NoSystemBackground);
-     connect(m_toolbar, SIGNAL(toolbarResized()),
-             this, SLOT(slotToolbarResized()));
-+    connect(m_toolbar, SIGNAL(menuRequested(QMenu*)),
-+            this, SLOT(slotMenuRequested(QMenu*)));
- 
-     m_proxy = new QGraphicsProxyWidget;
-     m_proxy->setWidget(m_toolbar);
-@@ -115,6 +117,12 @@
-     resize(m_toolbar->width() + lr, m_toolbar->height() + tb);
- }
- 
-+void UimApplet::slotMenuRequested(QMenu *menu)
-+{
-+    menu->adjustSize();
-+    menu->exec(popupPosition(menu->size()));
-+}
-+
- QGraphicsWidget *UimApplet::graphicsWidget()
- {
-     return m_widget;
-Index: qt4/toolbar/CMakeLists.txt
-===================================================================
---- qt4/toolbar/CMakeLists.txt	(revision 6120)
-+++ qt4/toolbar/CMakeLists.txt	(working copy)
-@@ -3,7 +3,7 @@
- find_package(KDE4 REQUIRED)
- include(KDE4Defaults)
- 
--add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DPLASMA_APPLET_UIM)
- include_directories(${KDE4_INCLUDES}
-         ${CMAKE_SOURCE_DIR}/../.. ${CMAKE_SOURCE_DIR}/../../uim
-         ${CMAKE_SOURCE_DIR}/../../replace ${CMAKE_SOURCE_DIR}/..)
diff --git a/app-i18n/uim/files/uim-1.5.7-qt4.7.patch b/app-i18n/uim/files/uim-1.5.7-qt4.7.patch
deleted file mode 100644
index d1e4af25ebc5..000000000000
--- a/app-i18n/uim/files/uim-1.5.7-qt4.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: qt4/pref/customwidgets.cpp
-===================================================================
---- qt4/pref/customwidgets.cpp	(revision 6394)
-+++ qt4/pref/customwidgets.cpp	(revision 6395)
-@@ -886,8 +886,7 @@
-     : QDialog( parent ),
-       pressed_keyval( 0 ),
-       pressed_keystate( Qt::NoModifier ),
--      pressed_unichar ( 0 ),
--      m_keystr( 0 )
-+      pressed_unichar ( 0 )
- {
-     QLabel *l = new QLabel( _("Press keys to grab (e.g. <Control>a)"), this );
- 
diff --git a/app-i18n/uim/files/uim-1.6.0-gettext.patch b/app-i18n/uim/files/uim-1.6.0-gettext.patch
deleted file mode 100644
index aa3a056cec61..000000000000
--- a/app-i18n/uim/files/uim-1.6.0-gettext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-sandbox-violation.patch b/app-i18n/uim/files/uim-1.6.0-sandbox-violation.patch
deleted file mode 100644
index d0bb19ce5b07..000000000000
--- a/app-i18n/uim/files/uim-1.6.0-sandbox-violation.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-diff --git a/scm/custom-rt.scm b/scm/custom-rt.scm
-index ea94593..967f3c7 100644
---- a/scm/custom-rt.scm
-+++ b/scm/custom-rt.scm
-@@ -63,7 +63,10 @@
- (define custom-file-path
-   (lambda (gsym)
-     (let* ((group-name (symbol->string gsym))
--	   (path (string-append (get-config-path! #f)
-+           (config-path (get-config-path #f))
-+           (path (string-append (if config-path
-+                                  config-path
-+                                  "")
- 				"/customs/custom-"
- 				group-name
- 				".scm")))
-diff --git a/scm/dynlib.scm b/scm/dynlib.scm
-index 991ed55..6b67a77 100644
---- a/scm/dynlib.scm
-+++ b/scm/dynlib.scm
-@@ -34,14 +34,15 @@
- (define uim-dynlib-load-path
-   (if (setugid?)
-       (list (string-append (sys-pkglibdir) "/plugin"))
--      (let ((home-dir (or (home-directory (user-name)) ""))
--	    (ld-library-path (getenv "LD_LIBRARY_PATH")))
-+      (let* ((ld-library-path (getenv "LD_LIBRARY_PATH"))
-+             (config-path (get-config-path #f))
-+             (user-plugin-path (if config-path
-+                                 (string-append config-path "/plugin")
-+                                 '())))
- 	(filter string?
- 		(append (list (getenv "LIBUIM_PLUGIN_LIB_DIR")
--			      (if home-dir
--				  (string-append (get-config-path! #f) "/plugin")
--				  '())
--			      (string-append (sys-pkglibdir) "/plugin"))
-+                              user-plugin-path
-+                              (string-append (sys-pkglibdir) "/plugin"))
- 			;; XXX
- 			(if ld-library-path
- 			    (string-split ld-library-path ":")
-diff --git a/scm/plugin.scm b/scm/plugin.scm
-index 2d5d74a..d187429 100644
---- a/scm/plugin.scm
-+++ b/scm/plugin.scm
-@@ -39,12 +39,12 @@
- (define uim-plugin-scm-load-path
-   (if (setugid?)
-       (list (sys-pkgdatadir))
--      (let ((home-dir (or (home-directory (user-name)) ""))
-+      (let ((config-path (get-config-path #f))
-             (scm-paths (string-split (load-path) ":")))
- 	(filter string?
- 		(append scm-paths
--		      (if home-dir
--			  (list (string-append (get-config-path! #f) "/plugin"))
-+		      (if config-path
-+			  (list (string-append config-path "/plugin"))
- 			  '())
- 		      (list (sys-pkgdatadir)))))))
- 
-@@ -71,9 +71,9 @@
- ;; TODO: write test
- (define load-module-conf
-   (lambda ()
--    (let* ((home-dir (or (home-directory (user-name)) ""))
--	   (user-module-dir (if home-dir
--				(string-append (get-config-path! #f) "/plugin/")
-+    (let* ((config-path (get-config-path #f))
-+	   (user-module-dir (if config-path
-+				(string-append config-path "/plugin/")
- 				#f))
- 	   (conf-file "installed-modules.scm")
- 	   (user-conf-file (if user-module-dir
-@@ -100,9 +100,9 @@
- ;; TODO: write test
- (define load-enabled-modules
-   (lambda ()
--    (let* ((home-dir (or (home-directory (user-name)) ""))
--	   (user-module-dir (if home-dir
--				(string-append (get-config-path! #f) "/plugin/")
-+    (let* ((config-path (get-config-path #f))
-+	   (user-module-dir (if config-path
-+				(string-append config-path "/plugin/")
- 				#f))
- 	   (file "loader.scm")
- 	   (user-file (if user-module-dir
-diff --git a/uim/uim-helper.c b/uim/uim-helper.c
-index e4a558f..882aea6 100644
---- a/uim/uim-helper.c
-+++ b/uim/uim-helper.c
-@@ -207,7 +207,11 @@ uim_helper_get_pathname(char *helper_path, int len)
-   return UIM_TRUE;
- 
-  path_error:
--  uim_fatal_error("uim_helper_get_pathname()");
-+#if USE_UIM_NOTIFY && !UIM_NON_LIBUIM_PROG
-+  uim_notify_fatal("uim_helper_get_pathname() failed");
-+#else
-+  fprintf(stderr, "uim_helper_get_pathname() failed\n");
-+#endif
-   helper_path[0] = '\0';
- 
-   UIM_CATCH_ERROR_END();
-diff --git a/uim/uim-posix.c b/uim/uim-posix.c
-index 83691d8..de8a327 100644
---- a/uim/uim-posix.c
-+++ b/uim/uim-posix.c
-@@ -141,21 +141,33 @@ home_directory(uim_lisp user_)
-   return MAKE_STR(home);
- }
- 
--uim_bool
--uim_check_dir(const char *dir)
-+static uim_bool
-+uim_check_dir_internal(const char *dir, int need_prepare)
- {
-   struct stat st;
- 
-   if (stat(dir, &st) < 0)
--    return (mkdir(dir, 0700) < 0) ? UIM_FALSE : UIM_TRUE;
-+    if (need_prepare)	  
-+      return (mkdir(dir, 0700) < 0) ? UIM_FALSE : UIM_TRUE;
-+    else
-+      return UIM_FALSE;
-   else {
-     mode_t mode = S_IFDIR | S_IRUSR | S_IWUSR | S_IXUSR;
-     return ((st.st_mode & mode) == mode) ? UIM_TRUE : UIM_FALSE;
-   }
- }
- 
-+/* FIXME: use appropriate name for this API */
-+uim_bool
-+uim_check_dir(const char *dir)
-+{
-+  int need_prepare = UIM_TRUE;
-+
-+  return uim_check_dir_internal(dir, need_prepare);
-+}
-+
- static uim_lisp
--c_check_dir(uim_lisp dir_)
-+c_prepare_dir(uim_lisp dir_)
- {
-   if (!uim_check_dir(REFER_C_STR(dir_))) {
-     return uim_scm_f();
-@@ -163,8 +175,8 @@ c_check_dir(uim_lisp dir_)
-   return uim_scm_t();
- }
- 
--uim_bool
--uim_get_config_path(char *path, int len, int is_getenv)
-+static uim_bool
-+uim_get_config_path_internal(char *path, int len, int is_getenv, int need_prepare)
- {
-   char home[MAXPATHLEN];
- 
-@@ -174,34 +186,63 @@ uim_get_config_path(char *path, int len, int is_getenv)
-   if (!uim_get_home_directory(home, sizeof(home), getuid()) && is_getenv) {
-     char *home_env = getenv("HOME");
- 
--    if (!home_env)
-+    if (!home_env) {
-+      path[0] = '\0';
-       return UIM_FALSE;
-+    }
- 
--    if (strlcpy(home, home_env, sizeof(home)) >= sizeof(home))
-+    if (strlcpy(home, home_env, sizeof(home)) >= sizeof(home)) {
-+      path[0] = '\0';
-       return UIM_FALSE;
-+    }
-   }
- 
--  if (snprintf(path, len, "%s/.uim.d", home) == -1)
-+  if (snprintf(path, len, "%s/.uim.d", home) < 0) {
-+    path[0] = '\0';
-     return UIM_FALSE;
-+  }
- 
--  if (!uim_check_dir(path)) {
-+  if (!uim_check_dir_internal(path, need_prepare)) {
-     return UIM_FALSE;
-   }
- 
-   return UIM_TRUE;
- }
- 
-+/* FIXME: use appropriate name for this API */
-+uim_bool
-+uim_get_config_path(char *path, int len, int is_getenv)
-+{
-+  int need_prepare = UIM_TRUE;
-+
-+  return uim_get_config_path_internal(path, len, is_getenv, need_prepare);
-+}
-+
- static uim_lisp
--c_get_config_path(uim_lisp is_getenv_)
-+c_prepare_config_path(uim_lisp is_getenv_)
- {
-   char path[MAXPATHLEN];
-+  int need_prepare = UIM_TRUE;
- 
--  if (!uim_get_config_path(path, sizeof(path), C_BOOL(is_getenv_)))
-+  if (!uim_get_config_path_internal(path, sizeof(path), C_BOOL(is_getenv_), need_prepare))
-     return uim_scm_f();
-   return MAKE_STR(path);
- }
- 
- static uim_lisp
-+c_get_config_path(uim_lisp is_getenv_)
-+{
-+  char path[MAXPATHLEN];
-+  int need_prepare = UIM_FALSE;
-+  int exist;
-+
-+  /* No need to check the existence of path in this function */
-+  exist = uim_get_config_path_internal(path, sizeof(path), C_BOOL(is_getenv_), need_prepare);
-+
-+  return MAKE_STR(path);
-+}
-+
-+static uim_lisp
- file_stat_mode(uim_lisp filename, mode_t mode)
- {
-   struct stat st;
-@@ -391,8 +432,9 @@ uim_init_posix_subrs(void)
-   uim_scm_init_proc0("user-name", user_name);
-   uim_scm_init_proc1("home-directory", home_directory);
- 
--  uim_scm_init_proc1("create/check-directory!", c_check_dir);
--  uim_scm_init_proc1("get-config-path!", c_get_config_path);
-+  uim_scm_init_proc1("create/check-directory!", c_prepare_dir);
-+  uim_scm_init_proc1("get-config-path!", c_prepare_config_path);
-+  uim_scm_init_proc1("get-config-path", c_get_config_path);
- 
-   uim_scm_init_proc1("file-readable?", file_readablep);
-   uim_scm_init_proc1("file-writable?", file_writablep);
diff --git a/app-i18n/uim/files/uim-1.6.0-xcompose.patch b/app-i18n/uim/files/uim-1.6.0-xcompose.patch
deleted file mode 100644
index 48a56c32921c..000000000000
--- a/app-i18n/uim/files/uim-1.6.0-xcompose.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/uim-1.5.7-r1.ebuild b/app-i18n/uim/uim-1.5.7-r1.ebuild
deleted file mode 100644
index 6ad893996903..000000000000
--- a/app-i18n/uim/uim-1.5.7-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# 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.5.7-r1.ebuild,v 1.5 2011/03/27 11:38:50 nirbheek 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="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+anthy canna eb emacs gnome gtk kde 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:2 )
-	kde? ( >=kde-base/kdelibs-4 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 <x11-libs/libnotify-0.7 )
-	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
-	kde? ( dev-util/cmake )
-	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}/${P}-kde4.patch" \
-		"${FILESDIR}/${P}-kde4-applet.patch" \
-		"${FILESDIR}/${P}-qt4.7.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 || use qt4 ; 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_enable kde kde4-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) \
-		$(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-qt4."
-	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-r2.ebuild b/app-i18n/uim/uim-1.6.0-r2.ebuild
deleted file mode 100644
index f572cd59e20f..000000000000
--- a/app-i18n/uim/uim-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# 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-r2.ebuild,v 1.3 2011/02/13 19:11:08 armin76 Exp $
-
-EAPI="3"
-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="~amd64 ~hppa ~ppc ~ppc64 ~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"
-
-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 )
-	curl? ( >=net-misc/curl-7.16.4 )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	ffi? ( virtual/libffi )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	kde? ( >=kde-base/kdelibs-4 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 <x11-libs/libnotify-0.7 )
-	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] )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	!dev-scheme/sigscheme
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-#	>=dev-scheme/sigscheme-0.8.5
-#	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
-	kde? ( dev-util/cmake )
-	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 )
-		)
-	)"
-#	test? ( dev-scheme/gauche )
-
-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}/${P}-gentoo.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
-	#./autogen.sh
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-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 || use qt4 ; 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 curl) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_with ffi) \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		$(use_enable kde kde4-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) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_with skk) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable ssl openssl) \
-		$(use_with xft) \
-		${myconf}
-		# $(use_enable qt4 qt4-qt3support) \
-}
-
-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 || die
-	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
-
-	# collision with dev-scheme/sigscheme, bug #330975
-	# find "${ED}" -name '*gcroots*' -delete || die
-}
-
-pkg_postinst() {
-	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-qt4."
-	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
-}