Fixed libedit related issue, bug #275420.

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

3 files changed, 213 insertions, 2 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index e367e88dfcfe..3e00d28279ff 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.196 2009/06/25 14:54:39 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.197 2009/06/28 14:36:09 matsuu Exp $
+
+*uim-1.5.6-r1 (28 Jun 2009)
+
+  28 Jun 2009; MATSUU Takuto <matsuu@gentoo.org> +uim-1.5.6-r1.ebuild:
+  Fixed libedit related issue, bug #275420.
 
 *uim-1.5.6 (25 Jun 2009)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 6dbd7d57bcd6..6df924d3d5b0 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -11,6 +11,7 @@ DIST uim-1.5.6.tar.bz2 3343584 RMD160 01774ff38e64436945290a5c3b2e1dc1a14d6771 S
 EBUILD uim-1.4.1.ebuild 3956 RMD160 e5c4f8885725cac6f6f78f4937cbb67904e72bce SHA1 5bd58ce7165a99bc8b716c20e8ecb853e677e361 SHA256 48f2fc7e38c7b233012f611893c5be115e84498a7789ee1f31a442cc228357a7
 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 5503 RMD160 46a6f4c0d96e660891f7ee9775c4efc2aa0f55b6 SHA1 c90540f97da8c1bc153ccd59367c05fbb24730fe SHA256 c78f789fb274fa3e49ca56c49beebcf7efce57f34862d8abec0b50fda2dc1311
 EBUILD uim-1.5.6.ebuild 5393 RMD160 970e6b6aeb5895ec8bc8a58c806dd266ad60b6f2 SHA1 8edfd17debad475ee0181f15beb81f71b17aaaf5 SHA256 55dae85376b0385a9fd2de9c485dfd5da651fd96d12353caf919c0c21eb48570
-MISC ChangeLog 27526 RMD160 caf388fa12855fc0fd50770f5e9b37d075bf7320 SHA1 c4792c7b5304efd9f8a054dcd2133ec3c8284a9a SHA256 811de64d22c1615540a2d56974265dd2b1b58176c0e668d0239967ac7cddd99c
+MISC ChangeLog 27671 RMD160 6427db4b84a4c7635beb188314178a686dbfbbef SHA1 64bff26c335d8ccc12a0112e73782201ea3bd819 SHA256 89935331531a6a30154cf337c3044c33dec29cd57001fb59cc9399884c6c8563
 MISC metadata.xml 815 RMD160 012fd0ff539fa5f7d943f2b2b955af2b1a51579f SHA1 1c035765a6908e1b767689d899a68876e44dc772 SHA256 a1f64b1559c0291cb60d8783c53482f9235f03802984816c827255f92d171d5e
diff --git a/app-i18n/uim/uim-1.5.6-r1.ebuild b/app-i18n/uim/uim-1.5.6-r1.ebuild
new file mode 100644
index 000000000000..a560cbb717b6
--- /dev/null
+++ b/app-i18n/uim/uim-1.5.6-r1.ebuild
@@ -0,0 +1,205 @@
+# 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-r1.ebuild,v 1.1 2009/06/28 14:36:09 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"
+
+	# 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
+}