Totally disable nas with -nas in USE-flags, see bug #113706

Package-Manager: portage-2.0.53_rc7

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 8d506aecdef4b992f8e7e3d76e73052a271cc674..e5c416283d12894d0d7f9e65f060ab0251fec8ca 100644 (file)
--- 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.157 2005/11/29 19:36:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.158 2005/11/30 06:57:19 suka Exp $
+
+  30 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Totally disable nas with -nas in USE-flags (instead of building the internal
+  one). Otherwise the build will break with modular X.org, see bug #113706
 
   29 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.0.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 5f9afd5b119b24d5ae01510f1840cd0b4a0a5892..aa43d01d930b3388320ed09c7c0f3a85290d4f58 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 fea0167266436b5fe4e07a4cf1e9d431 ChangeLog 34242
+MD5 03453c732ed3abcbe7fce9926d451369 ChangeLog 34477
 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
@@ -41,4 +41,4 @@ MD5 039f6964d10fd36776620f93b84705dd files/digest-openoffice-2.0.0 478
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 5073250e9526a661fe84ecf6ee3876d5 openoffice-2.0.0.ebuild 7265
+MD5 fb08ec2c20dad7cd99b84423e53c23c8 openoffice-2.0.0.ebuild 7310

diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index 87295b09bb3d468866c37ce9c30a5f08e2737ac9..b70717644b9579c74626b720918b663b0dc925aa 100644 (file)
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.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.ebuild,v 1.18 2005/11/29 19:36:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.19 2005/11/30 06:57:19 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -134,9 +134,9 @@ src_unpack() {
 
        #Use flag checks
        use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
+       use nas &&    echo "--with-system-nas" >> ${CONFFILE} || echo "--without-nas" >> ${CONFFILE}
 
        echo "`use_with curl system-curl`" >> ${CONFFILE}
-       echo "`use_with nas system-nas`" >> ${CONFFILE}
        echo "`use_with xml2 system-libxml`" >> ${CONFFILE}
        echo "`use_with zlib system-zlib`" >> ${CONFFILE}