From: Matsuu Takuto <matsuu@gentoo.org>
Date: Tue, 10 Oct 2006 10:54:37 +0000 (+0000)
Subject: Fixed #146272.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0348caed393d726344f8dcdae44ff74d25831d9;p=gentoo.git

Fixed #146272.
Package-Manager: portage-2.1.1-r1
---

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index d61f5234f093..42fbf500b292 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.99 2006/10/10 10:45:11 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.100 2006/10/10 10:54:37 matsuu Exp $
+
+  10 Oct 2006; MATSUU Takuto <matsuu@gentoo.org> scim-1.4.4.ebuild,
+  scim-1.4.5.ebuild:
+  Added dev-util/intltool to DEPEND(1.4.4), bug 146272.
+  Added app-i18n/scim-bridge to DEPEND(1.4.5).
 
 *scim-1.4.5 (10 Oct 2006)
 
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index f16aa0c9ad87..52683be667e3 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -14,18 +14,18 @@ EBUILD scim-1.4.3.ebuild 2794 RMD160 12db28f360ebf0058919a19b0c953d611147b0a1 SH
 MD5 ab1b1a34809fbaa4ce8523aae9b7b90b scim-1.4.3.ebuild 2794
 RMD160 12db28f360ebf0058919a19b0c953d611147b0a1 scim-1.4.3.ebuild 2794
 SHA256 0b89b9ed2b69c6f938450e60664da25bbb5b159064b21ddf8b13f19cd49256b1 scim-1.4.3.ebuild 2794
-EBUILD scim-1.4.4.ebuild 3020 RMD160 6bd9f3c69287a0a20df4c80e3617632ebbe7d850 SHA1 54354aebf271e0c68014834413d54275e55da7cb SHA256 5bee9a1bc1348ae9de878eb462fbc72eee826e8ed5c99c320b8ab438f0e1a663
-MD5 c648af6e67fa0065b66792fb21e110fe scim-1.4.4.ebuild 3020
-RMD160 6bd9f3c69287a0a20df4c80e3617632ebbe7d850 scim-1.4.4.ebuild 3020
-SHA256 5bee9a1bc1348ae9de878eb462fbc72eee826e8ed5c99c320b8ab438f0e1a663 scim-1.4.4.ebuild 3020
-EBUILD scim-1.4.5.ebuild 2774 RMD160 ac805d99263ee867b4baa1a9f37c8532a7b8dc0b SHA1 466d16547e21ea1c7d87f534777eb15e1d6951cf SHA256 1109df655ec6540ef9d8e04fe93838a1c1b83251be18284fbaaf06dd1e92fb31
-MD5 30dcd6c3f4a1d5edc0b1218e50df7442 scim-1.4.5.ebuild 2774
-RMD160 ac805d99263ee867b4baa1a9f37c8532a7b8dc0b scim-1.4.5.ebuild 2774
-SHA256 1109df655ec6540ef9d8e04fe93838a1c1b83251be18284fbaaf06dd1e92fb31 scim-1.4.5.ebuild 2774
-MISC ChangeLog 13516 RMD160 d01e5d0ed3eacc3dbf0ca8d9b04284833f20c0a4 SHA1 117cac01203b2d0da81a520ac6cd9893aed76a57 SHA256 11452148372024452d8d47bf96f65b9e6e9d95dbd95cefddcf2c993eeaaea593
-MD5 cd63173ec50498b16ee67f985b188594 ChangeLog 13516
-RMD160 d01e5d0ed3eacc3dbf0ca8d9b04284833f20c0a4 ChangeLog 13516
-SHA256 11452148372024452d8d47bf96f65b9e6e9d95dbd95cefddcf2c993eeaaea593 ChangeLog 13516
+EBUILD scim-1.4.4.ebuild 3046 RMD160 1dd18f66a863c589593fc5fe842fe9205c56f807 SHA1 b6d5b89606815c85c6b0f8810202bc9d8e64c1e1 SHA256 ce36de1a5a816f8be0df7db973aa719e47e7ba9a0890bc705ccaeabd3cd31238
+MD5 6f299cb70bf8ccdf43dccbc921198ccf scim-1.4.4.ebuild 3046
+RMD160 1dd18f66a863c589593fc5fe842fe9205c56f807 scim-1.4.4.ebuild 3046
+SHA256 ce36de1a5a816f8be0df7db973aa719e47e7ba9a0890bc705ccaeabd3cd31238 scim-1.4.4.ebuild 3046
+EBUILD scim-1.4.5.ebuild 2802 RMD160 90ac82e914d607c51c8e548aa3c53d36bf3bf437 SHA1 f9137b492165a2e65242184520caef5979f6b865 SHA256 44dacd3f3569d51d47e539b116c09c96f5cd1b4cd49bb2c7b8872d71bba8b81f
+MD5 74e0172022985a597e7a90eb5d2b28df scim-1.4.5.ebuild 2802
+RMD160 90ac82e914d607c51c8e548aa3c53d36bf3bf437 scim-1.4.5.ebuild 2802
+SHA256 44dacd3f3569d51d47e539b116c09c96f5cd1b4cd49bb2c7b8872d71bba8b81f scim-1.4.5.ebuild 2802
+MISC ChangeLog 13710 RMD160 966272d7dc366918b755c44678b232823ed25496 SHA1 14cb7acc05959f0fada23c34f18d354ad2b24ae1 SHA256 7ecbfeb14bd0f739c092054ba16a00b2de01401ea9f76d5af3b33c4fcf61ab43
+MD5 ff759e58a2f95b36eae1d4b8e688a33c ChangeLog 13710
+RMD160 966272d7dc366918b755c44678b232823ed25496 ChangeLog 13710
+SHA256 7ecbfeb14bd0f739c092054ba16a00b2de01401ea9f76d5af3b33c4fcf61ab43 ChangeLog 13710
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
diff --git a/app-i18n/scim/scim-1.4.4.ebuild b/app-i18n/scim/scim-1.4.4.ebuild
index 2652a775936b..e86a8293ca82 100644
--- a/app-i18n/scim/scim-1.4.4.ebuild
+++ b/app-i18n/scim/scim-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.4.ebuild,v 1.9 2006/10/10 01:11:27 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.4.ebuild,v 1.10 2006/10/10 10:54:37 matsuu Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -28,7 +28,8 @@ RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 DEPEND="${RDEPEND}
 	|| ( x11-libs/libXt virtual/x11 )
 	doc? ( app-doc/doxygen )
-	dev-lang/perl"
+	dev-lang/perl
+	>=dev-util/intltool-0.33"
 
 has_gtk() {
 	if has_version '>=x11-libs/gtk+-2' ; then
diff --git a/app-i18n/scim/scim-1.4.5.ebuild b/app-i18n/scim/scim-1.4.5.ebuild
index a20739c26faa..add24a2f63eb 100644
--- a/app-i18n/scim/scim-1.4.5.ebuild
+++ b/app-i18n/scim/scim-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.5.ebuild,v 1.1 2006/10/10 10:45:11 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.5.ebuild,v 1.2 2006/10/10 10:54:37 matsuu Exp $
 
 inherit flag-o-matic
 
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.33"
 
 PDEPEND="!alpha? ( !hppa? ( kde? ( app-i18n/skim ) ) )
-	!alpha? ( !hppa? ( !ppc64? ( !sparc? ( qt3? ( app-i18n/scim-qtimm ) ) ) ) )"
+	!alpha? ( !hppa? ( !ppc64? ( !sparc? ( qt3? ( || ( app-i18n/scim-qtimm app-i18n/scim-bridge ) ) ) ) ) )"
 
 get_gtk_confdir() {
 	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then