backport from trunk for build issue, bug #284815.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 266 insertions, 2 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 75d8011cb558..7b061187273b 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.202 2009/09/15 22:15:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.203 2009/09/16 16:23:00 matsuu Exp $
+
+*uim-1.5.6-r2 (16 Sep 2009)
+
+  16 Sep 2009; MATSUU Takuto <matsuu@gentoo.org> +uim-1.5.6-r2.ebuild,
+  +files/uim-disable-notify.diff:
+  backport from trunk for build issue, bug #284815.
 
   15 Sep 2009; Jeroen Roovers <jer@gentoo.org> uim-1.5.6-r1.ebuild:
   Stable for HPPA (bug #268190).
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index b7eb5bd6ca1b..99b22cbd2881 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -4,6 +4,7 @@ AUX uim-1.5.4-gcc43.patch 404 RMD160 99bb3adb856b82b7efcf5e9e07dfe1a647cde83d SH
 AUX uim-1.5.4-gentoo.patch 1366 RMD160 2ff73cab38b95772245ed78c06166ca865aa4474 SHA1 cb729594bd9d1cf56c084050ed954bf07fac0e8d SHA256 5b9639144848e42a049426172d7a4b53cbc74532e9787881a807511ab8b6552b
 AUX uim-1.5.4-zhTW.patch 1034 RMD160 8d9102b0937d2746a1b4bad5470b1480b94b5eb8 SHA1 d93cf2c1f7e253fefdbdb80f2207b2080d2d1768 SHA256 82afb0a1cc1c2e706ac02da71084fe16655bbcb9719710ae37057ab6c14b9196
 AUX uim-1.5.5-applet.patch 1091 RMD160 3094d86f539a0d2bf318d8c7e18bff0381ab61e6 SHA1 ee0a110a67027e0d51a6cd661cd08110312f47f2 SHA256 8842cef3f4a7df062abb5d05526ee34b638e3b72d037cfcb99bba3b873664f5d
+AUX uim-disable-notify.diff 1738 RMD160 a19b315a0b5f1408c543535886665562e90dd666 SHA1 023ce4cb996ddcd50ce19892a202c6d09dcab522 SHA256 05325e441d0c7d6ae241976ac0e432e4cb7f56c9c4b2d37eddfd081e45490848
 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.5.tar.bz2 3259238 RMD160 ac3815658d02abde9d2bf68b90f3e3777734d7e9 SHA1 d688f962073f0f95391fa38cb82ee5703c2ff3b8 SHA256 b5be3e3651234a442723d8ae4c15219520dac1cab087c62958d0ba8dd0fff43d
@@ -12,6 +13,7 @@ EBUILD uim-1.4.1.ebuild 3956 RMD160 e5c4f8885725cac6f6f78f4937cbb67904e72bce SHA
 EBUILD uim-1.4.2.ebuild 4586 RMD160 3370c7659bfefaaf4dab1d6e0aabbf98d7f65612 SHA1 3361443f8dfe07634e52aae81ee8d137d843e878 SHA256 d20decc372b71f7b80c63dcb0846d52f5a821fa35d87b8357a011ff59107e28c
 EBUILD uim-1.5.5-r1.ebuild 5455 RMD160 ef6583ec0df1d2ba714fe3b02aedff0e3de5f7f2 SHA1 fb106c0257c809521873afa339cc220a62223ede SHA256 527f5e7d965bef45af1c64c19237177c7b432655659751f5e99ca3c77af65568
 EBUILD uim-1.5.6-r1.ebuild 5495 RMD160 2622e04e174d6b1487e30b107aa70fc328027872 SHA1 cf0de6cdf5fc1b1a340201ca2646eac1019a4b3c SHA256 73dd94d04598b1aaed846cb971d7dd504d556a4edcdf056fef7875a16597ada7
+EBUILD uim-1.5.6-r2.ebuild 5551 RMD160 c1a0f269e1bfe97fddd62600332f349fd85e73eb SHA1 86cceb7cd1f8764ecbc922adf43b6db8621140e1 SHA256 f4d6f497dfd2963f3a638ebf08636e2db7982b58f4402497804cda74da6372d3
 EBUILD uim-1.5.6.ebuild 5393 RMD160 970e6b6aeb5895ec8bc8a58c806dd266ad60b6f2 SHA1 8edfd17debad475ee0181f15beb81f71b17aaaf5 SHA256 55dae85376b0385a9fd2de9c485dfd5da651fd96d12353caf919c0c21eb48570
-MISC ChangeLog 28162 RMD160 a1679de1f3cb4ed24d9d1cf20228c9178d4ff25d SHA1 d6ffc2ee9144f13f1f51383b4639dc7ce3f4824c SHA256 caa0092625c6f499b61422f66c0c614c63c581da6e5f9a761a628ce5c910089d
+MISC ChangeLog 28352 RMD160 f2cad6e86117dfc063bd92836a93611ae1ed0acd SHA1 4b7b49ba59f01fd6b1c94c7d2822b4e826e81a19 SHA256 6edd9bbabc03f8fe274848782d3386e32faa83ef335976506a1fc861184c1106
 MISC metadata.xml 815 RMD160 012fd0ff539fa5f7d943f2b2b955af2b1a51579f SHA1 1c035765a6908e1b767689d899a68876e44dc772 SHA256 a1f64b1559c0291cb60d8783c53482f9235f03802984816c827255f92d171d5e
diff --git a/app-i18n/uim/files/uim-disable-notify.diff b/app-i18n/uim/files/uim-disable-notify.diff
new file mode 100644
index 000000000000..cbb33a82494d
--- /dev/null
+++ b/app-i18n/uim/files/uim-disable-notify.diff
@@ -0,0 +1,50 @@
+Index: uim/uim-notify.c
+===================================================================
+--- uim/uim-notify.c	(revision 5997)
++++ uim/uim-notify.c	(working copy)
+@@ -111,6 +111,8 @@
+ 
+   if (strcmp(agent->desc()->name, name) == 0) {
+     return UIM_TRUE;
++  } if (getenv("UIM_DISABLE_NOTIFY") != NULL) {
++    return UIM_TRUE;
+   } else if (strcmp(name, "stderr") == 0) {
+     agent->quit();
+     if (notify_dlhandle)
+@@ -238,6 +240,10 @@
+ 		    MAKE_STR(desc->name),
+ 		    MAKE_STR(desc->desc)),
+ 	      uim_scm_null());
++
++  if (getenv("UIM_DISABLE_NOTIFY") != NULL)
++    return uim_scm_callf("reverse", "o", ret_);
++
+   dirp = opendir(NOTIFY_PLUGIN_PATH);
+   if (dirp) {
+     while ((dp = readdir(dirp)) != NULL) {
+Index: scm/Makefile.am
+===================================================================
+--- scm/Makefile.am	(revision 5997)
++++ scm/Makefile.am	(working copy)
+@@ -97,7 +97,8 @@
+ UIM_MODULE_MANAGER_ENV = \
+         LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \
+         LIBUIM_SCM_FILES=$(abs_srcdir) \
+-        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs
++        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs \
++        UIM_DISABLE_NOTIFY=1
+ 
+ installed-modules.scm loader.scm: $(SCM_FILES)
+ 	$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/uim uim-module-manager && \
+--- scm/Makefile.in.orig	Tue Sep 15 02:01:18 2009
++++ scm/Makefile.in	Tue Sep 15 02:01:36 2009
+@@ -363,7 +363,8 @@
+ UIM_MODULE_MANAGER_ENV = \
+         LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \
+         LIBUIM_SCM_FILES=$(abs_srcdir) \
+-        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs
++        LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs \
++        UIM_DISABLE_NOTIFY=1
+ 
+ all: all-am
+ 
diff --git a/app-i18n/uim/uim-1.5.6-r2.ebuild b/app-i18n/uim/uim-1.5.6-r2.ebuild
new file mode 100644
index 000000000000..02c2ebd691d5
--- /dev/null
+++ b/app-i18n/uim/uim-1.5.6-r2.ebuild
@@ -0,0 +1,206 @@
+# 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.1 2009/09/16 16:23:00 matsuu Exp $
+
+EAPI="2"
+inherit autotools 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 unicode X xft linguas_zh_CN linguas_zh_TW 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}
+	dev-util/pkgconfig
+	>=sys-devel/gettext-0.15
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+RDEPEND="${RDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		linguas_zh_CN? (
+			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
+		)
+		linguas_zh_TW? (
+			media-fonts/intlfonts
+		)
+		linguas_ja? (
+			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
+		)
+		linguas_ko? (
+			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
+		)
+	)"
+
+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}/${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"
+
+	# bug 275420
+	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
+	eautoconf
+}
+
+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 && 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) \
+		$(use_with qt3 qt-immodule) \
+		$(use_with qt4 qt4-immodule) \
+		$(use_with 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 b0rked, 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 "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
+}