Added libgnomeui dependency. cleanup.

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

4 files changed, 128 insertions, 13 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index 2e21a2a46a04..387ecf8bf9e2 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.58 2008/07/31 10:10:23 ulm Exp $
+# 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 $
+
+*im-ja-1.5-r1 (18 Oct 2009)
+
+  18 Oct 2009; MATSUU Takuto <matsuu@gentoo.org> +im-ja-1.5-r1.ebuild,
+  +files/im-ja-1.5-gentoo.patch:
+  Added libgnomeui dependency. cleanup.
 
   31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-i18n/im-ja/Manifest b/app-i18n/im-ja/Manifest
index 34ed926802c2..0de981d9b6b7 100644
--- a/app-i18n/im-ja/Manifest
+++ b/app-i18n/im-ja/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX im-ja-1.5-gentoo.patch 1248 RMD160 caa74cd924ad751fe88b4c80ed2eb0c9c5168329 SHA1 9b40e4bcae8001334b3ccda0d6f1dc5cd2665fee SHA256 a7002f2a5c796718e53514420f3f822f09bd77e297ff0e787ff02cadb5531965
 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.ebuild 2548 RMD160 4e1d0ee5f0aec3c77da6c4ca22a2f128756d9f06 SHA1 120e10ca18425175cee84e46edbdb316cf93306a SHA256 32ff61535ece3332d61ddba7f42665e61cc1ca5f3fc78cb10d2ed2e2ac50f4a8
-MISC ChangeLog 7853 RMD160 9d59836135f30a1df437c2cec172949977240ed5 SHA1 8d8516edd7b175df49184b654f993fbf6ac7db30 SHA256 0ecf49d3561d99f569811393d47dc8c9232e7f2dc5e7abf51c55a7c2f7ad1462
+MISC ChangeLog 8030 RMD160 ce410169fe034b30ad8a140335bc560b62ee3eb1 SHA1 6a82f2f04629f5f86756bf6568f4226926818284 SHA256 373fe1268a917c4e9331de2f06de828fa68b2148a254c0151fbcc915944bcc27
 MISC metadata.xml 649 RMD160 62918fc20381985a7c0538e24dc403852d1bc489 SHA1 34049931e690c27cbe35cd47de6f5001d42cf136 SHA256 9d3e00503f95c8497d2cfcf4a35d7c332ec78eb8e9c71a46726839bee5c8a14b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiRj5wACgkQOeoy/oIi7uxfOwCgo15mjZW+dgAYhOdyfEslT1f1
-OuEAmQGHya8MtpvaPNxdjEU48FdY00cA
-=irHb
------END PGP SIGNATURE-----
diff --git a/app-i18n/im-ja/files/im-ja-1.5-gentoo.patch b/app-i18n/im-ja/files/im-ja-1.5-gentoo.patch
new file mode 100644
index 000000000000..af78e77876fa
--- /dev/null
+++ b/app-i18n/im-ja/files/im-ja-1.5-gentoo.patch
@@ -0,0 +1,30 @@
+diff -Naur im-ja-1.5.orig/configure.in im-ja-1.5/configure.in
+--- im-ja-1.5.orig/configure.in	2006-04-18 19:52:25.000000000 +0900
++++ im-ja-1.5/configure.in	2009-10-19 08:19:22.000000000 +0900
+@@ -28,6 +28,7 @@
+ PKG_CHECK_MODULES([GTK], gtk+-2.0 >= 2.4.0)
+ PKG_CHECK_MODULES([GCONF], gconf-2.0)
+ PKG_CHECK_MODULES([LIBGLADE], libglade-2.0 >= 2.4.0)
++PKG_CHECK_MODULES([LIBGNOMEUI], libgnomeui-2.0 >= 2.4.0)
+ 
+ AM_GCONF_SOURCE_2
+ 
+diff -Naur im-ja-1.5.orig/src/gnome-panel-applet/Makefile.am im-ja-1.5/src/gnome-panel-applet/Makefile.am
+--- im-ja-1.5.orig/src/gnome-panel-applet/Makefile.am	2006-04-18 19:52:24.000000000 +0900
++++ im-ja-1.5/src/gnome-panel-applet/Makefile.am	2009-10-19 08:21:24.000000000 +0900
+@@ -26,13 +26,14 @@
+        -DIM_JA_LIBPROGDIR=\"$(libprogdir)\"    \
+        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+        $(LIBPANELAPPLET_CFLAGS) \
++       $(LIBGNOMEUI_CFLAGS)     \
+        @DEBUG_FLAGS@            \
+        @DISABLE_CANNA_FLAG@     \
+        @DISABLE_ANTHY_FLAG@     \
+        @DISABLE_SKK_FLAG@       \
+        @DISABLE_WNN_FLAG@ 
+ 
+-im_ja_applet_LDADD = $(LIBPANELAPPLET_LIBS)
++im_ja_applet_LDADD = $(LIBPANELAPPLET_LIBS) $(LIBGNOMEUI_LIBS)
+ 
+ uidir = $(datadir)/gnome-2.0/ui
+ ui_DATA = GNOME_ImJaApplet.xml
diff --git a/app-i18n/im-ja/im-ja-1.5-r1.ebuild b/app-i18n/im-ja/im-ja-1.5-r1.ebuild
new file mode 100644
index 000000000000..4787ec56504c
--- /dev/null
+++ b/app-i18n/im-ja/im-ja-1.5-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/10/18 23:44:03 matsuu Exp $
+
+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
+	>=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-base/libgnomeui-2.4
+	gnome? ( >=gnome-base/gnome-panel-2.0 )
+	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"
+
+pkg_config() {
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR="${GTK2_CONFDIR:=/etc/gtk-2.0}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	eautoreconf
+}
+
+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}/${GTK2_CONFDIR}/gtk.immodules"
+	fi
+	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() {
+	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
+		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	fi
+	gnome2_pkg_postrm
+}