Block sys-apps/hal to prevent overlapping.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 14 insertions, 8 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index dc90c77c8978..32f2f59152b2 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.37 2011/03/26 11:40:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.38 2011/03/27 08:21:48 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.8.ebuild,
+  upower-0.9.9.ebuild:
+  Block sys-apps/hal to prevent overlapping.
 
 *upower-0.9.9 (26 Mar 2011)
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index f88f0eed4329..7fd25a00b46e 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,6 +1,6 @@
 DIST upower-0.9.8.tar.bz2 462754 RMD160 cf3f0ec75e4e53b3e57a6429329c19e4826844be SHA1 4eb30f974dd817e7552698483e47c2d27838fbdc SHA256 7afaec3cb10ebbc898308c7abd250c27fd58e10379a42e80444d7a4b32f2eb91
 DIST upower-0.9.9.tar.bz2 478434 RMD160 78990545f56ba99b9cb335dfe3e9f55c498fc303 SHA1 6109a934cce6c6ab38e471f7d50ff6927561a3ab SHA256 39e19bab2c776000477d6d0ddb4bc508808954f63867a2da2be40eaf341214e2
-EBUILD upower-0.9.8.ebuild 2098 RMD160 85c236ff3d21dbeaf3a37c46ffcb72ad82eba35e SHA1 5df66c33845cd0c4dfadcb124a1761854cbdeea5 SHA256 b4f116b9a3bb3adfdf70e0e3c9f69560126af801547b49e151a5c274b3b224c5
-EBUILD upower-0.9.9.ebuild 2103 RMD160 28d42d8f3a5ff97c9fee19f3403c37de769dcfd6 SHA1 07032d9aae24a68593ea1aa22c6957a3a1212092 SHA256 7566f0f6138ffc79f165c279ee99da7a165a4fc2298e704f004c0be3c6322a78
-MISC ChangeLog 4835 RMD160 97454afff5ca559de934715099498bbbf12a004b SHA1 fb59dcbe3817d64379bd20476703f500b8ac2b8c SHA256 2fece285c76b70928208a7988dbf9a17d99275bee5ee079074724d1b147660d6
+EBUILD upower-0.9.8.ebuild 2112 RMD160 8b0c80dba3280e202c294da8fc424b52acc36e6b SHA1 d7ee8ed1f161117fd3f1732baa1e06e2d881ab5f SHA256 7e5a97d4a01c9d0b5358a87857c2054c8a9c9467c5ac79b77a58e04ff3284cfe
+EBUILD upower-0.9.9.ebuild 2118 RMD160 378d6c4179be0e9c4bd09de20e9d24044ad827ac SHA1 165102cc832c93390587cb6aa0a13eeb6e5a71c2 SHA256 2a2e08ce2001d158a77bf7e3ed41aac3ba97164e8c118a003b110e4326309af0
+MISC ChangeLog 4979 RMD160 1e608a0cde353c4e4eb13187626a709b6651ca64 SHA1 22650c4e8214f85a4e1ad8a4bfc2f39e5ce68f99 SHA256 ef71a53ef79c45e214a7dfc2e95e4c03a83104008d580957433cc38f649ffa23
 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
diff --git a/sys-power/upower/upower-0.9.8.ebuild b/sys-power/upower/upower-0.9.8.ebuild
index c0b3d30dbf7b..ab359634ddd2 100644
--- a/sys-power/upower/upower-0.9.8.ebuild
+++ b/sys-power/upower/upower-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.8.ebuild,v 1.8 2011/03/22 21:21:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.8.ebuild,v 1.9 2011/03/27 08:21:49 ssuominen Exp $
 
 EAPI=3
 inherit linux-info
@@ -23,7 +23,8 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
 		virtual/libusb:1
 		ipod? ( >=app-pda/libimobiledevice-0.9.7
 			>=app-pda/libplist-0.12 ) )
-	!sys-apps/devicekit-power"
+	!sys-apps/devicekit-power
+	!sys-apps/hal"
 RDEPEND="${COMMON_DEPEND}
 	kernel_linux? ( >=sys-power/pm-utils-1.4.1 )"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-power/upower/upower-0.9.9.ebuild b/sys-power/upower/upower-0.9.9.ebuild
index e3d60eb0a0e7..94413561a020 100644
--- a/sys-power/upower/upower-0.9.9.ebuild
+++ b/sys-power/upower/upower-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.9.ebuild,v 1.1 2011/03/26 11:40:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.9.ebuild,v 1.2 2011/03/27 08:21:48 ssuominen Exp $
 
 EAPI=3
 inherit linux-info
@@ -23,7 +23,8 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.88
 		virtual/libusb:1
 		ipod? ( >=app-pda/libimobiledevice-0.9.7
 			>=app-pda/libplist-0.12 ) )
-	!sys-apps/devicekit-power"
+	!sys-apps/devicekit-power
+	!sys-apps/hal"
 RDEPEND="${COMMON_DEPEND}
 	kernel_linux? ( >=sys-power/pm-utils-1.4.1 )"
 DEPEND="${COMMON_DEPEND}