build qtkde-helper and merged the changes of app-i18n/uim.

5 files changed, 147 insertions, 3 deletions

diff --git a/app-i18n/uim-svn/ChangeLog b/app-i18n/uim-svn/ChangeLog
index 8d2f4de090f7..4c03368bfc3b 100644
--- a/app-i18n/uim-svn/ChangeLog
+++ b/app-i18n/uim-svn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/uim-svn
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.6 2004/06/24 21:56:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.7 2004/07/09 11:56:29 hattya Exp $
+
+*uim-svn-20040709 (09 Jul 2004)
+
+  09 Jul 2004; Akinori Hattori <hattya@gentoo.org>
+  +files/uim-svn-qtkde-helper.diff, +uim-svn-20040709.ebuild:
+  build qtkde-helper and merged the changes of app-i18n/uim.
 
   07 Apr 2004; Akinori Hattori <hattya@gentoo.org> uim-svn-20040124.ebuild:
   inherit flag-o-matic.
diff --git a/app-i18n/uim-svn/Manifest b/app-i18n/uim-svn/Manifest
index 7919d5f0eaec..3121855a8199 100644
--- a/app-i18n/uim-svn/Manifest
+++ b/app-i18n/uim-svn/Manifest
@@ -1,5 +1,8 @@
-MD5 b5839813bf0612817bbc71a35a8c17a2 uim-svn-20040124.ebuild 1580
-MD5 f8e664981e7fa697ee12b8a2b07234cc ChangeLog 848
+MD5 b9178ca2bb8fae5daa21f2962c9eb501 ChangeLog 1056
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 b5839813bf0612817bbc71a35a8c17a2 uim-svn-20040124.ebuild 1580
+MD5 23c2929a9289fad160d7df3cca94217a uim-svn-20040709.ebuild 1877
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-uim-svn-20040124 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-uim-svn-20040709 0
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-svn-gtk-query-immodules-gentoo.diff 552
+MD5 e783fdfae053c896cccc1b26ecfd90d4 files/uim-svn-qtkde-helper.diff 1671
diff --git a/app-i18n/uim-svn/files/digest-uim-svn-20040709 b/app-i18n/uim-svn/files/digest-uim-svn-20040709
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-i18n/uim-svn/files/digest-uim-svn-20040709
diff --git a/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff b/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff
new file mode 100644
index 000000000000..189170ace83a
--- /dev/null
+++ b/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff
@@ -0,0 +1,40 @@
+diff -ur uim.orig/qt/qtkde-helper/configure.in.in uim/qt/qtkde-helper/configure.in.in
+--- uim.orig/qt/qtkde-helper/configure.in.in	2004-06-20 00:17:30.000000000 +0900
++++ uim/qt/qtkde-helper/configure.in.in	2004-06-20 22:47:14.625513536 +0900
+@@ -4,17 +4,5 @@
+ AC_C_BIGENDIAN
+ AC_CHECK_KDEMAXPATHLEN
+ 
+-AC_CHECK_LIB(uim, uim_init, HAVE_UIM_LIB=yes, HAVE_UIM_LIB=no)
+-if test "x$HAVE_UIM_LIB" = "xyes"; then
+-  AC_CHECK_HEADER(uim/uim.h, HAVE_UIM_LIB=yes, HAVE_UIM_LIB=no)
+-  if test "x$HAVE_UIM_LIB" = "xyes"; then
+-    AC_DEFINE(HAVE_UIM_LIB, 1,
+-       [Define to 1 if you have uim library and header files])
+-    LIB_UIM="-luim"
+-  else
+-    AC_MSG_ERROR([You are missing uim headers.])
+-  fi
+-else
+-  AC_MSG_ERROR([You are missing uim. Please install uim first.])
+-fi
++LIB_UIM="../../../../uim/libuim.la"
+ AC_SUBST(LIB_UIM)
+diff -ur uim.orig/qt/qtkde-helper/src/candwin/uim-helper-candwin-qt.cpp uim/qt/qtkde-helper/src/candwin/uim-helper-candwin-qt.cpp
+--- uim.orig/qt/qtkde-helper/src/candwin/uim-helper-candwin-qt.cpp	2004-06-20 00:17:15.000000000 +0900
++++ uim/qt/qtkde-helper/src/candwin/uim-helper-candwin-qt.cpp	2004-07-03 20:52:41.495442296 +0900
+@@ -110,13 +110,12 @@
+     int y = list[2].toInt();
+ 
+     QPoint p1(x, y);
+-    QRect focusRect = QRect( QPoint(x, y + height()), frameSize() );
++    QRect focusRect = QRect( QPoint(x, y), frameSize() );
+     QRect screenRect = QRect(0, 0,
+                              QApplication::desktop()->screenGeometry().width(),
+                              QApplication::desktop()->screenGeometry().height());
+ 
+     QPoint p = forceInside(screenRect, focusRect);
+-    adjustCandidateWindowSize();
+     move(p);
+ }
+ 
diff --git a/app-i18n/uim-svn/uim-svn-20040709.ebuild b/app-i18n/uim-svn/uim-svn-20040709.ebuild
new file mode 100644
index 000000000000..3b36cceb1046
--- /dev/null
+++ b/app-i18n/uim-svn/uim-svn-20040709.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20040709.ebuild,v 1.1 2004/07/09 11:56:29 hattya Exp $
+
+inherit subversion flag-o-matic
+
+IUSE="X debug gtk nls m17n-lib kde"
+
+ESVN_REPO_URI="http://freedesktop.org:8080/svn/uim/trunk"
+ESVN_BOOTSTRAP="autogen.sh"
+ESVN_PATCHES="*.diff"
+
+DESCRIPTION="a simple, secure and flexible input method library"
+HOMEPAGE="http://uim.freedesktop.org/"
+SRC_URI=""
+
+LICENSE="GPL-2 | BSD"
+KEYWORDS="~x86"
+SLOT="0"
+
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser
+	nls? ( sys-devel/gettext )"
+RDEPEND="X? ( virtual/x11 )
+	gtk? ( >=x11-libs/gtk+-2 )
+	kde? (
+		=x11-libs/qt-3*
+		=kde-base/kdebase-3.2*
+		=kde-base/kdelibs-3.2*
+	)
+	m17n-lib? ( dev-libs/m17n-lib )
+	!app-i18n/uim"
+
+src_compile() {
+
+	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
+	use debug && append-flags -g
+
+	econf \
+		`use_enable nls` \
+		`use_with X x` \
+		`use_with gtk gtk2` \
+		`use_with m17n-lib m17nlib` \
+		|| die
+	emake || die
+
+	if use X && use kde; then
+		local abs_top_dir=`pwd`
+
+		! use gtk && sed -ie "52s:NULL:\"uim-helper-candwin-qt\":" xim/canddisp.cpp
+
+		cd qt/qtkde-helper
+
+		make -f Makefile.cvs
+		econf \
+			`use_enable nls` \
+			`use_enable debug '' full` \
+			--with-extra-includes=${abs_top_dir} \
+			|| die
+		emake || die
+	fi
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	if use X && use kde; then
+		cd qt/qtkde-helper
+		make DESTDIR=${D} install || die
+		cd -
+	fi
+
+	dodoc [A-Z][A-Z]* ChangeLog* doc/[A-Z0-9][A-Z0-9]*
+
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
+	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo."
+	einfo "To use uim-prime you should emerge app-i18n/prime."
+	einfo
+
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
+
+}
+
+pkg_postrm() {
+
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
+
+}