Remove hal use flag; it was a false hope that the gnome meta can be emerged without hal

Package-Manager: portage-2.1.2.5

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 90eb8ea0d8567df306fa60df389d7e30e61aff2f..2ba2b9f5a766d392895cb6da4e9136911e5d44d2 100644 (file)
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.268 2007/04/23 17:07:17 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.269 2007/05/01 18:05:58 dang Exp $
+
+  01 May 2007; Daniel Gryniewicz <dang@gentoo.org> gnome-2.18.0.ebuild:
+  Remove hal use flag; it was a false hope that the gnome meta can be emerged
+  without hal
 
   23 Apr 2007; Daniel Gryniewicz <dang@gentoo.org> gnome-2.18.0.ebuild:
   remove gnopernicus; orca replaces it

diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 9a9ba7bd1a635606b87c372e7082ff52ee51742b..ce1eacaa423d183ce9bb7ff3acfe95188c61e460 100644 (file)
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -13,14 +13,14 @@ EBUILD gnome-2.16.2.ebuild 4657 RMD160 e9c88bb79a7b2fc7bab318533b80b820fa25a250
 MD5 684b42ca8edeb06ea565efa8f81d33d0 gnome-2.16.2.ebuild 4657
 RMD160 e9c88bb79a7b2fc7bab318533b80b820fa25a250 gnome-2.16.2.ebuild 4657
 SHA256 8a97ce64e75c9655ca5c6b3ead5e0d3255c9d13feaebc9b9bcde53c4a181ad55 gnome-2.16.2.ebuild 4657
-EBUILD gnome-2.18.0.ebuild 4673 RMD160 4228c55463d8a0663e5e3f3169f90beef1b50de2 SHA1 a432a5811bf0db6313d2f84895771c91c69fa851 SHA256 d0d5a52df80efa848189dec3ca65b8d6f36759f49c8cd8d7b5b9ccce5eb169a3
-MD5 f55ed7a1543a7c69b39a65f285ec266b gnome-2.18.0.ebuild 4673
-RMD160 4228c55463d8a0663e5e3f3169f90beef1b50de2 gnome-2.18.0.ebuild 4673
-SHA256 d0d5a52df80efa848189dec3ca65b8d6f36759f49c8cd8d7b5b9ccce5eb169a3 gnome-2.18.0.ebuild 4673
-MISC ChangeLog 36085 RMD160 a0665cd16a17c06df772e9968bb6e28a415b314c SHA1 246ae4cebef4c20b37dcd56a89661f93a015d6f4 SHA256 04a68d51d0313d3f2d4d5bf2ac35ee459e8f9e8a76bb76f9aa005d88d7a17015
-MD5 47519eed8c131bb88723b6e8b4c7e693 ChangeLog 36085
-RMD160 a0665cd16a17c06df772e9968bb6e28a415b314c ChangeLog 36085
-SHA256 04a68d51d0313d3f2d4d5bf2ac35ee459e8f9e8a76bb76f9aa005d88d7a17015 ChangeLog 36085
+EBUILD gnome-2.18.0.ebuild 4659 RMD160 d2f51814902523d2a538a0fef83a00f1f9acafcf SHA1 c59cdbbd89c4bb462580ef2244a6c023e661b1b8 SHA256 723971ebc64d302d5ece51324fd6a65174f3c178f1a3353f76ca4b8dc6797d50
+MD5 1c1b13faa0c1bb53ee229fb5262c4a77 gnome-2.18.0.ebuild 4659
+RMD160 d2f51814902523d2a538a0fef83a00f1f9acafcf gnome-2.18.0.ebuild 4659
+SHA256 723971ebc64d302d5ece51324fd6a65174f3c178f1a3353f76ca4b8dc6797d50 gnome-2.18.0.ebuild 4659
+MISC ChangeLog 36250 RMD160 673c4ff227d45eb6e3ddd189753e630c0ad63ff4 SHA1 34e26004bce793b1c95300222644209ccd4707d4 SHA256 f4f5640b9c748fbc8f2fd7c74a5beb6cf4e0b6476680dbeb79073d003001698a
+MD5 157c7b659de31fdfb94de37dbfd8b063 ChangeLog 36250
+RMD160 673c4ff227d45eb6e3ddd189753e630c0ad63ff4 ChangeLog 36250
+SHA256 f4f5640b9c748fbc8f2fd7c74a5beb6cf4e0b6476680dbeb79073d003001698a ChangeLog 36250
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -40,7 +40,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGLOfKomPajV0RnrERAvqyAJ9wuyYxC8ZxRcGy0kz1sYgVYqti0QCdHgaw
-OG0cl2wUPYKuxH8S/58/G/4=
-=B0CT
+iD8DBQFGN4GaomPajV0RnrERAr8sAJ0Yh6sdVr/7nOYh/Vpj3r/7Pe3jMwCfR/Qt
+zMUJI2UenrmzHcLBaviPBFc=
+=QJSS
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome/gnome-2.18.0.ebuild b/gnome-base/gnome/gnome-2.18.0.ebuild
index f8e6fb232d320f6189a7108c8ff458ff8426869a..b91bd017199d1fbb7293f2992200a50ebc9d0f07 100644 (file)
--- a/gnome-base/gnome/gnome-2.18.0.ebuild
+++ b/gnome-base/gnome/gnome-2.18.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.18.0.ebuild,v 1.3 2007/04/23 17:07:17 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.18.0.ebuild,v 1.4 2007/05/01 18:05:58 dang Exp $
 
 DESCRIPTION="Meta package for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -12,7 +12,7 @@ SLOT="2.0"
 # double check none of the deps are still masked !
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="accessibility cdr cups dvdr hal ldap"
+IUSE="accessibility cdr cups dvdr ldap"
 
 S=${WORKDIR}
 
@@ -119,8 +119,6 @@ RDEPEND="!gnome-base/gnome-core
        cdr? ( >=gnome-extra/nautilus-cd-burner-2.18.0 )
        dvdr? ( >=gnome-extra/nautilus-cd-burner-2.18.0 )
 
-       hal? ( >=gnome-base/gnome-volume-manager-2.17.0 )
-
        >=gnome-extra/gtkhtml-3.14.0
        >=mail-client/evolution-2.10.0
        >=gnome-extra/evolution-data-server-1.10.0
@@ -141,6 +139,7 @@ RDEPEND="!gnome-base/gnome-core
        >=gnome-extra/gnome-screensaver-2.18.0
        >=x11-misc/alacarte-0.11.3
        >=gnome-extra/gnome-power-manager-2.18.0
+       >=gnome-base/gnome-volume-manager-2.17.0
 
        accessibility? (
                >=gnome-extra/libgail-gnome-1.18.0