Fixed up dbus dependencies

Package-Manager: portage-2.1.2_rc2-r1

3 files changed, 28 insertions, 21 deletions

diff --git a/rox-extra/memo/ChangeLog b/rox-extra/memo/ChangeLog
index d2fa1f56c148..28c998357464 100644
--- a/rox-extra/memo/ChangeLog
+++ b/rox-extra/memo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for rox-extra/memo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/memo/ChangeLog,v 1.10 2006/11/20 18:25:01 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/memo/ChangeLog,v 1.11 2006/12/04 16:25:33 lack Exp $
+
+  04 Dec 2006; Jim Ramsay <lack@gentoo.org> memo-1.9.7.ebuild:
+  Fixed up dbus dependencies
 
   20 Nov 2006; Christian Faulhammer <opfer@gentoo.org> memo-1.9.6.ebuild:
   stable x86, bug #155521
diff --git a/rox-extra/memo/Manifest b/rox-extra/memo/Manifest
index b2208f8eaf38..69af2ae0adab 100644
--- a/rox-extra/memo/Manifest
+++ b/rox-extra/memo/Manifest
@@ -1,20 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST memo-1.9.6.tar.bz2 32805 RMD160 d8d762936aaca774f533632e673eb2b485314f00 SHA1 ad7d3526dc8d0d4b930869e9f59c835be43046a9 SHA256 b90b491d6ba6c5e49133e3c99d94fbfa9ed8c4645ca02cbab6b61d65926ada35
 DIST memo-1.9.7.tar.bz2 39208 RMD160 f28693f2d90a118baa3686c777eb30c1ecbe3e8f SHA1 82fd19c04021186b6954dcd57dc2148bf89d9d1c SHA256 3c640c1a7a7b6ae639b1e37601593c5466570ac627dde98c54951cac707eea5f
 EBUILD memo-1.9.6.ebuild 527 RMD160 729d18aebe5106957f3ec69954c97be9a095d2cd SHA1 9f43361f36daf2b6d99488a71cf55594627bfa41 SHA256 bea82bf530edf126e19e97dc427141bfcac22053ff36b61b112bea9e63912262
 MD5 f725d14f290bbc3885e4b28718587bb5 memo-1.9.6.ebuild 527
 RMD160 729d18aebe5106957f3ec69954c97be9a095d2cd memo-1.9.6.ebuild 527
 SHA256 bea82bf530edf126e19e97dc427141bfcac22053ff36b61b112bea9e63912262 memo-1.9.6.ebuild 527
-EBUILD memo-1.9.7.ebuild 612 RMD160 f9226dcf7c71ec054d81e902944b2a7d065958fc SHA1 f97b12809f7d5f52b67aaa20a1cd02347168f509 SHA256 444f7f74456fe02a5bad31b60526c6e751c6833f68d18a9bbb09c617f6f83b41
-MD5 04f25e42d59cf132828e64a1f86b6726 memo-1.9.7.ebuild 612
-RMD160 f9226dcf7c71ec054d81e902944b2a7d065958fc memo-1.9.7.ebuild 612
-SHA256 444f7f74456fe02a5bad31b60526c6e751c6833f68d18a9bbb09c617f6f83b41 memo-1.9.7.ebuild 612
-MISC ChangeLog 1544 RMD160 dd7501e813506e262dd79d270a6967a8efac7397 SHA1 59b07a39bce8de0db6c8917793887108a57a0e5a SHA256 566521f3a5e4b2b643e0515b2066e8df1ba90b6735c287cc539d01736f690f3a
-MD5 d4095406eed44979e454c6515458d071 ChangeLog 1544
-RMD160 dd7501e813506e262dd79d270a6967a8efac7397 ChangeLog 1544
-SHA256 566521f3a5e4b2b643e0515b2066e8df1ba90b6735c287cc539d01736f690f3a ChangeLog 1544
+EBUILD memo-1.9.7.ebuild 952 RMD160 38235b4bd111033f0d6404998fe48e193790d4d7 SHA1 85857221b7b3687d751685c1ff8e9cf6b65f4ca9 SHA256 278463644e24b608755b9a31a7b2a49bb51783f4312b8450e01f4d8ee2eec56e
+MD5 6e339db8bf9f69f5f5b00180bed95d95 memo-1.9.7.ebuild 952
+RMD160 38235b4bd111033f0d6404998fe48e193790d4d7 memo-1.9.7.ebuild 952
+SHA256 278463644e24b608755b9a31a7b2a49bb51783f4312b8450e01f4d8ee2eec56e memo-1.9.7.ebuild 952
+MISC ChangeLog 1636 RMD160 052a68c437051f5aecfc9fc7aa3dc7e587d23c2b SHA1 8d3926ac74187a6c9229ec51d55afd8292ebf974 SHA256 195be67e5cb48b6f037b53cda4691c3813840e2cc2d9b2d0833919f66079fded
+MD5 0550098c97b4bbb662e02900f76c0624 ChangeLog 1636
+RMD160 052a68c437051f5aecfc9fc7aa3dc7e587d23c2b ChangeLog 1636
+SHA256 195be67e5cb48b6f037b53cda4691c3813840e2cc2d9b2d0833919f66079fded ChangeLog 1636
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -25,10 +22,3 @@ SHA256 126e9e24b3c17bb5b758a69fefc6943f262f2f6a0e079df7c2b6b13447c7f5ad files/di
 MD5 a73fae7fb061fcf03b0297995935ea97 files/digest-memo-1.9.7 232
 RMD160 b78b977fcb5669bd68cc9fc3fc21276974ab79ad files/digest-memo-1.9.7 232
 SHA256 c13c6f94355d0b66ed597bc984dbd5e514d1718dffc351065b37ab79259fd07d files/digest-memo-1.9.7 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFYfMCNQqtfCuFneMRApcyAJ9Gs4SD4Tp0VYJYd8sOcogsJqbIOACeNUuJ
-Ly/8wam3KiXv1cDe/W1luj4=
-=dp6h
------END PGP SIGNATURE-----
diff --git a/rox-extra/memo/memo-1.9.7.ebuild b/rox-extra/memo/memo-1.9.7.ebuild
index cddd5559e9a5..c2cef4a1836d 100644
--- a/rox-extra/memo/memo-1.9.7.ebuild
+++ b/rox-extra/memo/memo-1.9.7.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/rox-extra/memo/memo-1.9.7.ebuild,v 1.2 2006/10/31 03:47:17 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/memo/memo-1.9.7.ebuild,v 1.3 2006/12/04 16:25:33 lack Exp $
 
 ROX_LIB_VER=1.9.8
 inherit rox
@@ -15,6 +15,20 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE="libnotify"
 
-RDEPEND="libnotify? ( >=sys-apps/dbus-0.60 x11-misc/notification-daemon )"
+RDEPEND="libnotify? (
+			|| ( >=dev-python/dbus-python-0.71
+				( >=sys-apps/dbus-0.60 <sys-apps/dbus-0.90 ) )
+			x11-misc/notification-daemon )"
 
 APPNAME=${MY_PN}
+
+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
+}
+