Fixed gnome-panel dependency, bug #348158. EAPI=3. imsettings support.

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

4 files changed, 139 insertions, 3 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index 387ecf8bf9e2..bab8e0625000 100644
--- a/app-i18n/im-ja/ChangeLog
+++ b/app-i18n/im-ja/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/im-ja
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.59 2009/10/18 23:44:03 matsuu Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.60 2011/01/12 15:06:47 matsuu Exp $
+
+*im-ja-1.5-r2 (12 Jan 2011)
+
+  12 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> +im-ja-1.5-r2.ebuild,
+  +files/xinput-im-ja:
+  Fixed gnome-panel dependency, bug #348158. EAPI=3. imsettings support.
 
 *im-ja-1.5-r1 (18 Oct 2009)
 
diff --git a/app-i18n/im-ja/Manifest b/app-i18n/im-ja/Manifest
index 73f5467fd911..e7ff1ae67578 100644
--- a/app-i18n/im-ja/Manifest
+++ b/app-i18n/im-ja/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX im-ja-1.5-gentoo.patch 1248 RMD160 caa74cd924ad751fe88b4c80ed2eb0c9c5168329 SHA1 9b40e4bcae8001334b3ccda0d6f1dc5cd2665fee SHA256 a7002f2a5c796718e53514420f3f822f09bd77e297ff0e787ff02cadb5531965
+AUX xinput-im-ja 198 RMD160 badfac2a08d4c6d825a58ec85419a3f02e08ca2e SHA1 d755fc4768fabdd0e7a1d6ded0fd771223fc39b8 SHA256 8ba6698e33fe4cca0d214cf00e4a3442033cb314c771c1f8cb6fc7f85b86d090
 DIST im-ja-1.5.tar.gz 905539 RMD160 24c16b77bff1caa6b0fa439c4fc81f0772eb3eba SHA1 1f8b4b6286be0dd0e004db018203bb5ec1093674 SHA256 96f4ed82706a873bdade99a934a1a66431f146758837ed0f007e3c145649f780
 EBUILD im-ja-1.5-r1.ebuild 2586 RMD160 081487a2024518c4b332e9518b985986c8edc53f SHA1 1d109e20d5cf7997f91789b47976d6f10eb16848 SHA256 ad917410255e25716f48d3df145368fbdb04775a1826c4a134a4f51b0b1021dd
+EBUILD im-ja-1.5-r2.ebuild 2786 RMD160 86af59ff29ac9b13b87271d51c574ada81bc0f8e SHA1 1b3f4a032b1e73d1e4438e91bffaf1cd870f9ce0 SHA256 037e1a61cc1eaaa5e202d3e705bd7b3f7706b0b169635707b24d3f55d265dd3a
 EBUILD im-ja-1.5.ebuild 2556 RMD160 b5aa4dffdf18e1c558d44337ba6da35babc312ef SHA1 20a6ad6c60d15975c4a3a653a6f89baafdf2e9b4 SHA256 2b61b2dcf6910315374f22490fe4800f61d64e673912b07c90f65e09715f7bcf
-MISC ChangeLog 8030 RMD160 ce410169fe034b30ad8a140335bc560b62ee3eb1 SHA1 6a82f2f04629f5f86756bf6568f4226926818284 SHA256 373fe1268a917c4e9331de2f06de828fa68b2148a254c0151fbcc915944bcc27
+MISC ChangeLog 8227 RMD160 0d519a20a5785a2bc675857777f5a1f674a371dd SHA1 afd3f725e8c7086ca3f27080af24b7c0efa00d0d SHA256 6bdb633d97ab2f7faf9f58845096e84336eec7da993f0543ccd14eda5e0fc170
 MISC metadata.xml 649 RMD160 62918fc20381985a7c0538e24dc403852d1bc489 SHA1 34049931e690c27cbe35cd47de6f5001d42cf136 SHA256 9d3e00503f95c8497d2cfcf4a35d7c332ec78eb8e9c71a46726839bee5c8a14b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNLcORAAoJECaGw+YFKA1p67QP/jI2ftReDZ4PLoqRbTe3mmx9
+i/FSw9AIJtC6VVvjvuoZtGHr9KEk1PBfYukgtN4ID0awe9Shcgn4KlhAhuAfwrDA
+VyxlA51/vBhVfgEhO8aL8sQ0NGzMXt6zQ3hShadowJHEaRXQafBEfZOQaV1L5NfC
+ZcA5DeA8f1DkJOl+0zf43Ft+U4RmnGJGMTOauZ9fEHfZbzBXaBRXgvFhNDBVF6U5
+MqK+Ezq0NFSAUgRaF51QSNcvKMX2e+I7SLGJSv3xy5jbvhl+pXEbj2yAtgPkPK/A
+d6WrZlTcHYONYdw7Q0TqgXYfBYGkKr70XlPrjXKKPyj1istgC+KsWybtfkiuGjRn
+lQnJS0+ROz1iN+0sGWaSvjc0U47yusnYXnToq1zBX1PARObgNYPGYijmp6eqtSWS
+7l/HYYH4HRHyUiEFzZYk8KiHIBzMFQFkxpGHMqrOY6PsBwgXw3N/VSJGZeHw2SaF
+0zIDComT9DzwvvS4+LkOnKZp2sABCmjv0uKEwDLrVRVoEgPWkmM8QyQNlYpSI/hR
+thL1fRSJUTqvxPUgdE2T6/4JuvdDGaHZP2js/h+ww9kpvJsZCu28j/9LSA9m9f8d
+zVkI0S70nZKAiJxBvhd/ui1My+lmLqkDwwPmItmd4ixDHJgExt3TwEbxRDgo9KFb
+Bczj+a6JlysuB2Un3w+9
+=h6VB
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/im-ja/files/xinput-im-ja b/app-i18n/im-ja/files/xinput-im-ja
new file mode 100644
index 000000000000..6f76ec609ac1
--- /dev/null
+++ b/app-i18n/im-ja/files/xinput-im-ja
@@ -0,0 +1,7 @@
+XIM=im-ja-xim-server
+XIM_PROGRAM="@EPREFIX@/usr/bin/im-ja-xim-server"
+PREFERENCE_PROGRAM="@EPREFIX@/usr/bin/im-ja-conf"
+ICON=im-ja-capplet
+SHORT_DESC="im-ja"
+GTK_IM_MODULE=im-ja
+#QT_IM_MODULE=im-ja
diff --git a/app-i18n/im-ja/im-ja-1.5-r2.ebuild b/app-i18n/im-ja/im-ja-1.5-r2.ebuild
new file mode 100644
index 000000000000..70fea40765a2
--- /dev/null
+++ b/app-i18n/im-ja/im-ja-1.5-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5-r2.ebuild,v 1.1 2011/01/12 15:06:47 matsuu Exp $
+
+EAPI="3"
+inherit autotools gnome2 eutils multilib
+
+DESCRIPTION="A Japanese input module for GTK2 and XIM"
+HOMEPAGE="http://im-ja.sourceforge.net/"
+SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
+	http://im-ja.sourceforge.net/old/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="gnome canna freewnn skk anthy"
+# --enable-debug causes build failure with gtk+-2.4
+#IUSE="${IUSE} debug"
+
+RDEPEND=">=dev-libs/glib-2.4:2
+	>=dev-libs/atk-1.6
+	>=x11-libs/gtk+-2.4:2
+	>=x11-libs/pango-1.2.1
+	>=gnome-base/gconf-2.4:2
+	>=gnome-base/libglade-2.4
+	>=gnome-base/libgnomeui-2.4
+	gnome? (
+		|| (
+			gnome-base/gnome-panel[bonobo]
+			<gnome-base/gnome-panel-2.32
+		)
+	)
+	freewnn? ( app-i18n/freewnn )
+	canna? ( app-i18n/canna )
+	skk? ( virtual/skkserv )
+	anthy? ( app-i18n/anthy )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-perl/URI
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS README ChangeLog TODO"
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	# You cannot use `use_enable ...` here. im-ja's configure script
+	# doesn't distinguish --enable-canna from --disable-canna, so
+	# --enable-canna stands for --disable-canna in the script ;-(
+	use gnome || myconf="$myconf --disable-gnome"
+	use canna || myconf="$myconf --disable-canna"
+	use freewnn || myconf="$myconf --disable-wnn"
+	use anthy || myconf="$myconf --disable-anthy"
+	use skk || myconf="$myconf --disable-skk"
+	#use debug && myconf="$myconf --enable-debug"
+
+	# gnome2_src_compile automatically sets debug IUSE flag
+	econf $myconf || die "econf im-ja failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/${PN}.conf" || die
+}
+
+pkg_postinst() {
+	update_gtk_immodules
+
+	gnome2_pkg_postinst
+	elog
+	elog "This version of im-ja comes with experimental XIM support."
+	elog "If you'd like to try it out, run im-ja-xim-server and set"
+	elog "environment variable XMODIFIERS to @im=im-ja-xim-server"
+	elog "e.g.)"
+	elog "\t$ export XMODIFIERS=@im=im-ja-xim-server (sh)"
+	elog "\t> setenv XMODIFIERS @im=im-ja-xim-server (csh)"
+	elog
+}
+
+pkg_postrm() {
+	update_gtk_immodules
+
+	gnome2_pkg_postrm
+}