Fixing dbus depend

Package-Manager: portage-2.1.2_pre3-r8

4 files changed, 35 insertions, 21 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index c864863b35b2..d9fe36bd0f26 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.208 2006/10/21 07:04:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.209 2006/11/01 04:34:23 cardoe Exp $
+
+  01 Nov 2006; Doug Goldstein <cardoe@gentoo.org> cups-1.2.4.ebuild,
+  cups-1.2.5.ebuild:
+  Fixing dbus depend
 
   21 Oct 2006; Stefan Schweizer <genstef@gentoo.org> files/cups-1.2.5.patch:
   fix patch, thanks to Kalidarn <dcecchin@gmail.com> in bug 152182
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 8d147c459b36..768da5e9306c 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cups-1.1.23-bindnow.patch 2087 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 SHA1 6f3c24500c50016c0bb2f1913b7c3cb6384c6b21 SHA256 fb932b7e9d04dfe7d52bd455f3514818a3bba1eaa3a3342b5c6b840bf957e67b
 MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087
 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 files/cups-1.1.23-bindnow.patch 2087
@@ -57,18 +60,18 @@ EBUILD cups-1.1.23-r8.ebuild 4985 RMD160 e01cbcb4bd77aa3e2b232253235e185129167ee
 MD5 54a99ab704429d053d41ff1fe558188e cups-1.1.23-r8.ebuild 4985
 RMD160 e01cbcb4bd77aa3e2b232253235e185129167ee6 cups-1.1.23-r8.ebuild 4985
 SHA256 37605ea842c753d35a37cc36f651dad3e6cc6fae9c3cb1c832a689b3f3961321 cups-1.1.23-r8.ebuild 4985
-EBUILD cups-1.2.4.ebuild 5778 RMD160 3f8e024e05c82637e5bd653bf4c6534770ff4c86 SHA1 b42c2d05d47bf1191754976b7f0968a7b1512d6c SHA256 b5bceb0517f5521e2d1da22cb9be5414398bc35caadad6119a8cf232ffdc0e52
-MD5 7fc695393e0d337504f7f94e09d0c3b3 cups-1.2.4.ebuild 5778
-RMD160 3f8e024e05c82637e5bd653bf4c6534770ff4c86 cups-1.2.4.ebuild 5778
-SHA256 b5bceb0517f5521e2d1da22cb9be5414398bc35caadad6119a8cf232ffdc0e52 cups-1.2.4.ebuild 5778
-EBUILD cups-1.2.5.ebuild 5816 RMD160 3cdf82c8f0ad14bf575592070b1359ac7742d0e5 SHA1 ff604223b20394a6c88139962594c9bc7c7a3bef SHA256 e5c472333299a90044081849c11cebc31752b5cb45f03cb36ec5b427fce75748
-MD5 d2b9303b24da08498db8e3bf5be3d873 cups-1.2.5.ebuild 5816
-RMD160 3cdf82c8f0ad14bf575592070b1359ac7742d0e5 cups-1.2.5.ebuild 5816
-SHA256 e5c472333299a90044081849c11cebc31752b5cb45f03cb36ec5b427fce75748 cups-1.2.5.ebuild 5816
-MISC ChangeLog 29609 RMD160 f0487ce6805200a237c7173db08ec0be7f14b18f SHA1 c666c7fac3260417b1234959a41774798c424a6c SHA256 a9b6987bca948a6b71f72bf7d5f67e802c2cc5ae94ea2ace668f55b10b2467e1
-MD5 d1df2391fb296e98f0c12d9171407943 ChangeLog 29609
-RMD160 f0487ce6805200a237c7173db08ec0be7f14b18f ChangeLog 29609
-SHA256 a9b6987bca948a6b71f72bf7d5f67e802c2cc5ae94ea2ace668f55b10b2467e1 ChangeLog 29609
+EBUILD cups-1.2.4.ebuild 5751 RMD160 6e71fef8d736718e1404d20bfaa2daf817eff6b6 SHA1 95a6895c648e811e92ccaa91c5de31282d439564 SHA256 cb580324fa58ea196eb94d7aa3462dbb7e7422fe1a10e9c791998005c0e431bb
+MD5 a7dfa140cadd75395bd5b89275874089 cups-1.2.4.ebuild 5751
+RMD160 6e71fef8d736718e1404d20bfaa2daf817eff6b6 cups-1.2.4.ebuild 5751
+SHA256 cb580324fa58ea196eb94d7aa3462dbb7e7422fe1a10e9c791998005c0e431bb cups-1.2.4.ebuild 5751
+EBUILD cups-1.2.5.ebuild 5788 RMD160 05ee7c23daedb7de015f6592bbee5148bf610370 SHA1 29cc77115d166b862d862b7187cf30274d8f8ce5 SHA256 f7abfac67a3575ded1102b984b333458d9d0c493987fdc04f96837c35984d7f1
+MD5 65d93b590eb04aef1ff28aeaefc6af91 cups-1.2.5.ebuild 5788
+RMD160 05ee7c23daedb7de015f6592bbee5148bf610370 cups-1.2.5.ebuild 5788
+SHA256 f7abfac67a3575ded1102b984b333458d9d0c493987fdc04f96837c35984d7f1 cups-1.2.5.ebuild 5788
+MISC ChangeLog 29720 RMD160 c246839c46457d05c347e174c66383adb4de07c3 SHA1 f95136385f16bc3f868c1b65e1a7011f8987a9f3 SHA256 579b2aa66860f33779484fb98e800b81c24cbca89820218858edd3c562f987c3
+MD5 d6a380d791aef4da965b8ba8f456e05c ChangeLog 29720
+RMD160 c246839c46457d05c347e174c66383adb4de07c3 ChangeLog 29720
+SHA256 579b2aa66860f33779484fb98e800b81c24cbca89820218858edd3c562f987c3 ChangeLog 29720
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -82,3 +85,10 @@ SHA256 a7c03e62e92a4a9a394acd423c6cce5af8e0c6a6afae5b44686c21858e79ec52 files/di
 MD5 b8e30436b4c06424b912140b59189cb5 files/digest-cups-1.2.5 259
 RMD160 71eb4e72bce763377f3f0aa0529bb57845026ad4 files/digest-cups-1.2.5 259
 SHA256 02c5089d6f092247fb7edc49dee8dad9dabf7ad7b182368adcdde7451d59cb6e files/digest-cups-1.2.5 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFSCP8oeSe8B0zEfwRAnGWAJ9bFxp+nCs3YI4aeZ98TiJsZrHUbQCeNXXZ
+m/cj4we/gaz8vmnVQbiJJ6M=
+=wr0N
+-----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.2.4.ebuild b/net-print/cups/cups-1.2.4.ebuild
index 094e03d61800..017da015c732 100644
--- a/net-print/cups/cups-1.2.4.ebuild
+++ b/net-print/cups/cups-1.2.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/net-print/cups/cups-1.2.4.ebuild,v 1.4 2006/10/19 16:23:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.4.ebuild,v 1.5 2006/11/01 04:34:23 cardoe Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -19,7 +19,7 @@ IUSE="ssl slp pam php samba nls dbus tiff png ppds jpeg X"
 DEP="pam? ( virtual/pam )
 	ssl? ( net-libs/gnutls )
 	slp? ( >=net-libs/openslp-1.0.4 )
-	dbus? ( || ( sys-apps/dbus-core sys-apps/dbus ) )
+	dbus? ( sys-apps/dbus )
 	png? ( >=media-libs/libpng-1.2.1 )
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	jpeg? ( >=media-libs/jpeg-6b )
@@ -31,8 +31,8 @@ RDEPEND="${DEP}
 	nls? ( virtual/libintl )
 	!virtual/lpr
 	>=app-text/poppler-0.4.3-r1
-	X? ( x11-misc/xdg-utils )
-	"
+	X? ( x11-misc/xdg-utils )"
+
 PDEPEND="
 	ppds? ( || (
 		(
diff --git a/net-print/cups/cups-1.2.5.ebuild b/net-print/cups/cups-1.2.5.ebuild
index 1c65609e7e70..e64266e75112 100644
--- a/net-print/cups/cups-1.2.5.ebuild
+++ b/net-print/cups/cups-1.2.5.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/net-print/cups/cups-1.2.5.ebuild,v 1.1 2006/10/21 00:45:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.5.ebuild,v 1.2 2006/11/01 04:34:23 cardoe Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -19,7 +19,7 @@ IUSE="ssl slp pam php samba nls dbus tiff png ppds jpeg X"
 DEP="pam? ( virtual/pam )
 	ssl? ( net-libs/gnutls )
 	slp? ( >=net-libs/openslp-1.0.4 )
-	dbus? ( || ( sys-apps/dbus-core sys-apps/dbus ) )
+	dbus? ( sys-apps/dbus )
 	png? ( >=media-libs/libpng-1.2.1 )
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	jpeg? ( >=media-libs/jpeg-6b )
@@ -31,8 +31,8 @@ RDEPEND="${DEP}
 	nls? ( virtual/libintl )
 	!virtual/lpr
 	>=app-text/poppler-0.4.3-r1
-	X? ( x11-misc/xdg-utils )
-	"
+	X? ( x11-misc/xdg-utils )"
+
 PDEPEND="
 	ppds? ( || (
 		(