summaryrefslogtreecommitdiff
path: root/dev-util/cdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-03-03 13:42:34 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-03-03 13:42:34 +0000
commit066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree3cb05783d73b2c33589ba305144a31c718e123cd /dev-util/cdiff
parent16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
gentoo resync : 03.03.2019
Diffstat (limited to 'dev-util/cdiff')
-rw-r--r--dev-util/cdiff/Manifest4
-rw-r--r--dev-util/cdiff/cdiff-0.9.8.ebuild33
-rw-r--r--dev-util/cdiff/cdiff-1.0.ebuild2
3 files changed, 2 insertions, 37 deletions
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 9a4384164384..c3c592ebc929 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,7 +1,5 @@
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 712 BLAKE2B b44804886c63bb5aa739199f28b9ff03f42a4a0442ef5d8a2d4539e7769a10930b50a2ce3cbdd9d9d49071ed67d5439541c18d674e9c658538b613ba36ec335d SHA512 e0157c81572d4a0d385706ea63d2cd5b79b9a1d35fe7f9ffb6763f99c22dbf51b0d182fa3ce9c0e44196cc70376377bc2552b8727fe3e9f35be1ade736f72ad2
+EBUILD cdiff-1.0.ebuild 711 BLAKE2B 7877ede0ba03803d4527dde659f5312bea4c3126c82447d36e3527a46a8cf981d86da6b1dd7a0dac880a2236af1747fc76c918c692b7e7bc92c6c10edab64d47 SHA512 5444aad617de87c0bd6234db67705f6be50f984591b259fa4f6a3d01f54c3363a4cf5a0fba860d010a8da60625d0a7fd45b09d7610a31babd16792a35f02fb7a
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
deleted file mode 100644
index a38fa1a360dd..000000000000
--- a/dev-util/cdiff/cdiff-0.9.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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
index e30bb906a508..44e8bc31bed3 100644
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ b/dev-util/cdiff/cdiff-1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
DEPEND="
!<app-misc/colordiff-1.0.13-r1