From 963e784e6db18e00b64fcf994cf7c1018cdb16b4 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Fri, 21 Oct 2005 15:49:37 +0000 Subject: [PATCH] Add dependency to >=dev-java/java-config-1.2.11-r1 for all the crazy people who already build OOo 2.0 on stable... Package-Manager: portage-2.0.53_rc6 --- app-office/openoffice/ChangeLog | 8 +++++++- app-office/openoffice/Manifest | 4 ++-- app-office/openoffice/openoffice-2.0.0.ebuild | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index e929b50d046f..3833df68aa0d 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.137 2005/10/20 18:04:43 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.138 2005/10/21 15:49:37 suka Exp $ + + 21 Oct 2005; Andreas Proschofsky + openoffice-2.0.0.ebuild: + Add dependency to >=dev-java/java-config-1.2.11-r1 as some people seem to be + building OOo 2.0.0 on stable, and the build will fail without the newest + version of java-config *openoffice-2.0.0 (20 Oct 2005) diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 0d8274a4ed63..5f7c8fb8ff6f 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,4 +1,4 @@ -MD5 eb994c975284d1d950c4a284cc158ce2 ChangeLog 29957 +MD5 c6ebe850d3767418bb2f06118675500c ChangeLog 30217 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766 @@ -40,5 +40,5 @@ MD5 c27522fd99b4d48dc035d2defbe57015 files/digest-openoffice-2.0.0_rc3 478 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566 -MD5 6684975cc3cc77a8d4e4beaeedc0d2f4 openoffice-2.0.0.ebuild 6782 +MD5 464fff747f1300df8ae63c7648a2db6d openoffice-2.0.0.ebuild 6817 MD5 94c7530a7b2b51223c1087fdf108db76 openoffice-2.0.0_rc3.ebuild 7083 diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild index b4eda039cf6b..25ca5fe7be53 100644 --- a/app-office/openoffice/openoffice-2.0.0.ebuild +++ b/app-office/openoffice/openoffice-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.1 2005/10/20 18:04:44 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.2 2005/10/21 15:49:37 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs @@ -67,7 +67,8 @@ DEPEND="${RDEPEND} sys-libs/pam !dev-util/dmake java? ( =virtual/jdk-1.4* - dev-java/ant-core ) + dev-java/ant-core + >=dev-java/java-config-1.2.11-r1 ) !java? ( dev-libs/libxslt >=dev-libs/libxml2-2.0 ) ldap? ( net-nds/openldap ) -- 2.26.2