fix dbus dependency for dbus-1.0 (bug #155287)

Package-Manager: portage-2.1.2_rc2-r1

3 files changed, 18 insertions, 21 deletions

diff --git a/gnome-extra/nautilus-cd-burner/ChangeLog b/gnome-extra/nautilus-cd-burner/ChangeLog
index 9e0196ffe836..1b3e69b7f257 100644
--- a/gnome-extra/nautilus-cd-burner/ChangeLog
+++ b/gnome-extra/nautilus-cd-burner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/nautilus-cd-burner
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.146 2006/11/19 20:24:50 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.147 2006/11/20 22:28:16 compnerd Exp $
+
+  20 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  nautilus-cd-burner-2.16.1-r1.ebuild:
+  Fix dbus dependency for dbus-1.0 release (bug #155287)
 
   19 Nov 2006; Mart Raudsepp <leio@gentoo.org>
   -nautilus-cd-burner-2.12.3.ebuild:
diff --git a/gnome-extra/nautilus-cd-burner/Manifest b/gnome-extra/nautilus-cd-burner/Manifest
index c2616ef9986a..fbed2283aa7a 100644
--- a/gnome-extra/nautilus-cd-burner/Manifest
+++ b/gnome-extra/nautilus-cd-burner/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nautilus-cd-burner-2.16.1-make_iso_c.patch 1341 RMD160 1313d93b45968ea1f19dc5ce88c58905923fba02 SHA1 594b51fc6bb1bd0e1ad021784d9064c10a3d485f SHA256 8f4331b8986fd034b2d25cfb733e1e4ca343c456474ec0f8a8e76ef3648e7ea7
 MD5 1516af1f818240afe62f82cfedb7d2d6 files/nautilus-cd-burner-2.16.1-make_iso_c.patch 1341
 RMD160 1313d93b45968ea1f19dc5ce88c58905923fba02 files/nautilus-cd-burner-2.16.1-make_iso_c.patch 1341
@@ -11,14 +8,14 @@ EBUILD nautilus-cd-burner-2.14.2.ebuild 984 RMD160 c0462b5ca65c481118437c4b59a12
 MD5 4ff03017441d5410a8500cabf9715d35 nautilus-cd-burner-2.14.2.ebuild 984
 RMD160 c0462b5ca65c481118437c4b59a12c9ecad9d448 nautilus-cd-burner-2.14.2.ebuild 984
 SHA256 0321775fbd50059f77a5279ab5f075469242957ca9ee784896cfbc5727c21f4d nautilus-cd-burner-2.14.2.ebuild 984
-EBUILD nautilus-cd-burner-2.16.1-r1.ebuild 1129 RMD160 9dc8521d45e5ec098a7e283c50339f23f75920eb SHA1 8a25fb84257a108b0b1684f73b5ce180eaf16ef8 SHA256 dbf9a2bc8d10524cd8fb0609372bbda6e0a0cd61f075da0d7f081ac882094dd3
-MD5 4231f338955325861b48b1596a4a16f9 nautilus-cd-burner-2.16.1-r1.ebuild 1129
-RMD160 9dc8521d45e5ec098a7e283c50339f23f75920eb nautilus-cd-burner-2.16.1-r1.ebuild 1129
-SHA256 dbf9a2bc8d10524cd8fb0609372bbda6e0a0cd61f075da0d7f081ac882094dd3 nautilus-cd-burner-2.16.1-r1.ebuild 1129
-MISC ChangeLog 19331 RMD160 c4467c2a52ad2eed1ea82d4b944b3e6b5d32486e SHA1 b910f775bff450cf459b6310b3b384264ab2e7ad SHA256 8815e5b273f6d3f1215fda0ab5a345da75d36208723e563c43186e7b9045e6c0
-MD5 9c3817e62847645947ccd1369343fab1 ChangeLog 19331
-RMD160 c4467c2a52ad2eed1ea82d4b944b3e6b5d32486e ChangeLog 19331
-SHA256 8815e5b273f6d3f1215fda0ab5a345da75d36208723e563c43186e7b9045e6c0 ChangeLog 19331
+EBUILD nautilus-cd-burner-2.16.1-r1.ebuild 1193 RMD160 08c92d39a1cc8213e5ec9faec7dee499714e653e SHA1 b9929857a91765f452ba164b84213ec8d434c546 SHA256 9c4d7498d661888b7e05102ffc230310ac1b01f91fef356e3fb2cca516529945
+MD5 81ad281e0ba8431f6440cc7b36192b04 nautilus-cd-burner-2.16.1-r1.ebuild 1193
+RMD160 08c92d39a1cc8213e5ec9faec7dee499714e653e nautilus-cd-burner-2.16.1-r1.ebuild 1193
+SHA256 9c4d7498d661888b7e05102ffc230310ac1b01f91fef356e3fb2cca516529945 nautilus-cd-burner-2.16.1-r1.ebuild 1193
+MISC ChangeLog 19488 RMD160 80ffcbd557632f889f5e7eea86b962337941dbd4 SHA1 ac43491e465d89b3a4f980197ce070169f0fc29b SHA256 1ba4e3abd1bb2fd151ccf82f4dbf603a8ef763c1d0e5de51782ee3d8ad377113
+MD5 5a1eeeac14d1c78b32061252ad7a356b ChangeLog 19488
+RMD160 80ffcbd557632f889f5e7eea86b962337941dbd4 ChangeLog 19488
+SHA256 1ba4e3abd1bb2fd151ccf82f4dbf603a8ef763c1d0e5de51782ee3d8ad377113 ChangeLog 19488
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -29,10 +26,3 @@ SHA256 daae505f3e73167a7c921ec2c99c3ced67fd0678d3cd8f3fe38c65b02805de85 files/di
 MD5 36a3ab566070f924b7f2f2b024146c2f files/digest-nautilus-cd-burner-2.16.1-r1 280
 RMD160 b21b24d1e4441377cd94977f9c4826cd005ccdf8 files/digest-nautilus-cd-burner-2.16.1-r1 280
 SHA256 ac5481c3d948a0b98030613c4e5ae892d0bda66faee1f69aafeecdb3f344976c files/digest-nautilus-cd-burner-2.16.1-r1 280
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFYL2akeYb6olFHJcRAkwgAKCp+dfnj3VMUxfOgaPCBAbjjWolgACfdYyf
-m4HiXvgsyWUWeyK06xaYloA=
-=l5YU
------END PGP SIGNATURE-----
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.ebuild
index 6ee0fff62212..f9ab4c37056f 100644
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.ebuild
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.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-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.ebuild,v 1.1 2006/10/30 19:31:44 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.ebuild,v 1.2 2006/11/20 22:28:16 compnerd Exp $
 
 inherit gnome2 eutils
 
@@ -22,7 +22,10 @@ RDEPEND=">=gnome-base/gnome-vfs-2.1.3.1
 	>=gnome-base/gconf-2
 	>=gnome-base/gnome-mount-0.4
 	>=sys-apps/hal-0.5.7
-	>=sys-apps/dbus-0.6.0
+	||	(
+			>=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.6.0 )
+		)
 	cdr? ( virtual/cdrtools )
 	dvdr? ( >=app-cdr/dvd+rw-tools-6.1 )"
 DEPEND="${RDEPEND}