Fixed qt4 issue, bug #244841.

Added libnotify USE flag. cleanup.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 224 insertions, 2 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index bcbbff1e915d..c2f15761e0f9 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.187 2008/10/28 23:43:12 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.188 2008/10/29 17:00:51 matsuu Exp $
+
+*uim-1.5.4-r1 (29 Oct 2008)
+
+  29 Oct 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/uim-1.5.4-gentoo.patch, +uim-1.5.4-r1.ebuild:
+  Fixed qt4 issue, bug #244841. Added libnotify USE flag. cleanup.
 
 *uim-1.5.4 (28 Oct 2008)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 9821ed532af6..feb07d1bb65c 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,5 +1,6 @@
 AUX 50uim-el-gentoo.el 296 RMD160 0a966341d3f19dee46a855257ed7636a58e4418b SHA1 a313337910f00e8cd920cbf036cc5d672e95a9b5 SHA256 e572b2c766fcf5534dc687ec9a7e4384e3a5747431f91695c977a925392baeb4
 AUX 50uim-gentoo.el 113 RMD160 4830acc8f32525aaae156cf0252d9e93cd41cc2c SHA1 64b0c88335dbfdab07938a8d92218407ebec2db1 SHA256 58a536e5b7d0ffac6802e60d348b092623601d25c8917d64a51347efab9e4cb7
+AUX uim-1.5.4-gentoo.patch 1366 RMD160 2ff73cab38b95772245ed78c06166ca865aa4474 SHA1 cb729594bd9d1cf56c084050ed954bf07fac0e8d SHA256 5b9639144848e42a049426172d7a4b53cbc74532e9787881a807511ab8b6552b
 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
 DIST uim-1.5.3.tar.bz2 3245982 RMD160 b9ab2c941f4d6f4ecc3e0052378c8ba2019fac31 SHA1 c958fbb686e81e0708233834e1f1313078685aef SHA256 ac0d3f26d61067c867a877cb8bba5aeff82659da8a4606cb6655dabfd824013a
@@ -7,6 +8,7 @@ DIST uim-1.5.4.tar.bz2 3212490 RMD160 e7beb0602fff76444d47350c3057a7b533c15b20 S
 EBUILD uim-1.4.1.ebuild 3956 RMD160 e5c4f8885725cac6f6f78f4937cbb67904e72bce SHA1 5bd58ce7165a99bc8b716c20e8ecb853e677e361 SHA256 48f2fc7e38c7b233012f611893c5be115e84498a7789ee1f31a442cc228357a7
 EBUILD uim-1.4.2.ebuild 4590 RMD160 254b7c44c4d8c363e514f1024439e467da948c0b SHA1 f77658148f89fbf5c424d34e11e187798e01df2f SHA256 270579c6e3c1864e037496562a1fa4d3a1967178860b358a2df9c8f41c582b6e
 EBUILD uim-1.5.3.ebuild 5078 RMD160 813fbf3e6e3716f41f231b19393a4bc5c33b4906 SHA1 1a3bd6fe646e9534510a02bbcb63a686ca1d0c5f SHA256 c64f125bfba4153bbf29452d6b404e9b8fd448e3118c8b34edd9b464452145cd
+EBUILD uim-1.5.4-r1.ebuild 5241 RMD160 fbccd758b0f13e8626539926b36f3cff890e136f SHA1 d30dbacec369c91cc96f39015159682a3f9fea6d SHA256 298d5d1861f40ef12689b01e321661eb4b208898e78e4e801c564c9a3730beb5
 EBUILD uim-1.5.4.ebuild 4806 RMD160 925a2ba9ee5b18d359cda209f47f3830c16f02d3 SHA1 e29994f2b5fc3cdcc75dba3972b71aa268c81c05 SHA256 75f1eacaab45b2ad0386b2f761e07d56697d36d571cf7dfcdb2a81ac31228cc3
-MISC ChangeLog 26124 RMD160 7a2373a33894dec5cc1f7629104323b89ec4fd81 SHA1 908a1e8e35fc6ed01c50388cf91ac1bc8c23ce1b SHA256 dae1e2d3af5876cd8079c4bd95da9433278116c168b636c30fb1bcb241219c5b
+MISC ChangeLog 26325 RMD160 213f056dbf1f3377024afb82ad7f5147f03dc97e SHA1 cfb471a06a3669c427ddc81d17ab72025ba1255a SHA256 dfa479d5925f8939d5646d2e6091390c62baa10756d92b9593b0c44ce7e61641
 MISC metadata.xml 815 RMD160 012fd0ff539fa5f7d943f2b2b955af2b1a51579f SHA1 1c035765a6908e1b767689d899a68876e44dc772 SHA256 a1f64b1559c0291cb60d8783c53482f9235f03802984816c827255f92d171d5e
diff --git a/app-i18n/uim/files/uim-1.5.4-gentoo.patch b/app-i18n/uim/files/uim-1.5.4-gentoo.patch
new file mode 100644
index 000000000000..b13af6aa2404
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.5.4-gentoo.patch
@@ -0,0 +1,24 @@
+diff -Naur uim-1.5.4.orig/notify/Makefile.am uim-1.5.4/notify/Makefile.am
+--- uim-1.5.4.orig/notify/Makefile.am	2008-03-29 22:33:30.000000000 +0900
++++ uim-1.5.4/notify/Makefile.am	2008-10-30 01:38:43.000000000 +0900
+@@ -14,6 +14,8 @@
+ endif
+ 
+ if KNOTIFY3
++QT_CXXFLAGS = $(UIM_QT_CXXFLAGS)
++QT_LDFLAGS  = $(UIM_QT_LDFLAGS)
+ uimnotify_plugin_LTLIBRARIES += libuimnotify-knotify3.la
+ libuimnotify_knotify3_la_SOURCES = uim-knotify3.cc
+ libuimnotify_knotify3_la_CXXFLAGS = -I@KNOTIFY3_INCLUDE_DIR@ $(QT_CXXFLAGS)
+diff -Naur uim-1.5.4.orig/notify/Makefile.in uim-1.5.4/notify/Makefile.in
+--- uim-1.5.4.orig/notify/Makefile.in	2008-10-24 21:11:28.000000000 +0900
++++ uim-1.5.4/notify/Makefile.in	2008-10-30 01:45:46.000000000 +0900
+@@ -369,6 +369,8 @@
+ @LIBNOTIFY_TRUE@libuimnotify_libnotify_la_CFLAGS = @LIBNOTIFY_CFLAGS@
+ @LIBNOTIFY_TRUE@libuimnotify_libnotify_la_LDFLAGS = -avoid-version -module
+ @LIBNOTIFY_TRUE@libuimnotify_libnotify_la_LIBADD = @LIBNOTIFY_LIBS@ $(top_builddir)/replace/libreplace.la
++@KNOTIFY3_TRUE@QT_CXXFLAGS = $(UIM_QT_CXXFLAGS)
++@KNOTIFY3_TRUE@QT_LDFLAGS = $(UIM_QT_LDFLAGS)
+ @KNOTIFY3_TRUE@libuimnotify_knotify3_la_SOURCES = uim-knotify3.cc
+ @KNOTIFY3_TRUE@libuimnotify_knotify3_la_CXXFLAGS = -I@KNOTIFY3_INCLUDE_DIR@ $(QT_CXXFLAGS)
+ @KNOTIFY3_TRUE@libuimnotify_knotify3_la_LDFLAGS = -avoid-version -module -L@KNOTIFY3_LIB_DIR@ $(QT_LDFLAGS)
diff --git a/app-i18n/uim/uim-1.5.4-r1.ebuild b/app-i18n/uim/uim-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..7b3a63f518d6
--- /dev/null
+++ b/app-i18n/uim/uim-1.5.4-r1.ebuild
@@ -0,0 +1,190 @@
+# 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.5.4-r1.ebuild,v 1.1 2008/10/29 17:00:51 matsuu Exp $
+
+EAPI=2
+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 kde libedit libnotify 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
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender )
+	anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) )
+	canna? ( app-i18n/canna )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	gnome? ( >=gnome-base/gnome-panel-2.14 )
+	gtk? ( >=x11-libs/gtk+-2.4 )
+	kde? ( kde-base/kdelibs:3.5 )
+	libedit? ( dev-libs/libedit )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	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.2.0:3[immqt-bc] >=x11-libs/qt-3.2.0:3[immqt] ) )
+	qt4? ( || ( x11-libs/qt-core:4 =x11-libs/qt-4.3*:4 ) )
+	!app-i18n/uim-svn
+	!<app-i18n/prime-0.9.4"
+#	mana? ( app-i18n/mana )
+#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
+#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
+#	wnn? ( app-i18n/wnn )
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto
+		x11-proto/xproto )
+	nls? ( sys-devel/gettext )"
+
+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 )
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	# 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_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+src_configure() {
+	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
+
+	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 ; then
+		myconf="${myconf} --with-qt"
+	else
+		myconf="${myconf} --without-qt"
+	fi
+
+	if use qt3 && use kde ; then
+		myconf="${myconf} --enable-notify=knotify3"
+	elif use libnotify ; then
+		myconf="${myconf} --enable-notify=libnotify"
+	fi
+
+	econf $(use_with X x) \
+		$(use_with canna) \
+		$(use_with eb) \
+		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
+		$(use_enable gnome gnome-applet) \
+		$(use_with gtk gtk2) \
+		$(use_with libedit) \
+		$(use_enable kde kde-applet) \
+		$(use_with m17n-lib m17nlib) \
+		$(use_enable ncurses fep) \
+		$(use_enable nls) \
+		$(use_with prime) \
+		$(use_with qt3 qt-immodule) \
+		$(use_with qt4 qt4-immodule) \
+		$(use_with truetype xft) \
+		${myconf} || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	# parallel make install borks, bug #222677
+	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
+	if use emacs; then
+		elisp-install uim-el emacs/*.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
+			|| die "elisp-site-file-install failed"
+	fi
+}
+
+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"
+	if use emacs; then
+		elisp-site-regen
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of features:"
+		elog "There is no keybinding defined to call it directly, so please"
+		elog "create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have"
+		elog "a look at the documentation how to achieve this."
+	fi
+}
+
+pkg_postrm() {
+	use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	use emacs && elisp-site-regen
+}