Drop virtual/x11 dependency.

Package-Manager: portage-2.1.3_rc8

4 files changed, 23 insertions, 25 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 1420b4f80825..c077ff0a06cb 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/canna
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.55 2007/04/22 09:58:25 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.56 2007/07/22 09:06:19 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> canna-3.7_p2.ebuild,
+  canna-3.7_p3.ebuild:
+  Drop virtual/x11 dependency.
 
   22 Apr 2007; MATSUU Takuto <matsuu@gentoo.org>
   -files/canna-3.6_p4-gentoo.diff, -canna-3.6_p4.ebuild,
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index b86a530ce5f6..167ec87581e0 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -24,18 +24,18 @@ RMD160 8c73fa6c6814a4032eea45bab19321f579715f3d files/update-canna-dics_dir 1101
 SHA256 d1114dce288e815f897b20eabd177bb5b77e0d479bcb4b7eff9afb0d65607f11 files/update-canna-dics_dir 1101
 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.7_p2.ebuild 3607 RMD160 f581b6ad8d2371513cb3d25cb473224a1d4fe317 SHA1 1b0424421f3c6010387052d7bea347307fc8551e SHA256 8e94a77b38c0befdbd4c1fb21c3a212d4e7025b68de1b2d1c5d7160883f63e42
-MD5 5f8027fa04f282c4bcece2e1b0fbf5bf canna-3.7_p2.ebuild 3607
-RMD160 f581b6ad8d2371513cb3d25cb473224a1d4fe317 canna-3.7_p2.ebuild 3607
-SHA256 8e94a77b38c0befdbd4c1fb21c3a212d4e7025b68de1b2d1c5d7160883f63e42 canna-3.7_p2.ebuild 3607
-EBUILD canna-3.7_p3.ebuild 3613 RMD160 ec6e3f600e61f79a14b1e1f91ffa036d98abf710 SHA1 0179797e6575700b2b09efded6ef8fe8ea6bef4e SHA256 a512f7f14f53e421847281e2011c893e8ae9a4dbb414c408a346f56379670b74
-MD5 a334726f37fdf7adb725e98185deaebc canna-3.7_p3.ebuild 3613
-RMD160 ec6e3f600e61f79a14b1e1f91ffa036d98abf710 canna-3.7_p3.ebuild 3613
-SHA256 a512f7f14f53e421847281e2011c893e8ae9a4dbb414c408a346f56379670b74 canna-3.7_p3.ebuild 3613
-MISC ChangeLog 8403 RMD160 d8780089de0606560383bb71e30a451f6d892d5c SHA1 9bfbd89996bd33f4585ce8a671c561823a448f4c SHA256 22ac0a3f984a97bea4254a362a3ef37f82a429deb2b334b3f212c4415ff2c228
-MD5 dc5ce7bc9eb791e0e2c3188be4862c6c ChangeLog 8403
-RMD160 d8780089de0606560383bb71e30a451f6d892d5c ChangeLog 8403
-SHA256 22ac0a3f984a97bea4254a362a3ef37f82a429deb2b334b3f212c4415ff2c228 ChangeLog 8403
+EBUILD canna-3.7_p2.ebuild 3578 RMD160 fd09268f7b5aa9a44e8507d2c6f9ee975d017fe9 SHA1 7ccee8b8e34bf00d4fe7fc64f3f2fea5ac7872d8 SHA256 036b330eef6f71f8480f2ac72692b95e11cfe9d063eb066179fd6f6f4136efea
+MD5 4a2ebf01e47c9e1d43ad8db40b301fd1 canna-3.7_p2.ebuild 3578
+RMD160 fd09268f7b5aa9a44e8507d2c6f9ee975d017fe9 canna-3.7_p2.ebuild 3578
+SHA256 036b330eef6f71f8480f2ac72692b95e11cfe9d063eb066179fd6f6f4136efea canna-3.7_p2.ebuild 3578
+EBUILD canna-3.7_p3.ebuild 3584 RMD160 ca2fcfffff8a44cb3dc8b1fbafe0ff3f0f3b9316 SHA1 5a1e7c5ec8b275a1bf3838d6cd5933693d58989e SHA256 2b3c518c2482506503202e4bb75607a05780875a123377e8c98190bffb30b0a9
+MD5 0cc66b7b959eb7f399a70057ee36022c canna-3.7_p3.ebuild 3584
+RMD160 ca2fcfffff8a44cb3dc8b1fbafe0ff3f0f3b9316 canna-3.7_p3.ebuild 3584
+SHA256 2b3c518c2482506503202e4bb75607a05780875a123377e8c98190bffb30b0a9 canna-3.7_p3.ebuild 3584
+MISC ChangeLog 8531 RMD160 b4643c262e19a4901371351833b8d005205f3aee SHA1 1b5b0f9d5e93cf345d2b14c8283cfd82af83e926 SHA256 7c8ded4c25169f4eaf9ec4288c2313bda349fe5d2b734781cafdcbdfaaaa8ac6
+MD5 027f4f538f742340a129db87a4d033c0 ChangeLog 8531
+RMD160 b4643c262e19a4901371351833b8d005205f3aee ChangeLog 8531
+SHA256 7c8ded4c25169f4eaf9ec4288c2313bda349fe5d2b734781cafdcbdfaaaa8ac6 ChangeLog 8531
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
diff --git a/app-i18n/canna/canna-3.7_p2.ebuild b/app-i18n/canna/canna-3.7_p2.ebuild
index 3231289712a7..74b8f86e166f 100644
--- a/app-i18n/canna/canna-3.7_p2.ebuild
+++ b/app-i18n/canna/canna-3.7_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.17 2007/04/22 09:58:25 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.18 2007/07/22 09:06:19 calchan Exp $
 
 inherit cannadic eutils multilib
 
@@ -17,11 +17,8 @@ IUSE="doc"
 
 DEPEND="virtual/libc
 	>=sys-apps/sed-4
-	|| ( ( x11-misc/gccmakedep
-			x11-misc/imake
-		)
-		virtual/x11
-	)
+	x11-misc/gccmakedep
+	x11-misc/imake
 	doc? ( app-text/ptex )"
 RDEPEND="virtual/libc"
 
diff --git a/app-i18n/canna/canna-3.7_p3.ebuild b/app-i18n/canna/canna-3.7_p3.ebuild
index aa5eea065c31..e0ac4970844e 100644
--- a/app-i18n/canna/canna-3.7_p3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3.ebuild,v 1.3 2007/04/22 09:58:25 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3.ebuild,v 1.4 2007/07/22 09:06:19 calchan Exp $
 
 inherit cannadic eutils multilib
 
@@ -17,11 +17,8 @@ IUSE="doc"
 
 DEPEND="virtual/libc
 	>=sys-apps/sed-4
-	|| ( ( x11-misc/gccmakedep
-			x11-misc/imake
-		)
-		virtual/x11
-	)
+	x11-misc/gccmakedep
+	x11-misc/imake
 	doc? ( app-text/ptex )"
 RDEPEND="virtual/libc"