5 files changed, 96 insertions, 0 deletions
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
new file mode 100644
index 000000000000..c752a7621104
--- /dev/null
+++ b/dev-util/cdiff/Manifest
@@ -0,0 +1,7 @@
+AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 SHA256 70e82adad4c75d669e9b4ef2363d8b2d47d1603189345a50857619cf4dd2fcff SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9 WHIRLPOOL b96203035ecab6371adb662ff5467d212e311153a28d3fdd4af1fe391dfd91785a136ce7f55b0dc3b2fae05fd72c4ec7b765ec3ae9da8fbe1111aa5f948e4506
+DIST cdiff-0.9.8.tar.gz 34861 SHA256 61229ba5b294faa8b4c257a220cfda34ac4a7ecf35aa88e8121c36234fea3760 SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3 WHIRLPOOL a49f492746fba7af7869408bdfcb4ae2accfb78f9b999d49763f35fbfddb58ac96ae9a734e22441a0b9d060d89de56704f09762c1af10c059851e280a348156b
+EBUILD cdiff-0.9.8.ebuild 783 SHA256 9f9fca4b2d7b09b6f984bf5abeef7997ae35c5e78f8d00a162d2e6f86365f9af SHA512 08857ef6c8f2d2483fdff53eadbc0e491c20b22a3626c8247ab4c4df4c60e12cda0969cfa091c13e628afab0ae6908581ee35846223d265b439d068a2af8e16f WHIRLPOOL 4bba2ad03aa4b2aad143da24a40379cb32ea627887fe24d5ab4fa27d22159209fde7435041c1a6036a7547cff30bd23e02284214348ed8940f0d4055822575a0
+EBUILD cdiff-9999.ebuild 787 SHA256 1134352c45148d4dd38245a45ddac99196f6e868813a5f0787f118ea7d1d6e71 SHA512 80e6bd4d06bd8dba869f9d1111ade351ff5ef9649ca59690f171e8d0a7983b11b234e408ed8ead069d94bdf13f13cf1c108eb7f92c2d675e5fbc107808b3e936 WHIRLPOOL fa711d9b0d396ae17e0a14dbe6bd55f7bf78d642de7af1eb71282a5f109baf2868ecc6b156124c850b679963f2e18de2f8cabe4f6e4509fe5620a2782d26482b
+MISC ChangeLog 4026 SHA256 74cb35d1f84421383d57094b0c56e1228e8ce1cfc02ca94ec5058912ab221913 SHA512 742e5d9923cf2aac4549500e802f38d548b9e6e127023fdb5fc088a5ef388008ebc6f7b6bd5bfaa5d02003ad957fcd30df48f293bf4a22f2ad1eac0a01e20e24 WHIRLPOOL c6c4d969dbd6f00a8792a1a7eb107547ab8d3c7885b123239c5a9d5464fbd359df81ffb39214603f610b2ec3d2be1b9775ab16c44c6d70ab82e6981ea0faba46
+MISC ChangeLog-2015 5192 SHA256 530bc093bedc57e718642964fa3ef0edd502b1880edac135c6ffa936bc60f392 SHA512 ae2e18ca68a380617a298b8a63a456cbec00ab40644565072842c872575c4d9249787991ed40d938cbe0062f9d3495dbefcd40408903a4f2977549953f971adf WHIRLPOOL fa550207d04bd4031ae32cebffe72ad259ff6b3fc6c8da07431ce665a6872dd63199e8512a2c5051a87515e511fabe678ed112b5cca60a105fba8a942f65e5ca
+MISC metadata.xml 383 SHA256 328518abaf3012c730c4260e7e90eeca43c52d8d6ed988524ff1403ad3e6ce16 SHA512 c797a47d8258e3aff9bf93328566438192a37c166733e84fd6846ecccb77ea0398c82dd9abbbe90623d4a1fa33405c75ed1defeb832cb2e55b754d3a594bba5f WHIRLPOOL ea96e77b173f44f1c77e16dc2e43c13dfc28d319ab34f3e3463b3af911441f4b397e91701ee8f60768b3cb1b861bdada7df55948c791a5e8c218cc9af41a4acf
diff --git a/dev-util/cdiff/cdiff-0.9.8.ebuild b/dev-util/cdiff/cdiff-0.9.8.ebuild
new file mode 100644
index 000000000000..0b2159815163
--- /dev/null
+++ b/dev-util/cdiff/cdiff-0.9.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Colored, side-by-side diff terminal viewer"
+HOMEPAGE="https://github.com/ymattw/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+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
new file mode 100644
index 000000000000..0052610eb3f9
--- /dev/null
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Term based view of colored, incremental diff in a Git/Mercurial/Svn workspace"
+HOMEPAGE="https://github.com/ymattw/${PN}"
+EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+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/files/cdiff-0.9.2-disable-unimportant-failing-test.patch b/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
new file mode 100644
index 000000000000..50b00cc5a46e
--- /dev/null
+++ b/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
@@ -0,0 +1,11 @@
+--- a/tests/test_cdiff.py	2013-03-24 15:08:00.000000000 +0100
++++ b/tests/test_cdiff.py	2013-06-23 01:17:20.560520188 +0200
+@@ -737,7 +737,7 @@
+         os.chdir(self._non_ws)
+         ret = cdiff.main()
+         os.chdir(self._cwd)
+-        self.assertNotEqual(ret, 0)
++#        self.assertNotEqual(ret, 0)
+ 
+     def test_read_log(self):
+         sys.argv = [sys.argv[0], '--log']
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
new file mode 100644
index 000000000000..8298304ad283
--- /dev/null
+++ b/dev-util/cdiff/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+    Colored, side-by-side diff terminal viewer.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">cdiff</remote-id>
+    <remote-id type="github">ymattw/cdiff</remote-id>
+  </upstream>
+</pkgmetadata>