Added scim-cvs as scim alternative

7 files changed, 16 insertions, 46 deletions

diff --git a/app-i18n/scim-chinese/ChangeLog b/app-i18n/scim-chinese/ChangeLog
index d340cde0fad1..fb3794923454 100644
--- a/app-i18n/scim-chinese/ChangeLog
+++ b/app-i18n/scim-chinese/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-chinese
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-chinese/ChangeLog,v 1.14 2004/06/26 10:23:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-chinese/ChangeLog,v 1.15 2004/06/28 08:05:01 usata Exp $
+
+  28 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> scim-chinese-0.3.0.ebuild,
+  scim-chinese-0.4.0.ebuild:
+  Added scim-cvs as scim alternative
 
   26 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> -scim-chinese-0.2.6.ebuild,
   -scim-chinese-0.2.7.ebuild, scim-chinese-0.3.0.ebuild:
diff --git a/app-i18n/scim-chinese/scim-chinese-0.3.0.ebuild b/app-i18n/scim-chinese/scim-chinese-0.3.0.ebuild
index 014951413162..0490a1037dd9 100644
--- a/app-i18n/scim-chinese/scim-chinese-0.3.0.ebuild
+++ b/app-i18n/scim-chinese/scim-chinese-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-chinese/scim-chinese-0.3.0.ebuild,v 1.4 2004/06/26 10:23:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-chinese/scim-chinese-0.3.0.ebuild,v 1.5 2004/06/28 08:05:01 usata Exp $
 
 inherit gnome2
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 
 DEPEND="virtual/x11
-	>=app-i18n/scim-0.9.0"
+	|| ( >=app-i18n/scim-0.9.0 app-i18n/scim-cvs )"
 
 SCROLLKEEPER_UPDATE="0"
 G2CONF="--disable-static"
diff --git a/app-i18n/scim-chinese/scim-chinese-0.4.0.ebuild b/app-i18n/scim-chinese/scim-chinese-0.4.0.ebuild
index 328a254014af..918237f30983 100644
--- a/app-i18n/scim-chinese/scim-chinese-0.4.0.ebuild
+++ b/app-i18n/scim-chinese/scim-chinese-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-chinese/scim-chinese-0.4.0.ebuild,v 1.2 2004/06/24 21:53:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-chinese/scim-chinese-0.4.0.ebuild,v 1.3 2004/06/28 08:05:01 usata Exp $
 
 inherit gnome2
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/x11
-	>=app-i18n/scim-0.9.0"
+	|| ( >=app-i18n/scim-0.9.0 app-i18n/scim-cvs )"
 
 SCROLLKEEPER_UPDATE="0"
 G2CONF="--disable-static"
diff --git a/app-i18n/scim-m17n/ChangeLog b/app-i18n/scim-m17n/ChangeLog
index 63655febba1c..bf702400da8c 100644
--- a/app-i18n/scim-m17n/ChangeLog
+++ b/app-i18n/scim-m17n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-m17n
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/ChangeLog,v 1.8 2004/06/26 10:15:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/ChangeLog,v 1.9 2004/06/28 08:06:41 usata Exp $
+
+  28 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> -scim-m17n-0.1.0.ebuild,
+  scim-m17n-0.1.1.ebuild:
+  Added scim-cvs as scim alternative
 
   26 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> scim-m17n-0.1.1.ebuild:
   Aded to ~alpha
diff --git a/app-i18n/scim-m17n/files/digest-scim-m17n-0.1.0 b/app-i18n/scim-m17n/files/digest-scim-m17n-0.1.0
deleted file mode 100644
index 4e702252a822..000000000000
--- a/app-i18n/scim-m17n/files/digest-scim-m17n-0.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59c51037d8b0dd5f338d6ce101b87aa7 scim-m17n-0.1.0.tar.gz 321524
diff --git a/app-i18n/scim-m17n/scim-m17n-0.1.0.ebuild b/app-i18n/scim-m17n/scim-m17n-0.1.0.ebuild
deleted file mode 100644
index c74446178243..000000000000
--- a/app-i18n/scim-m17n/scim-m17n-0.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/scim-m17n-0.1.0.ebuild,v 1.2 2004/06/24 21:53:46 agriffis Exp $
-
-DESCRIPTION="scim-m17n is an input module for Smart Common Input Method (SCIM) which uses m17n as backend"
-HOMEPAGE="http://freedesktop.org/~suzhe/"
-SRC_URI="http://freedesktop.org/~suzhe/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=app-i18n/scim-0.99.0_pre20040614
-	>=dev-libs/m17n-lib-1.0.2-r1"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog THANKS README
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use SCIM with both GTK2 and XIM, you should use the following"
-	einfo "in your user startup scripts such as .gnomerc or .xinitrc:"
-	einfo
-	einfo "LANG='your_language' scim -f socket -e m17n -c simple -d"
-	einfo "LANG='your_language' scim -f x11 -e socket -c socket -d"
-	einfo "export XMODIFIERS=@im=SCIM"
-	einfo
-}
diff --git a/app-i18n/scim-m17n/scim-m17n-0.1.1.ebuild b/app-i18n/scim-m17n/scim-m17n-0.1.1.ebuild
index ced5f1cbcdbd..ed5c4fcbfe87 100644
--- a/app-i18n/scim-m17n/scim-m17n-0.1.1.ebuild
+++ b/app-i18n/scim-m17n/scim-m17n-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/scim-m17n-0.1.1.ebuild,v 1.3 2004/06/26 10:15:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/scim-m17n-0.1.1.ebuild,v 1.4 2004/06/28 08:06:41 usata Exp $
 
 DESCRIPTION="scim-m17n is an input module for Smart Common Input Method (SCIM) which uses m17n as backend"
 HOMEPAGE="http://freedesktop.org/~suzhe/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~x86 ~alpha"
 IUSE=""
 
-DEPEND=">=app-i18n/scim-0.99.0_pre20040614
+DEPEND="|| ( >=app-i18n/scim-0.99.0_pre20040614 app-i18n/scim-cvs )
 	>=dev-libs/m17n-lib-1.0.2-r1"
 
 src_compile() {