dev-vcs/git-cola: Fix tests and docs

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 38 insertions, 29 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index a6b12845e4fe..a89a8ed6660f 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git-cola
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.37 2015/01/16 09:38:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.38 2015/01/16 10:41:45 jlec Exp $
+
+  16 Jan 2015; Justin Lecher <jlec@gentoo.org> git-cola-2.0.7.ebuild,
+  git-cola-2.1.0.ebuild:
+  Fix tests and docs
 
 *git-cola-2.1.0 (16 Jan 2015)
 
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index cbf54d15b36c..2f8bff089173 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -14,26 +14,26 @@ DIST git-cola-2.0.7.tar.gz 679608 SHA256 bf87f6dacb2e524a4bbae8d8f33ac1be3e0b6cc
 DIST git-cola-2.1.0.tar.gz 682387 SHA256 1a443b270d5a710c60d00b51ccdef7e324a587e0e5e2b5ac9856a1a3d1ec878b SHA512 c8b5279c2ef6e7f147152cdfd746515f01501dc962dec6f8f98762b6eacda9c299551bf35a7ac31510f2f68b711a598a2db2ec5d2e865a7db7ef1f4c518e9fd3 WHIRLPOOL 01ae936b093a052735fe119ea5d26d174948f30c9b00ecfbf88425da226e5d5d22ffac855eea84503480d1c8a7d06a021d55884ab09e92698ecc4cf3fc5fa00a
 EBUILD git-cola-1.8.2.ebuild 2198 SHA256 ad11298dfad2ed771e138db229315b7e1e9fbc5c3ef47e5fb44f6f1d741da28c SHA512 c8edde9f4c6ed8eece606ac2106a1bc61812a3aba742763e6174fba90bdac611a00c85df30602b7fe52ea4cc07f57eed9d4cd19502e21fc50a7b6a6c3a135dda WHIRLPOOL c6679a20d7c2c99d5f58fd2dd30b2803ae5bdaf0e43224ea7f14c5ae605b7179fad4b22a3f0ec43b6b847474306ab582b2b79d73d8233b7108ec3b055394aaf2
 EBUILD git-cola-1.9.4.ebuild 2421 SHA256 0511ef7e83d8adbcd997a4f6bacdfe0e5580b63581a5e7feea5a6dbdeb258553 SHA512 95255897347c3817dae5d2da5a7e1d23bfb5f1a317cad3764782d4a808bacc83be2e504577a916ff2d1f3d6b448a741d662d37f32e7da2ccdff9018d1d702a28 WHIRLPOOL 4ea73c41178d97cb4b85939430fed8d1b800f3a1200f25d5e5323942a6bf3f0f45386ef23d3fd9544524c053438dec3f3fcc85d3b8b7b871f12d187c0384bf97
-EBUILD git-cola-2.0.7.ebuild 2400 SHA256 3ddb849706af3b9cd2519388fa51c78fbb06ca02b1f4189da34032ce83ea3056 SHA512 5749ee06a72ac822c4285c8e1e3ba9f16628b4f3c5de7aeb6da5e64a6a41a57604e85a23beea680fd6e39f9fb1d16f7e03dbe58d8633e38cacaf6b69aebbf6da WHIRLPOOL a324765061df94156c81a149e5f179cdfbed793ab6a619cdfe50c2de79024cedef4af8fe8a6d2151305edbacc2823c28af8bd8d9a5ff239dea5c55dad929841e
-EBUILD git-cola-2.1.0.ebuild 2532 SHA256 9d9e7781b0d50ef05ed5b138121231ffd5394a5e783d1f6ecf31de1dae937096 SHA512 1e4379ae100366a30838063c6eb93bab7e478a342bf08af1a62f61c835b32b36987c7b0f9d06ad3f6bcc9e4d763b7f6c9c610e048de3d717a127a59b5d30e9fa WHIRLPOOL 11750f7f999cd02f8e6a6235a5533dc3105ef5fdfdacee3d69b93cebe97bd05c858e271f5ad946f462f08317c853a22433d5194e373b71715f9dea0add057f3a
-MISC ChangeLog 8983 SHA256 871a78d5be3f25a3ecb217b572cd6edbc8dd42e36435f4f272013f916c1c788d SHA512 30cd49b4d19a0d26bec1308f161aa7fa68c0859cd9289bafd6f871d304bec8a9bce433ff9ab9191ffc0b8651435f39562ae21bbce8c3b2b8e78bc84ac9568df0 WHIRLPOOL 59d99702bb146bffc4994e91b32f31bbf5ba9d17c0596f1e9a41e298f6216db36c735f8dc0cc436e0f06a166594260b4ccd59128a8437931a71a8069c4c4e58f
+EBUILD git-cola-2.0.7.ebuild 2512 SHA256 d6baa004b3749435cded340723020b1a38842d9150ba6f8fb5b85a409f173437 SHA512 c67e99c5e22a22b5f5b9737c5c7b50ee84d2e92ab43984530ddb39d072b2f5bb51f998af89e6bcbf9efa13034e7cb197f6029438280170cc3b9bbff3a9d82b1b WHIRLPOOL a65bbdbd1cc6203f5212473b84f8f259869576b5c2023b362d994e5ccebc7f70a4be17c1c1afe303fd812a046925265fa1d8095a7886e5e8f79247a5dad34f4c
+EBUILD git-cola-2.1.0.ebuild 2512 SHA256 94b91aa3c4a05b55a80c1677b4d0abdd687f5b63f868225762364101f0aeec8a SHA512 30ce23cb624e8a50414ab182ead3cc029fb57916dd22d30c0212b4f6cbbc7e7bd6ac88536da77afff88532e7244abaf9a37b39e2ad3a70071972752021d48ba1 WHIRLPOOL 254ebb0eb08fe0dae2c1d2072bcf4a135a32605dd2f5c884312b79437c63bd7c01f70e8c707b81413a55241c78b161d5afb3f011c774909e4c6debb73d2ac207
+MISC ChangeLog 9100 SHA256 fd191220689b575641e0a2de159b66e5add8acf1b4a168afc2cf68be3c4350fd SHA512 9edc5a24b3aaea1967cd69e26ea6aa9410b33469234955a1754b926e6558f05f3df357739c523e49422357d42857f1dddd55fecbf8ba01ae6be8d03376c14498 WHIRLPOOL 38fa8369590b4d4c67a9aa05942a6274f2d03a36cd48b8931d2adbf12fba47850f43da1a710ce1e2bffd0c606e3f49a14043b66c175207631b7fd4cce7c4cf81
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUuNwsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUuOrqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirU8cP/j7mCWMPssYuvI0gH/Y04HKG
-DUJ9gVWAZcWSKKMkjqb77ASJrKWIKEb1xlRUxYhIUDCWvYaTliM25m6QtW9TSqZa
-FttwsvgPsUDvP8gp/cuAtyj7zOKrShUpCaoCnbkGEboSl1iRSor2ikyi7e5JQ5C2
-Zy1L3YDLA/g+vxoUb1XLr2CXRSMVADr5WH9KSqrPT7gzRBZYaw5ZwRi6lqs7pwxV
-2Yrk7Djrj6Z77bU1MZs/Bcuc7WH6HhpV9TR7k2kfRy6+G7oxWxusvE1a6+5iQUbw
-glIogvphW3QKOxjBKMe8ZciMCQGHHOBb5uzg/24eltIX7UzePEiypfUxoZbZCnm7
-ZRU1qsw/0KzWAcBcs0JTQ7sfuF9lWWWHkspcYTfGQcbgdJnBKnzIicfOnGbeLv35
-2hRc+k5y4QaZ4xJN7lfC/DOu7+xEGgdj9810no64HDla9MugFxF3rPt1zdwQK/Tg
-85XJjIrxxtTUy3TGE8EtiK38vaDMiq5dVu+8gU6653s39GR5UMQivqA/CZKpxLy0
-6rBHtEm9S2RTZHfNYD0865nzcgC6gjOll85jW+1d+OJvuSrAGJ8+Y/uApl1QNfdP
-h3v8V8ysIPQzLZc/iu+o3epq9DOGxa8OgZHca7jAPUlhJAQOMdCH7s+HqQ5ZKUrV
-kImA1b4znHZoKkIX9ux3
-=S2C7
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirQsYP/2WHaFVmuY+or15JOQo3KCrH
+hmklJG7zOqH33Bmt+cRu3ykHhEGuysRlMaMkgReyeFeTlccEYIiapArBRgW3K74F
+BpM2b1Z50PgklMmNaLIvJY0QQbR/SSvAfSMJ+9h4TBJvaGNCPYWvJxum2R14okqb
+TSjCC+FhidCCrr7i9cmHGun5o8Ixc+iQGVT1YvvqsxbLiP8IvNzV42yP4D9mN0z2
+4YN0ttR6A7QLNtCOtgn5XY2gI7gnAhvWktshs8jkCslf+Iak9XkYfL4xQaFgjJVE
+eeFqcB7J2gSzzorBpqDfU7It5xlesoVYDmbqM5/QiTe2phWIaPyWBH2G8zeGZmzQ
+i6JkwW7DjdFstPIFz48XDk443wh4LMxxblbBPwAx4kEhMOVY8NT2fOhWL0HVQkB/
+kr3w1nyM0g6F/jztx4sp2NQ23N10YwvFoJ0nWPrInVBe+O8CdTNvU7u8ge+cvQ02
+/NddtQsE3es1Xrqen3BV69AZJx+50jxNlJIUTmUh+hsAYku4ZOiEkfnuep/WZA4v
+Pgx8caj1xasInkUeuFqZbK/ad7wfv5hqTEx52vIunQ2zG3s65v+gC2mHJ7ozLMZ2
+BymjQm72Djm6O+AVT5vvInpfGfKfNLazl2F+Wh2o35uVSRUQ92oXyLLkWnNX8gPV
+inP2pRzi1tQ66yJ9m3Nk
+=WLM+
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-2.0.7.ebuild b/dev-vcs/git-cola/git-cola-2.0.7.ebuild
index 42e7b9896830..cb373fd720aa 100644
--- a/dev-vcs/git-cola/git-cola-2.0.7.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.0.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.7.ebuild,v 1.2 2015/01/16 09:38:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.7.ebuild,v 1.3 2015/01/16 10:41:45 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo virtualx
@@ -18,6 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
+REQUIRED_USE="doc? ( python_targets_python2_7 )"
+
 RDEPEND="
 	dev-python/jsonpickle[${PYTHON_USEDEP}]
 	dev-python/pyinotify[${PYTHON_USEDEP}]
@@ -27,7 +29,10 @@ DEPEND="${RDEPEND}
 	app-text/asciidoc
 	app-text/xmlto
 	sys-devel/gettext
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')]
+		)
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		sys-apps/net-tools
@@ -76,8 +81,8 @@ python_compile_all() {
 
 python_test() {
 	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-		VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
-		--with-id --exclude=jsonpickle --exclude=json" \
+		VIRTUALX_COMMAND="nosetests --verbose \
+		--with-id --with-doctest --exclude=sphinxtogithub" \
 		virtualmake
 }
 
diff --git a/dev-vcs/git-cola/git-cola-2.1.0.ebuild b/dev-vcs/git-cola/git-cola-2.1.0.ebuild
index d731af066520..b949076357e0 100644
--- a/dev-vcs/git-cola/git-cola-2.1.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.1.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.1.0.ebuild,v 1.1 2015/01/16 09:38:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.1.0.ebuild,v 1.2 2015/01/16 10:41:45 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
-PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo virtualx
@@ -19,6 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
+REQUIRED_USE="doc? ( python_targets_python2_7 )"
+
 RDEPEND="
 	dev-python/jsonpickle[${PYTHON_USEDEP}]
 	dev-python/pyinotify[${PYTHON_USEDEP}]
@@ -30,11 +31,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinxtogithub[${PYTHON_USEDEP}]
+		dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')]
 		)
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/sphinxtogithub[${PYTHON_USEDEP}]
 		sys-apps/net-tools
 		)"
 
@@ -81,8 +81,8 @@ python_compile_all() {
 
 python_test() {
 	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-		VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
-		--with-id --exclude=jsonpickle --exclude=json" \
+		VIRTUALX_COMMAND="nosetests --verbose \
+		--with-id --with-doctest --exclude=sphinxtogithub" \
 		virtualmake
 }