Add modular X dependencies, bug #115160 by Ben Skeggs

Package-Manager: portage-2.1_pre3-r1

3 files changed, 51 insertions, 26 deletions

diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index 0cdf25787d61..3be9e77ac157 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-terms/aterm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.79 2005/12/28 22:26:12 grobian Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.80 2006/01/03 21:21:40 sekretarz Exp $
+
+  03 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> aterm-1.0.0.ebuild:
+  Add modular X dependencies, bug #115160 by Ben Skeggs
 
   28 Dec 2005; Fabian Groffen <grobian@gentoo.org> aterm-0.4.2-r7.ebuild,
   aterm-0.4.2-r9.ebuild, aterm-0.4.2-r11.ebuild, aterm-0.4.2-r12.ebuild,
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 154565831d3b..5902cc41aab6 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,29 +1,39 @@
-MD5 77ac6b7f993997cda277ad5ee108cc1e aterm-1.00_beta2.ebuild 1733
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c09c13fbc0679ce8e4644f9624e2dd73 ChangeLog 13477
 MD5 7ad76f09bb0036765b4ae4ef47fce874 aterm-0.4.2-r11.ebuild 2791
+MD5 ff849761e9dc1b7e6949320c46cae324 aterm-0.4.2-r12.ebuild 2874
 MD5 fec003f13ffaa05439b8c8e5edf9ab53 aterm-0.4.2-r13.ebuild 2910
 MD5 a98503a03ed6acd38a7c03a976595d71 aterm-0.4.2-r7.ebuild 1978
-MD5 ff849761e9dc1b7e6949320c46cae324 aterm-0.4.2-r12.ebuild 2874
-MD5 59baf001cb73a3f0f4e0e593ccd1f764 ChangeLog 13344
 MD5 3760d8000310b330b0311eeef98de5dc aterm-0.4.2-r9.ebuild 2297
-MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
-MD5 cd2da80fa872b9ee626979f0f0699ddd aterm-1.0.0.ebuild 1571
-MD5 f35d671ae7390589e50cb67736e90fc3 files/digest-aterm-1.00_beta2 69
-MD5 c2aedeeb3e7cc1dcc9361a021a570973 files/aterm-0.4.2-paste.patch 2160
-MD5 3063615b031d8150f3d5070def999757 files/digest-aterm-1.0.0 64
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r7 128
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r9 128
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r11 128
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r12 128
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r13 128
-MD5 1ddbe9b625c32cb9e67d8ee23af57110 files/aterm-0.4.2-patch-pack000.patch 4124
-MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510
-MD5 18e59b417ce4b6394317ac17da46c122 files/aterm-0.4.2-internal-border.patch 3246
+MD5 2ac64aa47332df1eaee7426ea6962c08 aterm-1.0.0.ebuild 1743
+MD5 77ac6b7f993997cda277ad5ee108cc1e aterm-1.00_beta2.ebuild 1733
+MD5 56383dccdb085d09e33858081b774724 files/aterm-0.4.2-borderless.patch 4692
 MD5 cc3291cba64add4b46d22268878043f7 files/aterm-0.4.2-copynpaste-r2.patch 5308
 MD5 80558db5a2d61eaaf6998877b616bbd0 files/aterm-0.4.2-copynpaste-r3.patch 6358
-MD5 05908a3d59cb6a02004062beb5c003b3 files/aterm-1.00-beta2-bgfix.patch 627
-MD5 e91e244a20f4bff5ed4238e4cdb4d87a files/aterm-0.4.2-paste_mouse_outside.patch 6267
 MD5 1c869d8199dea55badd3758c5967e182 files/aterm-0.4.2-copynpaste.patch 3668
+MD5 18e59b417ce4b6394317ac17da46c122 files/aterm-0.4.2-internal-border.patch 3246
 MD5 001fefd640df8a6318e8597f86c6e08c files/aterm-0.4.2-ja-savelines.patch 4459
-MD5 64a8e39eb81e3b76ec3a28e0c36b2c30 files/aterm-0.4.2-scroll-double-free.patch 1826
-MD5 56383dccdb085d09e33858081b774724 files/aterm-0.4.2-borderless.patch 4692
+MD5 c2aedeeb3e7cc1dcc9361a021a570973 files/aterm-0.4.2-paste.patch 2160
+MD5 e91e244a20f4bff5ed4238e4cdb4d87a files/aterm-0.4.2-paste_mouse_outside.patch 6267
+MD5 1ddbe9b625c32cb9e67d8ee23af57110 files/aterm-0.4.2-patch-pack000.patch 4124
+MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510
 MD5 8faf173b6f8032958f1bc48d7877353c files/aterm-0.4.2-savelines.patch 4081
+MD5 64a8e39eb81e3b76ec3a28e0c36b2c30 files/aterm-0.4.2-scroll-double-free.patch 1826
+MD5 05908a3d59cb6a02004062beb5c003b3 files/aterm-1.00-beta2-bgfix.patch 627
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r11 128
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r12 128
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r13 128
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r7 128
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r9 128
+MD5 3063615b031d8150f3d5070def999757 files/digest-aterm-1.0.0 64
+MD5 f35d671ae7390589e50cb67736e90fc3 files/digest-aterm-1.00_beta2 69
+MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDuvkaZ/iYVBmujdURAqldAKCevCPPLyNbI8KfwurIaSkO6lzj8QCgzrYK
+M+3VHuc16qxSyX1IGQgsZ60=
+=5Fj1
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/aterm/aterm-1.0.0.ebuild b/x11-terms/aterm/aterm-1.0.0.ebuild
index 5faa984040d5..4af2c73bdf85 100644
--- a/x11-terms/aterm/aterm-1.0.0.ebuild
+++ b/x11-terms/aterm/aterm-1.0.0.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/x11-terms/aterm/aterm-1.0.0.ebuild,v 1.3 2005/12/25 15:41:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.0.ebuild,v 1.4 2006/01/03 21:21:40 sekretarz Exp $
 
 inherit flag-o-matic
 
@@ -13,9 +13,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cjk xgetdefault"
 
-DEPEND="media-libs/jpeg
+RDEPEND="media-libs/jpeg
 		media-libs/libpng
-		virtual/x11"
+		|| ( ( x11-libs/libX11
+				x11-libs/libXext
+				x11-libs/libICE
+				)
+				virtual/x11
+		)"
+
+DEPEND="${RDEPEND}
+		|| ( ( x11-libs/libXt
+				x11-proto/xproto
+				)
+				virtual/x11
+			)"
 
 src_compile() {
 	local myconf