New version 0.4.1 was released

Package-Manager: portage-2.1.4.4

5 files changed, 17 insertions, 50 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/Manifest b/rox-base/devtray/Manifest
index da8e4945d60b..c72d6dc8eb3f 100644
--- a/rox-base/devtray/Manifest
+++ b/rox-base/devtray/Manifest
@@ -1,7 +1,6 @@
-AUX DevTray-0.3.2-no_pycups.patch 1093 RMD160 b5ad53756ffe36f25b4a751a3707257e927e0171 SHA1 a4392b0d9ace8fb99b3aec9c8e039c54c38f3927 SHA256 0adef9964915aaca03b47aadc8e0bcf6e7bd7e2185c6ac59c1bc84a35cccb2c2
-DIST DevTray-0.3.2.tgz 109166 RMD160 475a0b9a2abf3ada3803879b7a7424dd3f676aed SHA1 1d10806b81aabcf8cdded322b257d04359512a03 SHA256 7409e1fc52c98ce6f46723851229c95b557bda16b76bf27d7026c33a224c5d52
 DIST DevTray-0.3.3.tgz 109184 RMD160 c4af3a04629c20fc05a3a3e6f0e4412ed29b75a7 SHA1 3b14dce6a1e2421f9ea876206f0059383e49efc8 SHA256 75ccd3871eaa87f0f571cb91ea90790d7f9d2401df729aa0b64958b98ff7f1b3
-EBUILD devtray-0.3.2-r1.ebuild 896 RMD160 4c52f2643f298d713846b741d89637f35528e70d SHA1 346af550d91cba58bc54a6ee91171de7e72cd131 SHA256 186c0967ab494717e7be63f15f81179d8f7e00b2e001bb6551b3cd1b0c85561b
-EBUILD devtray-0.3.3.ebuild 809 RMD160 26d7d454d9f5be50686fe5f9e76a85509f856e1d SHA1 3cfaf5acaf54baa412f841485448e7fd959adceb SHA256 48d9efd82cfd82f4a01cc087c4aeeb8cc1f427d831c5c6f8fe3a6879fe9cfec2
-MISC ChangeLog 799 RMD160 c4f6c7e3986f5ddc6469ae9423ebb0fb93b0797e SHA1 d7fa6b1943e4e804bd4359a0623774d6eb722ba5 SHA256 b823152fed581673ec2e4ad47ca8fe5394441fd1d9116c153d408247ce07ec32
+DIST DevTray-0.4.1.tgz 112010 RMD160 c832cb132324058d10f45a2678f3559db683e4e7 SHA1 bc786c46e301ae6cd45c0bec9dda7ba450bd5e32 SHA256 e5ecef7051aeb0c7dc3ab7f851209d9782a66517fa1aaf5f3c4af64e1608385c
+EBUILD devtray-0.3.3.ebuild 814 RMD160 70885067d5e4a2ddc8079098b2f6f64630276c34 SHA1 b84ff1f08d96252ef693ed3ee1b8d22dc9d97315 SHA256 2f1ea150d7dd7e0849af447e4acaea5026d34f7ee82e1202b9ffda836fa41654
+EBUILD devtray-0.4.1.ebuild 819 RMD160 b6da7e2c71ed14b9bcde835c0481e19d1e2e098d SHA1 ee4ecf0fafcc54d055c3a38b194f5022fd8414a5 SHA256 8355956c0d39ccc34521b229b0aecea7966e55e1f1e9ae42c68576075f557b26
+MISC ChangeLog 1020 RMD160 edf51510d7217c53a3e2df5a7577fe6879c27816 SHA1 ad4ca2982b0bcb508ab25828bc115653db1d3a66 SHA256 0960139191002fa3bcade78dec4155137b16fc010a65146323e3c2675374d7c2
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
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: