From 1f2f92c469670c6f5558abf2fd8e63f4cb423d6d Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 17 Nov 2006 09:09:00 +0000 Subject: [PATCH] fix dependency for dbus 1.0 (bug #155281) Package-Manager: portage-2.1.2_rc1-r7 --- gnome-base/gnome-volume-manager/ChangeLog | 6 ++++- gnome-base/gnome-volume-manager/Manifest | 26 ++++++------------- .../gnome-volume-manager-2.15.0.ebuild | 7 +++-- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog index aa3e062a1403..d041f4780843 100644 --- a/gnome-base/gnome-volume-manager/ChangeLog +++ b/gnome-base/gnome-volume-manager/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome-volume-manager # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.69 2006/11/07 14:09:42 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.70 2006/11/17 09:09:00 compnerd Exp $ + + 17 Nov 2006; Saleem Abdulrasool + gnome-volume-manager-2.15.0.ebuild: + Fix dependency for dbus 1.0 (bug #155281) 07 Nov 2006; Gustavo Zacarias gnome-volume-manager-1.5.15-r3.ebuild: diff --git a/gnome-base/gnome-volume-manager/Manifest b/gnome-base/gnome-volume-manager/Manifest index a5dc29e816f4..f586b7b722d8 100644 --- a/gnome-base/gnome-volume-manager/Manifest +++ b/gnome-base/gnome-volume-manager/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX disable-totem-dvd-autoplay.patch 876 RMD160 01da6e5fa66cee65001185c19e0f8fd37c0fa828 SHA1 25561850b6b8cbfa275da4dfa51b660df5f03063 SHA256 9152e40168176cc6f5c2db889ad8503d597f63d021234e0c6dff3bc07e1fafba MD5 66a15180a670b2d9e6c8f039ccf25f8f files/disable-totem-dvd-autoplay.patch 876 RMD160 01da6e5fa66cee65001185c19e0f8fd37c0fa828 files/disable-totem-dvd-autoplay.patch 876 @@ -33,14 +30,14 @@ EBUILD gnome-volume-manager-1.5.4.ebuild 1433 RMD160 4a594c64ed7146f93ab3f78bb08 MD5 791741a00a84463add10bb7768b556b8 gnome-volume-manager-1.5.4.ebuild 1433 RMD160 4a594c64ed7146f93ab3f78bb0845e6e218c1259 gnome-volume-manager-1.5.4.ebuild 1433 SHA256 48b731c79a14a5c8ec57a2a3da2f892e59899e252167aff1604427660301667e gnome-volume-manager-1.5.4.ebuild 1433 -EBUILD gnome-volume-manager-2.15.0.ebuild 1517 RMD160 483d66a64fc46a687ffec33c57bc1371f6e0ed8b SHA1 49c1867536c83b21843542cd02fb1b72a702b7cb SHA256 8156a6342d962d32cfe21cc636878f2cff41b0e0ab62f96bb908bbec882dfde1 -MD5 f606d9d8678eea0d25956bae78f7a38d gnome-volume-manager-2.15.0.ebuild 1517 -RMD160 483d66a64fc46a687ffec33c57bc1371f6e0ed8b gnome-volume-manager-2.15.0.ebuild 1517 -SHA256 8156a6342d962d32cfe21cc636878f2cff41b0e0ab62f96bb908bbec882dfde1 gnome-volume-manager-2.15.0.ebuild 1517 -MISC ChangeLog 10316 RMD160 3232c2558a1bf71764ef599e7b0527dac24c803d SHA1 48cfdeac1b6f6f22860cc0a9a0f7299f504230d0 SHA256 e91cb5d59792a227d3e53580c5d76f8bf33907092b16ffc6b8bf9898508c8aaf -MD5 1f58d37e7fc130fa08f081b22dd48688 ChangeLog 10316 -RMD160 3232c2558a1bf71764ef599e7b0527dac24c803d ChangeLog 10316 -SHA256 e91cb5d59792a227d3e53580c5d76f8bf33907092b16ffc6b8bf9898508c8aaf ChangeLog 10316 +EBUILD gnome-volume-manager-2.15.0.ebuild 1585 RMD160 4919b9b9b2b53fc35c5c4e7e56939b94869aef3f SHA1 9fed8ff180548b8fb38082058fa573ea14ffac0b SHA256 7114322f8fb75293c5cfc0b0482728a888eca8ba413bb34c7c0f04aca740d3c1 +MD5 05e4e1639d56e7e3c488660fc2789eeb gnome-volume-manager-2.15.0.ebuild 1585 +RMD160 4919b9b9b2b53fc35c5c4e7e56939b94869aef3f gnome-volume-manager-2.15.0.ebuild 1585 +SHA256 7114322f8fb75293c5cfc0b0482728a888eca8ba413bb34c7c0f04aca740d3c1 gnome-volume-manager-2.15.0.ebuild 1585 +MISC ChangeLog 10455 RMD160 6e32ffbdb12264d12a84ee1c0fc160898b8c4e9f SHA1 bab856eba3dc3806785183b173ce990bd20c8615 SHA256 145cd7335c7afa29dec4d45b7878d6411b2b8ce896307a4758d185ee12183054 +MD5 c73c1a80a3c44f0133a581bdb3edfcc7 ChangeLog 10455 +RMD160 6e32ffbdb12264d12a84ee1c0fc160898b8c4e9f ChangeLog 10455 +SHA256 145cd7335c7afa29dec4d45b7878d6411b2b8ce896307a4758d185ee12183054 ChangeLog 10455 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -57,10 +54,3 @@ SHA256 3d245c1e063d1fd3ff920d367175ff6431e212304a51841f5df976d95235d764 files/di MD5 87f7d0f480a84016aac5d54c4a42718e files/digest-gnome-volume-manager-2.15.0 286 RMD160 24a888ece144fc9a9dd4d9cb7ebb9a6762371d05 files/digest-gnome-volume-manager-2.15.0 286 SHA256 63e0ede732d541c479c89f6114d7498f5c81bc8a6d27bd171604233b4de7e8b3 files/digest-gnome-volume-manager-2.15.0 286 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) - -iD8DBQFFUJOaKRy60XGEcJIRAgqiAJ49uagBqKj4hDsvLj2n/SgwBQZ7dQCfWekV -f5QHoEqXEl6F2bjTRFXwAdQ= -=2MBK ------END PGP SIGNATURE----- diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.15.0.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.15.0.ebuild index 63ec4f1dad00..b12b8df14b3c 100644 --- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.15.0.ebuild +++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.15.0.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/gnome-base/gnome-volume-manager/gnome-volume-manager-2.15.0.ebuild,v 1.4 2006/10/21 23:43:44 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-2.15.0.ebuild,v 1.5 2006/11/17 09:09:00 compnerd Exp $ inherit gnome2 eutils autotools @@ -14,7 +14,10 @@ IUSE="crypt debug doc" RDEPEND="gnome-base/nautilus >=gnome-base/libgnomeui-2.1.5 - >=sys-apps/dbus-0.31 + || ( + >=dev-libs/dbus-glib-0.71 + ( =sys-apps/dbus-0.31 ) + ) >=sys-apps/hal-0.5.6 >=x11-libs/gtk+-2.6 >=gnome-base/libglade-2 -- 2.26.2