Version bumped.

Fixed kde-base/kdelibs dependency, bug #213423.
Package-Manager: portage-2.1.5_rc6

5 files changed, 48 insertions, 17 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index c9e8f46c7ec7..867a4221620d 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.172 2008/02/24 16:28:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.173 2008/05/01 16:34:56 matsuu Exp $
+
+*uim-1.5.0_beta2 (01 May 2008)
+
+  01 May 2008; MATSUU Takuto <matsuu@gentoo.org> uim-1.4.1.ebuild,
+  -uim-1.4.1-r1.ebuild, uim-1.4.2.ebuild, +uim-1.5.0_beta2.ebuild:
+  Version bumped.
+  Fixed kde-base/kdelibs dependency, bug #213423.
 
 *uim-1.4.2 (24 Feb 2008)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 72b4c0e7f1bb..cace44824d69 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -2,8 +2,9 @@ AUX 50uim-el-gentoo.el 296 RMD160 0a966341d3f19dee46a855257ed7636a58e4418b SHA1
 AUX 50uim-gentoo.el 113 RMD160 4830acc8f32525aaae156cf0252d9e93cd41cc2c SHA1 64b0c88335dbfdab07938a8d92218407ebec2db1 SHA256 58a536e5b7d0ffac6802e60d348b092623601d25c8917d64a51347efab9e4cb7
 DIST uim-1.4.1.tar.bz2 2634265 RMD160 84d95720af62990e0fca1bd3d1a53eeca25d5deb SHA1 5de27af0f59d2e9775c1688dcd6d3848a434fb26 SHA256 145e77ea713b0ebc7afd4be4e8775029b764c4cdd2d54b96594f00b999117771
 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
-EBUILD uim-1.4.1-r1.ebuild 4591 RMD160 1d13e69f0a96f3fe84668c834108e1c545905eb4 SHA1 38f2451f33d2e93fb61db8e88ff33223afa25351 SHA256 465c1aa8a93fa174e06d2735836d5d749d13691e9cd8ba7bad114c6789f86351
-EBUILD uim-1.4.1.ebuild 3959 RMD160 3be8d686ea0ecec61891e787c8d98c4d53c1f596 SHA1 d3843bab7a8df1d4371378a9f980dfe08e8f4129 SHA256 4e87f1bc1727e52c57a274895ec8aa7ff4c545652ee800ed5025faace4540d00
-EBUILD uim-1.4.2.ebuild 4588 RMD160 465ffa489a8835dec71ba57469895db84bd5d689 SHA1 e7d6863184b01ceec4d3918b47bf75a05a6e8299 SHA256 f8ab21468a8896ab7960b77b5d882247646db8034f01b46772a62c27ce6de060
-MISC ChangeLog 24098 RMD160 ff57a4694f7e3afdaaa1e26830ccf6c218dad75e SHA1 b4aef22036b13c4a3825588904ccb9f5f371d1a0 SHA256 dbf3cdcc1d43b3680f8a856a4d52933d2b4fabffddad0f33e2ccf814249bd3ef
+DIST uim-1.5.0-beta2.tar.bz2 3334053 RMD160 89780bb3794964a2ee9c8c274e8b89137d00fd52 SHA1 6ae076a15cf915f0dedf96d75cae738790109bd8 SHA256 48c05c11e07756f2e58238794ee715647a18eaf1ec42db6472c6d3f6d9c51dde
+EBUILD uim-1.4.1.ebuild 3959 RMD160 d456fd6ca7f9f35ee064fe6994459c7b1503d90b SHA1 e759504224a0e5d5fef08a6bf7e752f4f2e8b94e SHA256 56a0a806cd11f93da707b07cde1699a85d70dbb00e09fec9c3493df247b6dda7
+EBUILD uim-1.4.2.ebuild 4599 RMD160 aed72778aa80b813cf3957671ea11b46b98e80a6 SHA1 78601b68e35daa41c399185f80b1ed1b0b461cf8 SHA256 94ab2b2c324717a6023c10184492c39ddcb14b18961c5c5c179fa70b7bcea0f7
+EBUILD uim-1.5.0_beta2.ebuild 5036 RMD160 d535012180b38548c1439f2e48a01c361b64c6a9 SHA1 c14dd45688b6b829144172d28a2d17565a94db82 SHA256 a1dc3da17ba582acf7fe8f1b2eb193aca9dc99bd250012bae2ac58c2e9d56339
+MISC ChangeLog 24333 RMD160 637f2eec1271b562278d58d3d90d1ab147942456 SHA1 1f55d95303b3e341414006273a422f9a8a9e310a SHA256 31814cd1281660c860173f142f3c9dcdb9c7f44e5df8b07661a940243f4d1b8b
 MISC metadata.xml 576 RMD160 a6e8e996c4de79f9f3ebfb216626edccbb975983 SHA1 45931c77f02247eef1443b5e25dc74faeea897a5 SHA256 47cb23337b2795e1453d35f68a45e7c0f9aad413be508e5f3042964c4b61434d
diff --git a/app-i18n/uim/uim-1.4.1.ebuild b/app-i18n/uim/uim-1.4.1.ebuild
index 86961ae381f6..3d17a31a101f 100644
--- a/app-i18n/uim/uim-1.4.1.ebuild
+++ b/app-i18n/uim/uim-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v 1.12 2007/08/10 22:27:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v 1.13 2008/05/01 16:34:56 matsuu Exp $
 
 inherit eutils qt3 multilib elisp-common flag-o-matic
 
diff --git a/app-i18n/uim/uim-1.4.2.ebuild b/app-i18n/uim/uim-1.4.2.ebuild
index ace419322ef9..3aed67e9d048 100644
--- a/app-i18n/uim/uim-1.4.2.ebuild
+++ b/app-i18n/uim/uim-1.4.2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.1 2008/02/24 16:28:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.2 2008/05/01 16:34:56 matsuu Exp $
 
+EAPI=1
 inherit eutils qt3 multilib elisp-common flag-o-matic
 
 DESCRIPTION="Simple, secure and flexible input method library"
@@ -26,7 +27,7 @@ RDEPEND="X? ( x11-libs/libX11
 	emacs? ( virtual/emacs )
 	gnome? ( >=gnome-base/gnome-panel-2.14 )
 	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs )
+	kde? ( kde-base/kdelibs:3.5 )
 	libedit? ( dev-libs/libedit )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
 	ncurses? ( sys-libs/ncurses )
diff --git a/app-i18n/uim/uim-1.4.1-r1.ebuild b/app-i18n/uim/uim-1.5.0_beta2.ebuild
index fbfcb6914c12..3cdc0bbb4036 100644
--- a/app-i18n/uim/uim-1.4.1-r1.ebuild
+++ b/app-i18n/uim/uim-1.5.0_beta2.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1-r1.ebuild,v 1.1 2007/10/14 23:02:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.0_beta2.ebuild,v 1.1 2008/05/01 16:34:56 matsuu Exp $
 
+EAPI=1
 inherit eutils qt3 multilib elisp-common flag-o-matic
 
+MY_P="${P/_/-}"
 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"
+SRC_URI="http://uim.googlecode.com/files/${MY_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 kde libedit m17n-lib ncurses nls prime qt3 X linguas_zh_CN linguas_ja linguas_ko"
+IUSE="anthy canna eb emacs gnome gtk kde libedit m17n-lib ncurses nls prime qt3
+qt4 truetype unicode X linguas_zh_CN linguas_ja linguas_ko"
 
 RDEPEND="X? ( x11-libs/libX11
 		x11-libs/libXft
@@ -26,13 +29,14 @@ RDEPEND="X? ( x11-libs/libX11
 	emacs? ( virtual/emacs )
 	gnome? ( >=gnome-base/gnome-panel-2.14 )
 	gtk? ( >=x11-libs/gtk+-2.4 )
-	kde? ( kde-base/kdelibs )
+	kde? ( kde-base/kdelibs:3.5 )
 	libedit? ( dev-libs/libedit )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( virtual/libintl )
 	prime? ( app-i18n/prime )
 	qt3? ( $(qt_min_version 3.3.4) )
+	qt4? ( || ( x11-libs/qt-core:4 >=x11-libs/qt-4:4 ) )
 	!app-i18n/uim-svn
 	!<app-i18n/prime-0.9.4"
 
@@ -49,6 +53,8 @@ RDEPEND="${RDEPEND}
 	)"
 #		linguas_zh_TW? ( media-fonts/taipeifonts )
 
+S="${WORKDIR}/${MY_P}"
+
 SITEFILE=50${PN}-gentoo.el
 
 pkg_setup() {
@@ -76,14 +82,29 @@ src_compile() {
 		append-flags -DQT_THREAD_SUPPORT
 	fi
 
-	if use gtk || use qt3 ; then
+	if use gtk || use qt3 || 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 qt3 || use qt4 ; then
+		myconf="${myconf} --with-qt"
+	else
+		myconf="${myconf} --without-qt"
+	fi
+
 	econf $(use_with X x) \
-		$(use_with anthy) \
 		$(use_with canna) \
 		$(use_with eb) \
 		$(use_enable emacs) \
@@ -95,8 +116,9 @@ src_compile() {
 		$(use_with m17n-lib m17nlib) \
 		$(use_enable ncurses fep) \
 		$(use_enable nls) \
-		$(use_with qt3 qt) \
 		$(use_with qt3 qt-immodule) \
+		$(use_with qt4 qt-immodule) \
+		$(use_with truetype xft) \
 		${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"