diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2007-01-13 10:54:31 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2007-01-13 10:54:31 +0000 |
| commit | c22ed04f02a98b8ee5785053cea1367d80aa9ae5 (patch) | |
| tree | a0baccc98af2fd045f438b132fc8651593635057 /app-office | |
| parent | Remove old -0.13.0 version. (diff) | |
| download | gentoo-2-c22ed04f02a98b8ee5785053cea1367d80aa9ae5.tar.gz gentoo-2-c22ed04f02a98b8ee5785053cea1367d80aa9ae5.tar.bz2 gentoo-2-c22ed04f02a98b8ee5785053cea1367d80aa9ae5.zip | |
Fix java dependency to not accidentaly force =jdk-1.4, closes bug #161871
(Portage version: 2.1.2_rc4-r9)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.0.4.ebuild | 4 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.1.0.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2b8471c467b7..79897c03ecf4 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.293 2007/01/12 22:54:26 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.294 2007/01/13 10:54:31 suka Exp $ + + 13 Jan 2007; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.1.0.ebuild, openoffice-2.0.4.ebuild: + Fix java dependency to not accidentally force =jdk-1.4, closes bug #161871 12 Jan 2007; Andreas Proschofsky <suka@gentoo.org> +files/2.1.0/ooo-wrapper.in, +files/2.1.0/wrapper-readd.diff, diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild index 647f01c75e3b..4e1e68023f80 100644 --- a/app-office/openoffice/openoffice-2.0.4.ebuild +++ b/app-office/openoffice/openoffice-2.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.ebuild,v 1.27 2007/01/09 17:49:09 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.28 2007/01/13 10:54:31 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -106,7 +106,7 @@ DEPEND="${COMMON_DEPEND} pam? ( sys-libs/pam ) !dev-util/dmake >=dev-lang/python-2.3.4 - java? ( || ( =virtual/jdk-1.4* !amd64? ( =virtual/jdk-1.5* ) ) + java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* ) dev-java/ant-core ) dev-libs/libxslt ldap? ( net-nds/openldap ) diff --git a/app-office/openoffice/openoffice-2.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild index a046c7e05cbb..793a060b8a22 100644 --- a/app-office/openoffice/openoffice-2.1.0.ebuild +++ b/app-office/openoffice/openoffice-2.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.6 2007/01/12 22:54:26 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.7 2007/01/13 10:54:31 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -115,7 +115,7 @@ DEPEND="${COMMON_DEPEND} pam? ( sys-libs/pam ) !dev-util/dmake >=dev-lang/python-2.3.4 - java? ( || ( =virtual/jdk-1.4* !amd64? ( =virtual/jdk-1.5* ) ) + java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* ) dev-java/ant-core ) dev-libs/libxslt ldap? ( net-nds/openldap ) |