summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text/chasen')
-rw-r--r--app-text/chasen/ChangeLog7
-rw-r--r--app-text/chasen/chasen-2.3.3-r3.ebuild5
-rw-r--r--app-text/chasen/chasen-2.4.0_pre1-r1.ebuild6
3 files changed, 13 insertions, 5 deletions
diff --git a/app-text/chasen/ChangeLog b/app-text/chasen/ChangeLog
index 515807f59ec8..48511ec56b6f 100644
--- a/app-text/chasen/ChangeLog
+++ b/app-text/chasen/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/chasen
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/chasen/ChangeLog,v 1.23 2006/06/26 19:45:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/chasen/ChangeLog,v 1.24 2006/07/10 05:28:58 usata Exp $
+
+ 10 Jul 2006; Mamoru KOMACHI <usata@gentoo.org> chasen-2.3.3-r3.ebuild,
+ -chasen-2.4.0_pre1.ebuild, chasen-2.4.0_pre1-r1.ebuild:
+ Text::ChaSen from chasen distribution conflicts with dev-perl/Text-ChaSen.
+ (They are the same software but with different versions)
26 Jun 2006; Mamoru KOMACHI <usata@gentoo.org>
+files/chasen-2.3.3-darts-0.3.patch, chasen-2.3.3-r3.ebuild:
diff --git a/app-text/chasen/chasen-2.3.3-r3.ebuild b/app-text/chasen/chasen-2.3.3-r3.ebuild
index 04134f5d3ba5..0d5772cb1d52 100644
--- a/app-text/chasen/chasen-2.3.3-r3.ebuild
+++ b/app-text/chasen/chasen-2.3.3-r3.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-text/chasen/chasen-2.3.3-r3.ebuild,v 1.9 2006/06/26 19:45:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/chasen/chasen-2.3.3-r3.ebuild,v 1.10 2006/07/10 05:28:58 usata Exp $
inherit perl-app eutils
@@ -13,7 +13,8 @@ SLOT="0"
KEYWORDS="x86 amd64 sparc ppc"
IUSE="perl"
-RDEPEND=">=dev-libs/darts-0.2"
+RDEPEND=">=dev-libs/darts-0.2
+ perl? ( !dev-perl/Text-ChaSen )"
DEPEND="${RDEPEND}
>=sys-apps/sed-4"
PDEPEND=">=app-dicts/ipadic-2.6.1"
diff --git a/app-text/chasen/chasen-2.4.0_pre1-r1.ebuild b/app-text/chasen/chasen-2.4.0_pre1-r1.ebuild
index cbaa4b240625..627b003c7f41 100644
--- a/app-text/chasen/chasen-2.4.0_pre1-r1.ebuild
+++ b/app-text/chasen/chasen-2.4.0_pre1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/chasen/chasen-2.4.0_pre1-r1.ebuild,v 1.5 2005/12/18 16:00:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/chasen/chasen-2.4.0_pre1-r1.ebuild,v 1.6 2006/07/10 05:28:58 usata Exp $
inherit perl-app eutils
@@ -17,6 +17,8 @@ KEYWORDS="~x86 ~amd64 ~sparc ~ppc ppc64"
IUSE="perl"
DEPEND=">=dev-libs/darts-0.2"
+RDEPEND="${DEPEND}
+ perl? ( !dev-perl/Text-ChaSen )"
PDEPEND=">=app-dicts/ipadic-2.6.1"
src_unpack() {