gentoo resync : 14.07.2018

6 files changed, 128 insertions, 0 deletions

diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
new file mode 100644
index 000000000000..93c9a43b8498
--- /dev/null
+++ b/dev-util/cdiff/Manifest
@@ -0,0 +1,7 @@
+AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 BLAKE2B 4dfd4cdff8c71ba3cc160317d27a5bf26b2c5ed0d1278403dd7c5ad2a07e0b55759ec8c67c50b5d36aa1a8912f2b4f653fdb0b7ad1b36865367e28a433ebc4d7 SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9
+DIST cdiff-0.9.8.tar.gz 34861 BLAKE2B 2b9637c924cb6d2cf436386163af35a0931a1999caa9e63b3a350aef4db32f3c4be82cb1608adb0100d3e96b0b969ae5ca7e870be0fc03055a17f7118a26931d SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3
+DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe
+EBUILD cdiff-0.9.8.ebuild 783 BLAKE2B fc5c4f5c595940e8a36823349a7a5513fb80a59ceff26a88e34e04e7295b8a709abebb65fc068f13a82a517aa8bf0391e66791efb28457f827aceaecd6aa1c90 SHA512 ac5a69cd3dd6804219f77720d045945ed866d43815445581e39adf0d05ca294600000df3e7aadf887203b555749e3fdf6cc1bf4c6fb599049ff5db745f774a13
+EBUILD cdiff-1.0.ebuild 716 BLAKE2B 3a128a2dc5e35a40238e1e73e5085f90a211808f25041fdedc041647ae5f5940605ea47716705957637ad8774f4bf021c2a5dc1b8b5806ffac61c775ad3872ef SHA512 f4c225982bf50ed5af0011c8277f7dfd03d7d1da150bd7bb0a8995d1cceeb7b59363f1c5cc2c52faecd427b6a216ad6becec1fb211c4ff4b2d8c2958ca102695
+EBUILD cdiff-9999.ebuild 752 BLAKE2B dab28fae8a7d15a2b630ab794b3c388fbe6caf5fc011c8f3dea1451f5f388bd19ce5692e01699dee07df1c3c2c86e31ba392c4df2d3eca95ecf8b05a881c949c SHA512 68046d783fd8421ae93bb2094a6b46728b60955ac2d1e74c89657ef7e7740785db7eb8f5ded27fe99ca229545de49ecce09dbdc62e624a5f63f66d28545ae4b2
+MISC metadata.xml 383 BLAKE2B c2fba0c9ed05af593bf10ae733401d7de8a1396c22094ba912418a796783e069243506edfa72cfb1a706f63c0bcbc5cfb0321b21a5d699a726901ccae682a32f SHA512 c797a47d8258e3aff9bf93328566438192a37c166733e84fd6846ecccb77ea0398c82dd9abbbe90623d4a1fa33405c75ed1defeb832cb2e55b754d3a594bba5f
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..a38fa1a360dd
--- /dev/null
+++ b/dev-util/cdiff/cdiff-0.9.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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/cdiff"
+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-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
new file mode 100644
index 000000000000..010b3b89ab78
--- /dev/null
+++ b/dev-util/cdiff/cdiff-1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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/cdiff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	!<app-misc/colordiff-1.0.13-r1
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES.rst README.rst )
+
+RESTRICT="test"
+
+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..9d071be628c7
--- /dev/null
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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="Colored, side-by-side diff terminal viewer"
+HOMEPAGE="https://github.com/ymattw/cdiff"
+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>