Fixed dependency, bug #205052.

Package-Manager: portage-2.1.3.19

8 files changed, 20 insertions, 230 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/Manifest b/app-i18n/im-ja/Manifest
index ec965adab3bf..dc773dae888b 100644
--- a/app-i18n/im-ja/Manifest
+++ b/app-i18n/im-ja/Manifest
@@ -1,36 +1,16 @@
-AUX im-ja-1.2-gtk26.patch 872 RMD160 73b78567b50789ecfdd9a45b63f2104c5d293445 SHA1 7668091affea670b78ddec05f6db7c2eaa9ee25a SHA256 05c98e56f75230ce2041e04eb40976e7a493d1544302cf4a49a524e1e5b4a835
-MD5 f77bff8724589c3448942bdce8a18153 files/im-ja-1.2-gtk26.patch 872
-RMD160 73b78567b50789ecfdd9a45b63f2104c5d293445 files/im-ja-1.2-gtk26.patch 872
-SHA256 05c98e56f75230ce2041e04eb40976e7a493d1544302cf4a49a524e1e5b4a835 files/im-ja-1.2-gtk26.patch 872
-DIST im-ja-1.3.tar.gz 786914 RMD160 eb1498e5ab4ce9fcc78630ce181dba5bd809238c SHA1 c4d9555284bf87f23fd43555b545858acf9cec65 SHA256 92da6e1a319cec4a3e989976df1cd07fe3724c781e71076856246c208fdb2911
-DIST im-ja-1.4.tar.gz 805128 RMD160 f1511c12c76b8efc8275566f5f8f3e52a13f7fb0 SHA1 f4ddafc0fe1264c1095ae38ffe375e0f18bcc56a SHA256 a7fd8aac969a6836b487efe2cbd0414f52f334edd68add333cf7677f80d8e9d4
 DIST im-ja-1.5.tar.gz 905539 RMD160 24c16b77bff1caa6b0fa439c4fc81f0772eb3eba SHA1 1f8b4b6286be0dd0e004db018203bb5ec1093674 SHA256 96f4ed82706a873bdade99a934a1a66431f146758837ed0f007e3c145649f780
-EBUILD im-ja-1.3-r1.ebuild 2548 RMD160 d42c423572514ab3c7dd959e1906b7d9e09e7725 SHA1 443570cee7cb7d8cd298823fca5a53d1fb94eb1a SHA256 b02a0261999b98215ba39fb8fdccb1922f031d7f4e11f1cdc32a02a3b703c95d
-MD5 0d94baf5c9a3e6713a03bc9b71cab335 im-ja-1.3-r1.ebuild 2548
-RMD160 d42c423572514ab3c7dd959e1906b7d9e09e7725 im-ja-1.3-r1.ebuild 2548
-SHA256 b02a0261999b98215ba39fb8fdccb1922f031d7f4e11f1cdc32a02a3b703c95d im-ja-1.3-r1.ebuild 2548
-EBUILD im-ja-1.4.ebuild 2545 RMD160 64dd9d3eb7eb163f5070e4b618784ffb88bfe856 SHA1 e91e3f6f9e14cc29505d4af5e5c31c0d54048113 SHA256 0d5fe9818f403cd085926e4a4240773be95ed6d6d0f83bec076323ee145d0244
-MD5 e30a159974c2276b3f8cb90a7243c85c im-ja-1.4.ebuild 2545
-RMD160 64dd9d3eb7eb163f5070e4b618784ffb88bfe856 im-ja-1.4.ebuild 2545
-SHA256 0d5fe9818f403cd085926e4a4240773be95ed6d6d0f83bec076323ee145d0244 im-ja-1.4.ebuild 2545
-EBUILD im-ja-1.5.ebuild 2540 RMD160 0c837d430e437b690fa9eea965f7a70abdceca0d SHA1 08788b021d0bffde43d3eaeb6440c7e2d920e6e7 SHA256 2c7e76cb4c14f3f05af87633b5929bcf0fd00e1f4991899f5416ed704c4fa45a
-MD5 ee389cf1c540bd29ba3b407d2605e64a im-ja-1.5.ebuild 2540
-RMD160 0c837d430e437b690fa9eea965f7a70abdceca0d im-ja-1.5.ebuild 2540
-SHA256 2c7e76cb4c14f3f05af87633b5929bcf0fd00e1f4991899f5416ed704c4fa45a im-ja-1.5.ebuild 2540
-MISC ChangeLog 7540 RMD160 c8d84e26c8d5241149c613870677156990331dc9 SHA1 984075a61bfd7a96aeb11a1099f8fc65c04941ad SHA256 6d5d378bcdc395400901af84749efeb7cf1bfa0cc033e03c97e0c1db4afaa6a3
-MD5 f10e5c76b8490bf91445641d8244fb5a ChangeLog 7540
-RMD160 c8d84e26c8d5241149c613870677156990331dc9 ChangeLog 7540
-SHA256 6d5d378bcdc395400901af84749efeb7cf1bfa0cc033e03c97e0c1db4afaa6a3 ChangeLog 7540
+EBUILD im-ja-1.5.ebuild 2548 RMD160 02d6d240f5cb485fb108eef7127105f0e90e6228 SHA1 8c70963ca90860e4fda08996fed27b4f6e822c74 SHA256 2de995a654a900234a93d461115711d0f13438476bf0b7a1538cf490a71d1c9a
+MD5 de7e170bb0f66d914b1a8efa929c381d im-ja-1.5.ebuild 2548
+RMD160 02d6d240f5cb485fb108eef7127105f0e90e6228 im-ja-1.5.ebuild 2548
+SHA256 2de995a654a900234a93d461115711d0f13438476bf0b7a1538cf490a71d1c9a im-ja-1.5.ebuild 2548
+MISC ChangeLog 7742 RMD160 2516f33c8f5eec5f168523abd9cc38f94aadafcd SHA1 a55b46fb76aeb9303f6b3f71116f885c0d868fdd SHA256 f92c89aa755e71693bd1e1f00910bc1d662d610067f2f24fb5d614cee6c3362a
+MD5 97d27aeed49c4dece5f364c46b0beb92 ChangeLog 7742
+RMD160 2516f33c8f5eec5f168523abd9cc38f94aadafcd ChangeLog 7742
+SHA256 f92c89aa755e71693bd1e1f00910bc1d662d610067f2f24fb5d614cee6c3362a ChangeLog 7742
 MISC metadata.xml 522 RMD160 e988ba1317528cd38ec90b68b9a5b26c0dcf414f SHA1 1bf5ca8d6082b3c0bbd766b90ed7fd58d786b638 SHA256 3753a93af1b975fed28c390ae31acaabd32830c1943409fea8d9a47e0b96561a
 MD5 671f19c098650f48f938aba3ce96efd5 metadata.xml 522
 RMD160 e988ba1317528cd38ec90b68b9a5b26c0dcf414f metadata.xml 522
 SHA256 3753a93af1b975fed28c390ae31acaabd32830c1943409fea8d9a47e0b96561a metadata.xml 522
-MD5 007d3e9ce0dfcedc27752739dd1e87a2 files/digest-im-ja-1.3-r1 229
-RMD160 2838d10c535bbab60d90afa2559229f8e6fcafdb files/digest-im-ja-1.3-r1 229
-SHA256 35d42dcb929b07e11bf8e3e90c4ca4934456e090e9516f3bce75d3306bf26928 files/digest-im-ja-1.3-r1 229
-MD5 b35f9e3e8e35adfd89b7e80545d1b6c7 files/digest-im-ja-1.4 229
-RMD160 3a9d64c929bede46d67bdcb8dc77b239a2221304 files/digest-im-ja-1.4 229
-SHA256 5be5cf8cbde40e7df4a30d9ed49637dbd1a7142b7b59e42806f6494d676bdaf9 files/digest-im-ja-1.4 229
 MD5 ffa6f0e3465a172974c80cd5a2e2e2f3 files/digest-im-ja-1.5 229
 RMD160 30187bc4219db11e7544238930dc25ed3169ed14 files/digest-im-ja-1.5 229
 SHA256 0982160f7355a1f2905fb8001cf73bf323c8e3268ebd69218dd97d3c2dbfdc4b files/digest-im-ja-1.5 229
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