Updated dbus dependencies

(Portage version: 2.1.2-r8)

3 files changed, 11 insertions, 29 deletions

diff --git a/rox-base/rox-session/ChangeLog b/rox-base/rox-session/ChangeLog
index 302168d58ac3..47454de4aaf5 100644
--- a/rox-base/rox-session/ChangeLog
+++ b/rox-base/rox-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/rox-session
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.19 2007/01/30 17:53:05 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.20 2007/02/15 02:51:41 lack Exp $
+
+  15 Feb 2007; Jim Ramsay <lack@gentoo.org> rox-session-0.27-r1.ebuild,
+  rox-session-0.29.ebuild:
+  Updated dbus dependencies
 
   30 Jan 2007; Jim Ramsay <lack@gentoo.org> -files/rox.desktop,
   rox-session-0.29.ebuild:
diff --git a/rox-base/rox-session/rox-session-0.27-r1.ebuild b/rox-base/rox-session/rox-session-0.27-r1.ebuild
index 16a7f56478ab..dcb81dd48430 100644
--- a/rox-base/rox-session/rox-session-0.27-r1.ebuild
+++ b/rox-base/rox-session/rox-session-0.27-r1.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-base/rox-session/rox-session-0.27-r1.ebuild,v 1.6 2007/01/30 17:32:36 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.27-r1.ebuild,v 1.7 2007/02/15 02:51:41 lack Exp $
 
 # ROX-Session-0.27 now is compatible with dbus >=0.3
 # This version is all python, no more compiling
@@ -17,22 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="|| ( <dev-python/dbus-python-0.80
-		( >=sys-apps/dbus-0.3 <sys-apps/dbus-0.90 ) )"
+RDEPEND="<dev-python/dbus-python-0.80"
 
 MY_PN="ROX-Session"
 APPNAME=${MY_PN}
 
-pkg_setup() {
-	if ! has_version dev-python/dbus-python && \
-		! built_with_use sys-apps/dbus python
-	then
-		einfo "Rox-Session requires dbus to be built with python support."
-		einfo "Please rebuild dbus with USE=\"python\"."
-		die "python dbus modules missing"
-	fi
-}
-
 pkg_preinst() {
 	# need to fixup some permissions
 	cd ${D}/usr/lib/rox/${APPNAME}
diff --git a/rox-base/rox-session/rox-session-0.29.ebuild b/rox-base/rox-session/rox-session-0.29.ebuild
index fb2a21a4469d..6ba394255390 100644
--- a/rox-base/rox-session/rox-session-0.29.ebuild
+++ b/rox-base/rox-session/rox-session-0.29.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-base/rox-session/rox-session-0.29.ebuild,v 1.2 2007/01/30 17:53:05 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.29.ebuild,v 1.3 2007/02/15 02:51:41 lack Exp $
 
 ROX_LIB_VER="2.0.0"
 inherit eutils rox
@@ -14,22 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="|| ( >=dev-python/dbus-python-0.71
-		( >=sys-apps/dbus-0.3 <sys-apps/dbus-0.90 ) )"
+RDEPEND=">=dev-python/dbus-python-0.71"
 
 MY_PN="ROX-Session"
 APPNAME=${MY_PN}
 
-pkg_setup() {
-	if ! has_version dev-python/dbus-python && \
-		! built_with_use sys-apps/dbus python
-	then
-		einfo "Rox-Session requires dbus to be built with python support."
-		einfo "Please rebuild dbus with USE=\"python\"."
-		die "python dbus modules missing"
-	fi
-}
-
 pkg_preinst() {
 	# need to fixup some permissions
 	cd ${D}/usr/lib/rox/${APPNAME}
@@ -51,9 +40,9 @@ src_install() {
 
 pkg_postinst() {
 	echo
-	einfo "ROX-Session has been installed into /usr/lib/rox/${APPNAME}."
+	einfo "ROX-Session has been installed into ${APPDIR}"
 	einfo "Please review its documentation about proper use. A symlink"
-	einfo "for the executable has been created as /usr/bin/${APPNAME}."
+	einfo "for the executable has been created as /usr/bin/${WRAPPERNAME}."
 	echo
 	einfo "It has also been installed as an X Session, so you should be"
 	einfo "able to select it in the Session list of gdm or kdm"