update

3 files changed, 25 insertions, 31 deletions

diff --git a/app-i18n/uim-svn/ChangeLog b/app-i18n/uim-svn/ChangeLog
index b481bd5a8dc7..f20b6ac51a11 100644
--- a/app-i18n/uim-svn/ChangeLog
+++ b/app-i18n/uim-svn/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2004/08/10 08:19:40 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.11 2004/11/04 14:28:31 hattya Exp $
+
+  04 Nov 2004; Akinori Hattori <hattya@gentoo.org>
+  files/uim-svn-qtkde-helper.diff, uim-svn-20040709.ebuild:
+  add dict and fep use flags. and some updates.
 
   10 Aug 2004; Akinori Hattori <hattya@gentoo.org> uim-svn-20040709.ebuild:
   fixed access violation of qtkde-helper.
diff --git a/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff b/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff
index 189170ace83a..33205d98e732 100644
--- a/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff
+++ b/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff
@@ -1,6 +1,5 @@
-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
+--- uim.orig/qt/uim-kdehelper/configure.in.in	2004-06-20 00:17:30.000000000 +0900
++++ uim/qt/uim-kdehelper/configure.in.in	2004-06-20 22:47:14.625513536 +0900
 @@ -4,17 +4,5 @@
  AC_C_BIGENDIAN
  AC_CHECK_KDEMAXPATHLEN
@@ -20,21 +19,3 @@ diff -ur uim.orig/qt/qtkde-helper/configure.in.in uim/qt/qtkde-helper/configure.
 -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
index 791ea058bf27..98bc6a168a9a 100644
--- a/app-i18n/uim-svn/uim-svn-20040709.ebuild
+++ b/app-i18n/uim-svn/uim-svn-20040709.ebuild
@@ -1,35 +1,36 @@
 # 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.3 2004/08/10 08:19:40 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20040709.ebuild,v 1.4 2004/11/04 14:28:31 hattya Exp $
 
 inherit subversion flag-o-matic
 
-IUSE="X debug gtk nls m17n-lib kde"
+IUSE="X canna dict debug fep gtk kde m17n-lib nls"
 
 ESVN_REPO_URI="http://freedesktop.org:8080/svn/uim/trunk"
-ESVN_BOOTSTRAP="autogen.sh"
+ESVN_BOOTSTRAP="./autogen.sh -V"
 ESVN_PATCHES="*.diff"
 
 DESCRIPTION="a simple, secure and flexible input method library"
 HOMEPAGE="http://uim.freedesktop.org/"
 SRC_URI=""
 
-LICENSE="GPL-2 | BSD"
+LICENSE="||(GPL-2 BSD)"
 KEYWORDS="~x86 ~ppc"
 SLOT="0"
 
 DEPEND="${RDEPEND}
 	dev-perl/XML-Parser
 	nls? ( sys-devel/gettext )"
-RDEPEND="X? ( virtual/x11 )
+RDEPEND="!app-i18n/uim
+	X? ( virtual/x11 )
+	canna? ( app-i18n/canna )
 	gtk? ( >=x11-libs/gtk+-2 )
 	kde? (
 		=x11-libs/qt-3*
-		=kde-base/kdebase-3.2*
-		=kde-base/kdelibs-3.2*
+		=kde-base/kdebase-3*
+		=kde-base/kdelibs-3*
 	)
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim"
+	m17n-lib? ( dev-libs/m17n-lib )"
 
 src_compile() {
 
@@ -37,8 +38,11 @@ src_compile() {
 	use debug && append-flags -g
 
 	econf \
+		`use_enable fep` \
+		`use_enable dict` \
 		`use_enable nls` \
 		`use_with X x` \
+		`use_with canna` \
 		`use_with gtk gtk2` \
 		`use_with m17n-lib m17nlib` \
 		|| die
@@ -75,6 +79,11 @@ src_install() {
 
 	dodoc [A-Z][A-Z]* ChangeLog* doc/[A-Z0-9][A-Z0-9]*
 
+	if use fep; then
+		docinto fep
+		dodoc fep/[A-Z][A-Z]*
+	fi
+
 }
 
 pkg_postinst() {