Enable gfloppy if hal is enabled; bug #189666

Package-Manager: portage-2.1.3.6

3 files changed, 20 insertions, 15 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 6415fb6bf0cd..67f40595182e 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.153 2007/08/11 16:50:15 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.154 2007/08/21 17:48:34 dang Exp $
+
+  21 Aug 2007; Daniel Gryniewicz <dang@gentoo.org>
+  gnome-utils-2.18.1.ebuild:
+  Enable gfloppy if hal is enabled; bug #189666
 
   11 Aug 2007; Mart Raudsepp <leio@gentoo.org> -gnome-utils-2.14.0.ebuild:
   Removing Gnome 2.14
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index 9c15d6ba5dae..29d57cb65646 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -11,14 +11,14 @@ EBUILD gnome-utils-2.16.2-r2.ebuild 1219 RMD160 8f94b95ac649a71aecc466430a408914
 MD5 7d6afd2be87b0c9f5d74a5ff3705ca19 gnome-utils-2.16.2-r2.ebuild 1219
 RMD160 8f94b95ac649a71aecc466430a4089145162fe4b gnome-utils-2.16.2-r2.ebuild 1219
 SHA256 acd1a6dd960682963714d065091c2bb24284da451d2983284a96f861c688bdb3 gnome-utils-2.16.2-r2.ebuild 1219
-EBUILD gnome-utils-2.18.1.ebuild 1119 RMD160 78a872fa499eb7131050b46056bc13a64adc2d20 SHA1 5c3e2193a9e5a5628adec0b7e25c59cf1db68c6a SHA256 a2c06e81320ebc95caed8c3cdf325b6ad73f6b72a9828dea65c815389c67c7b3
-MD5 f1f9b4f232bf46478d780cc0e374fc79 gnome-utils-2.18.1.ebuild 1119
-RMD160 78a872fa499eb7131050b46056bc13a64adc2d20 gnome-utils-2.18.1.ebuild 1119
-SHA256 a2c06e81320ebc95caed8c3cdf325b6ad73f6b72a9828dea65c815389c67c7b3 gnome-utils-2.18.1.ebuild 1119
-MISC ChangeLog 19085 RMD160 e65f2f1ae531a714c2938242218f35f35da6ab5c SHA1 9927d007bf2c741731642affdf69b343bfb90f88 SHA256 8b228e9b8f4bf1cd197d88c45a51e142856e6bc3f8a270c2d42e36480f0d6163
-MD5 9b24073af872814d9023fca8067d93ad ChangeLog 19085
-RMD160 e65f2f1ae531a714c2938242218f35f35da6ab5c ChangeLog 19085
-SHA256 8b228e9b8f4bf1cd197d88c45a51e142856e6bc3f8a270c2d42e36480f0d6163 ChangeLog 19085
+EBUILD gnome-utils-2.18.1.ebuild 1145 RMD160 3b05f99f56db6a2d8456b991771b629e2f8a5e23 SHA1 cf350f54d6d213616fd90018bd7b92b1ce18fbda SHA256 d7a8c5697a3fa79f350509b4352bd378b522f528f5a8bc1b4f9446b030d2dd9c
+MD5 e6660b57fb09b379a001741968a55877 gnome-utils-2.18.1.ebuild 1145
+RMD160 3b05f99f56db6a2d8456b991771b629e2f8a5e23 gnome-utils-2.18.1.ebuild 1145
+SHA256 d7a8c5697a3fa79f350509b4352bd378b522f528f5a8bc1b4f9446b030d2dd9c gnome-utils-2.18.1.ebuild 1145
+MISC ChangeLog 19214 RMD160 4dd1798aa0de567d7f422036c1d9f7241a020a39 SHA1 4c485e60e2478f62ccf545a44971f3f275889ca4 SHA256 5e55e465d2c78f0409abca293d17ffcced40ae954081738d16f343a9d7ba0ea0
+MD5 3b3a764b78b23ea8aaf79546aa648bd7 ChangeLog 19214
+RMD160 4dd1798aa0de567d7f422036c1d9f7241a020a39 ChangeLog 19214
+SHA256 5e55e465d2c78f0409abca293d17ffcced40ae954081738d16f343a9d7ba0ea0 ChangeLog 19214
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -30,9 +30,9 @@ MD5 e4d5f34ed3ce281b2c1e33568babd6e8 files/digest-gnome-utils-2.18.1 262
 RMD160 7414944d38075418b497bb3bf7cc6bafbfd4f5f6 files/digest-gnome-utils-2.18.1 262
 SHA256 60cd995bb62d6a68034cbb5366d63b33ed349e0e8f769a82f50b548c0a702413 files/digest-gnome-utils-2.18.1 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGveh0keYb6olFHJcRApveAKDGhIaiyr+ovYrlraGNILXsZKaJ1wCgqLzw
-ri2pT31PwjDWkIQN6b19f/w=
-=fDz4
+iD8DBQFGyyWzomPajV0RnrERApyAAJ0SnrBS0gRz2VeN2Bh+HxZWeE0oLgCfUgs2
+W26oDwe0zFMBJIbjg48OFBo=
+=ZLU8
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.18.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.18.1.ebuild
index bf0ee6cb35ec..0ff76839eb13 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.18.1.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.18.1.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-extra/gnome-utils/gnome-utils-2.18.1.ebuild,v 1.8 2007/08/11 14:57:03 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.18.1.ebuild,v 1.9 2007/08/21 17:48:34 dang Exp $
 
 inherit gnome2
 
@@ -37,5 +37,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README THANKS"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)"
+	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)
+	$(use_enable hal gfloppy)"
 }