inherit eutils, reference upstream bug reports

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 16 insertions, 10 deletions

diff --git a/app-misc/goobook/ChangeLog b/app-misc/goobook/ChangeLog
index 3decec6bd6ba..9cff146c654a 100644
--- a/app-misc/goobook/ChangeLog
+++ b/app-misc/goobook/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/goobook
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/goobook/ChangeLog,v 1.4 2013/07/08 15:49:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/goobook/ChangeLog,v 1.5 2013/07/08 17:26:20 xmw Exp $
+
+  08 Jul 2013; Michael Weber <xmw@gentoo.org>
+  files/goobook-1.4-hcs-utils-1.3.patch, goobook-1.4-r1.ebuild:
+  inherit eutils, reference upstream bug reports
 
 *goobook-1.4-r1 (08 Jul 2013)
 
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
index acfdccabfc6c..c90b294aa9d8 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX goobook-1.4-hcs-utils-1.3.patch 2506 SHA256 254647908ea72709d34e29bdc09eb40928f870ca118b6a4acb732486d982e9d5 SHA512 aeba2c2c91cc4b64369200a937cf3f23dbd6029f5bfa6f35a18058c5dd239203eb2d9b8182649532ade4801231cbc674c2704b2ea020dfd3e0b2df1c957928be WHIRLPOOL 7a9c86b2e254287378a2b594b508d42b2936bcbd01712e9a66fab146b52de10695a010c4560d15b4cc2793fa8f0f794140db5d29ce283faaa3b044db03dc9152
+AUX goobook-1.4-hcs-utils-1.3.patch 2580 SHA256 bac32d9ececf090e3001214a4b0730ff0652137aa40a00aff6c61ff4beb7bbb4 SHA512 f07899ac73ccd73af42bbc588ff03c7ceb6e851fe37b5b20481179f5abaf891fb0190e3de7d3d7e3cfce3b01efc74557c3b42ae526c6beb3259031ccbf5d9403 WHIRLPOOL b26527e0f30f8635e3215d388dbcf4f64ff26af25c0b572e7bade244f61066d1997cce092c14301bc4f9479051fb98244ae52279f21a0e279407c6063195d14a
 DIST goobook-1.3.tar.gz 30934 SHA256 ef139f1a20190dfbb483d72e95ce085ef87d9d6dee2a5e510c207261d4f7fb50 SHA512 04e01c6f02ff884692dfd6bcc67a2e2e6534b28387504e9084402c5349800424d3b45319ba732db796469fe76aa44e9f186c8f1f78fc0e37f16f42086ed1dfd4 WHIRLPOOL d1dcda5eece63fc32699cef0ec7bc079ee20af48a6b5886c1cb93de8b0bea9ae2fc967a9394451f8a823a4f397ed906bb05b53d594887ea2bcfcd1299a280b68
 DIST goobook-1.4.tar.gz 34015 SHA256 abf600903c864645d510a9381189ecffd7097e7ca853ff44aedcbeace57330ae SHA512 3c375307ebc6454e28b06c4c81065ae1db195f01888e9a64a9fb6baa2d36237c5f6895d6ec849d4024fe214a4cb004f9114d2482b39317d5b1abb0edd7b434f7 WHIRLPOOL e332ea0ecab357516f292d23ef5655a225761497e779d18f65bdbe59d99a59648ecab86f26f6f3dda3862d754559d39401019ffd9d72866de52d9883c4f9858c
 EBUILD goobook-1.3.ebuild 987 SHA256 cdcc091406253de11fee021659e9c463150f4f11b7aa3c52d4e172b3f46f4518 SHA512 2c98433adee9ac046da29e385d46ad0ff4c8f0cf0256b62dbbc977927d5c7604fad38be52c745d112ec5f69d8cb85036102f3aca335b47771b662bbd6529d699 WHIRLPOOL 58ce464f362875ef7909e1e2379dff31d8c5d4197560e901b9825d2f2cf0a011e85d27b9b369db527d1afa1a9ff3fc3108c7fec3d24b97765f0e37f98789783d
-EBUILD goobook-1.4-r1.ebuild 1245 SHA256 38eb169dad3b3f6b0d08aec2ebf06809646bdfb6a73687b184fe804cd8b2b755 SHA512 4dca4732200a66c19ad2fa1562b82fd0b2774e983ccddedaef6cb68e10b48d97186753c4ce00b0b2440a6a4217d2168f79e3b16bc21da1e1c8dcb21f46ba84bf WHIRLPOOL 959a6efd804cb0b76f4630d507268ba71494f28b3729f55ee73726182c8a4539dc44c8c4e433335af8c4996169a32cce980cd14f8249203eed66dd2f1fbcf79a
+EBUILD goobook-1.4-r1.ebuild 1324 SHA256 5c75cbf0897bfa9e679ebfd9b6f4247166600d3d0957e9f8240448720758fb50 SHA512 cd335f67ec98965d67bae995c0138fcd6bd7a44a6816820f5b8e645799718e203a15b73525140825c34281bf841fe5bbb244fbbb6b80e8a086f797f0fcea594e WHIRLPOOL 294a34fd538d74d1eb396701d1d6c5d04a007c2548ed6bf9bc3230a8be7f8a9ab24e7a94d254a105b76841de89f449f7b317110036a904ca040b3deff3b60cf2
 EBUILD goobook-1.4.ebuild 989 SHA256 95301f477f33aa4fb66bcd0c93abe4feb32933ce89a44c8b9ae9b75dc9f8e329 SHA512 bbe18255ddd216317a7b71e19f29a3539e4346b740ce20ca76b3949dffeec9102d8a7337d5c40b76469ada6a0089be502cc783091144ad705f4383edd7164785 WHIRLPOOL e57c8312942c773087190283147962ed8ed74af86317592c076d69df1dbae3b65cf77e361849f0edd21ef29283d0a43862335017b75a5cae2825693efe9e9424
-MISC ChangeLog 928 SHA256 ac3b6ce4fc9e7e043c995ec4d699e2ee9b218371cf3c2d095d2949ecd1417a58 SHA512 fddf96d26aace7946a3ad40ad9884be07e86bce2748b5326ec17c05f961e490b90f8f75dbe29e254179f54867dcfe8f96d887cf3105ed6b8e60e05d64850e269 WHIRLPOOL 3d27eaeb77a2b09666811cfc586d9510263a50d2457eac7de7bf830710b5aff8d94ea39ddecab812e3bef20d79d1952ddd1e51b04c02a4690c6771c6b033e1e5
+MISC ChangeLog 1088 SHA256 877eb60ee8c96587f628adf750f350b7cd8e80689d7bd0041393c51b83f942d0 SHA512 dfc485cea84abd08895051c330a7bb2bdc68743fb703eb6dc26ce5bf4d2d9a212127126f73dc58f5d5724af7d42e04011ef285b400c77cc7f772fd4ded0b0e95 WHIRLPOOL 8b2aaa852b59e40d1a0878974c9b2d37192273b1e34440a8e38551d6f85d756b078792f65e37c3643b4c10b94d468c80ff0f43cce9eab66bd448be7d00be90bf
 MISC metadata.xml 461 SHA256 6bc5a2ef09ad81635fb3017f861fcd01d5a2175d6d2901fea6359544e74101b0 SHA512 22424baa35f8f6711a5b28ff8bcb07142a2c8a8fa500ad667af659f807c72b809745b76e172e99b319481bc5aea97333493a9732eb90f8c26c0a03f041b53f27 WHIRLPOOL 382d24a035b97a76b091a3aaf1972b34c3e683bf1807e9a45d6dfc9a4b7b8a81c88372799a2e793f1560f2b8b95127cb26423c277952d0a5c340aa2973369ffa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHa36IACgkQknrdDGLu8JC4dAD9GfuEx5siicM7RfSxKY2qtGuF
-6lru55HHcSq4zQW1Qz8A/AgKGpllRLrssQjU2UzhN7bHmqmblwpTrBOwsRE0zw7I
-=6Qyp
+iF4EAREIAAYFAlHa9j4ACgkQknrdDGLu8JDc7QEAlN28FamVtWwIVPkhL6FH95+P
+q4XPrt2CFyLDZ3imLV8A/2MnhT8nUlTNA0B+7SQTOlvJ16iLGzyFixQ+yzbnLOy1
+=XZg8
 -----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
index 66d00b2a6089..8051a5275e03 100644
--- 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
@@ -1,4 +1,5 @@
 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
diff --git a/app-misc/goobook/goobook-1.4-r1.ebuild b/app-misc/goobook/goobook-1.4-r1.ebuild
index 38f370912195..d8ac1651652f 100644
--- a/app-misc/goobook/goobook-1.4-r1.ebuild
+++ b/app-misc/goobook/goobook-1.4-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 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.1 2013/07/08 15:49:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/goobook/goobook-1.4-r1.ebuild,v 1.2 2013/07/08 17:26:20 xmw Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Google Contacts wrapper for mutt"
 HOMEPAGE="http://code.google.com/p/goobook/"
@@ -25,8 +25,9 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/simplejson-2.1.0[${PYTHON_USEDEP}]
 	virtual/python-argparse"
 
+# bug 476186, http://code.google.com/p/goobook/issues/detail?id=40
 DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools"
+	<dev-python/setuptools-0.7"
 ESTRICT_PYTHON_ABIS="3.*"
 
 python_prepare_all() {