Some more cleanups, also depend on libxml2 if building without java

Package-Manager: portage-2.0.53_rc5

4 files changed, 21 insertions, 27 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index d53df66f30d3..52f2deeaeedd 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.130 2005/10/12 10:21:47 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.131 2005/10/12 11:44:27 suka Exp $
+
+  12 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0_rc2.diff, openoffice-2.0.0_rc2.ebuild:
+  Some more cleanups, also depend on libxml2 if building without java. Also
+  using an updated version of ooo-build-2.0.0_rc2 now.
 
   12 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
   +files/2.0.0/no-ldap-mozilla.diff, files/2.0.0/gentoo-2.0.0_rc2.diff,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index e6eb83bcdba2..2754ea2c52ea 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 44c5fd238aa72b697819310901a494d7 ChangeLog 28708
+MD5 1a3dbb379bfe72085e300889de2a6fd4 ChangeLog 28959
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
@@ -32,7 +32,7 @@ MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
 MD5 4821a498748cc2b42dd3d32b27c95da9 files/2.0.0/config_office-openldap-fix.diff 484
-MD5 f9ceaf5d6ea10d047fbcf55e1dd71630 files/2.0.0/gentoo-2.0.0_rc2.diff 1386
+MD5 9fcafd818f3e84a8adda72501784243e files/2.0.0/gentoo-2.0.0_rc2.diff 1105
 MD5 078172057d5be938e24273c359b42435 files/2.0.0/no-ldap-mozilla.diff 1292
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
@@ -40,4 +40,4 @@ MD5 cd8007c1f613acc2ee85255b0d20b711 files/digest-openoffice-2.0.0_rc2 416
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 159fb7fbb76e97136b7fb924143563c6 openoffice-2.0.0_rc2.ebuild 6968
+MD5 5db01d12a6cda9f897569ae7b2dbf554 openoffice-2.0.0_rc2.ebuild 7079
diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff
index b4993c1198e3..527746fed47a 100644
--- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff
+++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff
@@ -28,23 +28,10 @@
  
  #
  # NOTE: 64 bit OOo is work in progress!
---- distro-configs/Common.conf.in.old	2005-07-27 19:33:53.000000000 +0200
-+++ distro-configs/Common.conf.in	2005-08-24 19:10:33.000000000 +0200
-@@ -2,17 +2,10 @@
- --disable-crashdump
- --disable-epm
- --enable-crashdump=no
----enable-openldap
- --with-build-version=\"Build @OOO_BUILDVERSION@\"
- --with-lang=\"@OOO_LANGS@\"
- --without-fonts
- --without-gpc
- --with-system-freetype
- --with-system-gcc
----with-system-jpeg
----with-system-libxml
----with-system-mozilla
----with-system-python
----with-system-zlib
----enable-evolution2
- @CAIRO_CONFIGURE_FLAG@
+--- distro-configs/Gentoo.conf.in       2005-08-26 11:48:38.000000000 +0200
++++ distro-configs/Gentoo.conf.in.new   2005-10-11 23:32:25.000000000 +0200
+@@ -4,3 +4,4 @@
+ --with-system-expat
+ --with-system-stdlibs
+ --with-system-xrender-headers
++--without-system-jpeg
diff --git a/app-office/openoffice/openoffice-2.0.0_rc2.ebuild b/app-office/openoffice/openoffice-2.0.0_rc2.ebuild
index d92cd02d09b0..321b211545a0 100644
--- a/app-office/openoffice/openoffice-2.0.0_rc2.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0_rc2.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.0_rc2.ebuild,v 1.5 2005/10/12 10:21:47 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0_rc2.ebuild,v 1.6 2005/10/12 11:44:27 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -69,7 +69,8 @@ DEPEND="${RDEPEND}
 	!dev-util/dmake
 	java? ( =virtual/jdk-1.4*
 		dev-java/ant-core )
-	!java? ( dev-libs/libxslt )
+	!java? ( dev-libs/libxslt
+		>=dev-libs/libxml2-2.0 )
 	ldap? ( net-nds/openldap )
 	python? ( >=dev-lang/python-2.3.4 )
 	xml2? ( >=dev-libs/libxml2-2.0 )"
@@ -105,7 +106,8 @@ pkg_setup() {
 		ewarn " You are building with java-support disabled, this results in some "
 		ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
 		ewarn " If something you need does not work for you, rebuild with "
-		ewarn " java in your USE-flags "
+		ewarn " java in your USE-flags. Also the xml2 use-flag is disabled with "
+		ewarn " -java to prevent build breakage. "
 		ewarn
 	fi