Make hal optional; bug #157867

Package-Manager: portage-2.1.2-r5

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 2ee7e7521b13b6bc22b8765ad681e3f85f3aad65..a09948c0317f4c934349319b39ea3a8f6c55a96d 100644 (file)
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.215 2007/01/21 20:17:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.216 2007/01/31 21:10:01 dang Exp $
+
+  31 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+  control-center-2.16.2.ebuild:
+  Make hal optional; bug #157867
 
   21 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
   control-center-2.16.2.ebuild:

diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 6ecbd0334ac86bc33bbb66787dae1751199ee4b5..223af67243c629fd7c52eee9c5262b0287d74d60 100644 (file)
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -23,14 +23,14 @@ EBUILD control-center-2.14.2.ebuild 2444 RMD160 689ba4fe0b7468731183154ff10ae5ac
 MD5 983f7e1a0d21717ee1ced77ae71f38b9 control-center-2.14.2.ebuild 2444
 RMD160 689ba4fe0b7468731183154ff10ae5acbe69bd54 control-center-2.14.2.ebuild 2444
 SHA256 79231146c56b8b159171ed3f860c8d7785e972b89c47a70252b120078c25a1f1 control-center-2.14.2.ebuild 2444
-EBUILD control-center-2.16.2.ebuild 2269 RMD160 87584e55773f3793db1c8e6a6e1ad4dc06744ec4 SHA1 65236497ed36e1dacce679ab803df7465124a38c SHA256 5be96a77abcb59f6891552af05e3f34746b5ae80b26404d210641fda722e9cb9
-MD5 8324a475a06ed0cd61de014b5102a8c7 control-center-2.16.2.ebuild 2269
-RMD160 87584e55773f3793db1c8e6a6e1ad4dc06744ec4 control-center-2.16.2.ebuild 2269
-SHA256 5be96a77abcb59f6891552af05e3f34746b5ae80b26404d210641fda722e9cb9 control-center-2.16.2.ebuild 2269
-MISC ChangeLog 29070 RMD160 e822bc7bd1c728565f60daa4c8c55e2d6eb7ac47 SHA1 f213b0b30d4a725300dbd499c341252293b76385 SHA256 3dfafc34e40383ee85aba140a9a7b90a4bf0a8cb32d2c8899fcce2d5475dc45b
-MD5 19ac3cb65144c80e80dbf7f05aeab8bf ChangeLog 29070
-RMD160 e822bc7bd1c728565f60daa4c8c55e2d6eb7ac47 ChangeLog 29070
-SHA256 3dfafc34e40383ee85aba140a9a7b90a4bf0a8cb32d2c8899fcce2d5475dc45b ChangeLog 29070
+EBUILD control-center-2.16.2.ebuild 2307 RMD160 9dafed9e6752383e252ae661d2624e91863978cb SHA1 4097b801fe1e6c28145614b0384820de8996179e SHA256 cfe346d71663f7902e81d4bcae70f93365a8c99fb7eaef021edc694f9a0d3625
+MD5 ba8800fbe4213fa42cd7155776079bc5 control-center-2.16.2.ebuild 2307
+RMD160 9dafed9e6752383e252ae661d2624e91863978cb control-center-2.16.2.ebuild 2307
+SHA256 cfe346d71663f7902e81d4bcae70f93365a8c99fb7eaef021edc694f9a0d3625 control-center-2.16.2.ebuild 2307
+MISC ChangeLog 29185 RMD160 39ed9a6a48a9d16cb8f041a0f849d8ac062cef3c SHA1 67b55e65deab38a4c68b90f2297fc7eadfa19767 SHA256 3f688827fb738f60ec52b2358daa755125fe712a4a39f6a1526114cd903dc6d2
+MD5 3fa08defed65aacbf1bb5b48adc5251a ChangeLog 29185
+RMD160 39ed9a6a48a9d16cb8f041a0f849d8ac062cef3c ChangeLog 29185
+SHA256 3f688827fb738f60ec52b2358daa755125fe712a4a39f6a1526114cd903dc6d2 ChangeLog 29185
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -44,7 +44,7 @@ SHA256 74e651694c629f647562cc363d47c94a79210a7489ec1e35273f794a0b29c441 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFvFNU8bi6rjpTunYRAuzRAKCEDKREnfY8H4Z+Q0iCLg/Y2tX1RACeJxlP
-j5rmZW/7GutuuUJ9PisnGRQ=
-=Jj4a
+iD8DBQFFwQWoomPajV0RnrERAtA6AJ9+K6SihMjnijdQCTgz3V46NoH89QCdHTGm
+G48orsAxOVwsc6lDNwFCVqc=
+=OXQo
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/control-center/control-center-2.16.2.ebuild b/gnome-base/control-center/control-center-2.16.2.ebuild
index ac16d7ab841fe166acc3acd24e311554d680a758..fbe3f9efff3f780e8c022be957594317398fb92c 100644 (file)
--- a/gnome-base/control-center/control-center-2.16.2.ebuild
+++ b/gnome-base/control-center/control-center-2.16.2.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/control-center/control-center-2.16.2.ebuild,v 1.10 2007/01/28 07:39:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.16.2.ebuild,v 1.11 2007/01/31 21:10:01 dang Exp $
 
 inherit eutils gnome2 autotools
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="alsa eds"
+IUSE="alsa eds hal"
 
 RDEPEND=">=gnome-base/gnome-vfs-2.2
                >=media-libs/fontconfig-1
@@ -33,7 +33,7 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2
                >=gnome-base/gnome-desktop-2.2
                >=gnome-base/gnome-menus-2.11.1
                media-sound/esound
-               >=sys-apps/hal-0.5.6
+               hal? ( >=sys-apps/hal-0.5.6 )
                >=x11-wm/metacity-2.8.6-r1
                >=x11-libs/libxklavier-2.91
                >=gnome-base/libgnome-2.2
@@ -69,6 +69,7 @@ pkg_setup() {
                --enable-vfs-methods    \
                --enable-gstreamer=0.10 \
                $(use_enable alsa)      \
+               $(use_enable hal)      \
                $(use_enable eds aboutme)"
 }