fix older versions for modular X too

Package-Manager: portage-2.1_pre3-r1

4 files changed, 45 insertions, 19 deletions

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 60676a17e286..d979ca5d1389 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fbac027b872baa4f2d6f3f757b59b002 ChangeLog 37072
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
@@ -43,14 +40,7 @@ MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
 MD5 f43c98cba404ee89be6bed4f785dfd00 files/digest-openoffice-2.0.0 478
 MD5 5cba4a6aa38cbfc6b9b91671aa500dd6 files/digest-openoffice-2.0.1 552
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659
-MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 ece6469b501209c7971a74c4dd0fbae8 openoffice-2.0.0.ebuild 7072
+MD5 cf9dc94e784a56867f8dfee43802c82f openoffice-1.1.4-r1.ebuild 16863
+MD5 9f4b77d9e3bc77ce21f5dae51c1c94cc openoffice-1.1.5.ebuild 16769
+MD5 a8947bb9eee6c9e83a083168d28e73ef openoffice-2.0.0.ebuild 7271
 MD5 843ba4afcee1cf087a83a964617af02f openoffice-2.0.1.ebuild 7550
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFD0UjUKRy60XGEcJIRAo8kAJwKDfcpJLVCTgngA2dIv496kZEC4gCfb5FL
-gDz/OQ97sW89Im1y8pk3Oco=
-=/oUx
------END PGP SIGNATURE-----
diff --git a/app-office/openoffice/openoffice-1.1.4-r1.ebuild b/app-office/openoffice/openoffice-1.1.4-r1.ebuild
index 836891b89896..e421141f48fc 100644
--- a/app-office/openoffice/openoffice-1.1.4-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4-r1.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/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.9 2005/11/20 19:27:15 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.10 2006/01/21 13:40:46 suka Exp $
 
 # Notes:
 #
@@ -45,7 +45,11 @@ SLOT="0"
 KEYWORDS="x86 ppc -sparc"
 
 RDEPEND="!app-office/openoffice-bin
-	virtual/x11
+	|| ( (
+			x11-libs/libXaw
+			x11-libs/libXinerama
+		)
+		virtual/x11 )
 	virtual/libc
 	virtual/lpr
 	>=dev-lang/perl-5.0
@@ -62,6 +66,14 @@ RDEPEND="!app-office/openoffice-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 )
 	>=sys-apps/findutils-4.1.20-r1
 	app-shells/tcsh
 	dev-util/pkgconfig
diff --git a/app-office/openoffice/openoffice-1.1.5.ebuild b/app-office/openoffice/openoffice-1.1.5.ebuild
index 61643d8853db..0d4cbbac372d 100644
--- a/app-office/openoffice/openoffice-1.1.5.ebuild
+++ b/app-office/openoffice/openoffice-1.1.5.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/app-office/openoffice/openoffice-1.1.5.ebuild,v 1.5 2005/09/24 07:27:54 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.5.ebuild,v 1.6 2006/01/21 13:40:46 suka Exp $
 
 # Notes:
 #
@@ -45,7 +45,11 @@ SLOT="0"
 KEYWORDS="~ppc -sparc ~x86"
 
 RDEPEND="!app-office/openoffice-bin
-	virtual/x11
+	|| ( (
+			x11-libs/libXaw
+			x11-libs/libXinerama
+		)
+		virtual/x11 )
 	virtual/libc
 	virtual/lpr
 	>=dev-lang/perl-5.0
@@ -62,6 +66,14 @@ RDEPEND="!app-office/openoffice-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 )
 	>=sys-apps/findutils-4.1.20-r1
 	app-shells/tcsh
 	dev-util/pkgconfig
diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index 663b7bbf2b82..cbb23b20c90b 100644
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.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/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.22 2006/01/17 18:59:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.23 2006/01/21 13:40:46 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -30,7 +30,11 @@ KEYWORDS="x86 ~ppc sparc"
 RDEPEND="!app-office/openoffice-bin
 	!app-office/openoffice-ximian-bin
 	!app-office/openoffice-ximian
-	virtual/x11
+	|| ( (
+			x11-libs/libXaw
+			x11-libs/libXinerama
+		)
+		virtual/x11 )
 	virtual/libc
 	>=dev-lang/perl-5.0
 	gnome? ( >=x11-libs/gtk+-2.4
@@ -56,6 +60,14 @@ RDEPEND="!app-office/openoffice-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