diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-11-30 06:57:19 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-11-30 06:57:19 +0000 |
| commit | dcc17ffa55bdefec2ede4a399936f82feb60a7da (patch) | |
| tree | b2ceaa975936a8e275f48763e6dcf95c98996820 | |
| parent | changed sed-search-regexp to match all header files in VDRDIR (diff) | |
| download | gentoo-2-dcc17ffa55bdefec2ede4a399936f82feb60a7da.tar.gz gentoo-2-dcc17ffa55bdefec2ede4a399936f82feb60a7da.tar.bz2 gentoo-2-dcc17ffa55bdefec2ede4a399936f82feb60a7da.zip | |
Totally disable nas with -nas in USE-flags, see bug #113706
(Portage version: 2.0.53_rc7)
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.0.0.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 8d506aecdef4..e5c416283d12 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.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/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild index 87295b09bb3d..b70717644b95 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-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} |