summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Chandler <sethbc@gentoo.org>2003-01-31 20:28:34 +0000
committerSeth Chandler <sethbc@gentoo.org>2003-01-31 20:28:34 +0000
commit8f454e2d4a059ed9b6c6b19fa3d09d79af0c9c08 (patch)
tree2eb2340c111f921420087f653173109191400c08 /app-office
parentunmask the new kdelibs, kdebase revisions as ~ (diff)
downloadhistorical-8f454e2d4a059ed9b6c6b19fa3d09d79af0c9c08.tar.gz
historical-8f454e2d4a059ed9b6c6b19fa3d09d79af0c9c08.tar.bz2
historical-8f454e2d4a059ed9b6c6b19fa3d09d79af0c9c08.zip
chenged some error messages
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/openoffice-1.0.1-r3.ebuild41
-rw-r--r--app-office/openoffice/openoffice-1.0.2.ebuild12
2 files changed, 25 insertions, 28 deletions
diff --git a/app-office/openoffice/openoffice-1.0.1-r3.ebuild b/app-office/openoffice/openoffice-1.0.1-r3.ebuild
index 9d9eba7dd944..b77baab45710 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.9 2003/01/27 18:56:01 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.1-r3.ebuild,v 1.10 2003/01/31 20:28:34 sethbc Exp $
# IMPORTANT: This is extremely alpha!!!
@@ -114,26 +114,25 @@ pkg_setup() {
if [ -z "$(echo ${JDK_HOME} | grep "blackdown")" ] && [ "${FORCE_JAVA}" != "yes" ]
then
- eerror
- eerror "This ebuild has only been tested with the blackdown port of"
- eerror "java. If you use another java implementation, it could fail"
- eerror "horribly, so please merge the blackdown-jdk and set it as"
- eerror "system VM before proceeding:"
- eerror
- eerror " # emerge blackdown-jdk"
- eerror " # java-config --set-system-vm=blackdown-jdk-1.4.1_beta"
- eerror " # env-update"
- eerror " # source /etc/profile"
- eerror
- eerror "At the time of writing, this was version 1.4.1_beta, so please"
- eerror "adjust the version according to the version installed in"
- eerror "/opt."
- eerror
- eerror "If you however want to test another JDK (not officially supported),"
- eerror "you could do the following:"
- eerror
- eerror " # export FORCE_JAVA=yes"
- eerror
+ eerror
+ eerror "This ebuild has only been tested with the blackdown port of"
+ eerror "java. If you use another java implementation, it could fail"
+ eerror "horribly, so please merge the blackdown-jdk and set it as"
+ eerror "system VM before proceeding:"
+ eerror
+ eerror " # emerge blackdown-jdk"
+ eerror " # java-config --set-system-vm=blackdown-jdk-<VERSION>"
+ eerror " # env-update"
+ eerror " # source /etc/profile"
+ eerror
+ eerror "Please adjust <VERSION> according to the version installed in"
+ eerror "/opt."
+ eerror
+ eerror "If you however want to test another JDK (not officially supported),"
+ eerror "you could do the following:"
+ eerror
+ eerror " # export FORCE_JAVA=yes"
+ eerror
die
fi
diff --git a/app-office/openoffice/openoffice-1.0.2.ebuild b/app-office/openoffice/openoffice-1.0.2.ebuild
index 239bc994796a..5182e818df0f 100644
--- a/app-office/openoffice/openoffice-1.0.2.ebuild
+++ b/app-office/openoffice/openoffice-1.0.2.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.2.ebuild,v 1.6 2003/01/31 18:36:01 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.2.ebuild,v 1.7 2003/01/31 20:28:34 sethbc Exp $
# IMPORTANT: This is extremely alpha!!!
@@ -64,8 +64,7 @@ HOMEPAGE="http://www.openoffice.org/"
LICENSE="LGPL-2 | SISSL-1.1"
SLOT="0"
-# keywording-x86, needs too many fixes to have in ~x86 right now (Seth)
-KEYWORDS="-x86 ~ppc"
+KEYWORDS="~x86 ~ppc"
IUSE="gnome kde"
RDEPEND=">=sys-libs/glibc-2.1
@@ -123,19 +122,18 @@ pkg_setup() {
eerror "system VM before proceeding:"
eerror
eerror " # emerge blackdown-jdk"
- eerror " # java-config --set-system-vm=blackdown-jdk-1.4.1_beta"
+ eerror " # java-config --set-system-vm=blackdown-jdk-<VERSION>"
eerror " # env-update"
eerror " # source /etc/profile"
eerror
- eerror "At the time of writing, this was version 1.4.1_beta, so please"
- eerror "adjust the version according to the version installed in"
+ eerror "Please adjust <VERSION> according to the version installed in"
eerror "/opt."
eerror
eerror "If you however want to test another JDK (not officially supported),"
eerror "you could do the following:"
eerror
eerror " # export FORCE_JAVA=yes"
- eerror
+ eerror
die
fi