summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-08-25 08:30:30 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-08-25 08:30:30 +0000
commit1219587ed908aa02cd378ef8167db64c6de778c3 (patch)
treee5898471b0ea5b3aa4dce445e7ea9e2fe9a27f69 /app-office
parentStable on ppc64 (diff)
downloadgentoo-2-1219587ed908aa02cd378ef8167db64c6de778c3.tar.gz
gentoo-2-1219587ed908aa02cd378ef8167db64c6de778c3.tar.bz2
gentoo-2-1219587ed908aa02cd378ef8167db64c6de778c3.zip
Another round of small fixes and cleanups to the ebuild
(Portage version: 2.1.1_pre5-r3)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/openoffice-2.0.4_rc1.ebuild8
2 files changed, 8 insertions, 6 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index aa39755cda25..c01ee8577581 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.243 2006/08/24 18:58:20 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.244 2006/08/25 08:30:30 suka Exp $
+
+ 25 Aug 2006; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-2.0.4_rc1.ebuild:
+ Another round of small fixes and cleanups to the ebuild
24 Aug 2006; Andreas Proschofsky <suka@gentoo.org>
openoffice-2.0.4_rc1.ebuild:
diff --git a/app-office/openoffice/openoffice-2.0.4_rc1.ebuild b/app-office/openoffice/openoffice-2.0.4_rc1.ebuild
index 1994282e8692..a2aba8ac8110 100644
--- a/app-office/openoffice/openoffice-2.0.4_rc1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4_rc1.ebuild,v 1.3 2006/08/24 18:58:20 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4_rc1.ebuild,v 1.4 2006/08/25 08:30:30 suka Exp $
inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
@@ -73,7 +73,7 @@ RDEPEND="!app-office/openoffice-bin
dev-libs/expat
java? ( >=virtual/jre-1.4 )
>=sys-devel/gcc-3.2.1
- amd64? ( >=dev-libs/boost-1.33.1 )
+ amd64? ( >=dev-libs/boost-1.31.0 )
linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
@@ -102,7 +102,7 @@ DEPEND="${RDEPEND}
app-admin/eselect-oodict
java? ( >=virtual/jdk-1.4
dev-java/ant-core
- >=dev-java/java-config-2.0.19-r1 )
+ ${JAVA_PKG_E_DEPEND} )
!java? ( dev-libs/libxslt
>=dev-libs/libxml2-2.0 )
ldap? ( net-nds/openldap )
@@ -155,8 +155,6 @@ pkg_setup() {
epause 10
fi
- java-pkg-opt-2_pkg_setup
-
}
src_unpack() {