dev-vcs/git-cola: Version BUmp; drop old
authorJustin Lecher <jlec@gentoo.org>
Fri, 16 Jan 2015 09:38:52 +0000 (09:38 +0000)
committerJustin Lecher <jlec@gentoo.org>
Fri, 16 Jan 2015 09:38:52 +0000 (09:38 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

dev-vcs/git-cola/ChangeLog
dev-vcs/git-cola/Manifest
dev-vcs/git-cola/git-cola-2.0.5-r1.ebuild [deleted file]
dev-vcs/git-cola/git-cola-2.0.7.ebuild
dev-vcs/git-cola/git-cola-2.1.0.ebuild [moved from dev-vcs/git-cola/git-cola-2.0.6.ebuild with 85% similarity]

index 3a0ee250c64379603021d33c13db7419b87c92e5..a6b12845e4fed669bb1cb723be0300848c7a0e87 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/git-cola
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.36 2014/10/21 06:57:33 jlec Exp $
+# 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 $
+
+*git-cola-2.1.0 (16 Jan 2015)
+
+  16 Jan 2015; Justin Lecher <jlec@gentoo.org> -git-cola-2.0.5-r1.ebuild,
+  -git-cola-2.0.6.ebuild, git-cola-2.0.7.ebuild, +git-cola-2.1.0.ebuild:
+  Version BUmp; drop old
 
   21 Oct 2014; Justin Lecher <jlec@gentoo.org> files/README.gentoo:
   Fix typo, #526096; thanks Coacher spotting this
index 04dc882632119d9fc731f203898f652b44d0cd84..cbf54d15b36cb80af8e67631cf69bd1e96860c05 100644 (file)
@@ -10,32 +10,30 @@ AUX git-cola-1.9.3-disable-tests.patch 859 SHA256 cf6e9410e0b3ddef9b40ce00906fc4
 AUX index.html 355 SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac WHIRLPOOL fd3d058f2d57dd9664bc498d6b8bfa749d219d44bef7cbf64624abe16e019062108f52f8cc18ebf580e70d2eb20cdb89f760d380a83b932712a689e921201f7f
 DIST git-cola-1.8.2.tar.gz 397346 SHA256 386b29cd70b3c6a14b23790567d2e93168e1eeaaec5d85be37e4f5ce4fd9a977 SHA512 5136749a12d262dd28db4058efd3892a437e5dea18d4fe888248fd7a3891409091e7d36565536fa7d4538354a01f11f8a02e0fd31c2c86ea7159f4e6004b75cc WHIRLPOOL 861af22ba39d6e5a3899fe569c6cfa3651daab6d4d57a4daf07acad133cd2cc1a375da403a94deb943d3a5ddee4e364d5a50b3f7996dbb3310495b57c67a7369
 DIST git-cola-1.9.4.tar.gz 434458 SHA256 c7f065bf5557ceba424ee26e5af94d01b37537ef426fffe581efe33526733525 SHA512 aabf1887da1aee2b1ae2c004c8ab29317796c4e21bda7b9937fdf3ad8aa6721e8833b56f143e4cda72bcd631ede3f176592335862e456f69729494332b33264b WHIRLPOOL 2ee639402b2bdab9bc49b11d0bf29696e3607e9218662af72fd6aeafd73da37955ce5dc40ddb03f9664fd15c3ec213681a2ab58b6451ac121a8abaafbb4bc32d
-DIST git-cola-2.0.5.tar.gz 665336 SHA256 a3fc3dc5b1010e4c85b75b01346f94823b1b8eb35dd23ef1d9703b7a4c8959ef SHA512 275f66c32792f6c50fa46512aa998ab5b7bcbc51d5c01bd97f864264961f68f71a24c74e2788f7598a91b35087eb7c93c142c2ebd03fe969a66a84752b3f03a2 WHIRLPOOL dfcc01c4a9a629cb32303be02a46787bd0da95eddaf2e7c36c1060ef12af9b9dea34c5aa20067e1c81ce9acefd79a302d967b207d17306862b633cc3c25d3bd8
-DIST git-cola-2.0.6.tar.gz 679597 SHA256 5522fbfc2537488ba7d36a79842af33bdbe89a053809f3c90008aff76b8aa3b3 SHA512 e370255cf919ffb1311e32a8d7ef219063d03593d5243dd85a3a6c776c31b9b9fd02da4c5661f98e8b8e6e5190cfeccb726e655575561e096576dec86656f7a5 WHIRLPOOL 374d02e2e2c857f7e4b45c3bcb4a26e05caad67066f0a2b586b1d6ff5be1338335e94b74ef906a18e62178605cd9da819b282ad25e61f0ef405ce8babbe04d71
 DIST git-cola-2.0.7.tar.gz 679608 SHA256 bf87f6dacb2e524a4bbae8d8f33ac1be3e0b6cc4c41ac1c3819eacfd784c2d2a SHA512 0f26207145c337c3298962fff32695b753b4b5096bd028085e804e7e70589d0e68feeb3cb96403aa3b15dab401ef89d336115d68e7c40bb3d99cee2727a443b7 WHIRLPOOL 75042b712282a689a3f46fb7dc65696001f5c193da01ee65df7e5a525702f3bdee5c5e28f58ee3deafdb8b3d4a4e03a5e55ba74a34d3b18a66fa85ecb69c600f
+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.5-r1.ebuild 2405 SHA256 345a0f2eb69f3e1a439c27dc6b2cc3c40c5cede0f6d2ae547d40b1d97405923e SHA512 71db5e67e411e8f158f4c71db16a90119f01ac6d19a9a265db344e7ccfa26e923811152ccad25a00d67a50578561de0dc0ed05a2187d924f91f06496377722ea WHIRLPOOL ea656ccb1545511e8dba80e75d53e735ea0a3e59ca99b083978aef06742bfa561ccd099fe0487d93702fe795ef65ef62ecdfd1cf9c0475a1bcb6a2e621e7a4bc
-EBUILD git-cola-2.0.6.ebuild 2400 SHA256 59c95228898a3074b0df03a2d78cc56f842486ee6d5aea5a232bd04838ccc3e7 SHA512 702f38a7f268740101f20e010e6e67c2a2a3e08ea0dc5d443909094bca8816377d1505805aeb1d1ac6f722af95cfdf875dcb83d75fdeb817b4d3e05633803242 WHIRLPOOL 916d50886bf91b4803a84dcc3e26278c9b6f4d1b213d14c4b526e6673d87dc6e107dacf870ad3daaddc556137e6ef61e8f7a82e4cd0619b7fe5589ce4435c42e
-EBUILD git-cola-2.0.7.ebuild 2400 SHA256 c6d4d96a920425968a0783fb7bbb12716544bde958d111e4f5930204c6bf3057 SHA512 fce723be4b3d9465cdbd6a1661ea96a4da424935536f5c433ec9b8cb0fe6ec835fbd84e8409638ee05caf826134dbeb7d73bfdf710d6f9c45d1d8a972a6a8c3c WHIRLPOOL fd004f53936f8f05abfb2da5790c2c6c74cc3d4aa58bfb57e1c3a5e40587430eb797c4929956fb5279c976a7f1682563c3a7cf62dfeb1f90e2729abc70cfa029
-MISC ChangeLog 8779 SHA256 c6f63c54a9ad3db7d8101a30550009613d21126492e6ff7e7609393f7906c34b SHA512 e331cf0a29a8bcf95f18ec72998e962d932b56ad18b734c42757cf2b8d06a8da97af0da2f55264136690a590a52f6c4d64c82d8208c05241c6f7f499353b35ca WHIRLPOOL e9bbede72f3ec8a321b5f8a01149ab0a73b88d20717958698410a4f3a56cb744ea5271b1f5695a7ef222cfaf892ca8d512e850d22c8f8a7fe7189ac0f8c59792
+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
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJURgPeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUuNwsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirPWgQAJfB/wPW3HV1wH0pL8V7o+BV
-IBtjncH4S7ujFAZtlp6Re2ebqWRYXQY1tq7avE66a8nYExLTZVgNCGnjRI4R+9F2
-amZDOUhO8D4JhaNoDZKMDhDuFQQcMl87n95xK40FIAvPtVz89AM5ZAAjnoA0wdX8
-lJPx4GvNQEQf+W3naO7sL1E2PNNZADfJHfHxJxXe1Hs65ENiLV8Q32JCsz8+caEM
-Pwi3KmCtXx5JIZMlVrxNUWpOTThrKv38rKB74lxO4UkyFCzpD12c35q6v5C36VJl
-kY5ELyZEt9mr9PaXUVPL5uEQzFM8j6QUPgzOSxWdda9kn9WEn1b4Ge0Ql3FRDH8z
-v3z7Sk3GvnjVHm4jySjzCyQ09sL22pCPw8pq0RftJSM/obmOleVeGp/mzxg56oLh
-CbGML8KV0Wp8fR/8ILZGJtxJcNX6j5TN+M1wUBxpyqzpHJhaO7zRGHMLaF5Q/vUL
-H5lblD8olgOBnyHKYVmB4nO6meGYQH9S7/p9XBcX2P3GAzKgmYHgaHTRgNmt6Qt+
-K/978NvDDyV0NHpefGhIwg/a/u4gov2GKetASXsoQ28tPhXv6mbmxH5LNL2/wwam
-yliskajRqcnyKJKO6hY32RiR0CNZslcV1Wu9F1HN1RLEhKJKRAQiCrOSWiBGDcV3
-kVF1j1uJn9+ZZL0sA9O1
-=Ytfy
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-2.0.5-r1.ebuild b/dev-vcs/git-cola/git-cola-2.0.5-r1.ebuild
deleted file mode 100644 (file)
index e65dce1..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 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.5-r1.ebuild,v 1.1 2014/08/10 07:13:51 dev-zero Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="http://git-cola.github.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-       dev-python/jsonpickle[${PYTHON_USEDEP}]
-       dev-python/pyinotify[${PYTHON_USEDEP}]
-       dev-python/PyQt4[${PYTHON_USEDEP}]
-       dev-vcs/git"
-DEPEND="${RDEPEND}
-       app-text/asciidoc
-       app-text/xmlto
-       sys-devel/gettext
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       test? (
-               dev-python/nose[${PYTHON_USEDEP}]
-               sys-apps/net-tools
-               )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.9.3-disable-tests.patch
-       "${FILESDIR}"/${PN}-1.9.1-system-ssh-askpass.patch
-       )
-
-pkg_pretend() {
-       if use test && [[ -z "$(hostname -d)" ]] ; then
-               die "Test will fail if no domain is set"
-       fi
-}
-
-python_prepare_all() {
-       rm share/git-cola/bin/*askpass* || die
-
-       # unfinished translate framework
-       rm test/i18n_test.py || die
-
-       # don't install docs into wrong location
-       sed -i \
-               -e '/doc/d' \
-               setup.py || die "sed failed"
-
-       sed -i \
-               -e  "s|'doc', 'git-cola'|'doc', '${PF}'|" \
-               cola/resources.py || die "sed failed"
-
-       distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-       cd share/doc/${PN}/
-       if use doc ; then
-               emake all
-       else
-               sed \
-                       -e '/^install:/s:install-html::g' \
-                       -e '/^install:/s:install-man::g' \
-                       -i Makefile || die
-       fi
-}
-
-src_install() {
-       distutils-r1_src_install
-}
-
-python_install_all() {
-       cd share/doc/${PN}/ || die
-       emake \
-               DESTDIR="${D}" \
-               docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               prefix="${EPREFIX}/usr" \
-               install
-
-       python_fix_shebang "${D}/usr/share/git-cola/bin/git-xbase"
-       python_optimize "${D}/usr/share/git-cola/lib/cola"
-
-       if ! use doc ; then
-               HTML_DOCS=( "${FILESDIR}"/index.html )
-       fi
-
-       distutils-r1_python_install_all
-       readme.gentoo_create_doc
-       docompress /usr/share/doc/${PF}/git-cola.txt
-}
-
-python_test() {
-       PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-               VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
-               --with-id --exclude=jsonpickle --exclude=json" \
-               virtualmake
-}
index b0c2debd77167dc6710901d6193193ef07044185..42e7b9896830b50131caa0aa57152161962fee83 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.1 2014/10/01 12:38:40 jlec Exp $
+# $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 $
 
 EAPI=5
 
@@ -74,6 +74,13 @@ python_compile_all() {
        fi
 }
 
+python_test() {
+       PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+               VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
+               --with-id --exclude=jsonpickle --exclude=json" \
+               virtualmake
+}
+
 src_install() {
        distutils-r1_src_install
 }
@@ -97,10 +104,3 @@ python_install_all() {
        readme.gentoo_create_doc
        docompress /usr/share/doc/${PF}/git-cola.txt
 }
-
-python_test() {
-       PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-               VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
-               --with-id --exclude=jsonpickle --exclude=json" \
-               virtualmake
-}
similarity index 85%
rename from dev-vcs/git-cola/git-cola-2.0.6.ebuild
rename to dev-vcs/git-cola/git-cola-2.1.0.ebuild
index e6661d454e4eb9072fe1c4bf4ac8badcf743682b..d731af0665209021f6f1b23ef3e694341e37c5af 100644 (file)
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.6.ebuild,v 1.2 2014/09/16 08:46:05 jlec Exp $
+# $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 $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo virtualx
@@ -27,9 +28,13 @@ 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_USEDEP}]
+               )
        test? (
                dev-python/nose[${PYTHON_USEDEP}]
+               dev-python/sphinxtogithub[${PYTHON_USEDEP}]
                sys-apps/net-tools
                )"
 
@@ -74,6 +79,13 @@ python_compile_all() {
        fi
 }
 
+python_test() {
+       PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+               VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
+               --with-id --exclude=jsonpickle --exclude=json" \
+               virtualmake
+}
+
 src_install() {
        distutils-r1_src_install
 }
@@ -97,10 +109,3 @@ python_install_all() {
        readme.gentoo_create_doc
        docompress /usr/share/doc/${PF}/git-cola.txt
 }
-
-python_test() {
-       PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-               VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
-               --with-id --exclude=jsonpickle --exclude=json" \
-               virtualmake
-}