Bump version + cleanup broken stuff

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

4 files changed, 23 insertions, 93 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/Manifest b/app-misc/goobook/Manifest
index 0e36b0e5fd69..1b6838863ef6 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -1,27 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX goobook-1.4-hcs-utils-1.3.patch 2580 SHA256 bac32d9ececf090e3001214a4b0730ff0652137aa40a00aff6c61ff4beb7bbb4 SHA512 f07899ac73ccd73af42bbc588ff03c7ceb6e851fe37b5b20481179f5abaf891fb0190e3de7d3d7e3cfce3b01efc74557c3b42ae526c6beb3259031ccbf5d9403 WHIRLPOOL b26527e0f30f8635e3215d388dbcf4f64ff26af25c0b572e7bade244f61066d1997cce092c14301bc4f9479051fb98244ae52279f21a0e279407c6063195d14a
-DIST goobook-1.4.tar.gz 34015 SHA256 abf600903c864645d510a9381189ecffd7097e7ca853ff44aedcbeace57330ae SHA512 3c375307ebc6454e28b06c4c81065ae1db195f01888e9a64a9fb6baa2d36237c5f6895d6ec849d4024fe214a4cb004f9114d2482b39317d5b1abb0edd7b434f7 WHIRLPOOL e332ea0ecab357516f292d23ef5655a225761497e779d18f65bdbe59d99a59648ecab86f26f6f3dda3862d754559d39401019ffd9d72866de52d9883c4f9858c
-EBUILD goobook-1.4-r1.ebuild 1331 SHA256 c513bef44f6c2ae3a61a91fec3d15bd431f63fa33837473e6d0b541c690ee3e2 SHA512 11ca2c53473396ec7b405e839aebfe3e426a924d1386e0056a6fd0db2b292419939f63603bac55ac074f64bf4f484b7d75bedc28b791cd1425589a4eec29b8bc WHIRLPOOL b617407c247237fed137492b585e054cabda085bee685761f24e25cfcce99cd643934c18f4cad84a8d7141545213413f868639983c1339652f32fae7b572a58d
-MISC ChangeLog 1848 SHA256 b432f4374c0f95b88b9c72b77490c88976a090e512be010a66aefde0336030d8 SHA512 1eb9e08f91d6bb36047acd3ad14c4fe406023d2823ab86012cea21f58dbf098d1dc359599dcbd34569efe926b99f5dc9af4d47ec604c4bfbeef63364d1bd4d15 WHIRLPOOL 3bd2ee603df5ec90d99ef7801555405e212ca0adf12c9a89ad72c4a72d2fae8c98307100802416dae92e039f27197a641f0a10a1d114445949cb2e1357174856
+DIST goobook-1.8.tar.gz 29231 SHA256 55c48e2c0e2f22743a0096829e4ed0f3e14978df4d30ec6559195c80f9b9be2f SHA512 4a284e334a7389a28a28b5fa40c39d68a5ab891cb59c79fadc12736867fd8eecf073993e5ac017e577d786e244cb847a76ebe549b226f94cb4c144202203a680 WHIRLPOOL b8071d01433719742663aa15849cc7094ebf8eba5787e32aba84295cd55fd94e5cf6300e2140eb8a4cc6ad45a8b6097d7733ee68909993f81429ad8a6f12b152
+EBUILD goobook-1.8.ebuild 1379 SHA256 369ab2d6cfebb33fafc0686669a47aa52287bc183533430c322ee6798760e62b SHA512 7fe41667bde17f77836f7c0e2d38e9b6862bb53bd00dcec6897e857d205bd5dec6b3294226db216a4b4a155460f5c68a015b578dc45e58459e3ecb16fbec37c0 WHIRLPOOL 63505fa1f12c20c8df970735b8e26c9bcf341c83815f992b58abab45092a86d13c546192bfed968127aded9b5e34ee27a237025a4cb589fc1a4f3813b97d2d1e
+MISC ChangeLog 2151 SHA256 46a97412350d03b229584594055855b04347a705191d728cdd793cd012e33eca SHA512 2f977d0523192d40f3943e853ac9eb4faaa106e678edc9662583c32846ef927a3b3d56e9d7c7536be280289d8c73f58132112cc0dcf4f20a94a59e3243d82931 WHIRLPOOL 34cc4ae9e7409946ddb8dfe2c48f50a7874f23a17357e1f15551bf1c2542e50ac54900f794099599441f2e961a4633e90a676598697b3c670c5a2b946fa80bbf
 MISC metadata.xml 461 SHA256 6bc5a2ef09ad81635fb3017f861fcd01d5a2175d6d2901fea6359544e74101b0 SHA512 22424baa35f8f6711a5b28ff8bcb07142a2c8a8fa500ad667af659f807c72b809745b76e172e99b319481bc5aea97333493a9732eb90f8c26c0a03f041b53f27 WHIRLPOOL 382d24a035b97a76b091a3aaf1972b34c3e683bf1807e9a45d6dfc9a4b7b8a81c88372799a2e793f1560f2b8b95127cb26423c277952d0a5c340aa2973369ffa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJNl7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6ScP/2ddlezCa37ka2RKjr4uAC2V
-H/NJeZ6pzmHo3I0x2FL3ZGnGNP1QIRuKwYb9XreuWwz1iyarHI4x2IzM9M4ixvjv
-VinD7cRfFKImvZw5Xw81XcSMwaNdEChB5rIRlXpMoxW9T/rg3M3ozLJ4LEuQNZWW
-MObBmisIPKK0j1ff7Sbh8uxIYBkH3pQ7JzcxnaFT0tIUwVlDdnwcmeWucYeWkWiW
-l6qs85KhjhlY3cliDDj91u5OIXfeN3HsYeS2AbLKg/2gUa3XyEP10gTCg0fBB7fO
-RNmvyzPJZtX3JgoymdV1vzaVCfuqeFyV+0hQq58SANzAMOrNX3KYFN/GZrZbtSjC
-E8217xD7LiG6BQFaeIRde9Do1Bk/s2B9x51Lk9k9F3iyajGRJlNeLM8h/1q/JYQq
-KqQfvOLO2AjFXe3aW9Ir5qlxIo/CkAxr/dzmEMl5bBKz8uoj3qf/pnWjwdKwq7Av
-Ouq2jcBKNnsq93qMJnkWSwxj7Ess4p0tw75J6kMa/iQCOW2d3Q4wKEcZ0dTTPhHC
-yhAYFdErQEPaog+EZptFrfHzp6zpw/MYxbroyhqRMzXq252nX3teZ5o6AJnvqN02
-VDQXxDOiVMhiW1SECYhcShRlG7YtKCPn+oedTZJ3C/SjbsSDUOOG3poe+xDXFcgT
-BoVe1EDdAQqRddS/Y7de
-=bNU6
+iD8DBQFVbsM8KWxsyjWmQTQRCER0AJ4lIvDfoJcTZsXbF+/l18HGZZXd1QCdH0D4
+wgkau0KFGAKNLwVxmVmqHpc=
+=+5QA
 -----END PGP SIGNATURE-----
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.