diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2003-10-08 12:52:38 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2003-10-08 12:52:38 +0000 |
| commit | f1d9bb00a67c363e96ad31110e0ce619d854b0f2 (patch) | |
| tree | ae6f6ecc63a983ffcdfac34a1ca6f84bc1cf27b3 /app-office | |
| parent | marking stable (diff) | |
| download | historical-f1d9bb00a67c363e96ad31110e0ce619d854b0f2.tar.gz historical-f1d9bb00a67c363e96ad31110e0ce619d854b0f2.tar.bz2 historical-f1d9bb00a67c363e96ad31110e0ce619d854b0f2.zip | |
Fix old ccache issue
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-1.1.0.ebuild | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index f7408ec30a9d..724533d112ae 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.38 2003/10/07 11:02:16 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.39 2003/10/08 12:52:32 pauldv Exp $ + + 08 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0.ebuild: + Fix ccache test so that the old style ccache works again (if replaced by elif) 07 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0.ebuild: Add a hack to make nationalised builds work diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index d1a5f4993f5e..ff7a01c4468b 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,7 +1,7 @@ -MD5 314160825bff13b3a3ff781f193483fa ChangeLog 9753 +MD5 786b00088a0341271646f9b742616acb ChangeLog 9910 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 2eb557537830964289b9939edbd5a133 openoffice-1.1_rc3.ebuild 19359 -MD5 ca8d01851687f92b849ccdc284a8d40f openoffice-1.1.0.ebuild 19636 +MD5 3bd846d907128b23f1dd881c9dd85cd8 openoffice-1.1.0.ebuild 19634 MD5 64d84cd59e6cc059b4ab4275c95db675 openoffice-1.0.3-r1.ebuild 21905 MD5 a6c9d8c5763378f5bae1e4ac50a2ecaf files/digest-openoffice-1.1_rc3 196 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330 diff --git a/app-office/openoffice/openoffice-1.1.0.ebuild b/app-office/openoffice/openoffice-1.1.0.ebuild index 9e0d928c1a8d..f46c04997155 100644 --- a/app-office/openoffice/openoffice-1.1.0.ebuild +++ b/app-office/openoffice/openoffice-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0.ebuild,v 1.2 2003/10/07 11:02:16 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0.ebuild,v 1.3 2003/10/08 12:52:32 pauldv Exp $ # IMPORTANT: This is extremely alpha!!! @@ -335,10 +335,9 @@ src_compile() { # we take the easy way out. (Az) export CC="/usr/bin/ccache/ccache ${CC}" export CXX="/usr/bin/ccache/ccache ${CXX}" - fi # Enable new ccache for this build - if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \ + elif [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \ "${FEATURES/ccache/}" != "${FEATURES}" -a \ -x /usr/bin/ccache ] then |