Add dependencies for modular X (Naga, bug #122651).

Package-Manager: portage-2.1_pre5-r4

diff --git a/app-editors/cooledit/ChangeLog b/app-editors/cooledit/ChangeLog
index 2baac2b6d1e392f8bf759dc8b433a3ad7a963127..d1cb6ad2fdf497d1a2a064b3a5735d7dca6e541a 100644 (file)
--- a/app-editors/cooledit/ChangeLog
+++ b/app-editors/cooledit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/cooledit
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/ChangeLog,v 1.11 2005/12/11 20:15:34 josejx Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/ChangeLog,v 1.12 2006/03/11 00:47:26 joshuabaergen Exp $
+
+  11 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  cooledit-3.17.7.ebuild, cooledit-3.17.12.ebuild:
+  Add dependencies for modular X (Naga, bug #122651).
 
   11 Dec 2005; Joseph Jezak <josejx@gentoo.org> cooledit-3.17.7.ebuild:
   Marked ppc stable for bug #112419.

diff --git a/app-editors/cooledit/Manifest b/app-editors/cooledit/Manifest
index 45e9bc84904a3fe2e5e30c90f2f61cf879bfc066..714faeb6b07875e419af525cb7f43bd5d4258904 100644 (file)
--- a/app-editors/cooledit/Manifest
+++ b/app-editors/cooledit/Manifest
@@ -1,16 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 516ea80bbc64456f51328180c6a57d6d ChangeLog 1459
-MD5 734b0ec156e3e53fb94e06deb047a82e cooledit-3.17.12.ebuild 782
-MD5 5f1484bca3dbdc6a473394b11839d125 cooledit-3.17.7.ebuild 719
+MD5 31da76a9759b2c9b75022d0d4385ce92 ChangeLog 1629
+RMD160 c77b31ed41eadf637f6991aa6432fc3a34a300aa ChangeLog 1629
+SHA256 57230a925214653b70e53d62f5e66fcf9df7de64c0404d0d20f0703203c24a9f ChangeLog 1629
+MD5 6d1401a78a315a182e5eaca200ea1d8b cooledit-3.17.12.ebuild 868
+RMD160 a485fcd2cd7fa0248feb7b8b3e9d5d7e8789e15d cooledit-3.17.12.ebuild 868
+SHA256 553803551f68f208e00e75ced651e09aaf6542b110880130bd1798108319c8cf cooledit-3.17.12.ebuild 868
+MD5 400d5459b833aab4d89faf3b38665e66 cooledit-3.17.7.ebuild 807
+RMD160 7943acee012c5dbe4415ae41ab3012acaeb4688c cooledit-3.17.7.ebuild 807
+SHA256 1461a207e220d1e4a56478c5dbf57b2da1a2e14d86b77b69031d712cce289246 cooledit-3.17.7.ebuild 807
 MD5 f1bdf7075843ece5a84088b337e30c9b files/digest-cooledit-3.17.12 69
+RMD160 4494fbd533e86e595cf206fa0f5b2a426260156b files/digest-cooledit-3.17.12 69
+SHA256 a782692eae6c4ce232bb2eb2ccf774aa3c7bb3207cb4b15c49800bb9c22ab228 files/digest-cooledit-3.17.12 69
 MD5 cd0766c29eb3b2519e2104cbdfb99772 files/digest-cooledit-3.17.7 68
+RMD160 26b27efe58ab418f495ee684d18e509184021d49 files/digest-cooledit-3.17.7 68
+SHA256 3de81f54e7b594f4e3ad4efb7f29c529a8a7f4b1915dc3429e2bb54b2203de0c files/digest-cooledit-3.17.7 68
 MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnIj3csIHjyDViGQRApsJAKCqNi5GxQ+pV1gg/7IVSPGLSb7qwwCfZVtL
-eb/44PJMMVOtHQqxOfH0UVo=
-=Lqe+
------END PGP SIGNATURE-----
+RMD160 f564038fc21efdd3b5ee03d1de546221990ef183 metadata.xml 256
+SHA256 4c0605b0c821709464eafa37874903cd8181aae4503efa5b9d14f6a3974dfd1c metadata.xml 256

diff --git a/app-editors/cooledit/cooledit-3.17.12.ebuild b/app-editors/cooledit/cooledit-3.17.12.ebuild
index 18ca58ca7e845a13c5fad1331b4766f26807c8af..fbde7dd94747444e6ab15b21b6b88ecde64cb669 100644 (file)
--- a/app-editors/cooledit/cooledit-3.17.12.ebuild
+++ b/app-editors/cooledit/cooledit-3.17.12.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-editors/cooledit/cooledit-3.17.12.ebuild,v 1.5 2005/10/04 13:45:05 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/cooledit-3.17.12.ebuild,v 1.6 2006/03/11 00:47:26 joshuabaergen Exp $
 
 IUSE="nls spell"
 
@@ -10,8 +10,11 @@ SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
-DEPEND="virtual/x11
+
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
        spell? ( app-text/ispell )"
+DEPEND="${RDEPEND}
+       || ( x11-libs/libXpm virtual/x11 )"
 
 src_compile() {
        # Fix for bug 40152 (04 Feb 2004 agriffis)

diff --git a/app-editors/cooledit/cooledit-3.17.7.ebuild b/app-editors/cooledit/cooledit-3.17.7.ebuild
index cebea2b136f9d51d6f06b10247bc7e6bbea60a57..e1404b956248447bf639d11be4a2a861e9b4f2a8 100644 (file)
--- a/app-editors/cooledit/cooledit-3.17.7.ebuild
+++ b/app-editors/cooledit/cooledit-3.17.7.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-editors/cooledit/cooledit-3.17.7.ebuild,v 1.8 2005/12/11 20:15:34 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/cooledit-3.17.7.ebuild,v 1.9 2006/03/11 00:47:26 joshuabaergen Exp $
 
 IUSE="nls spell"
 
@@ -10,8 +10,11 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc x86"
-DEPEND="virtual/x11
+
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
        spell? ( app-text/ispell )"
+DEPEND="${RDEPEND}
+       || ( x11-libs/libXpm virtual/x11 )"
 
 src_compile() {
        # Fix for bug 40152 (04 Feb 2004 agriffis)