From: Jim Ramsay <lack@gentoo.org>
Date: Thu, 15 Feb 2007 02:57:18 +0000 (+0000)
Subject: Fixing up dbus dependencies
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc7cf442464adc8509cad5e9d881505c2eabe210;p=gentoo.git

Fixing up dbus dependencies
Package-Manager: portage-2.1.2-r8
---

diff --git a/rox-extra/downloadmanager/ChangeLog b/rox-extra/downloadmanager/ChangeLog
index 292757c82d81..318dd9ff49c0 100644
--- a/rox-extra/downloadmanager/ChangeLog
+++ b/rox-extra/downloadmanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-extra/downloadmanager
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/downloadmanager/ChangeLog,v 1.9 2007/01/15 19:54:43 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/downloadmanager/ChangeLog,v 1.10 2007/02/15 02:57:18 lack Exp $
+
+  15 Feb 2007; Jim Ramsay <lack@gentoo.org> downloadmanager-0.1.2-r2.ebuild,
+  downloadmanager-0.1.3.ebuild:
+  Fixing up dbus dependencies
 
 *downloadmanager-0.1.3 (15 Jan 2007)
 
diff --git a/rox-extra/downloadmanager/downloadmanager-0.1.2-r2.ebuild b/rox-extra/downloadmanager/downloadmanager-0.1.2-r2.ebuild
index 4542f9fc2f9f..ad0416beb846 100644
--- a/rox-extra/downloadmanager/downloadmanager-0.1.2-r2.ebuild
+++ b/rox-extra/downloadmanager/downloadmanager-0.1.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/downloadmanager/downloadmanager-0.1.2-r2.ebuild,v 1.1 2006/12/04 18:16:29 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/downloadmanager/downloadmanager-0.1.2-r2.ebuild,v 1.2 2007/02/15 02:57:18 lack Exp $
 
 ROX_LIB_VER=2.0.0
 inherit rox eutils
@@ -16,22 +16,11 @@ KEYWORDS="x86"
 IUSE=""
 
 RDEPEND=">=rox-extra/fetch-0.1.0
-	|| ( >=dev-python/dbus-python-0.71
-		( >=sys-apps/dbus-0.3 <sys-apps/dbus-0.90 ) )"
+		>=dev-python/dbus-python-0.71"
 
 APPNAME=${MY_PN}
 S=${WORKDIR}
 
-pkg_setup() {
-	if ! has_version dev-python/dbus-python && \
-		! built_with_use sys-apps/dbus python
-	then
-		einfo "${APPNAME} requires dbus to be built with python support."
-		einfo "Please rebuild dbus with USE=\"python\"."
-		die "python dbus modules missing"
-	fi
-}
-
 src_install() {
 	# Do normal ROX install first
 	rox_src_install
diff --git a/rox-extra/downloadmanager/downloadmanager-0.1.3.ebuild b/rox-extra/downloadmanager/downloadmanager-0.1.3.ebuild
index 30b62b4b85bd..cc80c8956452 100644
--- a/rox-extra/downloadmanager/downloadmanager-0.1.3.ebuild
+++ b/rox-extra/downloadmanager/downloadmanager-0.1.3.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/rox-extra/downloadmanager/downloadmanager-0.1.3.ebuild,v 1.1 2007/01/15 19:54:43 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/downloadmanager/downloadmanager-0.1.3.ebuild,v 1.2 2007/02/15 02:57:18 lack Exp $
 
 ROX_LIB_VER=2.0.0
 inherit rox eutils
@@ -16,22 +16,11 @@ KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND=">=rox-extra/fetch-0.1.0
-	|| ( >=dev-python/dbus-python-0.71
-		( >=sys-apps/dbus-0.3 <sys-apps/dbus-0.90 ) )"
+		>=dev-python/dbus-python-0.71"
 
 APPNAME=${MY_PN}
 S=${WORKDIR}
 
-pkg_setup() {
-	if ! has_version dev-python/dbus-python && \
-		! built_with_use sys-apps/dbus python
-	then
-		einfo "${APPNAME} requires dbus to be built with python support."
-		einfo "Please rebuild dbus with USE=\"python\"."
-		die "python dbus modules missing"
-	fi
-}
-
 src_install() {
 	# Do normal ROX install first
 	rox_src_install