Fixed dependency, bug #205052.

(Portage version: 2.1.3.19)

7 files changed, 12 insertions, 202 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index 5b0be2fccd8d..25b0c0a918bf 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.56 2007/11/14 20:14:56 drac Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.57 2008/01/18 16:18:38 matsuu Exp $
+
+  18 Jan 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/im-ja-1.2-gtk26.patch, -im-ja-1.3-r1.ebuild, -im-ja-1.4.ebuild,
+  im-ja-1.5.ebuild:
+  Fixed dependency, bug #205052.
+  Removed old versions.
 
   14 Nov 2007; Samuli Suominen <drac@gentoo.org> im-ja-1.5.ebuild:
   amd64 stable wrt #133667
diff --git a/app-i18n/im-ja/files/digest-im-ja-1.3-r1 b/app-i18n/im-ja/files/digest-im-ja-1.3-r1
deleted file mode 100644
index 2a1b8dff5d70..000000000000
--- a/app-i18n/im-ja/files/digest-im-ja-1.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 20ceb957496d84f854e379f40b0e704a im-ja-1.3.tar.gz 786914
-RMD160 eb1498e5ab4ce9fcc78630ce181dba5bd809238c im-ja-1.3.tar.gz 786914
-SHA256 92da6e1a319cec4a3e989976df1cd07fe3724c781e71076856246c208fdb2911 im-ja-1.3.tar.gz 786914
diff --git a/app-i18n/im-ja/files/digest-im-ja-1.4 b/app-i18n/im-ja/files/digest-im-ja-1.4
deleted file mode 100644
index fd1c9ec78cf5..000000000000
--- a/app-i18n/im-ja/files/digest-im-ja-1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8442d54e8e24d749ab1a8aeb8c6bef64 im-ja-1.4.tar.gz 805128
-RMD160 f1511c12c76b8efc8275566f5f8f3e52a13f7fb0 im-ja-1.4.tar.gz 805128
-SHA256 a7fd8aac969a6836b487efe2cbd0414f52f334edd68add333cf7677f80d8e9d4 im-ja-1.4.tar.gz 805128
diff --git a/app-i18n/im-ja/files/im-ja-1.2-gtk26.patch b/app-i18n/im-ja/files/im-ja-1.2-gtk26.patch
deleted file mode 100644
index 11ef62f4921b..000000000000
--- a/app-i18n/im-ja/files/im-ja-1.2-gtk26.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- im-ja/im-ja/src/gtk/im-ja-gtk.c	2004/06/25 08:57:18	1.7
-+++ im-ja/im-ja/src/gtk/im-ja-gtk.c	2004/12/09 13:07:09	1.8
-@@ -37,8 +37,8 @@
- #include "../actionmenu.h"
- 
- extern GType gtk_im_module_get_type(void);
--#define GTK_TYPE_IM_MODULE (gtk_im_module_get_type())
--#define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST((im_module), GTK_TYPE_IM_MODULE, GtkIMModule))
-+/*#define GTK_TYPE_IM_MODULE (gtk_im_module_get_type())*/
-+/*#define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST((im_module), GTK_TYPE_IM_MODULE, GtkIMModule))*/
- 
- IMJAConfig cfg; 
- gint notify_id = 0;
-@@ -429,7 +429,7 @@
- 	GtkIMModule *im_module;
- 	IM_JA_DEBUG("im_module_init()\n");
- 
--	im_module = GTK_IM_MODULE(module);
-+	im_module = module;
- 	g_module_make_resident(im_module->library); /*FIXME: This is only a workaround for the GConf bug */
- 
- 	im_ja_gtk_register_type(module);
diff --git a/app-i18n/im-ja/im-ja-1.3-r1.ebuild b/app-i18n/im-ja/im-ja-1.3-r1.ebuild
deleted file mode 100644
index ac7f6ef599ec..000000000000
--- a/app-i18n/im-ja/im-ja-1.3-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 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.8 2007/01/05 16:19:15 flameeyes 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
-	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}/$(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
deleted file mode 100644
index e476e5515d4d..000000000000
--- a/app-i18n/im-ja/im-ja-1.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 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.7 2007/01/05 16:19:15 flameeyes 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="alpha amd64 ppc sparc x86"
-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
-	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}/$(get_gtk_confdir)/gtk.immodules
-	fi
-	gnome2_pkg_postrm
-}
diff --git a/app-i18n/im-ja/im-ja-1.5.ebuild b/app-i18n/im-ja/im-ja-1.5.ebuild
index 19caca55eb2c..6076266b211a 100644
--- a/app-i18n/im-ja/im-ja-1.5.ebuild
+++ b/app-i18n/im-ja/im-ja-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.7 2007/11/14 20:14:56 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5.ebuild,v 1.8 2008/01/18 16:18:38 matsuu Exp $
 
 inherit gnome2 eutils
 
@@ -20,9 +20,9 @@ DEPEND="dev-lang/perl
 	dev-perl/URI
 	>=sys-devel/autoconf-2.50
 	>=sys-devel/automake-1.7
+	dev-util/pkgconfig
 	${RDEPEND}"
-RDEPEND="virtual/libc
-	>=dev-libs/glib-2.4
+RDEPEND=">=dev-libs/glib-2.4
 	>=dev-libs/atk-1.6
 	>=x11-libs/gtk+-2.4
 	>=x11-libs/pango-1.2.1