Fixed dependency, bug #186551.

Package-Manager: portage-2.1.2.11

7 files changed, 17 insertions, 112 deletions

diff --git a/app-i18n/scim-m17n/ChangeLog b/app-i18n/scim-m17n/ChangeLog
index bd7ae3c97c18..1e6f38f1e2fe 100644
--- a/app-i18n/scim-m17n/ChangeLog
+++ b/app-i18n/scim-m17n/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/scim-m17n
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/ChangeLog,v 1.24 2007/01/05 16:29:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/ChangeLog,v 1.25 2007/08/07 16:00:05 matsuu Exp $
+
+  07 Aug 2007; MATSUU Takuto <matsuu@gentoo.org> -scim-m17n-0.2.0.ebuild,
+  -scim-m17n-0.2.1.ebuild, scim-m17n-0.2.2.ebuild:
+  Fixed dependency, bug #186551.
+  Removed old versions.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> scim-m17n-0.1.3.ebuild,
   scim-m17n-0.2.0.ebuild, scim-m17n-0.2.1.ebuild, scim-m17n-0.2.2.ebuild:
diff --git a/app-i18n/scim-m17n/Manifest b/app-i18n/scim-m17n/Manifest
index 85575ecf04bc..8f12f178b285 100644
--- a/app-i18n/scim-m17n/Manifest
+++ b/app-i18n/scim-m17n/Manifest
@@ -1,30 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST scim-m17n-0.1.3.tar.gz 321827 RMD160 8edacda8fc8baf5a7c1d23d4c1d095ac32f5400a SHA1 9622b15b1ea2b931ec491e6dd555633b9b348a04 SHA256 d0083bc740e124b6c598ac65b7b844f2b7c73e7bbb315519b6a113ca35bacc6b
-DIST scim-m17n-0.2.0.tar.gz 338792 RMD160 a3670100dc7d776a54d2250ba1643d3537e12365 SHA1 78cd87f9673bd7546c81db0823a337607b76d5cc SHA256 1f8abaf1fa3e9c0997f62b24b049eb58de66c5ff2671999fa89510d8da9e0076
-DIST scim-m17n-0.2.1.tar.gz 342633 RMD160 01990a9864a91c1891a5e438771b36eda150a69a SHA1 f5a7054f403036af64dc647856c7c03e26734eb3 SHA256 0fa6651454988f2573abc1a30206becacd3c366e594714a3b74816aa2cb57259
 DIST scim-m17n-0.2.2.tar.gz 343103 RMD160 2777c6bc1d3495280829860a0b34c3b0dba9e213 SHA1 3294820028e1637029b3c6f9156346018953e4d5 SHA256 cc88ece9460c25960c092c8cc088162a56c52a9d211c929ecadc15c8aca986ce
 EBUILD scim-m17n-0.1.3.ebuild 1023 RMD160 b50c53c193f65c5cc7b31accdf3f6ad7e508c604 SHA1 22e9d538a307a93ace4064a3d7e170d0760e1b10 SHA256 bd45c504c32b12397bdaaac4982d8a50b8d137818c57dbc9174eb2de106a951f
 MD5 fde38e240f461dfaf7ecd9c8e2de51e4 scim-m17n-0.1.3.ebuild 1023
 RMD160 b50c53c193f65c5cc7b31accdf3f6ad7e508c604 scim-m17n-0.1.3.ebuild 1023
 SHA256 bd45c504c32b12397bdaaac4982d8a50b8d137818c57dbc9174eb2de106a951f scim-m17n-0.1.3.ebuild 1023
-EBUILD scim-m17n-0.2.0.ebuild 1027 RMD160 74e281ea71debf63a1df1db235a49ff38da5189c SHA1 2b3c18a7530147d3b86fa55d038043766c1cfa2c SHA256 df683a0e4f9e21ee8acc5b738869ffd537ef232f5e850270be0f32612cf4221e
-MD5 7f66a7b9303de82df1fb8be2391ffc1a scim-m17n-0.2.0.ebuild 1027
-RMD160 74e281ea71debf63a1df1db235a49ff38da5189c scim-m17n-0.2.0.ebuild 1027
-SHA256 df683a0e4f9e21ee8acc5b738869ffd537ef232f5e850270be0f32612cf4221e scim-m17n-0.2.0.ebuild 1027
-EBUILD scim-m17n-0.2.1.ebuild 1021 RMD160 c44666e532c9a777fe1ad5f5410cd7af8a765104 SHA1 f08d51363da38283189d66b1b1b8d6081232a7b6 SHA256 27ad2f4a86d50bcbc76e6dfa2aeca99292f4cebb26d8872aab8947a8eb784c0d
-MD5 708d74766171a34fbbf427dc6168daab scim-m17n-0.2.1.ebuild 1021
-RMD160 c44666e532c9a777fe1ad5f5410cd7af8a765104 scim-m17n-0.2.1.ebuild 1021
-SHA256 27ad2f4a86d50bcbc76e6dfa2aeca99292f4cebb26d8872aab8947a8eb784c0d scim-m17n-0.2.1.ebuild 1021
-EBUILD scim-m17n-0.2.2.ebuild 1021 RMD160 34c70bea593c884f2def360e71b03d32441ffd31 SHA1 be46d6484825feeca59472467e9ed9357b36572a SHA256 519103ca4e9bcbba10eb9309d995b4b88128f6a7795c33b2e8341d129d08a1a8
-MD5 0b3da577e125afd16e3a1c228b14ab19 scim-m17n-0.2.2.ebuild 1021
-RMD160 34c70bea593c884f2def360e71b03d32441ffd31 scim-m17n-0.2.2.ebuild 1021
-SHA256 519103ca4e9bcbba10eb9309d995b4b88128f6a7795c33b2e8341d129d08a1a8 scim-m17n-0.2.2.ebuild 1021
-MISC ChangeLog 3204 RMD160 2eaaa7c738a777575b6df7ffea6d49c65ed46738 SHA1 6e305eb364ab8d999281e167c471d2a6cea38d6e SHA256 ed918b5e38f7a8f3a2a10dee983cdc3ef3df37f67c581e6b5e5aa4931f010d42
-MD5 ecd9f6bb4ec33a3efae07494fa06128c ChangeLog 3204
-RMD160 2eaaa7c738a777575b6df7ffea6d49c65ed46738 ChangeLog 3204
-SHA256 ed918b5e38f7a8f3a2a10dee983cdc3ef3df37f67c581e6b5e5aa4931f010d42 ChangeLog 3204
+EBUILD scim-m17n-0.2.2.ebuild 1009 RMD160 78dbba80127c14f0ea151bcb568f569e79574d8e SHA1 ade8512dd30ad409a8cc476c69bca5b03400d504 SHA256 ff4b1943d9c0a8d120cdcd19f3fd5b86e2654794b1c9aa75a49305a20e587d79
+MD5 c6cd68c5cbf74defdf6ac937f7bf90d4 scim-m17n-0.2.2.ebuild 1009
+RMD160 78dbba80127c14f0ea151bcb568f569e79574d8e scim-m17n-0.2.2.ebuild 1009
+SHA256 ff4b1943d9c0a8d120cdcd19f3fd5b86e2654794b1c9aa75a49305a20e587d79 scim-m17n-0.2.2.ebuild 1009
+MISC ChangeLog 3384 RMD160 8d9ca33e8fd4bfeca6a80876fa65dda328b4870c SHA1 97d7550c1dae1ca4a920a218a33b36f37c497a2b SHA256 3ecc4af2cb66a9a106ca40c1ff403adc00a9e64fe1592092120ecfb255fa1197
+MD5 d310544ed5393bf0c40dc918d449fe4d ChangeLog 3384
+RMD160 8d9ca33e8fd4bfeca6a80876fa65dda328b4870c ChangeLog 3384
+SHA256 3ecc4af2cb66a9a106ca40c1ff403adc00a9e64fe1592092120ecfb255fa1197 ChangeLog 3384
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
@@ -32,19 +19,6 @@ SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata
 MD5 b2609e8e77670131a1f4cc92eea327b5 files/digest-scim-m17n-0.1.3 247
 RMD160 b008d1eae5352ea61fd2aab0fc2bb8c074b3ae37 files/digest-scim-m17n-0.1.3 247
 SHA256 93f1a22300a3f93ee9947636f61a9c76fa5ea10767e61961b218d49f665f395d files/digest-scim-m17n-0.1.3 247
-MD5 dc8c3ec3c51a42982f8d6f8b15441879 files/digest-scim-m17n-0.2.0 247
-RMD160 1fff444a2a92e7a68725f33d3e4ed59754c19f92 files/digest-scim-m17n-0.2.0 247
-SHA256 c1943edc8d812a5913232a0b68e1b5ab6b0183907037a627bda239e72e1829e7 files/digest-scim-m17n-0.2.0 247
-MD5 4c9cbb11cbfc6f57c993ca05c4f1e861 files/digest-scim-m17n-0.2.1 247
-RMD160 e8c57374d4d4819720c625ca254180352cdc4a64 files/digest-scim-m17n-0.2.1 247
-SHA256 8a76f7d4b76b15b45e4ae80240a1f3345f213c02d9245bf1ba9508622a066994 files/digest-scim-m17n-0.2.1 247
 MD5 3130b3ccde4e719add3a2c65d84f55a0 files/digest-scim-m17n-0.2.2 247
 RMD160 53214a6a52164182b78b745168941e65d3b6861b files/digest-scim-m17n-0.2.2 247
 SHA256 2b3a3569dfe0a841b5be91ae1f5e1b7131d0fd307fa442b909305f926928f9b9 files/digest-scim-m17n-0.2.2 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnnzeAiZjviIA2XgRAqaRAJ9fhA7MvFhOoKTvpVCWcudP8n87LACgp0Kp
-1eYbKr01Pw2vCLzgQIKWAAU=
-=emCD
------END PGP SIGNATURE-----
diff --git a/app-i18n/scim-m17n/files/digest-scim-m17n-0.2.0 b/app-i18n/scim-m17n/files/digest-scim-m17n-0.2.0
deleted file mode 100644
index 205928befe8e..000000000000
--- a/app-i18n/scim-m17n/files/digest-scim-m17n-0.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0756a310e0b8503c80de4e1f53a9524c scim-m17n-0.2.0.tar.gz 338792
-RMD160 a3670100dc7d776a54d2250ba1643d3537e12365 scim-m17n-0.2.0.tar.gz 338792
-SHA256 1f8abaf1fa3e9c0997f62b24b049eb58de66c5ff2671999fa89510d8da9e0076 scim-m17n-0.2.0.tar.gz 338792
diff --git a/app-i18n/scim-m17n/files/digest-scim-m17n-0.2.1 b/app-i18n/scim-m17n/files/digest-scim-m17n-0.2.1
deleted file mode 100644
index c3e25c1a4355..000000000000
--- a/app-i18n/scim-m17n/files/digest-scim-m17n-0.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 473fe0793135f96f8230cb493521a6a0 scim-m17n-0.2.1.tar.gz 342633
-RMD160 01990a9864a91c1891a5e438771b36eda150a69a scim-m17n-0.2.1.tar.gz 342633
-SHA256 0fa6651454988f2573abc1a30206becacd3c366e594714a3b74816aa2cb57259 scim-m17n-0.2.1.tar.gz 342633
diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.0.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.0.ebuild
deleted file mode 100644
index 7d875a96dfc3..000000000000
--- a/app-i18n/scim-m17n/scim-m17n-0.2.0.ebuild
+++ /dev/null
@@ -1,36 +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/scim-m17n/scim-m17n-0.2.0.ebuild,v 1.2 2007/01/05 16:29:00 flameeyes Exp $
-
-DESCRIPTION="scim-m17n is an input module for Smart Common Input Method (SCIM) which uses m17n as backend"
-HOMEPAGE="http://www.scim-im.org/projects/imengines"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
-	>=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() {
-	elog
-	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:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog
-}
diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.1.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.1.ebuild
deleted file mode 100644
index 2d400b86d1c2..000000000000
--- a/app-i18n/scim-m17n/scim-m17n-0.2.1.ebuild
+++ /dev/null
@@ -1,32 +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/scim-m17n/scim-m17n-0.2.1.ebuild,v 1.2 2007/01/05 16:29:00 flameeyes Exp $
-
-DESCRIPTION="scim-m17n is an input module for Smart Common Input Method (SCIM) which uses m17n as backend"
-HOMEPAGE="http://www.scim-im.org/projects/imengines"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
-	>=dev-libs/m17n-lib-1.0.2-r1"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog THANKS README
-}
-
-pkg_postinst() {
-	elog
-	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:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog "export GTK_IM_MODULE=\"scim\""
-	elog
-}
diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild
index b1ea21a059e7..a3f6dbdeff15 100644
--- a/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild
+++ b/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.2.2.ebuild,v 1.2 2007/01/05 16:29:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-m17n/scim-m17n-0.2.2.ebuild,v 1.3 2007/08/07 16:00:05 matsuu Exp $
 
 DESCRIPTION="scim-m17n is an input module for Smart Common Input Method (SCIM) which uses m17n as backend"
 HOMEPAGE="http://www.scim-im.org/projects/imengines"
@@ -11,8 +11,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
-	>=dev-libs/m17n-lib-1.0.2-r1"
+DEPEND="|| ( >=app-i18n/scim-1.4 >=app-i18n/scim-cvs-1.4 )
+	>=dev-libs/m17n-lib-1.2.0"
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"