summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-01-21 14:35:03 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-01-21 14:35:03 +0000
commit6a2d8188f9b1d7221da0f7272108ba18c69b4bcc (patch)
treed91a5e880b14ac65a9975be05b888c205f9fce36 /app-office
parentMark 3.51.2 stable on alpha (diff)
downloadgentoo-2-6a2d8188f9b1d7221da0f7272108ba18c69b4bcc.tar.gz
gentoo-2-6a2d8188f9b1d7221da0f7272108ba18c69b4bcc.tar.bz2
gentoo-2-6a2d8188f9b1d7221da0f7272108ba18c69b4bcc.zip
Modular X dependencies
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice-ximian/ChangeLog6
-rw-r--r--app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild18
-rw-r--r--app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild18
3 files changed, 35 insertions, 7 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/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