Porting to modular X

(Portage version: 2.0.53)

5 files changed, 82 insertions, 12 deletions

diff --git a/x11-misc/xaos/ChangeLog b/x11-misc/xaos/ChangeLog
index d981ff946ef3..627813ef0218 100644
--- a/x11-misc/xaos/ChangeLog
+++ b/x11-misc/xaos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xaos
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.18 2006/01/25 11:30:43 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.19 2006/01/25 13:19:50 phosphan Exp $
+
+  25 Jan 2006; Patrick Kursawe <phosphan@gentoo.org> xaos-3.1.ebuild,
+  xaos-3.1.1.ebuild, xaos-3.1.3.ebuild:
+  Porting to modular X
 
   25 Jan 2006; Patrick Kursawe <phosphan@gentoo.org> xaos-3.1.3.ebuild:
   I guess -sparc is a mistake (can't find any change in the log, and 3.1.1 works)
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index 46ff1dbc2d79..ce140f89954e 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -4,6 +4,6 @@ MD5 a5aa09876dbb6a8b3800c2ddeb749264 files/digest-xaos-3.1.1 63
 MD5 ffe0ee7c85eaba15fb216fc1f400fc03 files/digest-xaos-3.1.3 63
 MD5 7589bd8d57e0ddebeb3463df943ed3a2 files/gcc3.4.patch 7778
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 cdf8eb68c4ce6cc44992f1fa74e854d4 xaos-3.1.1.ebuild 1688
-MD5 a5d918bb7b0a5e3522f9b7cfdebc78d9 xaos-3.1.3.ebuild 1692
-MD5 dc3ea29a3319b960518790c572768926 xaos-3.1.ebuild 1761
+MD5 39e14e8ddf7e03404a67da632820cf5e xaos-3.1.1.ebuild 2008
+MD5 f5a7b2bba9f7660056cecce8929079d5 xaos-3.1.3.ebuild 2012
+MD5 b34f0f7b892c0048a0eb580ea02454df xaos-3.1.ebuild 2081
diff --git a/x11-misc/xaos/xaos-3.1.1.ebuild b/x11-misc/xaos/xaos-3.1.1.ebuild
index 343ff9d34e5f..de0d485ea142 100644
--- a/x11-misc/xaos/xaos-3.1.1.ebuild
+++ b/x11-misc/xaos/xaos-3.1.1.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-misc/xaos/xaos-3.1.1.ebuild,v 1.3 2005/06/28 02:08:59 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.1.1.ebuild,v 1.4 2006/01/25 13:19:50 phosphan Exp $
 
 inherit eutils
 
@@ -18,7 +18,17 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc sparc ~x86"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( 
+			 || (
+					virtual/x11
+					(
+					x11-libs/libX11
+					x11-libs/libXxf86dga
+					x11-libs/libXext
+					x11-libs/libXxf86vm
+					)
+				)
+		   )
 	svga? ( >=media-libs/svgalib-1.4.3 )
 	aalib? ( media-libs/aalib )
 	sys-libs/zlib
@@ -26,6 +36,18 @@ DEPEND="X? ( virtual/x11 )
 # xaos has ggi support, but it doesn't build
 #	ggi?   ( media-libs/libggi )
 
+DEPEND="${RDEPEND}
+		X? ( 
+			|| (
+					virtual/x11
+					(
+					x11-proto/xf86vidmodeproto
+					x11-proto/xextproto
+					x11-proto/xf86dgaproto
+					x11-proto/xproto
+					)
+				)
+			)"
 
 src_compile() {
 	local myconf
diff --git a/x11-misc/xaos/xaos-3.1.3.ebuild b/x11-misc/xaos/xaos-3.1.3.ebuild
index 6245c031672e..51af3cd0a5c7 100644
--- a/x11-misc/xaos/xaos-3.1.3.ebuild
+++ b/x11-misc/xaos/xaos-3.1.3.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/x11-misc/xaos/xaos-3.1.3.ebuild,v 1.2 2006/01/25 11:30:43 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.1.3.ebuild,v 1.3 2006/01/25 13:19:50 phosphan Exp $
 
 inherit eutils
 
@@ -18,7 +18,17 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( 
+			 || (
+					virtual/x11
+					(
+					x11-libs/libX11
+					x11-libs/libXxf86dga
+					x11-libs/libXext
+					x11-libs/libXxf86vm
+					)
+				)
+		   )
 	svga? ( >=media-libs/svgalib-1.4.3 )
 	aalib? ( media-libs/aalib )
 	sys-libs/zlib
@@ -26,6 +36,18 @@ DEPEND="X? ( virtual/x11 )
 # xaos has ggi support, but it doesn't build
 #	ggi?   ( media-libs/libggi )
 
+DEPEND="${RDEPEND}
+		X? ( 
+			|| (
+					virtual/x11
+					(
+					x11-proto/xf86vidmodeproto
+					x11-proto/xextproto
+					x11-proto/xf86dgaproto
+					x11-proto/xproto
+					)
+				)
+			)"
 
 src_compile() {
 	local myconf
diff --git a/x11-misc/xaos/xaos-3.1.ebuild b/x11-misc/xaos/xaos-3.1.ebuild
index 2cdff4e4ca9a..1bc13633e07a 100644
--- a/x11-misc/xaos/xaos-3.1.ebuild
+++ b/x11-misc/xaos/xaos-3.1.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-misc/xaos/xaos-3.1.ebuild,v 1.12 2005/02/07 09:15:32 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.1.ebuild,v 1.13 2006/01/25 13:19:50 phosphan Exp $
 
 inherit eutils
 
@@ -18,7 +18,17 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc amd64 -sparc"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( 
+			 || (
+					virtual/x11
+					(
+					x11-libs/libX11
+					x11-libs/libXxf86dga
+					x11-libs/libXext
+					x11-libs/libXxf86vm
+					)
+				)
+		   )
 	svga? ( >=media-libs/svgalib-1.4.3 )
 	aalib? ( media-libs/aalib )
 	sys-libs/zlib
@@ -26,6 +36,18 @@ DEPEND="X? ( virtual/x11 )
 # xaos has ggi support, but it doesn't build
 #	ggi?   ( media-libs/libggi )
 
+DEPEND="${RDEPEND}
+		X? ( 
+			|| (
+					virtual/x11
+					(
+					x11-proto/xf86vidmodeproto
+					x11-proto/xextproto
+					x11-proto/xf86dgaproto
+					x11-proto/xproto
+					)
+				)
+			)"
 
 src_unpack() {
 	unpack ${A}