Removing old versions. Fixing D-Bus depend

Package-Manager: portage-2.1.2_rc2

diff --git a/gnome-extra/hal-device-manager/ChangeLog b/gnome-extra/hal-device-manager/ChangeLog
index ba9d2b9656a88f08760b28bf2531dec5564329f4..b94f03b8a6cfd821176c616e9d362d6f631c3d36 100644 (file)
--- a/gnome-extra/hal-device-manager/ChangeLog
+++ b/gnome-extra/hal-device-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/hal-device-manager
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hal-device-manager/ChangeLog,v 1.11 2006/09/05 16:36:23 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hal-device-manager/ChangeLog,v 1.12 2006/11/18 07:23:17 cardoe Exp $
+
+  18 Nov 2006; Doug Goldstein <cardoe@gentoo.org>
+  -hal-device-manager-0.4.5.ebuild, -hal-device-manager-0.5.ebuild,
+  hal-device-manager-0.5-r1.ebuild:
+  Removing old versions. Fixing D-Bus depend
 
   05 Sep 2006; Steev Klimaszewski <steev@gentoo.org>
   hal-device-manager-0.5-r1.ebuild:

diff --git a/gnome-extra/hal-device-manager/files/digest-hal-device-manager-0.5-r1 b/gnome-extra/hal-device-manager/files/digest-hal-device-manager-0.5-r1
index 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/gnome-extra/hal-device-manager/files/digest-hal-device-manager-0.5-r1
+++ b/gnome-extra/hal-device-manager/files/digest-hal-device-manager-0.5-r1
@@ -1 +0,0 @@
-

diff --git a/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild b/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild
index fbbbc31dcd2a318221d658f13f5d3509bb0a9e7c..9f3ddae4e6192cca190ae0f51aa96a47179741b8 100644 (file)
--- a/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild
+++ b/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.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/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild,v 1.3 2006/09/17 22:05:43 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild,v 1.4 2006/11/18 07:23:17 cardoe Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=sys-apps/hal-${PV}-r1
-       >=sys-apps/dbus-0.60
+       || ( >=dev-python/dbus-python-0.71
+               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 ) )
        >=dev-python/gnome-python-2.0.0-r1"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
@@ -22,14 +23,16 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}
 
 pkg_setup() {
-       if ! built_with_use ">=sys-apps/dbus-0.60" 'python' ; then
-               eerror 'Please rebuild dbus with the python useflag before installing'
-               eerror 'this package.'
-               echo
-               eerror "echo 'sys-apps/dbus python' >> /etc/portage/package.use"
-               eerror 'emerge dbus'
-
-               die "dbus python bindings unavailable"
+       if [ ! -z $(best_version =sys-apps/dbus-0.62*) ]; then
+               if ! built_with_use "=sys-apps/dbus-0.62*" python; then
+                       eerror 'Please rebuild dbus with the python useflag before installing'
+                       eerror 'this package.'
+                       eerror
+                       eerror "echo 'sys-apps/dbus python' >> /etc/portage/package.use"
+                       eerror 'emerge dbus'
+
+                       die "dbus python bindings unavailable"
+               fi
        fi
 }