commit: 62f7495f92dc2c173f9ff189a7b354de4f3279b8 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Jul 13 04:53:38 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Jul 13 04:53:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f7495f
dev-util/cdiff: Remove last-rited pkg Closes: https://bugs.gentoo.org/710538 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-util/cdiff/Manifest | 1 - dev-util/cdiff/cdiff-1.0.ebuild | 31 --------------------- dev-util/cdiff/cdiff-1.1.ebuild | 21 -------------- dev-util/cdiff/cdiff-9999.ebuild | 32 ---------------------- ...ff-0.9.2-disable-unimportant-failing-test.patch | 11 -------- dev-util/cdiff/metadata.xml | 9 ------ profiles/package.mask | 5 ---- 7 files changed, 110 deletions(-) diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest deleted file mode 100644 index ddb8ebc017c..00000000000 --- a/dev-util/cdiff/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild deleted file mode 100644 index c3187506572..00000000000 --- a/dev-util/cdiff/cdiff-1.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -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=" - 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-1.1.ebuild b/dev-util/cdiff/cdiff-1.1.ebuild deleted file mode 100644 index 173ec06646e..00000000000 --- a/dev-util/cdiff/cdiff-1.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Colored, side-by-side diff terminal viewer" -HOMEPAGE="https://github.com/ymattw/cdiff"; -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -DEPEND="" -RDEPEND="dev-util/ydiff" - -S="${WORKDIR}" - -src_install() { - dosym ydiff /usr/bin/cdiff -} diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild deleted file mode 100644 index 3b5ae5181b2..00000000000 --- a/dev-util/cdiff/cdiff-9999.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python3_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=" - 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 deleted file mode 100644 index 50b00cc5a46..00000000000 --- a/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 4ec31f8291a..00000000000 --- a/dev-util/cdiff/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="pypi">cdiff</remote-id> - <remote-id type="github">ymattw/cdiff</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 381b89f08e1..c5450c2ebd7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -405,11 +405,6 @@ app-misc/ifp-line # regarding runstatedir (not using /run). =net-misc/networkmanager-1.22.10-r11 -# Michał Górny <mgo...@gentoo.org> (2020-06-05) -# Replaced by dev-util/ydiff, after upstream rename. -# Removal in 30 days. Bug #710538. -dev-util/cdiff - # Stefan Strogin <ste...@gentoo.org> (2020-06-03) # Masked for testing >=dev-libs/libressl-3.2.0
