diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2006-11-18 07:23:17 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2006-11-18 07:23:17 +0000 |
| commit | a9e3fcdccf3b66e9af84e4730fe89c27e7c970b0 (patch) | |
| tree | d5cd7c9b83e9d5c681b67f8a2538d0ccca10ff62 /gnome-extra/hal-device-manager | |
| parent | add missed masks (diff) | |
| download | historical-a9e3fcdccf3b66e9af84e4730fe89c27e7c970b0.tar.gz historical-a9e3fcdccf3b66e9af84e4730fe89c27e7c970b0.tar.bz2 historical-a9e3fcdccf3b66e9af84e4730fe89c27e7c970b0.zip | |
Removing old versions. Fixing D-Bus depend
Package-Manager: portage-2.1.2_rc2
Diffstat (limited to 'gnome-extra/hal-device-manager')
3 files changed, 19 insertions, 12 deletions
diff --git a/gnome-extra/hal-device-manager/ChangeLog b/gnome-extra/hal-device-manager/ChangeLog index ba9d2b9656a8..b94f03b8a6cf 100644 --- 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 8b137891791f..e69de29bb2d1 100644 --- 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 fbbbc31dcd2a..9f3ddae4e619 100644 --- 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 } |