commit: 8e36163534e38a7b6a4880bbbc1da1bb19a2479d
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 23:30:25 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 23:35:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e361635
app-misc/gcalcli: fixup deps, add last major stable release before 4-alpha
Package-Manager: Portage-2.3.6, Repoman-2.3.3
app-misc/gcalcli/Manifest | 1 +
app-misc/gcalcli/files/gcalcli-oauth2client.patch | 30 ++++++++++++++++++++++
app-misc/gcalcli/gcalcli-3.2.ebuild | 2 +-
app-misc/gcalcli/gcalcli-3.3.2.ebuild | 2 +-
.../{gcalcli-3.2.ebuild => gcalcli-3.4.0.ebuild} | 15 +++++++----
...i-3.2.ebuild => gcalcli-4.0.0_alpha3-r1.ebuild} | 19 +++++++++-----
6 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest
index 625064bdbab..0312ffaaeca 100644
--- a/app-misc/gcalcli/Manifest
+++ b/app-misc/gcalcli/Manifest
@@ -1,3 +1,4 @@
DIST gcalcli-3.2.tar.gz 1672457 SHA256
9b3465be8e64c291ffe4582f8cb779a7025c700e6a83aae74722d87a3b88d55a SHA512
a2e0d9aea2f27eaee3796acfbfdc08b88a7792002b10f0e44b0db1187a7ecd50aa97f78df7236038c8c18bc1b6dacbfa4b26db6bfb5762c880415c10a5364d83
WHIRLPOOL
66b8e954c5d4527e2725d0f07786262f4365f356e3ef893aa8253d07c41523b5f9c71bffd03acc02b27c57001f0c1e7b3cd92fea7396974b8898b4940abff6fb
DIST gcalcli-3.3.2.tar.gz 1674569 SHA256
69c31b5bee1390b4187a48b85b57ba95e40db231489d3deec8c3d387305d2ff3 SHA512
725290de1c7c768ad48e77bcc74e65b2676aab2fe5d40bdf59e63e1552d96dbe849fe99680b1f33c8adebcf2ee4a1ad898879820e20d8b2050679348820f4ba0
WHIRLPOOL
86acaf08d36af331524e514c6bfc37e6591ec570dd5c25c0bca6b111aa901636082cc961b70fcadbc32616e72f6c09bbc8460aa97f15a146fa341850fa416d15
+DIST gcalcli-3.4.0.tar.gz 1675456 SHA256
1297f7082b4d33ac6d5ea3edfc11bdd329b8a6f28926aeda412806d45b7afdd1 SHA512
d3844dc34dfd21b1cca6f46bf2b66b6aabfccd4d7b23ad4e076966aeec51681792c0dbe5f61e4cb84a75ce3bbf4fd1c63a2ce759cecdeee3e4608c0238c07a4b
WHIRLPOOL
6bbe059a8ef28d8b498006f95f3c31ea0eb244139f39c0b1846f6981e3f05d26b1f49b2ff527f6127d21e3feafcfd1e77285bcb8afae0fe690fe6251483cdb99
DIST gcalcli-4.0.0_alpha3.tar.gz 1675261 SHA256
d295a5c577fd4d202eb59317169e239c07d03c8ab261211ef39549bdcf98e150 SHA512
215860f50d2b32b94124537b3d8dbaebd7af5b9c907d565a58eab5357efa8a8c8bc6c20264811337ddbc33ae75029bf59c782e1dbb317667084f11da8c41ea18
WHIRLPOOL
3fb9817ca408b2513b5bbcaa8ea343132e8e834ac3365cd1a4020c9dc9840f125e59b49b9067f27187b6b7210d4bb4227a79efe80ae1a98e7aad3bfc1177defa
diff --git a/app-misc/gcalcli/files/gcalcli-oauth2client.patch
b/app-misc/gcalcli/files/gcalcli-oauth2client.patch
new file mode 100644
index 00000000000..2ad7a2981f8
--- /dev/null
+++ b/app-misc/gcalcli/files/gcalcli-oauth2client.patch
@@ -0,0 +1,30 @@
+--- a/gcalcli-3.3.2/gcalcli 2015-09-14 02:26:55.000000000 -0300
++++ b/gcalcli-3.3.2/gcalcli 2016-09-21 00:20:45.817051537 -0300
+@@ -190,7 +190,8 @@
+ from apiclient.errors import HttpError
+ from oauth2client.file import Storage
+ from oauth2client.client import OAuth2WebServerFlow
+- from oauth2client.tools import run
++ from oauth2client.tools import run_flow
++ from oauth2client.tools import argparser
+ except ImportError as e:
+ print "ERROR: Missing module - %s" % e.args[0]
+ sys.exit(1)
+@@ -665,14 +666,15 @@
+ credentials = storage.get()
+
+ if credentials is None or credentials.invalid:
+- credentials = run(
++ args, unknown = argparser.parse_known_args(sys.argv)
++ credentials = run_flow(
+ OAuth2WebServerFlow(
+ client_id=self.client_id,
+ client_secret=self.client_secret,
+ scope=['https://www.googleapis.com/auth/calendar',
+
'https://www.googleapis.com/auth/urlshortener'],
+ user_agent=__program__ + '/' + __version__),
+- storage)
++ storage,args)
+
+ self.authHttp = credentials.authorize(httplib2.Http())
+
diff --git a/app-misc/gcalcli/gcalcli-3.2.ebuild
b/app-misc/gcalcli/gcalcli-3.2.ebuild
index 4a5053542f9..5278106779a 100644
--- a/app-misc/gcalcli/gcalcli-3.2.ebuild
+++ b/app-misc/gcalcli/gcalcli-3.2.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/google-api-python-client[${PYTHON_USEDEP}]
+ >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
dev-python/gdata[${PYTHON_USEDEP}]
dev-python/vobject[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/app-misc/gcalcli/gcalcli-3.3.2.ebuild
b/app-misc/gcalcli/gcalcli-3.3.2.ebuild
index 4a5053542f9..5278106779a 100644
--- a/app-misc/gcalcli/gcalcli-3.3.2.ebuild
+++ b/app-misc/gcalcli/gcalcli-3.3.2.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/google-api-python-client[${PYTHON_USEDEP}]
+ >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
dev-python/gdata[${PYTHON_USEDEP}]
dev-python/vobject[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/app-misc/gcalcli/gcalcli-3.2.ebuild
b/app-misc/gcalcli/gcalcli-3.4.0.ebuild
similarity index 64%
copy from app-misc/gcalcli/gcalcli-3.2.ebuild
copy to app-misc/gcalcli/gcalcli-3.4.0.ebuild
index 4a5053542f9..43c611febff 100644
--- a/app-misc/gcalcli/gcalcli-3.2.ebuild
+++ b/app-misc/gcalcli/gcalcli-3.4.0.ebuild
@@ -2,8 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-# google-api-python-client only supports these
-PYTHON_COMPAT=( python2_7 pypy )
+# python-gflags doesn't support python3
+# parsedatetime doesn't support pypy
+PYTHON_COMPAT=( python2_7 )
inherit python-r1
@@ -15,15 +16,19 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
+ >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
+ dev-python/parsedatetime[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/google-api-python-client[${PYTHON_USEDEP}]
- dev-python/gdata[${PYTHON_USEDEP}]
+ dev-python/python-gflags[${PYTHON_USEDEP}]
dev-python/vobject[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/gcalcli-oauth2client.patch"
+}
+
src_install() {
dodoc -r ChangeLog README.md docs
python_foreach_impl python_doscript ${PN}
diff --git a/app-misc/gcalcli/gcalcli-3.2.ebuild
b/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild
similarity index 57%
copy from app-misc/gcalcli/gcalcli-3.2.ebuild
copy to app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild
index 4a5053542f9..ee26100ef27 100644
--- a/app-misc/gcalcli/gcalcli-3.2.ebuild
+++ b/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild
@@ -2,14 +2,17 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-# google-api-python-client only supports these
-PYTHON_COMPAT=( python2_7 pypy )
+# python-gflags doesn't support python3
+# parsedatetime doesn't support pypy
+PYTHON_COMPAT=( python2_7 )
-inherit python-r1
+inherit python-r1 versionator
+
+MY_PV="4.0.0a3"
DESCRIPTION="Google Calendar Command Line Interface"
HOMEPAGE="https://github.com/insanum/gcalcli";
-SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
@@ -18,12 +21,16 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/google-api-python-client[${PYTHON_USEDEP}]
dev-python/gdata[${PYTHON_USEDEP}]
+ >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
+ dev-python/parsedatetime[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/python-gflags[${PYTHON_USEDEP}]
dev-python/vobject[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
+S="${WORKDIR}/gcalcli-${MY_PV}"
+
src_install() {
dodoc -r ChangeLog README.md docs
python_foreach_impl python_doscript ${PN}
