summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatsuu Takuto <matsuu@gentoo.org>2006-10-10 10:54:37 +0000
committerMatsuu Takuto <matsuu@gentoo.org>2006-10-10 10:54:37 +0000
commit1e6677c29f6f5bcb45051973c83e2ba80af9e66d (patch)
treeff393b06a84033ae1d661ad15bc1e656027d19cc
parentVersion bumped. Cleanup ebuild. (diff)
downloadgentoo-2-1e6677c29f6f5bcb45051973c83e2ba80af9e66d.tar.gz
gentoo-2-1e6677c29f6f5bcb45051973c83e2ba80af9e66d.tar.bz2
gentoo-2-1e6677c29f6f5bcb45051973c83e2ba80af9e66d.zip
Fixed #146272.
(Portage version: 2.1.1-r1)
-rw-r--r--app-i18n/scim/ChangeLog7
-rw-r--r--app-i18n/scim/scim-1.4.4.ebuild5
-rw-r--r--app-i18n/scim/scim-1.4.5.ebuild4
3 files changed, 11 insertions, 5 deletions
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/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