summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-i18n/canna/ChangeLog6
-rw-r--r--app-i18n/canna/canna-3.7_p2.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 1aea287068e8..6cf12bc1681a 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/canna
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.48 2005/03/30 06:46:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.49 2005/07/08 19:26:13 flameeyes Exp $
+
+ 08 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> canna-3.7_p2.ebuild:
+ Make canna multilib-strict aware. Thanks Martin Schlemmer
+ <azarah@gentoo.org> for the sed.
30 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> -canna-3.7.ebuild,
-canna-3.7_p1.ebuild:
diff --git a/app-i18n/canna/canna-3.7_p2.ebuild b/app-i18n/canna/canna-3.7_p2.ebuild
index cf302ef4006c..cf3ef05f8237 100644
--- a/app-i18n/canna/canna-3.7_p2.ebuild
+++ b/app-i18n/canna/canna-3.7_p2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.12 2005/02/24 05:50:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.13 2005/07/08 19:26:13 flameeyes Exp $
-inherit cannadic eutils
+inherit cannadic eutils multilib
MY_P="Canna${PV//./}"
@@ -32,6 +32,10 @@ src_unpack() {
epatch ${T}/${PF}-gentoo.diff
cd dic/phono
epatch ${FILESDIR}/${PN}-kpdef-gentoo.diff
+
+ cd ${S}
+ # Multilib-strict fix for amd64
+ sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf*
}
src_compile() {