Version bumped.

(Portage version: 2.0.51.19)

5 files changed, 109 insertions, 18 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index 1d8507eae6da..30644ca0e26b 100644
--- a/app-i18n/im-ja/ChangeLog
+++ b/app-i18n/im-ja/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/im-ja
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.40 2005/03/27 09:06:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.41 2005/04/14 16:29:48 usata Exp $
+
+*im-ja-1.4 (14 Apr 2005)
+
+  14 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> im-ja-1.3-r1.ebuild,
+  +im-ja-1.4.ebuild:
+  Version bumped.
 
   27 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> im-ja-1.3-r1.ebuild:
   Stable on alpha.
diff --git a/app-i18n/im-ja/Manifest b/app-i18n/im-ja/Manifest
index daff17bb4c85..bf20f883d2ac 100644
--- a/app-i18n/im-ja/Manifest
+++ b/app-i18n/im-ja/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9e542619b2ab8708eccb967215341d74 ChangeLog 5879
+MD5 a65a3a66132e7ec70dcf7893ea0a89e8 im-ja-1.4.ebuild 2558
 MD5 671f19c098650f48f938aba3ce96efd5 metadata.xml 522
-MD5 31eaeb35d1a3aab937796b270dba482f im-ja-1.2-r1.ebuild 2629
 MD5 462bac20720c21edfe551264f8d4744b im-ja-1.2.ebuild 2205
-MD5 8bea970cd130366ac270d12ff9630908 im-ja-1.3-r1.ebuild 2382
+MD5 31eaeb35d1a3aab937796b270dba482f im-ja-1.2-r1.ebuild 2629
+MD5 d28b6ad89c9e7646ad1303d96578d776 im-ja-1.3-r1.ebuild 2555
+MD5 fffebc885dbf06b698e41f70c4e570c2 files/digest-im-ja-1.4 61
 MD5 3ab8f20388045bda688d16be32fa1cb9 files/digest-im-ja-1.2-r1 130
-MD5 cf7d1a07d984d74a0f0575ad5e8b88a4 files/digest-im-ja-1.3-r1 61
-MD5 f77bff8724589c3448942bdce8a18153 files/im-ja-1.2-gtk26.patch 872
 MD5 d30a8eb5243225cdcf281d93311194dc files/digest-im-ja-1.2 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCRnequgEuf3OQ0akRAlDtAJ0SRIq2llotKoLKYqC3P9q1Qq5x5gCfUl/P
-l/kaUwrB0Fhh9BgKwRjrZJo=
-=RPIf
------END PGP SIGNATURE-----
+MD5 f77bff8724589c3448942bdce8a18153 files/im-ja-1.2-gtk26.patch 872
+MD5 cf7d1a07d984d74a0f0575ad5e8b88a4 files/digest-im-ja-1.3-r1 61
diff --git a/app-i18n/im-ja/files/digest-im-ja-1.4 b/app-i18n/im-ja/files/digest-im-ja-1.4
new file mode 100644
index 000000000000..1671a9dbe646
--- /dev/null
+++ b/app-i18n/im-ja/files/digest-im-ja-1.4
@@ -0,0 +1 @@
+MD5 8442d54e8e24d749ab1a8aeb8c6bef64 im-ja-1.4.tar.gz 805128
diff --git a/app-i18n/im-ja/im-ja-1.3-r1.ebuild b/app-i18n/im-ja/im-ja-1.3-r1.ebuild
index 97731c8097b5..9f05709f330d 100644
--- a/app-i18n/im-ja/im-ja-1.3-r1.ebuild
+++ b/app-i18n/im-ja/im-ja-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.3-r1.ebuild,v 1.4 2005/03/27 09:06:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.3-r1.ebuild,v 1.5 2005/04/14 16:29:48 usata Exp $
 
 inherit gnome2 eutils
 
@@ -36,6 +36,14 @@ RDEPEND="virtual/libc
 
 DOCS="AUTHORS README ChangeLog TODO"
 
+get_gtk_confdir() {
+	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
+		echo "/etc/gtk-2.0/${CHOST}"
+	else
+		echo "/etc/gtk-2.0"
+	fi
+}
+
 src_compile() {
 	local myconf
 	# You cannot use `use_enable ...` here. im-ja's configure script
@@ -55,7 +63,7 @@ src_compile() {
 
 pkg_postinst() {
 	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
+		gtk-query-immodules-2.0 > ${ROOT}/$(get_gtk_confdir)/gtk.immodules
 	fi
 	gnome2_pkg_postinst
 	einfo
@@ -70,7 +78,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
+		gtk-query-immodules-2.0 > ${ROOT}/$(get_gtk_confdir)/gtk.immodules
 	fi
 	gnome2_pkg_postrm
 }
diff --git a/app-i18n/im-ja/im-ja-1.4.ebuild b/app-i18n/im-ja/im-ja-1.4.ebuild
new file mode 100644
index 000000000000..fc93d8d71162
--- /dev/null
+++ b/app-i18n/im-ja/im-ja-1.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2005 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.4.ebuild,v 1.1 2005/04/14 16:29:48 usata Exp $
+
+inherit gnome2 eutils
+
+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="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="gnome canna freewnn skk anthy"
+# --enable-debug causes build failure with gtk+-2.4
+#IUSE="${IUSE} debug"
+
+DEPEND="dev-lang/perl
+	dev-perl/URI
+	>=sys-devel/autoconf-2.50
+	>=sys-devel/automake-1.7
+	${RDEPEND}"
+RDEPEND="virtual/libc
+	>=dev-libs/glib-2.4
+	>=dev-libs/atk-1.6
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2.1
+	>=gnome-base/gconf-2.4
+	>=gnome-base/libglade-2.4
+	gnome? ( >=gnome-base/gnome-panel-2.0 )
+	freewnn? ( app-i18n/freewnn )
+	canna? ( app-i18n/canna )
+	skk? ( virtual/skkserv )
+	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )"
+
+DOCS="AUTHORS README ChangeLog TODO"
+
+get_gtk_confdir() {
+	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
+		echo "/etc/gtk-2.0/${CHOST}"
+	else
+		echo "/etc/gtk-2.0"
+	fi
+}
+
+src_compile() {
+	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"
+	emake || die "emake im-ja failed"
+}
+
+pkg_postinst() {
+	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
+		gtk-query-immodules-2.0 > ${ROOT}/$(get_gtk_confdir)/gtk.immodules
+	fi
+	gnome2_pkg_postinst
+	einfo
+	einfo "This version of im-ja comes with experimental XIM support."
+	einfo "If you'd like to try it out, run im-ja-xim-server and set"
+	einfo "environment variable XMODIFIERS to @im=im-ja-xim-server"
+	einfo "e.g.)"
+	einfo "\t$ export XMODIFIERS=@im=im-ja-xim-server (sh)"
+	einfo "\t> setenv XMODIFIERS @im=im-ja-xim-server (csh)"
+	einfo
+}
+
+pkg_postrm() {
+	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
+		gtk-query-immodules-2.0 > ${ROOT}/$(get_gtk_confdir)/gtk.immodules
+	fi
+	gnome2_pkg_postrm
+}