From f98ab07e25053003f66d4354437fe0251e3fdda1 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Tue, 12 Sep 2006 11:13:36 +0000 Subject: Small fix for the java dependency Package-Manager: portage-2.1.1 --- app-office/openoffice/ChangeLog | 6 +++++- app-office/openoffice/Manifest | 16 ++++++++-------- app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) (limited to 'app-office') diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 6742736ed3a0..60019c243c93 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.246 2006/09/12 07:22:09 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.247 2006/09/12 11:13:36 suka Exp $ + + 12 Sep 2006; Andreas Proschofsky + openoffice-2.0.4_rc1-r1.ebuild: + Small fix for the java dependency 12 Sep 2006; Andreas Proschofsky openoffice-2.0.4_rc1-r1.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index e23d66cdae1c..9b5da19b7545 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -29,14 +29,14 @@ EBUILD openoffice-2.0.3.ebuild 8889 RMD160 d088a15fccd5971b4b36499092c4736204898 MD5 9cc02ad193304b6f9b98891d4791196c openoffice-2.0.3.ebuild 8889 RMD160 d088a15fccd5971b4b36499092c4736204898dc7 openoffice-2.0.3.ebuild 8889 SHA256 874ec681fcc754dd5b54db0f8e1ad3f6446d80496e8188926ae17918d062afd7 openoffice-2.0.3.ebuild 8889 -EBUILD openoffice-2.0.4_rc1-r1.ebuild 9065 RMD160 6d0a99e952413f45afcab58b34079e56265ee055 SHA1 5f626f62a0db46b39fbea3e981ad44a2ed2ab369 SHA256 c3de1d0f5433e65be38ec89e858958fdafca75080964e65ffaae6ce1cdd360cd -MD5 75985f84662fb6135dc39adde5588c81 openoffice-2.0.4_rc1-r1.ebuild 9065 -RMD160 6d0a99e952413f45afcab58b34079e56265ee055 openoffice-2.0.4_rc1-r1.ebuild 9065 -SHA256 c3de1d0f5433e65be38ec89e858958fdafca75080964e65ffaae6ce1cdd360cd openoffice-2.0.4_rc1-r1.ebuild 9065 -MISC ChangeLog 51450 RMD160 22e8be11b032906aac9342abe2db84745220b0dd SHA1 4f69ae36702108f30fc0a176ec8564d0aa3b1af4 SHA256 2557ecce1901d60d85a4891dae332e49626b65136c8b7a65ed5092d916bd9b7e -MD5 33973b58bec3582f0a515e9400db117a ChangeLog 51450 -RMD160 22e8be11b032906aac9342abe2db84745220b0dd ChangeLog 51450 -SHA256 2557ecce1901d60d85a4891dae332e49626b65136c8b7a65ed5092d916bd9b7e ChangeLog 51450 +EBUILD openoffice-2.0.4_rc1-r1.ebuild 9065 RMD160 5dcd65a7d8fb6a6f0d6b9af440433d7725fb6b3f SHA1 d98b92487dd88f633da456898bc78730f4ad62f9 SHA256 75e99fac26bd4aaa9ecc69333fd29e62b14d26b5e4c72b408bb56da279b5b881 +MD5 eb16f626b59cb3c4496fd837a1887165 openoffice-2.0.4_rc1-r1.ebuild 9065 +RMD160 5dcd65a7d8fb6a6f0d6b9af440433d7725fb6b3f openoffice-2.0.4_rc1-r1.ebuild 9065 +SHA256 75e99fac26bd4aaa9ecc69333fd29e62b14d26b5e4c72b408bb56da279b5b881 openoffice-2.0.4_rc1-r1.ebuild 9065 +MISC ChangeLog 51574 RMD160 21378f07411e9360fc6794da7ef5666e77353508 SHA1 882d9ed4ef0054d3918f790905ffd07171c1d838 SHA256 9207e6c5d691613039e8e611227149f72788bc49261004142476a9c1c8bb3667 +MD5 7017afb91b23adf7835aac4c2ada96b4 ChangeLog 51574 +RMD160 21378f07411e9360fc6794da7ef5666e77353508 ChangeLog 51574 +SHA256 9207e6c5d691613039e8e611227149f72788bc49261004142476a9c1c8bb3667 ChangeLog 51574 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-r1.ebuild b/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild index 33a9f9b5a4b3..d78f91eda7f4 100644 --- a/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild +++ b/app-office/openoffice/openoffice-2.0.4_rc1-r1.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-r1.ebuild,v 1.2 2006/09/12 07:22:09 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild,v 1.3 2006/09/12 11:13:36 suka Exp $ inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs @@ -100,7 +100,7 @@ DEPEND="${RDEPEND} !dev-util/dmake >=dev-lang/python-2.3.4 >=app-admin/eselect-oodict-20060706 - java? ( || ( =virtual/jre-1.4* =virtual/jdk-1.5* ) + java? ( || ( =virtual/jre-1.4* =virtual/jre-1.5* ) dev-java/ant-core ) !java? ( dev-libs/libxslt >=dev-libs/libxml2-2.0 ) -- cgit v1.2.3-65-gdbad