From: Andreas Proschofsky Date: Mon, 4 Dec 2006 11:01:40 +0000 (+0000) Subject: Fix dbus-dependency for bug #154521 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec0990679dced6d3843b0a6fd989e374e08e64b6;p=gentoo.git Fix dbus-dependency for bug #154521 Package-Manager: portage-2.1.2_rc2-r5 --- 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 + openoffice-2.0.4.ebuild: + Fix dbus-dependency for bug #154521 30 Nov 2006; Andreas Proschofsky openoffice-2.0.4.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 183e581e977f..8523c0dfbc6f 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -28,14 +28,14 @@ EBUILD openoffice-2.0.3.ebuild 9145 RMD160 60a33696dbe9eecd555720610c34ccfdf834e MD5 59f7b5eb1b353c0bbd22dc07607acfcf openoffice-2.0.3.ebuild 9145 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb openoffice-2.0.3.ebuild 9145 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30 openoffice-2.0.3.ebuild 9145 -EBUILD openoffice-2.0.4.ebuild 9687 RMD160 e0b097b723f9b93544c72e0ff2151f4f7703cb51 SHA1 9382803247c85ee3b74121fd19a22a5f1abd6f71 SHA256 5f860bdd76a4a9c3338ed956f984cdd7983f77a4bcacab0227bab0c97b176abd -MD5 a5741935bb65b4fe66b700592aad93f1 openoffice-2.0.4.ebuild 9687 -RMD160 e0b097b723f9b93544c72e0ff2151f4f7703cb51 openoffice-2.0.4.ebuild 9687 -SHA256 5f860bdd76a4a9c3338ed956f984cdd7983f77a4bcacab0227bab0c97b176abd openoffice-2.0.4.ebuild 9687 -MISC ChangeLog 57891 RMD160 7fef6502f10676225bbc4e93dc3996f0ac76aa4c SHA1 5d489e32c42309f53f7692684aa96c6b8c01b0fc SHA256 7f9d6c82b5236370f4c1234720a590ba64ec97f539c60b34c716232750215687 -MD5 025ddd6fc3430dc47ee92deb7610ae52 ChangeLog 57891 -RMD160 7fef6502f10676225bbc4e93dc3996f0ac76aa4c ChangeLog 57891 -SHA256 7f9d6c82b5236370f4c1234720a590ba64ec97f539c60b34c716232750215687 ChangeLog 57891 +EBUILD openoffice-2.0.4.ebuild 9755 RMD160 84dc7427c02e492b63f8bd0b9b814db1140bbb16 SHA1 ffcfa57ec7032924a638ffaab4a4be4f1f194a72 SHA256 ddf73c2fe7611fea340135673fed27cf8adcfea64149b1f74b1954cddae8b536 +MD5 14ac27886f64ac7d40268ab27e1ebf09 openoffice-2.0.4.ebuild 9755 +RMD160 84dc7427c02e492b63f8bd0b9b814db1140bbb16 openoffice-2.0.4.ebuild 9755 +SHA256 ddf73c2fe7611fea340135673fed27cf8adcfea64149b1f74b1954cddae8b536 openoffice-2.0.4.ebuild 9755 +MISC ChangeLog 58010 RMD160 1da2c977a910696d28f44dc1bef374ca766db3f6 SHA1 1d5ae7f6c8d3b643009e75328d80ba807ff8316d SHA256 5838fd31d4c6e18d7ca90f7d538727d31d9a558d86c4cd3a769f6476560aa6c3 +MD5 1ae854172561ac760123df2a2db95ff5 ChangeLog 58010 +RMD160 1da2c977a910696d28f44dc1bef374ca766db3f6 ChangeLog 58010 +SHA256 5838fd31d4c6e18d7ca90f7d538727d31d9a558d86c4cd3a769f6476560aa6c3 ChangeLog 58010 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461 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.61 ) + ) ) gnome? ( >=x11-libs/gtk+-2.4 >=gnome-base/gnome-vfs-2.6 >=gnome-base/gconf-2.0 )