modX deps from canna-3.7_p3

Package-Manager: portage-2.1.1_rc1-r3

3 files changed, 18 insertions, 21 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 3629df46b415..0285c145e42d 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/canna
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.51 2006/08/20 14:14:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.52 2006/09/04 09:19:31 mr_bones_ Exp $
+
+  04 Sep 2006; Michael Sterrett <mr_bones_@gentoo.org> canna-3.6_p4.ebuild:
+  modX deps from canna-3.7_p3
 
 *canna-3.7_p3 (20 Aug 2006)
 
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index 9182f99f0657..212dbbcf2204 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX canna-3.6_p4-gentoo.diff 5587 RMD160 910bee940fbf38904c83044668643f7c345a0f1e SHA1 64f1eeed55c10bff3e3f95a93ab1c5c9529a6836 SHA256 751e38a6c3da0d2c0ae9ae9e85556e2e62c994c3cc418d49dcfe8f5d760c3160
 MD5 d77588a06485914d6bab3aab2a1985fb files/canna-3.6_p4-gentoo.diff 5587
 RMD160 910bee940fbf38904c83044668643f7c345a0f1e files/canna-3.6_p4-gentoo.diff 5587
@@ -32,10 +29,10 @@ SHA256 d1114dce288e815f897b20eabd177bb5b77e0d479bcb4b7eff9afb0d65607f11 files/up
 DIST Canna36p4.tar.gz 1455672
 DIST Canna37p2.tar.bz2 1263325 RMD160 21ed7e026cc55f1b8c76a41e7f8cdd4058380a32 SHA1 2bfbd119e4a470463fc68ae36f70cf4ed39dba83 SHA256 ab163cb90acb33ce2c3a2293329ac3cd1ce2a25e0a8e337518e7fab5b28b52c3
 DIST Canna37p3.tar.bz2 1263065 RMD160 33e5eb9e2dc144835db838612897e652acbc60ed SHA1 e39eece7c70c669dd46dd74b26121a60a2496fde SHA256 7d98d925043d3af24f99a8a2a09e3b4d6dfe881efc1303ef4a7f495a0f4542a7
-EBUILD canna-3.6_p4.ebuild 2879 RMD160 a9faefaf1981c8ea830d4e40d622d3f2e93aa790 SHA1 4376b1f42acb216ea18c7f0d1b218bd92dce9095 SHA256 b2b46c0064e8de9e44f6905d8bf425144de75d900dc4828f94277a0490dc2880
-MD5 64cfba0af4b826dd10e4da4e4d582b3a canna-3.6_p4.ebuild 2879
-RMD160 a9faefaf1981c8ea830d4e40d622d3f2e93aa790 canna-3.6_p4.ebuild 2879
-SHA256 b2b46c0064e8de9e44f6905d8bf425144de75d900dc4828f94277a0490dc2880 canna-3.6_p4.ebuild 2879
+EBUILD canna-3.6_p4.ebuild 2935 RMD160 64255c760ae7bb2bc0d8ad179d862553e518f293 SHA1 a61fbe610dc710d2112267d5df2cd308986afdf3 SHA256 581fd0bce935c90a7fc43cc5d35be519ffbbd220bc45b95c1dacab1fddc131a2
+MD5 090cc4edab1bcc2dfdcda0ec2a55f9a4 canna-3.6_p4.ebuild 2935
+RMD160 64255c760ae7bb2bc0d8ad179d862553e518f293 canna-3.6_p4.ebuild 2935
+SHA256 581fd0bce935c90a7fc43cc5d35be519ffbbd220bc45b95c1dacab1fddc131a2 canna-3.6_p4.ebuild 2935
 EBUILD canna-3.7_p2.ebuild 3657 RMD160 f9f73f3b8886d7134f526044479bf2f812e3ecea SHA1 1d876e94d5f6378e33bad31a029243c03350f1be SHA256 e46b1677bb151b2415f5dc09a19adac1cee9806979cb474d6c33415c83e1baff
 MD5 6594e84b72db4c023bafeb804e674a52 canna-3.7_p2.ebuild 3657
 RMD160 f9f73f3b8886d7134f526044479bf2f812e3ecea canna-3.7_p2.ebuild 3657
@@ -44,10 +41,10 @@ EBUILD canna-3.7_p3.ebuild 3663 RMD160 b039227354eed4687cb3a66f61ac413897451c5a
 MD5 aec94e6d7eb78f3f1a4b809319e1d860 canna-3.7_p3.ebuild 3663
 RMD160 b039227354eed4687cb3a66f61ac413897451c5a canna-3.7_p3.ebuild 3663
 SHA256 afb13e89ef262b9c467ce1f76bc6bc763e076d3b48458c716f17f76c4b29d577 canna-3.7_p3.ebuild 3663
-MISC ChangeLog 7850 RMD160 e02d7366660e423ec444e1961245c7dbf22f50e2 SHA1 9ed586a23d00ba0f8d69115232b7ab22559e0d6f SHA256 7da09a7645b71d7d69bf06fcbc3edc04d1fb4d3bdd28f67a328da83f0577993d
-MD5 0620fc17ee43817ddff3f445c3e6b7ae ChangeLog 7850
-RMD160 e02d7366660e423ec444e1961245c7dbf22f50e2 ChangeLog 7850
-SHA256 7da09a7645b71d7d69bf06fcbc3edc04d1fb4d3bdd28f67a328da83f0577993d ChangeLog 7850
+MISC ChangeLog 7959 RMD160 b2868c9ecd373a2ba72e9288179b0585f6c61ccb SHA1 f35605f7cee4bbc2a4a56114213a548952e9326b SHA256 5c100895d5f551738d6e064892feaf391c79c7da8f3c13fdba27f906729fd127
+MD5 3ded37bb7ef4cca95a57a22b134e441c ChangeLog 7959
+RMD160 b2868c9ecd373a2ba72e9288179b0585f6c61ccb ChangeLog 7959
+SHA256 5c100895d5f551738d6e064892feaf391c79c7da8f3c13fdba27f906729fd127 ChangeLog 7959
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
@@ -61,10 +58,3 @@ SHA256 92d90efaa5f07897ef7ae41ce231396839f9d57ac64434cd1a2c069a772e91de files/di
 MD5 c0222ed748903a926730f1be5364a640 files/digest-canna-3.7_p3 235
 RMD160 816a6ed3ac03ac67a8843bdbe0834e70c042b5a2 files/digest-canna-3.7_p3 235
 SHA256 6381f104319efd3b1e613d414c0b73a42da78506b1e7f8e4a0d17047423d3e0d files/digest-canna-3.7_p3 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFE6G5PuB6ZT1m7QRERAqlfAJ9bIGQjcQ5tJebDHz/4mG/SrnDD+ACeJ1jT
-9gtshB2DftQlqV9S77QgpK8=
-=d64F
------END PGP SIGNATURE-----
diff --git a/app-i18n/canna/canna-3.6_p4.ebuild b/app-i18n/canna/canna-3.6_p4.ebuild
index e5381794b3d5..6ca4265e4c42 100644
--- a/app-i18n/canna/canna-3.6_p4.ebuild
+++ b/app-i18n/canna/canna-3.6_p4.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/canna/canna-3.6_p4.ebuild,v 1.19 2006/08/20 14:14:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.20 2006/09/04 09:19:31 mr_bones_ Exp $
 
 inherit cannadic eutils
 
@@ -16,7 +16,11 @@ KEYWORDS="x86 ppc sparc alpha"
 IUSE="doc"
 
 DEPEND="virtual/libc
-	virtual/x11
+	|| ( ( x11-misc/gccmakedep
+			x11-misc/imake
+		)
+		virtual/x11
+	)
 	>=sys-apps/sed-4
 	doc? ( app-text/ptex )"
 RDEPEND="virtual/libc"