Version bump, bug #306609, thank Justin Lecher for report.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

3 files changed, 8 insertions, 43 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index e1411d869d1a..dd2f541ef60e 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.86 2010/02/13 18:12:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.87 2010/02/25 06:13:22 pva Exp $
+
+*gajim-0.13.3 (25 Feb 2010)
+
+  25 Feb 2010; Peter Volkov <pva@gentoo.org> -gajim-0.13.1.ebuild,
+  -files/gajim-0.13.1-define-exception.patch, +gajim-0.13.3.ebuild:
+  Version bump, bug #306609, thank Justin Lecher for report.
 
   13 Feb 2010; Raúl Porcel <armin76@gentoo.org> gajim-0.13.1.ebuild,
   gajim-0.13.2.ebuild:
diff --git a/net-im/gajim/files/gajim-0.13.1-define-exception.patch b/net-im/gajim/files/gajim-0.13.1-define-exception.patch
deleted file mode 100644
index 0091592a42fd..000000000000
--- a/net-im/gajim/files/gajim-0.13.1-define-exception.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-=== modified file 'src/common/dbus_support.py'
---- src/common/dbus_support.py	2010-01-04 16:15:54 +0000
-+++ src/common/dbus_support.py	2010-01-04 16:16:12 +0000
-@@ -60,7 +60,7 @@
- 			raise exceptions.DbusNotSupported
- 
- 		if not self.present():
--				raise exceptions.SystemBusNotPresent
-+			raise exceptions.SystemBusNotPresent
- 		return self.system_bus
- 
- 	def bus(self):
-
-=== modified file 'src/common/exceptions.py'
---- src/common/exceptions.py	2010-01-04 16:15:54 +0000
-+++ src/common/exceptions.py	2010-01-04 16:19:55 +0000
-@@ -68,7 +68,20 @@
- 		Exception.__init__(self)
- 
- 	def __str__(self):
--		return _('Session bus is not available.\nTry reading http://trac.gajim.org/wiki/GajimDBus')
-+		return _('Session bus is not available.\nTry reading %(url)s') % \
-+			{'url': 'http://trac.gajim.org/wiki/GajimDBus'}
-+
-+class SystemBusNotPresent(Exception):
-+	"""
-+	This exception indicates that there is no session daemon
-+	"""
-+
-+	def __init__(self):
-+		Exception.__init__(self)
-+
-+	def __str__(self):
-+		return _('System bus is not available.\nTry reading %(url)s') % \
-+			{'url': 'http://trac.gajim.org/wiki/GajimDBus'}
- 
- class NegotiationError(Exception):
- 	'''A session negotiation failed'''
-
diff --git a/net-im/gajim/gajim-0.13.1.ebuild b/net-im/gajim/gajim-0.13.3.ebuild
index b1b43935e919..d425f571bf82 100644
--- a/net-im/gajim/gajim-0.13.1.ebuild
+++ b/net-im/gajim/gajim-0.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.1.ebuild,v 1.3 2010/02/13 18:12:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.3.ebuild,v 1.1 2010/02/25 06:13:22 pva Exp $
 
 EAPI="2"
 
@@ -63,8 +63,6 @@ src_prepare() {
 	# install pyfiles in /usr/lib/python2.x/site-packages/gajim
 	# upstream: http://trac.gajim.org/ticket/5460
 	epatch "${FILESDIR}/${PN}-0.13-autotools--enable-site-packages_option.patch"
-	# http://trac.gajim.org/ticket/5457
-	epatch "${FILESDIR}/${P}-define-exception.patch"
 	eautoreconf
 }