--- goobook-1.4.ebuild	2013-07-07 15:36:06.329863898 -0400
+++ goobook-1.4-r1.ebuild	2013-07-07 15:35:00.514865843 -0400
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/goobook/goobook-1.4.ebuild,v 1.1 2012/12/02 11:36:21 hwoarang Exp $
 
-EAPI="2"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-inherit distutils
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-r1 distutils-r1
 
 DESCRIPTION="Google Contacts wrapper for mutt"
 HOMEPAGE="http://code.google.com/p/goobook/"
@@ -16,16 +15,22 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/gdata
-	=dev-python/hcs-utils-1.1.1
-	dev-python/simplejson
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools"
+
+RDEPEND="${DEPEND}
+	>=dev-python/gdata-2.0.7
+	>=dev-python/hcs-utils-1.3
+	>=dev-python/keyring-0.2
+	>=dev-python/simplejson-2.1.0
 	virtual/python-argparse"
 
-RESTRICT_PYTHON_ABIS="3.*"
+src_prepare() {
+	epatch "${FILESDIR}"/goobook-1.4-hcs-utils-1.3.patch
+	default_src_prepare
+}
 
 pkg_postinst() {
-	distutils_pkg_postinst
-
 	einfo "If you want to use goobook from mutt"
 	einfo "add this in your .muttrc file:"
 	einfo "set query_command=\"goobook query '%s'\""