dev-vcs/git-cola: Version BUmp

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

3 files changed, 134 insertions, 16 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index a89a8ed6660f..4aea5404a25b 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,11 @@
 # 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.38 2015/01/16 10:41:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.39 2015/02/05 10:26:31 jlec Exp $
+
+*git-cola-2.1.1 (05 Feb 2015)
+
+  05 Feb 2015; Justin Lecher <jlec@gentoo.org> +git-cola-2.1.1.ebuild:
+  Version BUmp
 
   16 Jan 2015; Justin Lecher <jlec@gentoo.org> git-cola-2.0.7.ebuild,
   git-cola-2.1.0.ebuild:
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 2f8bff089173..ade650afa9b8 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -12,28 +12,30 @@ DIST git-cola-1.8.2.tar.gz 397346 SHA256 386b29cd70b3c6a14b23790567d2e93168e1eea
 DIST git-cola-1.9.4.tar.gz 434458 SHA256 c7f065bf5557ceba424ee26e5af94d01b37537ef426fffe581efe33526733525 SHA512 aabf1887da1aee2b1ae2c004c8ab29317796c4e21bda7b9937fdf3ad8aa6721e8833b56f143e4cda72bcd631ede3f176592335862e456f69729494332b33264b WHIRLPOOL 2ee639402b2bdab9bc49b11d0bf29696e3607e9218662af72fd6aeafd73da37955ce5dc40ddb03f9664fd15c3ec213681a2ab58b6451ac121a8abaafbb4bc32d
 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
+DIST git-cola-2.1.1.tar.gz 953528 SHA256 41ce9fcbdd408afd626202b64d714ba10eb6fabbccdd32d5317d620fb72df13a SHA512 de1e8acc8f407dd33b69937ae17a862ba4b1bbb41844c731d60a047e45dbe4c2693a0e6a0a5a9be226a01a84b3c2c5b4825aeaba9baab8e6c35b7d4e0112bad9 WHIRLPOOL bdee8f56f899133a22a7afab01dbef88ea8273194f0dd405f894fe56e5e8a0d2577375e1baeaa03d9d49394fe0e11607a869cc542e66f0721e37fde079b2467d
 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 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
+EBUILD git-cola-2.1.1.ebuild 2512 SHA256 d124c531bcbce6a72d56f7db54376b2d3158c1fd8bf44c6bba9c117589f1009a SHA512 0f63c76c0d5ac4ff4ee08bca67f09005f731f7696077ccf80580d2886c800dac17d0995f191eb892fad6b00a2db1a887f381cc63ec46f438ccf238af4ec0d6f9 WHIRLPOOL 2fb404cafe1577cabfb71429bead357d65804b64cd3a82ca1b30564106d318a795e39b63c35a85f79ddf98e6e0a073b5833a0edd568687d0914a7856a5c71411
+MISC ChangeLog 9218 SHA256 7e05fb0e65c498751cf4dec1c0e618b984cb5fbe3c3d92c1cc3074152f3463e7 SHA512 65b0344c55d552c657a06c85b755984ba1ef45d66598ea46a8903ae5d44f954e0fcbfd5845ef7a3c60acbdd9833501a0f78ca46bf33bdd334322b96c420ecd66 WHIRLPOOL bda6672bdff5305b8b98e04eb490de76b20d7766a7bd4751bbd2e3e3776944cdf60372060552014dbe5f8c5341da88d069c3fd157593ceb57fa3b37dd7a89495
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUuOrqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU00VYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-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+
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirVRgP/izHcB/WTMCBfp03ZNMH8puX
+pr+AWphr66kXm7M+0UrvCNQR4wjlz3Nhm62O+45O/bmbI5MUdk+PT/KLOTgvaCh4
+et8sGGpK0WBFKZC4nURLQIwa6gpAKDGoRcUVL0QuqT24n+WY6sLdlxWhN8AxhQPc
+sbFONae5+QC+kyn5qj2GNG9hLtKahDk1hsNFlrAn1zPzRlzyLHdcoiYOUWiOROPi
+yeh4Na1EwCKl8sdAm3RKVU6v3Qtp3/izXeU6wbRSMgWgIDCdyRVGKzfmB71mYWHd
+EaC6Yjffyq3vEoYeiAZm/XF1mL1rnES5GmQLHqo3rq2G+nYUzFHmwmbDgWLW1p8O
+0vtgMHXbP87y7jGmK4y1/krOMX8iVRKfkzr/ykdVR8BwbH62lwYC1yy4EF5NtUVv
+wjckPlr9p6UQaqp04mNngzE4czix6yj3mVmc8QmNzZOIHuPSWA09/reSXxiqElQW
+g1JiPLXVh1V3DcHnzmiRGyAcckVA9c6Nza1ixNcO+DUa7TK5NhgitC6B6y6EOkkw
+QSmspgTV/qvcGVeGFNi0t+FnEC2uVXG78FMwwbfzbB9dXl3JSRTaQXkaYkfal70M
+5LQx2RmBpquga1DOExWmiSQv4q0Qv96c1VDI9MxYLbiZjfsMvAfDHWFPs7MnYNm0
+YA3JrOGgME17WtzgPtbz
+=W8jd
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-2.1.1.ebuild b/dev-vcs/git-cola/git-cola-2.1.1.ebuild
new file mode 100644
index 000000000000..e9dbb9d21dfe
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.1.1.ebuild
@@ -0,0 +1,111 @@
+# 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.1.ebuild,v 1.1 2015/02/05 10:26:31 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+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"
+
+REQUIRED_USE="doc? ( python_targets_python2_7 )"
+
+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}]
+		dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')]
+		)
+	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
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+		VIRTUALX_COMMAND="nosetests --verbose \
+		--with-id --with-doctest --exclude=sphinxtogithub" \
+		virtualmake
+}
+
+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 "${ED}/usr/share/git-cola/bin/git-xbase"
+	python_optimize "${ED}/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
+}