Modular X dependencies

Package-Manager: portage-2.1_pre3-r1

4 files changed, 38 insertions, 20 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index d65c8fb57bef..14ca231f15fa 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.146 2006/01/17 19:00:31 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.147 2006/01/21 14:35:03 suka Exp $
+
+  21 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9-r1.ebuild, openoffice-ximian-1.3.16.ebuild:
+  Modular X dependencies
 
   17 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   openoffice-ximian-1.9.199.ebuild:
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 161fac6b20aa..fc9008f501a7 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e08f624028f92ed4d86f4b3bcf304ca4 ChangeLog 35408
+MD5 9d77215de58eb16b3e0c43e42accb352 ChangeLog 35553
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
@@ -33,13 +30,6 @@ MD5 53867a5ca81d65d0139b4334ef63bd72 files/digest-openoffice-ximian-1.3.16 490
 MD5 e84e07ee231b9ceaabacc5556a63f647 files/digest-openoffice-ximian-1.3.9-r1 492
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openoffice-ximian-1.9.199 0
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
-MD5 a05de7453d373da927b2b9c6cc6c7bbe openoffice-ximian-1.3.16.ebuild 17873
-MD5 78ae49ad978e18d00d11830ec7dc740f openoffice-ximian-1.3.9-r1.ebuild 18015
+MD5 14fde61de66822998e2be8706303900f openoffice-ximian-1.3.16.ebuild 18076
+MD5 a5a780a32f46614c1bf56443e4dc3dce openoffice-ximian-1.3.9-r1.ebuild 18219
 MD5 327ac83cf90a1deb38d330b8e75f7bb9 openoffice-ximian-1.9.199.ebuild 1364
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDzT7fKRy60XGEcJIRAj/wAJ41+MQlkMV/uU7YIBIA1PQgaOpVfwCeIj3P
-F7TzCBHRY8mmWYF/bXA9bV0=
-=kn25
------END PGP SIGNATURE-----
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild
index 673e5c7feffa..5ebacb042a4c 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.16.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-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild,v 1.3 2005/09/24 07:02:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild,v 1.4 2006/01/21 14:35:03 suka Exp $
 
 # Notes:
 #
@@ -54,7 +54,11 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND="!app-office/openoffice-ximian-bin
-	virtual/x11
+	|| ( (
+			x11-libs/libXaw
+			x11-libs/libXinerama
+		)
+		virtual/x11 )
 	virtual/libc
 	>=dev-lang/perl-5.0
 	gnome? ( >=x11-libs/gtk+-2.0
@@ -79,6 +83,14 @@ RDEPEND="!app-office/openoffice-ximian-bin
 	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 DEPEND="${RDEPEND}
+	|| ( (
+			x11-libs/libXrender
+			x11-proto/printproto
+			x11-proto/xextproto
+			x11-proto/xproto
+			x11-proto/xineramaproto
+		)
+		virtual/x11 )
 	net-print/cups
 	>=sys-apps/findutils-4.1.20-r1
 	app-shells/tcsh
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
index ec86b97b7f05..40c959e6b4e7 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.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-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.9 2005/11/20 19:48:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.10 2006/01/21 14:35:03 suka Exp $
 
 # Notes:
 #
@@ -54,7 +54,11 @@ SLOT="0"
 KEYWORDS="ppc sparc x86"
 
 RDEPEND="!app-office/openoffice-ximian-bin
-	virtual/x11
+	|| ( (
+			x11-libs/libXaw
+			x11-libs/libXinerama
+		)
+		virtual/x11 )
 	virtual/libc
 	>=dev-lang/perl-5.0
 	gnome? ( >=x11-libs/gtk+-2.0
@@ -79,6 +83,14 @@ RDEPEND="!app-office/openoffice-ximian-bin
 	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 DEPEND="${RDEPEND}
+	|| ( (
+			x11-libs/libXrender
+			x11-proto/printproto
+			x11-proto/xextproto
+			x11-proto/xproto
+			x11-proto/xineramaproto
+		)
+		virtual/x11 )
 	net-print/cups
 	>=sys-apps/findutils-4.1.20-r1
 	app-shells/tcsh