summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatsuu Takuto <matsuu@gentoo.org>2011-01-08 06:21:31 +0000
committerMatsuu Takuto <matsuu@gentoo.org>2011-01-08 06:21:31 +0000
commiteb02e989b86770ffd420c996412ffa6bbf52f3d6 (patch)
tree71336902a4a3226a37a24067aee74b09092d4493 /app-i18n
parentInitial import. (diff)
downloadgentoo-2-eb02e989b86770ffd420c996412ffa6bbf52f3d6.tar.gz
gentoo-2-eb02e989b86770ffd420c996412ffa6bbf52f3d6.tar.bz2
gentoo-2-eb02e989b86770ffd420c996412ffa6bbf52f3d6.zip
Version bumped. Support imsettings.
(Portage version: 2.1.9.28/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/uim/ChangeLog8
-rw-r--r--app-i18n/uim/files/xinput-uim5
-rw-r--r--app-i18n/uim/uim-1.6.1.ebuild (renamed from app-i18n/uim/uim-1.6.0-r1.ebuild)16
3 files changed, 22 insertions, 7 deletions
diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index cc3f00ecbc6c..3294f58d6d6b 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-i18n/uim
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.226 2011/01/05 11:17:11 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.227 2011/01/08 06:21:31 matsuu Exp $
+
+*uim-1.6.1 (08 Jan 2011)
+
+ 08 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> -uim-1.6.0-r1.ebuild,
+ +uim-1.6.1.ebuild, +files/xinput-uim:
+ Version bumped. Support imsettings. Removed old version.
*uim-1.6.0-r2 (05 Jan 2011)
diff --git a/app-i18n/uim/files/xinput-uim b/app-i18n/uim/files/xinput-uim
new file mode 100644
index 000000000000..ff046b4fc851
--- /dev/null
+++ b/app-i18n/uim/files/xinput-uim
@@ -0,0 +1,5 @@
+XIM=uim
+XIM_PROGRAM=@EPREFIX@/usr/bin/uim-xim
+XIM_ARGS=
+GTK_IM_MODULE=uim
+QT_IM_MODULE=uim
diff --git a/app-i18n/uim/uim-1.6.0-r1.ebuild b/app-i18n/uim/uim-1.6.1.ebuild
index d28832045cd7..ab57bfbc0a36 100644
--- a/app-i18n/uim/uim-1.6.0-r1.ebuild
+++ b/app-i18n/uim/uim-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.0-r1.ebuild,v 1.2 2010/12/26 17:29:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.1.ebuild,v 1.1 2011/01/08 06:21:31 matsuu Exp $
EAPI="3"
inherit autotools eutils multilib elisp-common flag-o-matic
@@ -12,7 +12,6 @@ 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"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="+anthy canna curl eb emacs ffi gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
RESTRICT="test"
@@ -94,13 +93,14 @@ pkg_setup() {
src_prepare() {
epatch \
- "${FILESDIR}/${P}-gentoo.patch" \
+ "${FILESDIR}/${PN}-1.6.0-gentoo.patch" \
"${FILESDIR}/${PN}-1.5.4-zhTW.patch" \
- "${FILESDIR}/${P}-sandbox-violation.patch"
+ "${FILESDIR}/${PN}-1.6.0-linker.patch"
# bug 275420
sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
- eautoconf
+ #./autogen.sh
+ AT_NO_RECURSIVE=1 eautoreconf
}
src_configure() {
@@ -180,6 +180,10 @@ src_install() {
|| die "elisp-site-file-install failed"
fi
+ sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
+ insinto /etc/X11/xinit/xinput.d
+ doins "${T}/uim.conf" || die
+
# collision with dev-scheme/sigscheme, bug #330975
# find "${ED}" -name '*gcroots*' -delete || die
}