diff options
| author |   Herbie Hopkins <herbs@gentoo.org> | 2005-12-08 17:47:10 +0000 |
|---|---|---|
| committer | Herbie Hopkins <herbs@gentoo.org> | 2005-12-08 17:47:10 +0000 |
| commit | 54f019a7661583c292f5a826af96e82c9704fe36 (patch) | |
| tree | c240af197a83f01bc6ada5a5f757c48199bf4813 /app-office | |
| parent | fix dates in ChangeLog (diff) | |
| download | gentoo-2-54f019a7661583c292f5a826af96e82c9704fe36.tar.gz gentoo-2-54f019a7661583c292f5a826af96e82c9704fe36.tar.bz2 gentoo-2-54f019a7661583c292f5a826af96e82c9704fe36.zip | |
Adjusted RDEPEND to depend on emul-linux-x86-java to enable java functionality on amd64, closes bug #92378.
(Portage version: 2.0.53)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice-bin/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index df0eb70ed657..8031ea6a1aa0 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice-bin # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.112 2005/11/29 19:40:34 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.113 2005/12/08 17:47:10 herbs Exp $ + + 08 Dec 2005; Herbie Hopkins <herbs@gentoo.org> + openoffice-bin-2.0.0.ebuild: + Adjusted RDEPEND to depend on emul-linux-x86-java to enable java + functionality on amd64, closes bug #92378. 29 Nov 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-bin-2.0.0.ebuild: diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest index 3e57ade5b9d0..afac0e570c75 100644 --- a/app-office/openoffice-bin/Manifest +++ b/app-office/openoffice-bin/Manifest @@ -1,8 +1,8 @@ -MD5 be72a02d285bc05e13246fec51df05bf ChangeLog 19651 +MD5 bb069f9692caec47645b463ee7ae68da ChangeLog 19844 MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659 MD5 2919847c6afebe7fd157c48e78fb5770 files/2.0.0/ooo-wrapper2 3703 MD5 5828bbd9e0139dae2ff43c23a65a844b files/digest-openoffice-bin-1.1.5 82 MD5 72776dcacfb2853f6056793f531d7986 files/digest-openoffice-bin-2.0.0 4709 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460 MD5 754b2a399f6c90c5a6f17d2efc30131d openoffice-bin-1.1.5.ebuild 4718 -MD5 202d0c8998f71a7448550ba373cdfa7c openoffice-bin-2.0.0.ebuild 6873 +MD5 c4e28b9378797035de7651c7d751caf5 openoffice-bin-2.0.0.ebuild 6932 diff --git a/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild b/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild index e6b7a960a140..b8d24e09183a 100644 --- a/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-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-bin/openoffice-bin-2.0.0.ebuild,v 1.6 2005/11/29 19:40:34 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild,v 1.7 2005/12/08 17:47:10 herbs Exp $ inherit eutils fdo-mime rpm multilib @@ -80,7 +80,8 @@ RDEPEND="!app-office/openoffice >=dev-lang/perl-5.0 app-arch/zip app-arch/unzip - java? ( >=virtual/jre-1.4.1 ) + java? ( !amd64? ( >=virtual/jre-1.4.1 ) + amd64? ( app-emulation/emul-linux-x86-java ) ) amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 ) linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 ) linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 ) |