Version bump. Fixes bug #361555. Add new proxy maintainer

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

6 files changed, 142 insertions, 1 deletions

diff --git a/net-misc/gwibber/ChangeLog b/net-misc/gwibber/ChangeLog
index 9e6561f357fa..9488b4162daa 100644
--- a/net-misc/gwibber/ChangeLog
+++ b/net-misc/gwibber/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/gwibber
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwibber/ChangeLog,v 1.12 2011/07/06 14:44:09 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gwibber/ChangeLog,v 1.13 2011/07/07 18:00:45 hwoarang Exp $
+
+*gwibber-3.1.0 (07 Jul 2011)
+
+  07 Jul 2011; Markos Chandras <hwoarang@gentoo.org> +gwibber-3.1.0.ebuild,
+  +files/gwibber-fix-uuid-import.patch, +files/gwibber-twitter-api-key.patch,
+  +files/make_nm_optional.patch, metadata.xml:
+  Version bump. Fixes bug #361555. Add new proxy maintainer
 
   06 Jul 2011; Jesus Rivero <neurogeek@gentoo.org> metadata.xml:
   Added hwoarang as maintainer and dropped proxy-maintainer
diff --git a/net-misc/gwibber/files/gwibber-fix-uuid-import.patch b/net-misc/gwibber/files/gwibber-fix-uuid-import.patch
new file mode 100644
index 000000000000..914dcef83edb
--- /dev/null
+++ b/net-misc/gwibber/files/gwibber-fix-uuid-import.patch
@@ -0,0 +1,22 @@
+# workaround bug #351897 for gwibber
+--- gwibber/accounts.py_old	2011-07-06 15:02:46.843404291 +0200
++++ gwibber/accounts.py	2011-07-06 15:02:57.894782684 +0200
+@@ -29,7 +29,7 @@
+   gettext.bind_textdomain_codeset('gwibber','UTF-8')
+ gettext.textdomain('gwibber')
+ 
+-import gtk, pango, gconf, os, json, uuid
++import uuid, gtk, pango, gconf, os, json
+ from gwibber.lib import GwibberPublic
+ import util
+ from microblog.util import resources
+--- bin/gwibber-accounts_old	2011-07-07 09:48:01.786740055 +0200
++++ bin/gwibber-accounts	2011-07-07 09:48:13.957633450 +0200
+@@ -19,6 +19,7 @@
+ # Launch script for Gwibber Accounts
+ #
+ 
++import uuid
+ import sys
+ from os.path import join, dirname, exists, realpath, abspath
+ import gtk, gobject, wnck
diff --git a/net-misc/gwibber/files/gwibber-twitter-api-key.patch b/net-misc/gwibber/files/gwibber-twitter-api-key.patch
new file mode 100644
index 000000000000..e93fa22ec576
--- /dev/null
+++ b/net-misc/gwibber/files/gwibber-twitter-api-key.patch
@@ -0,0 +1,13 @@
+--- gwibber/microblog/util/const.py_old	2011-07-03 13:54:45.820418606 +0200
++++ gwibber/microblog/util/const.py	2011-07-03 13:55:37.039418630 +0200
+@@ -12,8 +12,8 @@
+ else:
+   FB_APP_KEY = "71b85c6d8cb5bbb9f1a3f8bbdcdd4b05"
+ 
+-TWITTER_OAUTH_KEY = "VDOuA5qCJ1XhjaSa4pl76g"
+-TWITTER_OAUTH_SECRET = "BqHlB8sMz5FhZmmFimwgiIdB0RiBr72Y0bio49IVJM"
++TWITTER_OAUTH_KEY = "qp51C1PWucL45GxsYT76w"
++TWITTER_OAUTH_SECRET = "a5YnLmbuQnZTabsGm1Eg96qcMy96msVsgFLYZQ3VVGs"
+ 
+ # Gwibber
+ MAX_MESSAGE_LENGTH = 140
diff --git a/net-misc/gwibber/files/make_nm_optional.patch b/net-misc/gwibber/files/make_nm_optional.patch
new file mode 100644
index 000000000000..e7025e516b80
--- /dev/null
+++ b/net-misc/gwibber/files/make_nm_optional.patch
@@ -0,0 +1,41 @@
+--- gwibber/microblog/dispatcher.py_old	2011-07-04 09:38:47.415809455 +0200
++++ gwibber/microblog/dispatcher.py	2011-07-04 09:40:47.174640849 +0200
+@@ -820,21 +820,24 @@
+ 
+     self.NM_STATE_UNKNOWN = 0
+ 
+-    log.logger.debug("NM Version is %s", str(self.nm.Get(NM_DBUS_INTERFACE, "Version")))
+-
+-    if str(self.nm.Get(NM_DBUS_INTERFACE, "Version")) >= "0.8.998":
+-      log.logger.debug("NM Version is greater than 0.8.997")
+-      self.NM_STATE_ASLEEP = 10
+-      self.NM_STATE_DISCONNECTED = 20
+-      self.NM_STATE_CONNECTING = 40
+-      self.NM_STATE_CONNECTED = 70
+-    else:
+-      log.logger.debug("NM Version is less than 0.8.998")
+-      self.NM_STATE_ASLEEP = 1
+-      self.NM_STATE_CONNECTING = 2
+-      self.NM_STATE_CONNECTED = 3
+-      self.NM_STATE_DISCONNECTED = 4
++    try:
++        log.logger.debug("NM Version is %s", str(self.nm.Get(NM_DBUS_INTERFACE, "Version")))
+ 
++        if str(self.nm.Get(NM_DBUS_INTERFACE, "Version")) >= "0.8.998":
++          log.logger.debug("NM Version is greater than 0.8.997")
++          self.NM_STATE_ASLEEP = 10
++          self.NM_STATE_DISCONNECTED = 20
++          self.NM_STATE_CONNECTING = 40
++          self.NM_STATE_CONNECTED = 70
++        else:
++          log.logger.debug("NM Version is less than 0.8.998")
++          self.NM_STATE_ASLEEP = 1
++          self.NM_STATE_CONNECTING = 2
++          self.NM_STATE_CONNECTED = 3
++          self.NM_STATE_DISCONNECTED = 4
++    
++    except:
++        log.logger.debug("NM seems not to be available")
+ 
+ 
+   def on_connection_changed(self, state):
diff --git a/net-misc/gwibber/gwibber-3.1.0.ebuild b/net-misc/gwibber/gwibber-3.1.0.ebuild
new file mode 100644
index 000000000000..155f24471062
--- /dev/null
+++ b/net-misc/gwibber/gwibber-3.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gwibber/gwibber-3.1.0.ebuild,v 1.1 2011/07/07 18:00:45 hwoarang Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils
+
+DESCRIPTION="Gwibber is an open source microblogging client for GNOME developed
+with Python and GTK."
+HOMEPAGE="https://launchpad.net/gwibber"
+SRC_URI="http://launchpad.net/${PN}/3.2/3.1.0/+download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/python[sqlite]
+	>=dev-python/dbus-python-0.80.2
+	>=dev-python/gconf-python-2.18.0
+	dev-python/gnome-keyring-python
+	>=dev-python/imaging-1.1.6
+	>=dev-python/notify-python-0.1.1
+	>=dev-python/pywebkitgtk-1.0.1
+	>=dev-python/simplejson-1.9.1
+	>=dev-python/egenix-mx-base-3.0.0
+	>=dev-python/python-distutils-extra-2.15
+	>=dev-python/pycurl-7.19.0
+	>=dev-python/libwnck-python-2.26.0
+	>=dev-python/feedparser-4.1
+	>=dev-python/pyxdg-0.15
+	>=dev-python/mako-0.2.4
+	>=dev-python/pygtk-2.16
+	dev-python/oauth
+	>=gnome-base/librsvg-2.22.2
+	"
+
+DOC="AUTHORS README"
+
+src_prepare() {
+	epatch "$FILESDIR"/gwibber-twitter-api-key.patch
+	epatch "$FILESDIR"/make_nm_optional.patch
+	epatch "$FILESDIR"/gwibber-fix-uuid-import.patch
+}
+
+src_install() {
+	distutils_src_install
+	doman gwibber{,-poster,-accounts}.1 || die "Man page couldn't be installed."
+	elog "A new Twitter API is used. If your old accounts fail to work, try to"
+	elog "re-add them."
+}
diff --git a/net-misc/gwibber/metadata.xml b/net-misc/gwibber/metadata.xml
index 5c72ae6e164f..105d286b2d13 100644
--- a/net-misc/gwibber/metadata.xml
+++ b/net-misc/gwibber/metadata.xml
@@ -10,4 +10,9 @@
 		<email>neurogeek@gentoo.org</email>
 		<name>Jesus Rivero</name>
 	</maintainer>
+	<maintainer>
+		<email>tante@the-gay-bar.com</email>
+		<name>Jürgen Geuter</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
 </pkgmetadata>