Updated old dbus dependencies and cleaned up old versions (bug 166919)

(Portage version: 2.1.2-r8)

8 files changed, 7 insertions, 109 deletions

diff --git a/rox-extra/memo/ChangeLog b/rox-extra/memo/ChangeLog
index 6f778ff1cb71..cd6957c69af8 100644
--- a/rox-extra/memo/ChangeLog
+++ b/rox-extra/memo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-extra/memo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/memo/ChangeLog,v 1.14 2007/02/09 22:10:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/memo/ChangeLog,v 1.15 2007/02/15 02:53:07 lack Exp $
+
+  15 Feb 2007; Jim Ramsay <lack@gentoo.org> -memo-1.9.6.ebuild,
+  -memo-1.9.7.ebuild, -memo-2.0.ebuild, memo-2.0-r1.ebuild:
+  Updated old dbus dependencies and cleaned up old versions (bug 166919)
 
   09 Feb 2007; Christian Faulhammer <opfer@gentoo.org> memo-2.0-r1.ebuild:
   stable x86; bug #165956
diff --git a/rox-extra/memo/files/digest-memo-1.9.6 b/rox-extra/memo/files/digest-memo-1.9.6
deleted file mode 100644
index 15ea3bedf4ac..000000000000
--- a/rox-extra/memo/files/digest-memo-1.9.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 42bce8bb845530f29e1f77af8a7377a0 memo-1.9.6.tar.bz2 32805
-RMD160 d8d762936aaca774f533632e673eb2b485314f00 memo-1.9.6.tar.bz2 32805
-SHA256 b90b491d6ba6c5e49133e3c99d94fbfa9ed8c4645ca02cbab6b61d65926ada35 memo-1.9.6.tar.bz2 32805
diff --git a/rox-extra/memo/files/digest-memo-1.9.7 b/rox-extra/memo/files/digest-memo-1.9.7
deleted file mode 100644
index 8007ba8af116..000000000000
--- a/rox-extra/memo/files/digest-memo-1.9.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fb64ee94ca0c385041016c1058ec2a39 memo-1.9.7.tar.bz2 39208
-RMD160 f28693f2d90a118baa3686c777eb30c1ecbe3e8f memo-1.9.7.tar.bz2 39208
-SHA256 3c640c1a7a7b6ae639b1e37601593c5466570ac627dde98c54951cac707eea5f memo-1.9.7.tar.bz2 39208
diff --git a/rox-extra/memo/files/digest-memo-2.0 b/rox-extra/memo/files/digest-memo-2.0
deleted file mode 100644
index 988169ef1648..000000000000
--- a/rox-extra/memo/files/digest-memo-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2cb1773bdc2ad2988b44c9ad5436332a memo-2.0.tar.bz2 39770
-RMD160 cec45c146766e7b9454a0f8cf14252bd2a57bbab memo-2.0.tar.bz2 39770
-SHA256 bd1cce9618fed4d1aef9f61ab403a6484b68e887c8de4870e6d4f67dc4e9f3cb memo-2.0.tar.bz2 39770
diff --git a/rox-extra/memo/memo-1.9.6.ebuild b/rox-extra/memo/memo-1.9.6.ebuild
deleted file mode 100644
index 4efab649d5a0..000000000000
--- a/rox-extra/memo/memo-1.9.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.6.ebuild,v 1.2 2006/11/20 18:25:01 opfer Exp $
-
-ROX_LIB_VER=1.9.8
-inherit rox
-
-MY_PN="Memo"
-DESCRIPTION="Memo - Memo is a simple alarm clock and clock applet for the ROX Desktop."
-HOMEPAGE="http://rox.sourceforge.net/phpwiki/index.php/Memo"
-SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-APPNAME=${MY_PN}
diff --git a/rox-extra/memo/memo-1.9.7.ebuild b/rox-extra/memo/memo-1.9.7.ebuild
deleted file mode 100644
index c2cef4a1836d..000000000000
--- a/rox-extra/memo/memo-1.9.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.3 2006/12/04 16:25:33 lack Exp $
-
-ROX_LIB_VER=1.9.8
-inherit rox
-
-MY_PN="Memo"
-DESCRIPTION="Memo - Memo is a simple alarm clock and clock applet for the ROX Desktop."
-HOMEPAGE="http://rox.sourceforge.net/phpwiki/index.php/Memo"
-SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="libnotify"
-
-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
-}
-
diff --git a/rox-extra/memo/memo-2.0-r1.ebuild b/rox-extra/memo/memo-2.0-r1.ebuild
index 23c2576e1566..205851708844 100644
--- a/rox-extra/memo/memo-2.0-r1.ebuild
+++ b/rox-extra/memo/memo-2.0-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-extra/memo/memo-2.0-r1.ebuild,v 1.2 2007/02/09 22:10:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/memo/memo-2.0-r1.ebuild,v 1.3 2007/02/15 02:53:07 lack Exp $
 
 ROX_LIB_VER=1.9.8
 inherit rox
@@ -16,20 +16,9 @@ KEYWORDS="~ppc x86"
 IUSE="libnotify"
 
 RDEPEND="libnotify? (
-			|| ( >=dev-python/dbus-python-0.71
-				( >=sys-apps/dbus-0.60 <sys-apps/dbus-0.90 ) )
+			>=dev-python/dbus-python-0.71
 			x11-misc/notification-daemon )"
 
 APPNAME=${MY_PN}
 APPCATEGORY="Utility;Clock"
 
-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
-}
-
diff --git a/rox-extra/memo/memo-2.0.ebuild b/rox-extra/memo/memo-2.0.ebuild
deleted file mode 100644
index 270005cf13e8..000000000000
--- a/rox-extra/memo/memo-2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/memo/memo-2.0.ebuild,v 1.1 2007/01/06 21:51:07 lack Exp $
-
-ROX_LIB_VER=1.9.8
-inherit rox
-
-MY_PN="Memo"
-DESCRIPTION="Memo - Memo is a simple alarm clock and clock applet for the ROX Desktop."
-HOMEPAGE="http://rox.sourceforge.net/phpwiki/index.php/Memo"
-SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="libnotify"
-
-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
-}
-