diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2006-12-04 11:01:40 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2006-12-04 11:01:40 +0000 |
| commit | ea4264b6d8f5dc887462330edb30675dab1b5a8f (patch) | |
| tree | b59d5cc9d56cf0f6bfb1ea77757abd01183098f6 /app-office | |
| parent | Version bump. Fixes bug #156350 (diff) | |
| download | gentoo-2-ea4264b6d8f5dc887462330edb30675dab1b5a8f.tar.gz gentoo-2-ea4264b6d8f5dc887462330edb30675dab1b5a8f.tar.bz2 gentoo-2-ea4264b6d8f5dc887462330edb30675dab1b5a8f.zip | |
Fix dbus-dependency for bug #154521
(Portage version: 2.1.2_rc2-r5)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.0.4.ebuild | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2b1ae8c3cc2f..45f1dea85963 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.276 2006/11/30 23:15:33 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.277 2006/12/04 11:01:40 suka Exp $ + + 04 Dec 2006; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.0.4.ebuild: + Fix dbus-dependency for bug #154521 30 Nov 2006; Andreas Proschofsky <suka@gentoo.org> openoffice-2.0.4.ebuild: diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild index a3f989430d46..6bd39b665232 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-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.ebuild,v 1.18 2006/11/30 23:15:33 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.19 2006/12/04 11:01:40 suka Exp $ inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs @@ -44,7 +44,10 @@ COMMON_DEPEND="!app-office/openoffice-bin x11-libs/libXinerama virtual/libc >=dev-lang/perl-5.0 - dbus? ( >=sys-apps/dbus-0.60 ) + dbus? ( || ( + >=dev-libs/dbus-glib-0.71 + ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 ) + ) ) gnome? ( >=x11-libs/gtk+-2.4 >=gnome-base/gnome-vfs-2.6 >=gnome-base/gconf-2.0 ) |