From 864dd5ac66de536accb6df577cad1bac506cea5f Mon Sep 17 00:00:00 2001
From: Jim Ramsay <lack@gentoo.org>
Date: Thu, 15 Feb 2007 02:51:41 +0000
Subject: [PATCH] Updated dbus dependencies Package-Manager: portage-2.1.2-r8

---
 rox-base/rox-session/ChangeLog                |  6 ++++-
 rox-base/rox-session/Manifest                 | 24 +++++++++----------
 .../rox-session/rox-session-0.27-r1.ebuild    | 15 ++----------
 rox-base/rox-session/rox-session-0.29.ebuild  | 19 ++++-----------
 4 files changed, 23 insertions(+), 41 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/Manifest b/rox-base/rox-session/Manifest
index b2ab15fb6df5..6a467785e46a 100644
--- a/rox-base/rox-session/Manifest
+++ b/rox-base/rox-session/Manifest
@@ -9,18 +9,18 @@ EBUILD rox-session-0.1.21.ebuild 742 RMD160 0a8b74fabac8c611bc9661fb9c40d56e3909
 MD5 49cc8b22d64fa7c660e11446939a6252 rox-session-0.1.21.ebuild 742
 RMD160 0a8b74fabac8c611bc9661fb9c40d56e390911a5 rox-session-0.1.21.ebuild 742
 SHA256 cc57f0b5bd7bc3734430510974fbe9d199cefd918116b4f142bb9dfc21d8465f rox-session-0.1.21.ebuild 742
-EBUILD rox-session-0.27-r1.ebuild 1359 RMD160 7d19085de0a652920f6c240f65ab9e200de750d0 SHA1 bc35c97b61f920e50f00354b5a22c1acfc7c10b7 SHA256 bdc11974720d59c352a632afd8994152bb0dd66fcb3269c99a2e5ba6f27dd4b0
-MD5 aafc379b1665f6b44fd548b8b1fdb047 rox-session-0.27-r1.ebuild 1359
-RMD160 7d19085de0a652920f6c240f65ab9e200de750d0 rox-session-0.27-r1.ebuild 1359
-SHA256 bdc11974720d59c352a632afd8994152bb0dd66fcb3269c99a2e5ba6f27dd4b0 rox-session-0.27-r1.ebuild 1359
-EBUILD rox-session-0.29.ebuild 1666 RMD160 cfda141c1807aabf4e731c11e0794bb6bed8afbd SHA1 ec6a3c7e137033fc522fd6f22c6c712e5aef70be SHA256 0d43fd93763ef2b7d592bb06331f23790f90720ecda455c60e9239a90579513f
-MD5 8c58212ef423805808d72a3f5634f22b rox-session-0.29.ebuild 1666
-RMD160 cfda141c1807aabf4e731c11e0794bb6bed8afbd rox-session-0.29.ebuild 1666
-SHA256 0d43fd93763ef2b7d592bb06331f23790f90720ecda455c60e9239a90579513f rox-session-0.29.ebuild 1666
-MISC ChangeLog 3839 RMD160 16a684073588afe7b8dbef8bd3ef90cd7e1c1d04 SHA1 63de93429f7188773c7534419f6826b8b61d3db8 SHA256 9f18da65194eb34b2a80f99cbfa1696193b6f4e98b0ce1308eee8a28cb53ffba
-MD5 f6ac49ea57330b5cb16a1fe347b92685 ChangeLog 3839
-RMD160 16a684073588afe7b8dbef8bd3ef90cd7e1c1d04 ChangeLog 3839
-SHA256 9f18da65194eb34b2a80f99cbfa1696193b6f4e98b0ce1308eee8a28cb53ffba ChangeLog 3839
+EBUILD rox-session-0.27-r1.ebuild 1037 RMD160 4824c27c5f1c5308cf2530c34c93b8cf97f76f5e SHA1 368252fd0c581bf7055af76180eaab48d4811357 SHA256 a53f27f80a1150b96be693a38c676b29eb80cd9a543b591c1ff95f18147e6a04
+MD5 cbdfc22f09b4f17701f15533ade3c36b rox-session-0.27-r1.ebuild 1037
+RMD160 4824c27c5f1c5308cf2530c34c93b8cf97f76f5e rox-session-0.27-r1.ebuild 1037
+SHA256 a53f27f80a1150b96be693a38c676b29eb80cd9a543b591c1ff95f18147e6a04 rox-session-0.27-r1.ebuild 1037
+EBUILD rox-session-0.29.ebuild 1333 RMD160 f97eab37c68bf69249fd0a91a3beef611df121dd SHA1 ab589c4aec8e46aa6a7c1fa0de0b79bd40ac232f SHA256 46cdc56125a93c3a68e36569aedb500233df6676e0093f23309928bfef24bf1c
+MD5 e46250deacb97fed00e40138bf90606b rox-session-0.29.ebuild 1333
+RMD160 f97eab37c68bf69249fd0a91a3beef611df121dd rox-session-0.29.ebuild 1333
+SHA256 46cdc56125a93c3a68e36569aedb500233df6676e0093f23309928bfef24bf1c rox-session-0.29.ebuild 1333
+MISC ChangeLog 3967 RMD160 c0a1f51005d5a8a6cf5409e296038bc9219ec475 SHA1 4752fc519fbabaa33018e5f05b9fa4327be36b14 SHA256 8f043c7ca16b3060119251865ab9fbc34465299737039a774d9a241df65fe4bf
+MD5 bf8a7e93369ebcb949c991a0da1f382a ChangeLog 3967
+RMD160 c0a1f51005d5a8a6cf5409e296038bc9219ec475 ChangeLog 3967
+SHA256 8f043c7ca16b3060119251865ab9fbc34465299737039a774d9a241df65fe4bf ChangeLog 3967
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
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"
-- 
2.26.2