Bump version + cleanup broken stuff

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)

3 files changed, 17 insertions, 74 deletions

diff --git a/app-misc/goobook/ChangeLog b/app-misc/goobook/ChangeLog
index fa92a98e75f8..a70d5c945849 100644
--- a/app-misc/goobook/ChangeLog
+++ b/app-misc/goobook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/goobook
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/goobook/ChangeLog,v 1.10 2015/04/08 07:30:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/goobook/ChangeLog,v 1.11 2015/06/03 09:04:51 mschiff Exp $
+
+*goobook-1.8 (03 Jun 2015)
+
+  03 Jun 2015; Marc Schiffbauer <mschiff@gentoo.org> -goobook-1.4-r1.ebuild,
+  +goobook-1.8.ebuild, -files/goobook-1.4-hcs-utils-1.3.patch:
+  Old version does not work anymore because Google droppen clientlogin support.
+  Cleaned up and bumped version with updated DEPENDs
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> goobook-1.4-r1.ebuild:
   Remove old Python implementations
diff --git a/app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch b/app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch
deleted file mode 100644
index 8051a5275e03..000000000000
--- a/app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=449916#c1
-reported upstream as http://code.google.com/p/goobook/issues/detail?id=39
-
-diff -uNr goobook-1.4.old/goobook/goobook.py goobook-1.4/goobook/goobook.py
---- goobook-1.4.old/goobook/goobook.py	2012-11-10 08:00:44.000000000 -0500
-+++ goobook-1.4/goobook/goobook.py	2013-07-06 23:27:02.091729438 -0400
-@@ -37,11 +37,11 @@
- import time
- import xml.etree.ElementTree as ET
- 
--from hcs_utils.storage import Storage
-+from hcs_utils.storage import Storage, storageify, unstorageify
- 
- log = logging.getLogger(__name__)
- 
--CACHE_FORMAT_VERSION = '3.2'
-+CACHE_FORMAT_VERSION = '4.0'
- G_MAX_SRESULTS = 9999 # Maximum number of entries to ask google for.
- GDATA_VERSION = '3'
- ATOM_NS = '{http://www.w3.org/2005/Atom}'
-@@ -243,8 +243,8 @@
-                 log.info('Failed to read the cache file: %s', err)
-                 raise
-         if cache:
--            self.contacts = cache.get('contacts')
--            self.groups = cache.get('groups')
-+            self.contacts = storageify(cache.get('contacts'))
-+            self.groups = storageify(cache.get('groups'))
-         else:
-             self.update()
-         if not self.contacts:
-@@ -262,7 +262,7 @@
- 
-         """
-         if self.contacts: # never write a empty addressbook
--            cache = {'contacts': self.contacts, 'groups': self.groups, 'goobook_cache': CACHE_FORMAT_VERSION}
-+            cache = {'contacts': unstorageify(self.contacts), 'groups': unstorageify(self.groups), 'goobook_cache': CACHE_FORMAT_VERSION}
-             pickle.dump(cache, open(self.__config.cache_filename, 'wb'))
- 
-     def get_group(self, id_):
-diff -uNr goobook-1.4.old/goobook.egg-info/requires.txt goobook-1.4/goobook.egg-info/requires.txt
---- goobook-1.4.old/goobook.egg-info/requires.txt	2012-11-10 08:01:54.000000000 -0500
-+++ goobook-1.4/goobook.egg-info/requires.txt	2013-07-06 23:29:30.206725062 -0400
-@@ -1,6 +1,5 @@
--argparse>=1.1
- distribute
- gdata>=2.0.7
--hcs_utils==1.1.1
-+hcs_utils>=1.3
- simplejson>=2.1.0
- keyring>=0.2
-\ No newline at end of file
-diff -uNr goobook-1.4.old/setup.py goobook-1.4/setup.py
---- goobook-1.4.old/setup.py	2012-11-10 08:00:44.000000000 -0500
-+++ goobook-1.4/setup.py	2013-07-06 23:27:45.351728160 -0400
-@@ -58,10 +58,9 @@
-         """.splitlines() if f.strip()],
-       license = 'GPLv3',
-       install_requires = [
--          'argparse>=1.1',
-           'distribute',
-           'gdata>=2.0.7',
--          'hcs_utils==1.1.1',
-+          'hcs_utils>=1.3',
-           'simplejson>=2.1.0',
-           'keyring>=0.2'],
-       packages = find_packages(),
diff --git a/app-misc/goobook/goobook-1.4-r1.ebuild b/app-misc/goobook/goobook-1.8.ebuild
index 88981f5be37e..93b23b5d5e38 100644
--- a/app-misc/goobook/goobook-1.4-r1.ebuild
+++ b/app-misc/goobook/goobook-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/goobook/goobook-1.4-r1.ebuild,v 1.6 2015/04/08 07:30:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/goobook/goobook-1.8.ebuild,v 1.1 2015/06/03 09:04:51 mschiff Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 readme.gentoo
 
 DESCRIPTION="Google Contacts wrapper for mutt"
-HOMEPAGE="http://code.google.com/p/goobook/"
+HOMEPAGE="https://gitlab.com/goobook/goobook"
 SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -22,14 +22,13 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/gdata-2.0.7[${PYTHON_USEDEP}]
 	>=dev-python/hcs-utils-1.3[${PYTHON_USEDEP}]
 	>=dev-python/keyring-0.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.1.0[${PYTHON_USEDEP}]"
+	>=dev-python/simplejson-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.4.11[${PYTHON_USEDEP}]"
 
 DEPEND="${PYTHON_DEPS}
 	dev-python/setuptools"
 
-# bug 449916, http://code.google.com/p/goobook/issues/detail?id=39
-PATCHES=( "${FILESDIR}"/${P}-hcs-utils-1.3.patch )
-
 src_install() {
 	distutils-r1_src_install
 	readme.gentoo_create_doc
@@ -38,6 +37,10 @@ src_install() {
 FORCE_PRINT_ELOG=1 # remove in the next bump
 DISABLE_AUTOFORMATTING=1
 DOC_CONTENTS="
+To setup initial authentication, execute:
+
+~ $ goobook authenticate
+
 If you want to use goobook from mutt, add this in your .muttrc file:
 	set query_command=\"goobook query '%s'\"
 to query address book.