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
commit08bf81a671042e521ccca6fe69ca8976ce4f60c9 (patch)
treec411d1380e4133c173ea4e820d5eae49719f2529 /app-office
parentStable on ppc64 (diff)
downloadhistorical-08bf81a671042e521ccca6fe69ca8976ce4f60c9.tar.gz
historical-08bf81a671042e521ccca6fe69ca8976ce4f60c9.tar.bz2
historical-08bf81a671042e521ccca6fe69ca8976ce4f60c9.zip
Another round of small fixes and cleanups to the ebuild
Package-Manager: portage-2.1.1_pre5-r3
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/Manifest16
-rw-r--r--app-office/openoffice/openoffice-2.0.4_rc1.ebuild8
3 files changed, 16 insertions, 14 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/Manifest b/app-office/openoffice/Manifest
index 7789d03d9e1d..6fa0ad957b37 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -28,14 +28,14 @@ EBUILD openoffice-2.0.3.ebuild 8771 RMD160 d8e4177da714bf2baf0918254d55d74b007c0
MD5 1bb775b012dc3e889ce2deb201d52cf7 openoffice-2.0.3.ebuild 8771
RMD160 d8e4177da714bf2baf0918254d55d74b007c0450 openoffice-2.0.3.ebuild 8771
SHA256 64fb4fc0fce9c69df56246ceec62779be3256d6e9eff1d876ab566e245a29e20 openoffice-2.0.3.ebuild 8771
-EBUILD openoffice-2.0.4_rc1.ebuild 9181 RMD160 d9610edd8dd5a8d15888a3e70e21980574c9eefb SHA1 3cdaedd025f8284f1c371bbd0022c047dc0259be SHA256 292a6ca4e37a9f7995af15e306349aa4910536e81cdd4e2c73b613d30b5816da
-MD5 0bed8e45731f97269f1cdbafbcff4797 openoffice-2.0.4_rc1.ebuild 9181
-RMD160 d9610edd8dd5a8d15888a3e70e21980574c9eefb openoffice-2.0.4_rc1.ebuild 9181
-SHA256 292a6ca4e37a9f7995af15e306349aa4910536e81cdd4e2c73b613d30b5816da openoffice-2.0.4_rc1.ebuild 9181
-MISC ChangeLog 50784 RMD160 ad2034d9bde2d538620e17aacb6436451ac9ed27 SHA1 5dd7a7ac73400d71512a678e054d0aeefa0120c3 SHA256 4f85194442b16588ccc93614a70725391f3cda393fb9735fa54d5c75c4aa4802
-MD5 c6de67ecfb6538dbb323258e95604221 ChangeLog 50784
-RMD160 ad2034d9bde2d538620e17aacb6436451ac9ed27 ChangeLog 50784
-SHA256 4f85194442b16588ccc93614a70725391f3cda393fb9735fa54d5c75c4aa4802 ChangeLog 50784
+EBUILD openoffice-2.0.4_rc1.ebuild 9142 RMD160 408d19f5110ffd8f6b14d902c39f7324c542da15 SHA1 030edd7208322d0c6ad635bfc612bae29e73bc7f SHA256 fda597f3a165dd0b00707585ab55fa78dfe8b486616ad05f5420b2cb0acc6aca
+MD5 28ab22a1438222cdf8ad395e8ac6e208 openoffice-2.0.4_rc1.ebuild 9142
+RMD160 408d19f5110ffd8f6b14d902c39f7324c542da15 openoffice-2.0.4_rc1.ebuild 9142
+SHA256 fda597f3a165dd0b00707585ab55fa78dfe8b486616ad05f5420b2cb0acc6aca openoffice-2.0.4_rc1.ebuild 9142
+MISC ChangeLog 50927 RMD160 7b6d6eb1d2288a8c9cde01ce266c644bdca86fa6 SHA1 dd5b6a9c23fb4680819f6accfcadc71702df6798 SHA256 c391a8890f6c1b0de6aa819861b181a747052d1cc55ba2b83ccd56c2235118ae
+MD5 d4519c2255c67835506b03d23fb3196c ChangeLog 50927
+RMD160 7b6d6eb1d2288a8c9cde01ce266c644bdca86fa6 ChangeLog 50927
+SHA256 c391a8890f6c1b0de6aa819861b181a747052d1cc55ba2b83ccd56c2235118ae ChangeLog 50927
MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
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() {