Version Bump

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

5 files changed, 71 insertions, 27 deletions

diff --git a/dev-util/cdiff/ChangeLog b/dev-util/cdiff/ChangeLog
index 17e93bb5c8ff..969cd6c04877 100644
--- a/dev-util/cdiff/ChangeLog
+++ b/dev-util/cdiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cdiff
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.32 2015/04/08 17:54:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.33 2015/05/05 17:10:15 jlec Exp $
+
+*cdiff-0.9.7 (05 May 2015)
+
+  05 May 2015; Justin Lecher <jlec@gentoo.org> +cdiff-0.9.7.ebuild,
+  cdiff-0.9.6.ebuild, cdiff-9999.ebuild:
+  Version Bump
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> cdiff-0.9.6.ebuild,
   cdiff-9999.ebuild:
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 14179b9b20e7..00423c259ee7 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 SHA256 70e82adad4c75d669e9b4ef2363d8b2d47d1603189345a50857619cf4dd2fcff SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9 WHIRLPOOL b96203035ecab6371adb662ff5467d212e311153a28d3fdd4af1fe391dfd91785a136ce7f55b0dc3b2fae05fd72c4ec7b765ec3ae9da8fbe1111aa5f948e4506
 DIST cdiff-0.9.6.tar.gz 30751 SHA256 a2fe898344f80ff5ecfd1d4bea7908422aeb0193f58b7669b485b8f7f978ae1b SHA512 8ae4d3dd26a53ba806f750736d7fcdddcae435d9492045e7ec57fa4b818125d0fe0f015d23910f393fa729b1c010ba3bf7bc5144f4794fe178a8a3e25d830480 WHIRLPOOL b799956392ea7b650b14d7073248a7a436281b5bbe6f11a53fe1c792543b46b279da24c795fb9bc49d1b4b35bee8518fd97e4486cc6cde3c8f932f828b2d35ce
-EBUILD cdiff-0.9.6.ebuild 1025 SHA256 082fa96452219bc8e220dd5b3181fc004e9c25eda0b915b742b3aeb8e6fb88f3 SHA512 9a44eb67d5bf5bd0020a55ff1201abc084a02339b723494fb4ef66e449b3e416e71f0a507bd3145d37f57a760eb87e1d39c06c7a8f1a143bfe75f5703b9c471b WHIRLPOOL 9c97aa3b75b8f39c14c7c2ee2609f811198df1a235d877e8fd1edab624b8057c809337b234f28c28b2d564914a9b83b35327e444074a376230bdf2644a7b7d38
-EBUILD cdiff-9999.ebuild 1026 SHA256 24e2dc83ef41efe8fb49673fcc4dca7a5d9545ed375223bc2a2b81f390a9cd63 SHA512 daa2f6ae3b2c98a2fd164418c626bf0bd1fbb60f1bf0f2a1f111effb3e451f33f35f0cd1c927be80843f0a4e923a8a77b1ef953c34c9b17b8b9f1b9a9551f1df WHIRLPOOL be1aefd9970f1283a38a85129c92f06a0d8e77fa5c39c83cc838c4a20f1100706a03770ab33a25f3e3df2059afe82b35da20bb8198645f14efe282775c2f1d19
-MISC ChangeLog 4939 SHA256 b7bbdae26b2afb5fb27bb60aa6e4085d45032e7d67d8149d7bd1069675008759 SHA512 b5377ee51783f12efead6bba35502b40dd4e066363039a2400a6ce55c69bf1204237f51c67cd51bb4730fa3b2eb96d61d7fd93cfdcd4fa82e74acf86b0f28a00 WHIRLPOOL 1eb129f0b04635612f86e5dca8a4d1e861730f1790c5d3899b48bbd0586d75632332b45df085a70500440b012bf692c8d182d089ec78b0051d6c33cbae2dc258
+DIST cdiff-0.9.7.tar.gz 32061 SHA256 63b7f1037cbcf5ce76b56cd4e5643751e25e0c2a124bcd382af827651d81ca90 SHA512 2f2bf77ecc6e369325753c5d1c6fd23279138e8ae6a4d11cd102b5674d5c7e089e7f2613bbd39d68a00b0db16c589df64af14746228e38065556d0eb11b1e0cd WHIRLPOOL c26cb5df0b02b3567fa334ab2fe131ee99742b782d1bc8e83a4f06476c03d8242bbdc8489cec07ffb49ada0f5404c192c69765e3d9835fdf5feb944f8bb0e703
+EBUILD cdiff-0.9.6.ebuild 1002 SHA256 570658f33a905a192770f7d2d7df43a6f2d674e085156d07ed433672876568ad SHA512 803aa4792eac6a48620dbe85d76581934930c1d176b812a88cc45413da0bf4a570232732ed619daa2ffbfbe5ce25d391003074c1a65cf68ecae66db625d70ffd WHIRLPOOL d3953373b7ce61ef57547dc9f5c475415153f1a1d930501229d1197c32ebaf768eac98dd7c8406e03c9aabeaf7ad8b69ce1644b7db225e28eed60d003ce83695
+EBUILD cdiff-0.9.7.ebuild 1007 SHA256 fcbc3e5abb4066393f80666f4e8e161d7fae5b0b54c034e8423a98ff6d591b24 SHA512 0bcdb1db13cdbeb4ac27ec6023f78f5cfd554a52c6d63868f94f24f0e5c8e582a0c6520421bffe1d9835f5c894a1a0acb2af5f321f87ea0203e2166a55cc153a WHIRLPOOL 69cfa91af314d04b66458c0b3ed29cae172df981b9cd2b72fbdc46b26846a332027c0356df4cf3401e15297bf3754a8d3124ec344fce9279186c75bd313fcae4
+EBUILD cdiff-9999.ebuild 1003 SHA256 445aadfa6a4e3ceb56eb10b0dd5a874fe557bd13da4bc00f7d575ef7c541cc17 SHA512 8e07729e969a6e196b0b97491be13c89aaed36d922abae27c49a0cd2ae85021e0200cab4f8d9a9c677bc351f09005fb2408dc7ce4aaca2579e1c5684b2594532 WHIRLPOOL 9eaa4737ac58fc27cf96f8f2f82cf9cee6d44c750dffa4ff4f2495c583714497dc2ed08cf64d586e788c26b8e7c38cd9f07661ad1353e8e28c90a5ce2746822e
+MISC ChangeLog 5090 SHA256 70d505ca12a32680f27afc0c214c5a1023b7692a5afe8a5891a8b16c9c644a31 SHA512 8f67270d3949428f842b72b60a119c289c7a180e3c5fee5d5dabcfc58d520dda0a1483751a3084f182bf8f6025125b1963ea7c89334081a724a108cbf67fd329 WHIRLPOOL 92f77481f921db734a6518de7f50c06d5825f23afa3c98dcda899cb9350da373fb29951f0c63a6382e24f864d8f4cb90ad054877e41f7c3f35afd79b65ff9701
 MISC metadata.xml 325 SHA256 dee6cddf57c314910ab9b015da8a521077e1027ab1e4badaba2e72256af5f860 SHA512 1b2b97f7e3ef635c0e363bf96edf915b432c4d669c3f47da4545755107cf284e9ecd21ef88b44afdd5104aea5fb63fc92c28a92f9481368107d3cef2e477edb4 WHIRLPOOL 45267048ab34bca25bbb909d72ed2bc23152809f9f62c4251ed02971ed32ea6cb9743951335d8062404e5ca1bc93525ed9d91bcbc646a7b6fea217a8c13daa4e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVJWtQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOokUP/RCo9c45IQkW9Ov3YI3M7tAa
-qJl3JgNuY2uArYGdqEG6I8xSyK4oXkWaZ98hvQW7TOdN1NrYx6/4B3oSjsaVnQsR
-qdI19dPixIczpAjmwMY0tIor0pY+oYunfT8s6KUSUto82VP8HU5bqw+2Fw8k+z9x
-wM+zzYgC0FqO5ljAH00kSZBVs6bapiNR243zNsf2fnan2kOuzeixyj3w6/q3lwbZ
-UAXYE240kWzNfDcjSu+YPrMQJR2Kige4CmOXnHj99PcXCxOgLN4pAVyxh1Iz/phP
-owZ6qf4OMEkBXWMkJD4AQp9Bd9Gmw0xquON6oGIHXANMYReJ2aCmfUGtYrUFpa58
-uTB+eTZwQ/WQLvyiwY1i6WKjFxhL9qPG2ZkVo3X1YTnvj97LiTMgBQThxugu59sR
-Gmmfevv0sfDSLTtG93xBev2qcIOl6BimpSCxn4cfVZDIbCrohzShHfyPFTjefpt+
-cpZYIbSI2sBwUqlU2BTYPESg+wPoFRydmsnqi81Srw9gh6difs1ZA11rSaXacUMx
-EdCqZH8zsGAP3L2JFud9H1/UHCdC/+Qainb2EDBUcsqyX4cdICxhGCuL9tqgG/sT
-3PszQVO/pS3aIKeHcEMt1074J2j6qhGhjecwD0DIfgjGqFvKPfrQFVJ8wvuikyfU
-+WzSdwpAd70cFu5W7KWT
-=05Tw
+iQJ8BAEBCgBmBQJVSPl4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirKtEQAJeGsosRc3kIn89wWXltyhzc
+antIBmFYDw3J6TI9ca1b65qRdgmpxitNgit7ylvg/gXPN2ubPfA3H+1laE8XM9Xq
+hfifr2e7sJ0/8xqs9e9XHgQx2/ftaN0OU0iW593Lk3SsJp2nZWmSNllvWmwg5yBM
+8cBoCiD7IZUsWZ3GJG+PgM3CONsYysdlFa/k2GEpQEjwZJsJAOn2ElMvdfccHXUb
+repNsAKF/6BOG7I2SfiFz6vQamcHNjGrrUMpTfp7lbrQMclzn22OaTUFfv81M4IQ
+dN/biaUoGH3lgUXwe4nYYEG5SnjGy/chOkJTb+XY4wZk3ayQ6YGU+ojbWb0aoXsr
+VqA3XNtbyAHN51BzS//T3Igzu0EaNYrgHDPLegVNuxnACjLRSaEXbcqNg5ch+npQ
+sO1kWx2rDBtjK7Mfv2bNxWMflyrLfu2Gm9arejD01vXunDrSbwY091rijG8BBzVj
+yNgRIMpywNYlRg+S+rUmQAiizCemISSz8b9Bq3qRZuN0ZkEoZ4RpzJqtEB6bVMC6
+gdOFebh73NdsrjxsDe0f//Ai5HW8B5UtyqvlnXQCK4xTvDCz5eJq222IR+EciI9f
+tGMaESd+RCudowff4TPldgPjbWqlPcCgqjCtmLKK0JrzPNkECG+tvHu7Dxacgp5b
+TCL6lo9elwMUJlAmBX5I
+=pBeM
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cdiff/cdiff-0.9.6.ebuild b/dev-util/cdiff/cdiff-0.9.6.ebuild
index 2e5f84073879..8da889f6dc38 100644
--- a/dev-util/cdiff/cdiff-0.9.6.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.6.ebuild,v 1.4 2015/04/08 17:54:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.6.ebuild,v 1.5 2015/05/05 17:10:15 jlec Exp $
 
 EAPI="5"
 
@@ -35,8 +35,6 @@ PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
 DOCS=( CHANGES.rst README.rst )
 
 python_test() {
-	python_export_best
-
 	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
 
 	./tests/regression.sh || die "Regression tests failed."
diff --git a/dev-util/cdiff/cdiff-0.9.7.ebuild b/dev-util/cdiff/cdiff-0.9.7.ebuild
new file mode 100644
index 000000000000..b9e5c2dc9271
--- /dev/null
+++ b/dev-util/cdiff/cdiff-0.9.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.7.ebuild,v 1.1 2015/05/05 17:10:15 jlec Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+if [[ "${PV}" != *"9999"* ]] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+else
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
+	inherit git-r3
+fi
+
+DESCRIPTION="Colored, side-by-side diff terminal viewer"
+HOMEPAGE="https://github.com/ymattw/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="
+	!<app-misc/colordiff-1.0.13-r1
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
+
+DOCS=( CHANGES.rst README.rst )
+
+python_test() {
+	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
+
+	./tests/regression.sh || die "Regression tests failed."
+}
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 2ba976b7e7e7..fb96304ba4a1 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-9999.ebuild,v 1.5 2015/04/08 17:54:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-9999.ebuild,v 1.6 2015/05/05 17:10:15 jlec Exp $
 
 EAPI="5"
 
@@ -35,8 +35,6 @@ PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
 DOCS=( CHANGES.rst README.rst )
 
 python_test() {
-	python_export_best
-
 	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
 
 	./tests/regression.sh || die "Regression tests failed."