Modular X deps

Package-Manager: portage-2.0.53_rc7

diff --git a/media-libs/aalib/ChangeLog b/media-libs/aalib/ChangeLog
index 19c31d5d3754ac6551bb08a7bd8192b2b44e7a60..ff3950f24651ca5faa88eab062cbe0592e251df3 100644 (file)
--- a/media-libs/aalib/ChangeLog
+++ b/media-libs/aalib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/aalib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.21 2005/06/30 21:56:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.22 2005/11/08 18:05:42 dang Exp $
+
+  08 Nov 2005; <dang@gentoo.org> aalib-1.4_rc5.ebuild:
+  Modular X deps
 
   30 Jun 2005; Aron Griffis <agriffis@gentoo.org> aalib-1.4_rc4-r2.ebuild,
   aalib-1.4_rc5.ebuild:

diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 8c30759b3237ff137276a084e518584c558d2232..dce7334c4e8fe555b42eb0a6849c1685f35ad6c3 100644 (file)
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -1,10 +1,20 @@
-MD5 1c773194a7e93c42e0939cdafb93fb79 aalib-1.4_rc5.ebuild 1330
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 07a49c1791364804eb3a133c7bb47a96 ChangeLog 2890
 MD5 261d6532a6056289c72bce141672da30 aalib-1.4_rc4-r2.ebuild 1304
-MD5 249173c85319305158ce2bc486effe55 ChangeLog 2821
-MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
+MD5 bad2f9443246435fb23dd45f3c5e1237 aalib-1.4_rc5.ebuild 1431
+MD5 4aff44ab71184e49f997a1b6f0593b83 files/aalib-1.4_rc4-gentoo.patch 1245
 MD5 224b7aa8488763f7d7b4bfa63948adef files/aalib-1.4_rc4-m4.patch 241
 MD5 09587da2537886441b0d5590bfd45d47 files/aalib-1.4_rc5-osx.patch 3121
+MD5 b59998ef8f5e2f1740b1e6ed0b22bb4b files/aalib-osx.patch 3399
 MD5 ffa1e1a7420535a1fe146ae5145ddbd6 files/digest-aalib-1.4_rc4-r2 64
 MD5 da57c040ac70e4ac57714131aaaeb6c6 files/digest-aalib-1.4_rc5 64
-MD5 b59998ef8f5e2f1740b1e6ed0b22bb4b files/aalib-osx.patch 3399
-MD5 4aff44ab71184e49f997a1b6f0593b83 files/aalib-1.4_rc4-gentoo.patch 1245
+MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcOkDomPajV0RnrERAuUSAJwKInPzgcA3AzdTFBSZPej4z4gK4wCZAS7m
+9MxRHO1fCthbCtnC/n2+beY=
+=C+U0
+-----END PGP SIGNATURE-----

diff --git a/media-libs/aalib/aalib-1.4_rc5.ebuild b/media-libs/aalib/aalib-1.4_rc5.ebuild
index 1e64efd192759090101be0ee1b40b0cb6a1fc6dd..83a5f97054c755d26f68775429b41cfa28b9ee17 100644 (file)
--- a/media-libs/aalib/aalib-1.4_rc5.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.4 2005/06/30 21:56:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.5 2005/11/08 18:05:42 dang Exp $
 
 inherit eutils libtool toolchain-funcs
 
@@ -16,8 +16,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
 IUSE="X slang gpm"
 
-DEPEND=">=sys-libs/ncurses-5.1
-       X? ( virtual/x11 )
+RDEPEND="X? ( || ( (
+               x11-libs/libX11 )
+               virtual/x11 ) )"
+
+DEPEND="${RDEPEND}
+       >=sys-libs/ncurses-5.1
+       X? ( || ( (
+               x11-proto/xproto )
+               virtual/x11 ) )
        gpm? ( sys-libs/gpm )
        slang? ( >=sys-libs/slang-1.4.2 )"