add anthy use flag. and fix LICENSE.

Package-Manager: portage-2.1.1-r1

3 files changed, 40 insertions, 25 deletions

diff --git a/app-i18n/uim-svn/ChangeLog b/app-i18n/uim-svn/ChangeLog
index 4d88fc61e37f..6f8ffe5bca7f 100644
--- a/app-i18n/uim-svn/ChangeLog
+++ b/app-i18n/uim-svn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/uim-svn
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.25 2006/10/26 16:11:03 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.26 2006/10/30 12:37:54 hattya Exp $
+
+  30 Oct 2006; Akinori Hattori <hattya@gentoo.org> uim-svn-20060320.ebuild:
+  add anthy use flag. and fix LICENSE.
 
   26 Oct 2006; Akinori Hattori <hattya@gentoo.org> uim-svn-20060320.ebuild:
   add gnome-base/librsvg to DEPEND. rsvg is required for converting svg to
diff --git a/app-i18n/uim-svn/Manifest b/app-i18n/uim-svn/Manifest
index 3c13bb5df6be..4641e2702202 100644
--- a/app-i18n/uim-svn/Manifest
+++ b/app-i18n/uim-svn/Manifest
@@ -2,14 +2,14 @@ AUX 50uim-gentoo.el 120 RMD160 de7359e37bde67449be61e99e1a271088c99a785 SHA1 c22
 MD5 bb1358d0c54a9f19ec23bd58b8b52ef3 files/50uim-gentoo.el 120
 RMD160 de7359e37bde67449be61e99e1a271088c99a785 files/50uim-gentoo.el 120
 SHA256 151b731d5940fc029fd5428275fe670f85d9af501adb8e2b0e5ee5277b301ee3 files/50uim-gentoo.el 120
-EBUILD uim-svn-20060320.ebuild 2652 RMD160 449c3fe6b13dca7e1c1ebf7ee24f45ab0cfc8734 SHA1 9c5ab224559875ad39543b0b341c020f5f94b322 SHA256 fed829e0820bacaf0830dcd4ca4b69bded5a716513a713a6503cca9b11748b0a
-MD5 27c899643c8661c40f9cbe9a9bbbd180 uim-svn-20060320.ebuild 2652
-RMD160 449c3fe6b13dca7e1c1ebf7ee24f45ab0cfc8734 uim-svn-20060320.ebuild 2652
-SHA256 fed829e0820bacaf0830dcd4ca4b69bded5a716513a713a6503cca9b11748b0a uim-svn-20060320.ebuild 2652
-MISC ChangeLog 3711 RMD160 71cd2404f3445a39fb680bac06c40a176db06ef7 SHA1 22945e611e3c844d618cd491574058bc1e24d671 SHA256 3c3ef2a06d0b14cdd2f41002cac3fd8f7c6114bba747087ef325ac21b7f8aea8
-MD5 d99a6989a75ad005fcf8e2187a3084a1 ChangeLog 3711
-RMD160 71cd2404f3445a39fb680bac06c40a176db06ef7 ChangeLog 3711
-SHA256 3c3ef2a06d0b14cdd2f41002cac3fd8f7c6114bba747087ef325ac21b7f8aea8 ChangeLog 3711
+EBUILD uim-svn-20060320.ebuild 2949 RMD160 4b0474e8445ef678edd330519ae3e78886dcccac SHA1 eef85a9ea2472625333f4500e1beac600697b277 SHA256 9134021d234dfbef1eb5c2da38234473eb644aa9261f450a78047e2f254558db
+MD5 f705fdb6859a26cd964f30efe1f1493a uim-svn-20060320.ebuild 2949
+RMD160 4b0474e8445ef678edd330519ae3e78886dcccac uim-svn-20060320.ebuild 2949
+SHA256 9134021d234dfbef1eb5c2da38234473eb644aa9261f450a78047e2f254558db uim-svn-20060320.ebuild 2949
+MISC ChangeLog 3827 RMD160 ad139a95d6809e2a578066cc58a261606d6accfb SHA1 ba21a717c0823e7cc4104c2f401ebcf20c6f5b83 SHA256 39f59e1af259747895e96e60c1b068a60f471fde30a04c2b85761343bb935309
+MD5 ceeb3f19067661557e8534a9536952b1 ChangeLog 3827
+RMD160 ad139a95d6809e2a578066cc58a261606d6accfb ChangeLog 3827
+SHA256 39f59e1af259747895e96e60c1b068a60f471fde30a04c2b85761343bb935309 ChangeLog 3827
 MISC metadata.xml 228 RMD160 d00ebe7b3e1735ca3ca559d39b754b06cf4a8d4b SHA1 2d51ec59cf9b5fdec09b26e402f14d6a8caf4aec SHA256 15500f2c0c8e55fe82f937103a2741db6182f259dec5a9d334016781ba928c5f
 MD5 144bface8ba60a1da8734f201abd268f metadata.xml 228
 RMD160 d00ebe7b3e1735ca3ca559d39b754b06cf4a8d4b metadata.xml 228
diff --git a/app-i18n/uim-svn/uim-svn-20060320.ebuild b/app-i18n/uim-svn/uim-svn-20060320.ebuild
index 2438e3b97dd9..27448d220668 100644
--- a/app-i18n/uim-svn/uim-svn-20060320.ebuild
+++ b/app-i18n/uim-svn/uim-svn-20060320.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20060320.ebuild,v 1.9 2006/10/26 16:11:03 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20060320.ebuild,v 1.10 2006/10/30 12:37:54 hattya Exp $
 
 inherit elisp-common flag-o-matic kde-functions multilib subversion
 
-IUSE="X canna dict eb emacs fep gtk immqt libedit m17n-lib nls qt3"
+IUSE="X anthy canna dict eb emacs fep gtk immqt libedit m17n-lib nls qt3"
 
 ESVN_REPO_URI="http://anonsvn.freedesktop.org/svn/uim/trunk"
 ESVN_BOOTSTRAP="./autogen.sh"
@@ -14,7 +14,7 @@ DESCRIPTION="a multilingual input method library"
 HOMEPAGE="http://uim.freedesktop.org/"
 SRC_URI=""
 
-LICENSE="|| ( GPL-2 BSD )"
+LICENSE="BSD GPL-2 LGPL-2.1"
 KEYWORDS="~x86"
 SLOT="0"
 
@@ -38,6 +38,7 @@ RDEPEND="!app-i18n/uim
 				x11-libs/libXrender
 			  )
 		   	  virtual/x11 ) )
+	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
 	canna? ( app-i18n/canna )
 	eb? ( dev-libs/eb )
 	emacs? ( virtual/emacs )
@@ -49,24 +50,35 @@ RDEPEND="!app-i18n/uim
 
 src_compile() {
 
+	local myconf="--enable-maintainer-mode"
+
+	if use dict && (use anthy || use canna); then
+		myconf="${myconf} --enable-dict"
+
+	else
+		ewarn "dict use flag should use with anthy or canna use flag. disabled."
+		myconf="${myconf} --disable-dict"
+
+	fi
+
 	if use qt3 || use immqt; then
 		set-qtdir 3
 	fi
 
 	econf \
-		`use_enable dict` \
-		`use_enable emacs` \
-		`use_enable fep` \
-		`use_enable nls` \
-		`use_with X x` \
-		`use_with canna` \
-		`use_with eb` \
-		`use_with immqt qt-immodule` \
-		`use_with libedit "" /usr` \
-		`use_with qt3 qt` \
-		`use_with gtk gtk2` \
-		`use_with m17n-lib m17nlib` \
-		--enable-maintainer-mode \
+		$(use_enable emacs) \
+		$(use_enable fep) \
+		$(use_enable nls) \
+		$(use_with X x) \
+		$(use_with anthy) \
+		$(use_with canna) \
+		$(use_with eb) \
+		$(use_with immqt qt-immodule) \
+		$(use_with libedit) \
+		$(use_with qt3 qt) \
+		$(use_with gtk gtk2) \
+		$(use_with m17n-lib m17nlib) \
+		${myconf} \
 		|| die
 	emake || die