summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2005-12-27 07:23:36 +0000
committerAndreas Proschofsky <suka@gentoo.org>2005-12-27 07:23:36 +0000
commitea24f5edcca874b5b877a103d4a4d38c07c40f76 (patch)
tree51d01dfb019a96a1bef6f057022008e7f327d5db /app-office
parent-media-video/vlc:freetype (diff)
downloadhistorical-ea24f5edcca874b5b877a103d4a4d38c07c40f76.tar.gz
historical-ea24f5edcca874b5b877a103d4a4d38c07c40f76.tar.bz2
historical-ea24f5edcca874b5b877a103d4a4d38c07c40f76.zip
Modular X dependencies
Package-Manager: portage-2.1_pre2
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/Manifest14
-rw-r--r--app-office/openoffice/openoffice-2.0.1.ebuild16
3 files changed, 21 insertions, 15 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index ada015be82ca..d2293f8c30d5 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.166 2005/12/23 22:54:37 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.167 2005/12/27 07:23:36 suka Exp $
+
+ 27 Dec 2005; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-2.0.1.ebuild:
+ Modular X dependencies
23 Dec 2005; Andreas Proschofsky <suka@gentoo.org>
+files/2.0.1/alwayscrystal.diff, openoffice-2.0.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 08d48e3e9d45..e0439b2964e7 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f98d3f878178ce0a3cfbbb47012f84d4 ChangeLog 35989
+MD5 d2b57b9af42cd5f1ccd53a82117907bb ChangeLog 36095
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
@@ -45,11 +42,4 @@ MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
MD5 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659
MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
MD5 efc84271190bae49c9785f068d0326ff openoffice-2.0.0.ebuild 6916
-MD5 b0b0d5b3872ababa1b746b5e0f6653eb openoffice-2.0.1.ebuild 6953
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrS0sI1lqEGTUzyQRAjSJAKCNH4llT5vA9Vj+vO9o6QP51u3KGQCfULYK
-401j+XwFbjo9h0h9WS11zC4=
-=MHJ4
------END PGP SIGNATURE-----
+MD5 c6534dc33282630ff290b8835a524efd openoffice-2.0.1.ebuild 7152
diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild
index d14a2cb1cd0d..d0dd51a353ff 100644
--- a/app-office/openoffice/openoffice-2.0.1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1.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-2.0.1.ebuild,v 1.7 2005/12/24 11:12:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.8 2005/12/27 07:23:36 suka Exp $
inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
@@ -29,7 +29,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
@@ -55,6 +59,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