summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-07-08 19:26:13 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-07-08 19:26:13 +0000
commitfa6b4f30d917923afe326adbb4d672254ce9a1a4 (patch)
tree2d6d1a8ed26dd7c594cee12f30b9b85484f9fabd /app-i18n
parentFixing RDEPEND for mips. (diff)
downloadhistorical-fa6b4f30d917923afe326adbb4d672254ce9a1a4.tar.gz
historical-fa6b4f30d917923afe326adbb4d672254ce9a1a4.tar.bz2
historical-fa6b4f30d917923afe326adbb4d672254ce9a1a4.zip
Make canna multilib-strict aware. Thanks Martin Schlemmer <azarah@gentoo.org> for the sed.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/canna/ChangeLog6
-rw-r--r--app-i18n/canna/Manifest14
-rw-r--r--app-i18n/canna/canna-3.7_p2.ebuild8
3 files changed, 18 insertions, 10 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/Manifest b/app-i18n/canna/Manifest
index 16f92cbd6e5a..fb18fb6da94a 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 ebdbb4141f3587373010f35ad64496f0 ChangeLog 7365
+MD5 d3c69a55fd3da32d76c73a44adba808d ChangeLog 7539
MD5 7cd8950ba0ed57a188100540f5d07be9 canna-3.6_p4.ebuild 2884
+MD5 92eacb4c6cdda55915214436b5064287 canna-3.7_p2.ebuild 3495
MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 21522055008d2a5e97142a8c92262c13 canna-3.7_p2.ebuild 3369
+MD5 d77588a06485914d6bab3aab2a1985fb files/canna-3.6_p4-gentoo.diff 5587
MD5 2b13f6b61d303f6bf273a325ff3bc411 files/canna-3.7-gentoo.diff.in 5263
MD5 d817072e9bb7181804fdde1b52427a3f files/canna-kpdef-gentoo.diff 255
-MD5 d77588a06485914d6bab3aab2a1985fb files/canna-3.6_p4-gentoo.diff 5587
MD5 c7949e9a4baa711a7088b00df56327fa files/canna.confd 299
MD5 d60168a33fd321ad1a29382cafcb60d3 files/canna.hosts 5
MD5 1bddc843aac5df610cf99b180a83352c files/canna.initd 999
MD5 c48de658742361ca5549edaddebb3e94 files/digest-canna-3.6_p4 62
-MD5 0d09a45d1074f9f4801a48bf8ec3208a files/update-canna-dics_dir 1101
MD5 300a4fe937c6c06bda8fe832906b672c files/digest-canna-3.7_p2 63
+MD5 0d09a45d1074f9f4801a48bf8ec3208a files/update-canna-dics_dir 1101
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCSkjoVWNWqTUmv+0RAknlAKCq/hAPPW4TtcjyiWbGhUqZsPMkOACeLiaO
-l/6ZPg1dubJzq3H7UQS7s9Q=
-=T07Z
+iD8DBQFCztN0j5H05b2HAEkRAkEVAJ45IjYJNR9U8GAVG11EE+sxOSmyaACbBXe7
+FO2050ApP8TzUsKk5hlgt40=
+=Hc/5
-----END PGP SIGNATURE-----
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() {