diff options
| author |   Seth Chandler <sethbc@gentoo.org> | 2003-01-27 18:56:01 +0000 |
|---|---|---|
| committer | Seth Chandler <sethbc@gentoo.org> | 2003-01-27 18:56:01 +0000 |
| commit | 39744ab47261dd20cd8760f618d039d085912d7b (patch) | |
| tree | c5c7e6afe657e6932e95b872dca1798c00839990 /app-office | |
| parent | New version (diff) | |
| download | historical-39744ab47261dd20cd8760f618d039d085912d7b.tar.gz historical-39744ab47261dd20cd8760f618d039d085912d7b.tar.bz2 historical-39744ab47261dd20cd8760f618d039d085912d7b.zip | |
block on openoffice-bin as there is a namespace conflict
Diffstat (limited to 'app-office')
5 files changed, 15 insertions, 10 deletions
diff --git a/app-office/openoffice/openoffice-1.0.0-r2.ebuild b/app-office/openoffice/openoffice-1.0.0-r2.ebuild index 04c3d931cca9..2f9ac42eb027 100644 --- a/app-office/openoffice/openoffice-1.0.0-r2.ebuild +++ b/app-office/openoffice/openoffice-1.0.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.0-r2.ebuild,v 1.6 2002/12/10 00:45:03 blauwers Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.0-r2.ebuild,v 1.7 2003/01/27 18:56:01 sethbc Exp $ inherit virtualx @@ -49,7 +49,8 @@ COMMONDEPEND=">=sys-libs/glibc-2.1 virtual/x11 app-arch/zip app-arch/unzip - >=virtual/jdk-1.3.1" + >=virtual/jdk-1.3.1 + !app-office/openoffice-bin" # All these are included with the source archive ... # >=media-libs/nas-1.4.1 diff --git a/app-office/openoffice/openoffice-1.0.1-r1.ebuild b/app-office/openoffice/openoffice-1.0.1-r1.ebuild index 4ec0abc343a2..074e4887877f 100644 --- a/app-office/openoffice/openoffice-1.0.1-r1.ebuild +++ b/app-office/openoffice/openoffice-1.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r1.ebuild,v 1.12 2002/12/10 00:45:03 blauwers Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r1.ebuild,v 1.13 2003/01/27 18:56:01 sethbc Exp $ # IMPORTANT: This is extremely alpha!!! @@ -77,7 +77,8 @@ RDEPEND=">=sys-libs/glibc-2.1 >=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced DEPEND="${RDEPEND} - app-shells/tcsh" + app-shells/tcsh + !app-office/openoffice-bin" # fix a bug with tcsh and dircolors # diff --git a/app-office/openoffice/openoffice-1.0.1-r2.ebuild b/app-office/openoffice/openoffice-1.0.1-r2.ebuild index 78e80500561a..0de44718e5de 100644 --- a/app-office/openoffice/openoffice-1.0.1-r2.ebuild +++ b/app-office/openoffice/openoffice-1.0.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r2.ebuild,v 1.10 2002/12/10 00:45:03 blauwers Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r2.ebuild,v 1.11 2003/01/27 18:56:01 sethbc Exp $ # IMPORTANT: This is extremely alpha!!! @@ -77,7 +77,8 @@ RDEPEND=">=sys-libs/glibc-2.1 >=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced DEPEND="${RDEPEND} - app-shells/tcsh" + app-shells/tcsh + !app-office/openoffice-bin" # fix a bug with tcsh and dircolors # diff --git a/app-office/openoffice/openoffice-1.0.1-r3.ebuild b/app-office/openoffice/openoffice-1.0.1-r3.ebuild index a516e0306c64..9d9eba7dd944 100644 --- a/app-office/openoffice/openoffice-1.0.1-r3.ebuild +++ b/app-office/openoffice/openoffice-1.0.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r3.ebuild,v 1.8 2003/01/20 02:15:51 sethbc Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r3.ebuild,v 1.9 2003/01/27 18:56:01 sethbc Exp $ # IMPORTANT: This is extremely alpha!!! @@ -77,7 +77,8 @@ RDEPEND=">=sys-libs/glibc-2.1 >=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced DEPEND="${RDEPEND} - app-shells/tcsh" + app-shells/tcsh + !app-office/openoffice-bin" # fix a bug with tcsh and dircolors # diff --git a/app-office/openoffice/openoffice-1.0.1.ebuild b/app-office/openoffice/openoffice-1.0.1.ebuild index c63a55b04429..e9f19c152088 100644 --- a/app-office/openoffice/openoffice-1.0.1.ebuild +++ b/app-office/openoffice/openoffice-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1.ebuild,v 1.4 2002/12/10 00:45:03 blauwers Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1.ebuild,v 1.5 2003/01/27 18:56:01 sethbc Exp $ # IMPORTANT: This is extremely alpha!!! @@ -73,7 +73,8 @@ RDEPEND=">=sys-libs/glibc-2.1 >=virtual/jdk-1.3.1" DEPEND="${RDEPEND} - app-shells/tcsh" + app-shells/tcsh + !app-office/openoffice-bin" # fix a bug with tcsh and dircolors # |