Fixed dependency, bug #223021.

(Portage version: 2.1.5_rc6)

4 files changed, 10 insertions, 108 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/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