Fixed dependency, bug #223021.

Package-Manager: portage-2.1.5_rc6

5 files changed, 12 insertions, 114 deletions

diff --git a/app-i18n/scim-uim/ChangeLog b/app-i18n/scim-uim/ChangeLog
index e8ac6db6ad61..27d5715e49e7 100644
--- a/app-i18n/scim-uim/ChangeLog
+++ b/app-i18n/scim-uim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/scim-uim
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/ChangeLog,v 1.27 2007/09/28 20:17:59 philantrop Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/ChangeLog,v 1.28 2008/06/10 16:59:12 matsuu Exp $
+
+  11 Jun 2008; MATSUU Takuto <matsuu@gentoo.org> -scim-uim-0.1.3.ebuild,
+  -scim-uim-0.1.4.ebuild, scim-uim-0.2.0.ebuild:
+  scim-uim-0.2.0 doesn't work on with uim-1.5*, bug #223021.
+  Removed old versions.
 
   28 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
   scim-uim-0.2.0.ebuild:
diff --git a/app-i18n/scim-uim/Manifest b/app-i18n/scim-uim/Manifest
index 5fd3dab04a4b..ee2587939d42 100644
--- a/app-i18n/scim-uim/Manifest
+++ b/app-i18n/scim-uim/Manifest
@@ -1,8 +1,4 @@
-DIST scim-uim-0.1.3.tar.gz 321608 RMD160 229f2898d7fe8cfedb0d15b73d82afce58b28b8d SHA1 41e0fc5446cef7a51d73da52847128a305faca10 SHA256 1de0a86ae7ee4389f59f23889d3269bac989ef2d2f7c2ee535ce4d3de1e52fe0
-DIST scim-uim-0.1.4.tar.gz 329980 RMD160 a9d118e83cb85b0cb3487db614e4139db40f67fb SHA1 9023c205cb1623e749bd5ca7baf721c55f36f279 SHA256 44196eca4e7bbb7666dd9a7b410f0cf7a6392b9044d0c25e6752389c262fd4aa
 DIST scim-uim-0.2.0.tar.gz 344389 RMD160 4cb0261742e4d67317535da1a01de7fa803139ca SHA1 456621d5969b6552c3c33c83cf295aa4134fff0a SHA256 457eb89f40dda70f813c0b401aaec8b397e7daa340d53136aba3b97407533e13
-EBUILD scim-uim-0.1.3.ebuild 1301 RMD160 c60986f558074a3eb911aa5f1d5e80a57d2e8ed0 SHA1 813c5fa89bd1b69088e8d97c41be48fe6f13eae9 SHA256 006f4b9c50b3cce70609a20ea94cbc0044392fdbb1dd9cdf7ebf3de20f1395f1
-EBUILD scim-uim-0.1.4.ebuild 1305 RMD160 f239f4e8f05cd454d1e806169a9d33847ab13206 SHA1 1bf9d40a6653590c1665652bb7e6f734c2e6dc5e SHA256 df9702be77e1cbb160a1c163980b19039d9f84e4d59e485bc3257cb606bff786
-EBUILD scim-uim-0.2.0.ebuild 980 RMD160 f0ef3ef178c37a18657d362d7b251c594d486217 SHA1 05d0e689fa65fd9bd5030bcc2bdf4eb8d2d92453 SHA256 f1701730e52dfbb63d454380c8bdb7ec3ee1b1f1c962ed5a4eae40fc9031f9fa
-MISC ChangeLog 3872 RMD160 97d864b876ab0f750a2869ffc11ab0c9003e1b22 SHA1 8516877477994cc0bfdc8fe53cb4b028c535dd16 SHA256 7c047956deb5dec0a0667c58ad1572a9d38b0806af9aa7952fdc6477917e339b
+EBUILD scim-uim-0.2.0.ebuild 995 RMD160 e09a700dd6960ea74f932e9c4f3f820da4d1412e SHA1 564746642d4229bb1729dee5cf54c73cd4aa8b84 SHA256 24a5afb69e66664ddcf1f02415e5442b5b84951ec7a9153ac0d163745d8f6499
+MISC ChangeLog 4076 RMD160 0b9ad2d97e7b7058f155b64cb22a7037a4a1bb59 SHA1 52cd1d14b3e7094c49dcea167d37d8f0d7cfc252 SHA256 16049fc1bb7a4b58e5c16ec7a1e1670bf1a16b744bf3195811848229bc317f32
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/scim-uim/scim-uim-0.1.3.ebuild b/app-i18n/scim-uim/scim-uim-0.1.3.ebuild
deleted file mode 100644
index 2d04f334c031..000000000000
--- a/app-i18n/scim-uim/scim-uim-0.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/scim-uim-0.1.3.ebuild,v 1.9 2006/10/16 18:23:26 flameeyes Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-DESCRIPTION="scim-uim is an input module for Smart Common Input Method (SCIM) which uses uim as backend"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha ppc amd64"
-IUSE=""
-
-RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
-	>=app-i18n/uim-0.3.9"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if has_version '=app-i18n/uim-0.4.5-r1' || has_version 'app-i18n/uim-svn' ; then
-		sed -i -e "/^UIM_VERSION/s/=.*/=rev1650/" configure.* || die
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog README THANKS
-}
-
-pkg_postinst() {
-	einfo
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	einfo
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	einfo
-}
diff --git a/app-i18n/scim-uim/scim-uim-0.1.4.ebuild b/app-i18n/scim-uim/scim-uim-0.1.4.ebuild
deleted file mode 100644
index 9b4498a9b68c..000000000000
--- a/app-i18n/scim-uim/scim-uim-0.1.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/scim-uim-0.1.4.ebuild,v 1.2 2006/10/16 18:23:26 flameeyes Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-DESCRIPTION="scim-uim is an input module for Smart Common Input Method (SCIM) which uses uim as backend"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
-	>=app-i18n/uim-0.3.9"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if has_version '=app-i18n/uim-0.4.5-r1' || has_version 'app-i18n/uim-svn' ; then
-		sed -i -e "/^UIM_VERSION/s/=.*/=rev1650/" configure.* || die
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog README THANKS
-}
-
-pkg_postinst() {
-	einfo
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	einfo
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	einfo
-}
diff --git a/app-i18n/scim-uim/scim-uim-0.2.0.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0.ebuild
index bf48112f9167..baecf3b54abc 100644
--- a/app-i18n/scim-uim/scim-uim-0.2.0.ebuild
+++ b/app-i18n/scim-uim/scim-uim-0.2.0.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/scim-uim/scim-uim-0.2.0.ebuild,v 1.4 2007/09/28 20:17:59 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/scim-uim-0.2.0.ebuild,v 1.5 2008/06/10 16:59:12 matsuu Exp $
 
 DESCRIPTION="scim-uim is an input module for Smart Common Input Method (SCIM) which uses uim as backend"
 HOMEPAGE="http://www.scim-im.org/"
@@ -12,6 +12,7 @@ KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/uim-1.1.0
+	<app-i18n/uim-1.5
 	|| (
 		>=app-i18n/scim-1.4.0
 		>=app-i18n/scim-cvs-1.4.0