Version bumped, bug #294120. Drop ~sparc because >=kde-base/kdelibs-4 has no sparc KEYWORDS.

(Portage version: 2.1.7.5/cvs/Linux x86_64)

5 files changed, 21 insertions, 177 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 06afefc4fb4b..171b14b0ddbc 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.208 2009/11/20 17:09:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.209 2009/11/23 15:14:17 matsuu Exp $
+
+*uim-1.5.7 (23 Nov 2009)
+
+  23 Nov 2009; MATSUU Takuto <matsuu@gentoo.org> -files/50uim-el-gentoo.el,
+  -uim-1.4.1.ebuild, -files/uim-1.5.5-applet.patch, -uim-1.5.6-r2.ebuild,
+  +uim-1.5.7.ebuild:
+  Version bumped, bug #294120. Removed old versions. Drop ~sparc because
+  >=kde-base/kdelibs-4 has no sparc KEYWORDS.
 
 *uim-1.5.6-r4 (20 Nov 2009)
 
diff --git a/app-i18n/uim/files/50uim-el-gentoo.el b/app-i18n/uim/files/50uim-el-gentoo.el
deleted file mode 100644
index f15456841494..000000000000
--- a/app-i18n/uim/files/50uim-el-gentoo.el
+++ /dev/null
@@ -1,11 +0,0 @@
-
-;;; uim-el site-lisp configuration
-
-(require 'uim)
-
-;; assign C-o to uim-mode-switch
-(global-set-key "\C-o" 'uim-mode-switch)
-(define-key uim-mode-map "\C-o" 'uim-mode-switch)
-
-;; please set this to nil if you prefer candidate display in minibuffer
-(setq uim-candidate-display-inline-default t)
diff --git a/app-i18n/uim/files/uim-1.5.5-applet.patch b/app-i18n/uim/files/uim-1.5.5-applet.patch
deleted file mode 100644
index 6b2c575088d0..000000000000
--- a/app-i18n/uim/files/uim-1.5.5-applet.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -pruN uim-1.5.5.orig/configure.ac uim-1.5.5/configure.ac
---- uim-1.5.5.orig/configure.ac	2008-10-29 20:15:24.000000000 +0900
-+++ uim-1.5.5/configure.ac	2009-02-26 18:57:03.000000000 +0900
-@@ -725,13 +725,13 @@ AC_ARG_ENABLE(gnome-applet,
-         use_applet_gnome="no"
-       ;;
-       yes|*)
--        PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0, use_applet_gnome="yes",use_applet_gnome="no")
-+        PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0 libgnomeui-2.0, use_applet_gnome="yes",use_applet_gnome="no")
-         PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0, panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
-       ;;
-     esac
-   ],
-   [
--    PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0, use_applet_gnome="yes",use_applet_gnome="no")
-+    PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0 libgnomeui-2.0, use_applet_gnome="yes",use_applet_gnome="no")
-     PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0, panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
-   ])
- 
diff --git a/app-i18n/uim/uim-1.4.1.ebuild b/app-i18n/uim/uim-1.4.1.ebuild
deleted file mode 100644
index 90a2d8a92a5e..000000000000
--- a/app-i18n/uim/uim-1.4.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2009 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.15 2009/10/25 00:36:00 ssuominen Exp $
-
-EAPI=1
-
-inherit eutils qt3 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="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="anthy canna eb emacs gnome gtk libedit m17n-lib ncurses nls prime qt3 X linguas_zh_CN 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? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
-	canna? ( app-i18n/canna )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	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? ( x11-libs/qt:3 )
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto
-		x11-proto/xproto )"
-
-RDEPEND="${RDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		linguas_zh_CN? ( media-fonts/font-isas-misc )
-		linguas_ja? ( media-fonts/font-jis-misc )
-		linguas_ko? ( media-fonts/font-daewoo-misc )
-	)"
-#		linguas_zh_TW? ( media-fonts/taipeifonts )
-
-pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		eerror "To support qt3 in this package is required to have"
-		eerror "=x11-libs/qt-3* compiled with immqt-bc(recommended) or immqt USE flag."
-		die "Please reemerge =x11-libs/qt-3* with USE=\"immqt-bc\" or USE=\"immqt\"."
-
-	fi
-	# 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_compile() {
-	local myconf
-
-	if use gtk && (use anthy || use canna); then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use qt3 ; then
-		append-flags -DQT_THREAD_SUPPORT
-	fi
-
-	if use gtk || use qt3 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	econf $(use_with X x) \
-		$(use_with anthy) \
-		$(use_with canna) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with qt3 qt) \
-		$(use_with qt3 qt-immodule) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	use emacs && elisp-site-file-install "${FILESDIR}"/50uim-el-gentoo.el
-}
-
-pkg_postinst() {
-	elog
-	elog "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	elog
-
-	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-qt."
-	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
-	use emacs && elisp-site-regen
-}
-
-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.5.6-r2.ebuild b/app-i18n/uim/uim-1.5.7.ebuild
index dd8480542b3c..21b500aab674 100644
--- a/app-i18n/uim/uim-1.5.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r2.ebuild,v 1.2 2009/10/25 00:36:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild,v 1.1 2009/11/23 15:14:17 matsuu Exp $
 
 EAPI="2"
 inherit autotools eutils qt3 multilib elisp-common flag-o-matic
@@ -11,8 +11,8 @@ SRC_URI="http://uim.googlecode.com/files/${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 libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+anthy canna eb emacs gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
 
 RDEPEND="X? (
 		x11-libs/libX11
@@ -32,6 +32,7 @@ RDEPEND="X? (
 	emacs? ( virtual/emacs )
 	gnome? ( >=gnome-base/gnome-panel-2.14 )
 	gtk? ( >=x11-libs/gtk+-2.4 )
+	kde? ( >=kde-base/kdelibs-4 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
@@ -50,6 +51,7 @@ RDEPEND="X? (
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/gettext-0.15
+	kde? ( dev-util/cmake )
 	X? (
 		x11-proto/xextproto
 		x11-proto/xproto
@@ -81,10 +83,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.5.4-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-1.5.4-gcc43.patch"
-	epatch "${FILESDIR}/${PN}-1.5.4-zhTW.patch"
-	epatch "${FILESDIR}/${PN}-disable-notify.diff"
+	epatch \
+		"${FILESDIR}/${PN}-1.5.4-gentoo.patch" \
+		"${FILESDIR}/${PN}-1.5.4-gcc43.patch" \
+		"${FILESDIR}/${PN}-1.5.4-zhTW.patch"
 
 	# bug 275420
 	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
@@ -104,7 +106,7 @@ src_configure() {
 		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"
@@ -133,12 +135,14 @@ src_configure() {
 		$(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) \
 		$(use_with qt3 qt) \
 		$(use_with qt3 qt-immodule) \
+		$(use_with qt4 qt4) \
 		$(use_with qt4 qt4-immodule) \
 		$(use_with xft) \
 		${myconf} || die "econf failed"