diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2007-06-22 11:22:42 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2007-06-22 11:22:42 +0000 |
| commit | b29e3c95c1120c86350dd219bcdc14908e73edb8 (patch) | |
| tree | 260890e46ddb590ae956121c8aa33cf36be47404 /app-office | |
| parent | add 2.11.27 (diff) | |
| download | gentoo-2-b29e3c95c1120c86350dd219bcdc14908e73edb8.tar.gz gentoo-2-b29e3c95c1120c86350dd219bcdc14908e73edb8.tar.bz2 gentoo-2-b29e3c95c1120c86350dd219bcdc14908e73edb8.zip | |
Fix some dependencies, see bug #182832
(Portage version: 2.1.3_rc4)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.2.1.ebuild | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2936c2b51d75..3a762d16ac86 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.331 2007/06/21 07:05:41 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.332 2007/06/22 11:22:42 suka Exp $ + + 22 Jun 2007; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.2.1.ebuild: + Fix some dependencies, see bug #182832 21 Jun 2007; Andreas Proschofsky <suka@gentoo.org> files/2.2.1/gentoo-2.2.1.diff, openoffice-2.2.1.ebuild: diff --git a/app-office/openoffice/openoffice-2.2.1.ebuild b/app-office/openoffice/openoffice-2.2.1.ebuild index 7a8ba0d88c67..5ef560598883 100644 --- a/app-office/openoffice/openoffice-2.2.1.ebuild +++ b/app-office/openoffice/openoffice-2.2.1.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.2.1.ebuild,v 1.6 2007/06/21 07:05:41 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.1.ebuild,v 1.7 2007/06/22 11:22:42 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -50,7 +50,6 @@ KEYWORDS="~amd64 ppc -sparc x86" COMMON_DEPEND="!app-office/openoffice-bin x11-libs/libXaw x11-libs/libXinerama - virtual/libc >=dev-lang/perl-5.0 dbus? ( || ( >=dev-libs/dbus-glib-0.71 @@ -102,7 +101,7 @@ COMMON_DEPEND="!app-office/openoffice-bin linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 ) linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )" -RDEPEND="java? ( || ( =virtual/jre-1.5* =virtual/jre-1.4* ) ) +RDEPEND="java? ( >=virtual/jre-1.4 ) ${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND} |