gentoo resync : 14.07.2018

5 files changed, 83 insertions, 0 deletions

diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
new file mode 100644
index 000000000000..b0ce4662ab36
--- /dev/null
+++ b/app-misc/icdiff/Manifest
@@ -0,0 +1,6 @@
+AUX icdiff-1.7.3-dont-check-changelog.patch 546 BLAKE2B 28a4ea2becc7f9fb57a6bbcb648b4c61d0c0911e1df463cf1a566cee3e8916f3cc41f57fc912a05f733d0a73010b05e8d4ec6b2d0235edec4982a43ac2689225 SHA512 e3cf4f6238b3d49b6f3b1ce42a340815c535bc7482af22e722d0f5afcb0e3bbb1771b9de4a76fa77f5abe47b7b2f7c4b27e933e9e6a27d48b020975e95a7abc0
+DIST icdiff-1.7.3.tar.gz 20215 BLAKE2B 9946506e91d3d49144f2a997fcd364831b8ecc07a22cb79549a3751d53d682970ad555160959cbd58fdd4984023fe598df10926a6d4c7b72eb4c1eaa36236c41 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
+DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
+EBUILD icdiff-1.7.3.ebuild 624 BLAKE2B 5c1c29e71507e180ad94d9b9a5eb57efaaddd1d149e847d08e42dec3434ed316b2d91d05119e37187467db934773f0923233334ab93001cd0615601c4a002fb6 SHA512 b128bb425e20d560a9c7fc6d38010dbe1e7cd0eb39b24bc59418684bcfda3b515f2466dfebb809a6c09cd3a9890976ee9c8e73f5f0b5d7e03119c60235129f38
+EBUILD icdiff-1.9.1.ebuild 555 BLAKE2B 25455ee6e61775f8532794d5d1f5f9b967bf2bec53bcc7dab3122511361a4809d3b12a596c79605f16b536e08993a13d69d0d5bef633294e8cc50fcbc8564c9c SHA512 a17a7cd1edf56ee343eb69f76c29e0413e47ad5ded2eb2af059a09e607ec76613ec86a7b8524881b171dc9741a2a1e1858716361988215057dc9ca376b33497d
+MISC metadata.xml 342 BLAKE2B f87cbd730938f6bdefcadea3d8c3d0635466b3e25597d1a5b8e7c85b6c8855698a19b29049c5b6e596696d15a91481527d16f83adc5c7ffaad39937d7bb9b951 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed
diff --git a/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch b/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch
new file mode 100644
index 000000000000..1a9f0c957cd5
--- /dev/null
+++ b/app-misc/icdiff/files/icdiff-1.7.3-dont-check-changelog.patch
@@ -0,0 +1,16 @@
+diff --git a/test.sh b/test.sh
+index 264c696..1bb7290 100755
+--- a/test.sh
++++ b/test.sh
+@@ -97,11 +97,6 @@ check_gold gold-67-wf.txt           tests/input-{6,7}.txt --cols=80 --whole-file
+ check_gold gold-67-ln.txt           tests/input-{6,7}.txt --cols=80 --line-numbers
+ check_gold gold-67-u3.txt           tests/input-{6,7}.txt --cols=80 -U 3
+ 
+-if [ $(./icdiff --version | awk '{print $NF}') != $(head -n 1 ChangeLog) ]; then
+-  echo "Version mismatch between ChangeLog and icdiff source."
+-  fail
+-fi
+-
+ if ! $REGOLD; then
+   echo PASS
+ fi
diff --git a/app-misc/icdiff/icdiff-1.7.3.ebuild b/app-misc/icdiff/icdiff-1.7.3.ebuild
new file mode 100644
index 000000000000..c1f6ccba26d9
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.7.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="https://www.jefftk.com/icdiff"
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.3-dont-check-changelog.patch"
+)
+
+DOCS=(README.md ChangeLog)
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_test() {
+	./test.sh "${EPYTHON%.*}" || die "Tests failed"
+}
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
new file mode 100644
index 000000000000..ba4846bf4425
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -0,0 +1,23 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="https://www.jefftk.com/icdiff"
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=(README.md ChangeLog)
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_test() {
+	./test.sh "${EPYTHON%.*}" || die "Tests failed"
+}
diff --git a/app-misc/icdiff/metadata.xml b/app-misc/icdiff/metadata.xml
new file mode 100644
index 000000000000..392b1b8c731f
--- /dev/null
+++ b/app-misc/icdiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jeffkaufman/icdiff</remote-id>
+  </upstream>
+</pkgmetadata>