New version 0.4.1 was released

(Portage version: 2.1.4.4)

4 files changed, 13 insertions, 45 deletions

diff --git a/rox-base/devtray/ChangeLog b/rox-base/devtray/ChangeLog
index 8537b5a2bf3d..dca115c3869a 100644
--- a/rox-base/devtray/ChangeLog
+++ b/rox-base/devtray/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for rox-base/devtray
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/devtray/ChangeLog,v 1.4 2008/01/22 16:50:11 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/devtray/ChangeLog,v 1.5 2008/05/11 15:59:24 lack Exp $
+
+*devtray-0.4.1 (11 May 2008)
+
+  11 May 2008; Jim Ramsay <lack@gentoo.org>
+  -files/DevTray-0.3.2-no_pycups.patch, -devtray-0.3.2-r1.ebuild,
+  devtray-0.3.3.ebuild, +devtray-0.4.1.ebuild:
+  New version 0.4.1 was released
 
 *devtray-0.3.3 (22 Jan 2008)
 
diff --git a/rox-base/devtray/devtray-0.3.3.ebuild b/rox-base/devtray/devtray-0.3.3.ebuild
index f2ae11cc7147..7374afa64fe3 100644
--- a/rox-base/devtray/devtray-0.3.3.ebuild
+++ b/rox-base/devtray/devtray-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/devtray/devtray-0.3.3.ebuild,v 1.1 2008/01/22 16:50:11 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/devtray/devtray-0.3.3.ebuild,v 1.2 2008/05/11 15:59:24 lack Exp $
 
 ROX_LIB_VER=1.9.6
 inherit rox
@@ -17,7 +17,7 @@ IUSE="gnome cddb alsa"
 
 # TODO: When pycups is available, depend on it too (probably conditionally)
 
-RDEPEND="rox-base/traylib
+RDEPEND="<rox-base/traylib-0.3
 	dev-python/dbus-python
 	sys-apps/hal
 	cddb? ( dev-python/cddb-py )
diff --git a/rox-base/devtray/devtray-0.3.2-r1.ebuild b/rox-base/devtray/devtray-0.4.1.ebuild
index 99b936f70337..bc792b935032 100644
--- a/rox-base/devtray/devtray-0.3.2-r1.ebuild
+++ b/rox-base/devtray/devtray-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/devtray/devtray-0.3.2-r1.ebuild,v 1.1 2007/11/28 20:04:52 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/devtray/devtray-0.4.1.ebuild,v 1.1 2008/05/11 15:59:24 lack Exp $
 
 ROX_LIB_VER=1.9.6
 inherit rox
@@ -17,7 +17,7 @@ IUSE="gnome cddb alsa"
 
 # TODO: When pycups is available, depend on it too (probably conditionally)
 
-RDEPEND="rox-base/traylib
+RDEPEND=">=rox-base/traylib-0.3.2.1
 	dev-python/dbus-python
 	sys-apps/hal
 	cddb? ( dev-python/cddb-py )
@@ -26,8 +26,3 @@ RDEPEND="rox-base/traylib
 
 APPNAME="${MY_PN}"
 S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${MY_PN}-${PV}-no_pycups.patch"
-}
diff --git a/rox-base/devtray/files/DevTray-0.3.2-no_pycups.patch b/rox-base/devtray/files/DevTray-0.3.2-no_pycups.patch
deleted file mode 100644
index 9dabac708991..000000000000
--- a/rox-base/devtray/files/DevTray-0.3.2-no_pycups.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- DevTray-orig/Handlers/Printer/__init__.py	2007-09-22 02:23:04.000000000 -0400
-+++ DevTray/Handlers/Printer/__init__.py	2007-11-26 09:00:57.000000000 -0500
-@@ -78,14 +78,15 @@
- 	def get_printer_name(self):
- 		if self.__cups_name != None:
- 			return self.__cups_name
--		for uri in conn.getDevices():
--			if self.__serial in uri:
--				printers = conn.getPrinters()
--				for name in printers:
--					printer = printers[name]
--					if printer['device-uri'] == uri:
--						self.__cups_name = name
--						return self.__cups_name
-+		if have_cups:
-+			for uri in conn.getDevices():
-+				if self.__serial in uri:
-+					printers = conn.getPrinters()
-+					for name in printers:
-+						printer = printers[name]
-+						if printer['device-uri'] == uri:
-+							self.__cups_name = name
-+							return self.__cups_name
- 		self.__cups_name = ''
- 		return ''
- 
-@@ -178,7 +179,6 @@
- 				menu_item.connect("activate", self.__add)
- 			menu.prepend(menu_item)
- 		
--		menu.prepend(menu_item)
- 		menu_item = g.ImageMenuItem(_("Enable"))
- 		if info:
- 			if info.get('printer-state', 0) == cups.IPP_PRINTER_STOPPED: