* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2015-12-09 12:01 Justin Lecher
0 siblings, 0 replies; 16+ messages in thread
From: Justin Lecher @ 2015-12-09 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 6601b6158523f7816d40240a9ec35e5cba18ebae
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 11:57:43 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 12:01:29 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6601b615
dev-util/cdiff: Clarify description
Clean live ebuild code from normal ebuilds
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567826
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-util/cdiff/cdiff-0.9.6.ebuild | 14 ++++----------
dev-util/cdiff/cdiff-9999.ebuild | 19 ++++++-------------
2 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/dev-util/cdiff/cdiff-0.9.6.ebuild b/dev-util/cdiff/cdiff-0.9.6.ebuild
index 251fa11..e16cd6e 100644
--- a/dev-util/cdiff/cdiff-0.9.6.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.6.ebuild
@@ -8,20 +8,14 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1
-if [[ "${PV}" != *"9999"* ]] ; then
- KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-else
- KEYWORDS=""
- EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
- inherit git-r3
-fi
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
+DESCRIPTION="Term based view of colored, incremental diff in a Git/Mercurial/Svn workspace"
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
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 8bbe3dd..dba6398 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -4,30 +4,23 @@
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
-inherit distutils-r1
+inherit distutils-r1 git-r3
-if [[ "${PV}" != *"9999"* ]] ; then
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-else
- KEYWORDS=""
- EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
- inherit git-r3
-fi
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
+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 )
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2016-01-21 8:33 Justin Lecher
0 siblings, 0 replies; 16+ messages in thread
From: Justin Lecher @ 2016-01-21 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 50bcd3f708b3ac9e9fed2bfc0cad267bdf1d93b3
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 07:36:56 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 08:33:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50bcd3f7
dev-util/cdiff: Version Bump
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-util/cdiff/Manifest | 1 +
dev-util/cdiff/cdiff-0.9.8.ebuild | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index f51d6d1..a6353a1 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,2 +1,3 @@
DIST cdiff-0.9.6.tar.gz 30751 SHA256 a2fe898344f80ff5ecfd1d4bea7908422aeb0193f58b7669b485b8f7f978ae1b SHA512 8ae4d3dd26a53ba806f750736d7fcdddcae435d9492045e7ec57fa4b818125d0fe0f015d23910f393fa729b1c010ba3bf7bc5144f4794fe178a8a3e25d830480 WHIRLPOOL b799956392ea7b650b14d7073248a7a436281b5bbe6f11a53fe1c792543b46b279da24c795fb9bc49d1b4b35bee8518fd97e4486cc6cde3c8f932f828b2d35ce
DIST cdiff-0.9.7.tar.gz 32061 SHA256 63b7f1037cbcf5ce76b56cd4e5643751e25e0c2a124bcd382af827651d81ca90 SHA512 2f2bf77ecc6e369325753c5d1c6fd23279138e8ae6a4d11cd102b5674d5c7e089e7f2613bbd39d68a00b0db16c589df64af14746228e38065556d0eb11b1e0cd WHIRLPOOL c26cb5df0b02b3567fa334ab2fe131ee99742b782d1bc8e83a4f06476c03d8242bbdc8489cec07ffb49ada0f5404c192c69765e3d9835fdf5feb944f8bb0e703
+DIST cdiff-0.9.8.tar.gz 34861 SHA256 61229ba5b294faa8b4c257a220cfda34ac4a7ecf35aa88e8121c36234fea3760 SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3 WHIRLPOOL a49f492746fba7af7869408bdfcb4ae2accfb78f9b999d49763f35fbfddb58ac96ae9a734e22441a0b9d060d89de56704f09762c1af10c059851e280a348156b
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 0000000..4a10fec
--- /dev/null
+++ b/dev-util/cdiff/cdiff-0.9.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} 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."
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2016-02-14 17:54 Justin Lecher
0 siblings, 0 replies; 16+ messages in thread
From: Justin Lecher @ 2016-02-14 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 91fc63a43ab3769a50c1039c70df12da2b3eb7d2
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 17:50:27 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 17:54:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91fc63a4
dev-util/cdiff: Drop old
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-util/cdiff/Manifest | 1 -
dev-util/cdiff/cdiff-0.9.6.ebuild | 35 -----------------------------------
2 files changed, 36 deletions(-)
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index a6353a1..32f47e4 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,3 +1,2 @@
-DIST cdiff-0.9.6.tar.gz 30751 SHA256 a2fe898344f80ff5ecfd1d4bea7908422aeb0193f58b7669b485b8f7f978ae1b SHA512 8ae4d3dd26a53ba806f750736d7fcdddcae435d9492045e7ec57fa4b818125d0fe0f015d23910f393fa729b1c010ba3bf7bc5144f4794fe178a8a3e25d830480 WHIRLPOOL b799956392ea7b650b14d7073248a7a436281b5bbe6f11a53fe1c792543b46b279da24c795fb9bc49d1b4b35bee8518fd97e4486cc6cde3c8f932f828b2d35ce
DIST cdiff-0.9.7.tar.gz 32061 SHA256 63b7f1037cbcf5ce76b56cd4e5643751e25e0c2a124bcd382af827651d81ca90 SHA512 2f2bf77ecc6e369325753c5d1c6fd23279138e8ae6a4d11cd102b5674d5c7e089e7f2613bbd39d68a00b0db16c589df64af14746228e38065556d0eb11b1e0cd WHIRLPOOL c26cb5df0b02b3567fa334ab2fe131ee99742b782d1bc8e83a4f06476c03d8242bbdc8489cec07ffb49ada0f5404c192c69765e3d9835fdf5feb944f8bb0e703
DIST cdiff-0.9.8.tar.gz 34861 SHA256 61229ba5b294faa8b4c257a220cfda34ac4a7ecf35aa88e8121c36234fea3760 SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3 WHIRLPOOL a49f492746fba7af7869408bdfcb4ae2accfb78f9b999d49763f35fbfddb58ac96ae9a734e22441a0b9d060d89de56704f09762c1af10c059851e280a348156b
diff --git a/dev-util/cdiff/cdiff-0.9.6.ebuild b/dev-util/cdiff/cdiff-0.9.6.ebuild
deleted file mode 100644
index e16cd6e..0000000
--- a/dev-util/cdiff/cdiff-0.9.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Term based view of colored, incremental diff in a Git/Mercurial/Svn workspace"
-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."
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2016-02-25 14:30 Patrice Clement
0 siblings, 0 replies; 16+ messages in thread
From: Patrice Clement @ 2016-02-25 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 2327488ab21e21811158c0d6873a8567ff6baf2e
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 14:13:17 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 14:17:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2327488a
dev-util/cdiff: package maintained by the Python project.
Package-Manager: portage-2.2.26
dev-util/cdiff/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
index eb47fa9..504cec7 100644
--- a/dev-util/cdiff/metadata.xml
+++ b/dev-util/cdiff/metadata.xml
@@ -8,4 +8,8 @@
<remote-id type="pypi">cdiff</remote-id>
<remote-id type="github">ymattw/cdiff</remote-id>
</upstream>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2017-04-23 20:48 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2017-04-23 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 7b9f31e1e322a606a626deb7da5c4a8b16889b05
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 20:34:21 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 20:47:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b9f31e1
dev-util/cdiff: Remove python@ from maintainers
dev-util/cdiff/metadata.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
index 504cec773f6..8298304ad28 100644
--- a/dev-util/cdiff/metadata.xml
+++ b/dev-util/cdiff/metadata.xml
@@ -1,6 +1,7 @@
<?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>
@@ -8,8 +9,4 @@
<remote-id type="pypi">cdiff</remote-id>
<remote-id type="github">ymattw/cdiff</remote-id>
</upstream>
- <maintainer type="project">
- <email>python@gentoo.org</email>
- <name>Python</name>
- </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2017-04-24 9:31 Pacho Ramos
0 siblings, 0 replies; 16+ messages in thread
From: Pacho Ramos @ 2017-04-24 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 415b5d9817601d33b62bcb0d46f9e8d32647d425
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 09:21:02 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 09:31:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=415b5d98
dev-util/cdiff: Support newer python
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-util/cdiff/cdiff-0.9.8.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/cdiff/cdiff-0.9.8.ebuild b/dev-util/cdiff/cdiff-0.9.8.ebuild
index 31fe9df52ef..31675e63769 100644
--- a/dev-util/cdiff/cdiff-0.9.8.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2017-04-26 7:40 Agostino Sarubbo
0 siblings, 0 replies; 16+ messages in thread
From: Agostino Sarubbo @ 2017-04-26 7:40 UTC (permalink / raw
To: gentoo-commits
commit: 531f9f7960cd44fccb252123fc3588ec2322f780
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 07:38:45 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 07:38:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531f9f79
dev-util/cdiff: amd64 stable wrt bug #616448
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-util/cdiff/cdiff-0.9.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/cdiff/cdiff-0.9.8.ebuild b/dev-util/cdiff/cdiff-0.9.8.ebuild
index 31675e63769..3265c2137fd 100644
--- a/dev-util/cdiff/cdiff-0.9.8.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.8.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"
IUSE=""
DEPEND="
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2017-04-27 12:17 Michael Palimaka
0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2017-04-27 12:17 UTC (permalink / raw
To: gentoo-commits
commit: e86a6d98e18ae3e7350eb6bda9a301835c4cb7c1
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 12:11:53 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 12:17:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86a6d98
dev-util/cdiff: remove 0.9.7
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-util/cdiff/Manifest | 1 -
dev-util/cdiff/cdiff-0.9.7.ebuild | 39 ---------------------------------------
2 files changed, 40 deletions(-)
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 32f47e4c93d..2eb56bce365 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,2 +1 @@
-DIST cdiff-0.9.7.tar.gz 32061 SHA256 63b7f1037cbcf5ce76b56cd4e5643751e25e0c2a124bcd382af827651d81ca90 SHA512 2f2bf77ecc6e369325753c5d1c6fd23279138e8ae6a4d11cd102b5674d5c7e089e7f2613bbd39d68a00b0db16c589df64af14746228e38065556d0eb11b1e0cd WHIRLPOOL c26cb5df0b02b3567fa334ab2fe131ee99742b782d1bc8e83a4f06476c03d8242bbdc8489cec07ffb49ada0f5404c192c69765e3d9835fdf5feb944f8bb0e703
DIST cdiff-0.9.8.tar.gz 34861 SHA256 61229ba5b294faa8b4c257a220cfda34ac4a7ecf35aa88e8121c36234fea3760 SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3 WHIRLPOOL a49f492746fba7af7869408bdfcb4ae2accfb78f9b999d49763f35fbfddb58ac96ae9a734e22441a0b9d060d89de56704f09762c1af10c059851e280a348156b
diff --git a/dev-util/cdiff/cdiff-0.9.7.ebuild b/dev-util/cdiff/cdiff-0.9.7.ebuild
deleted file mode 100644
index 7072a25903f..00000000000
--- a/dev-util/cdiff/cdiff-0.9.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-if [[ "${PV}" != *"9999"* ]] ; then
- KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-else
- KEYWORDS=""
- EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
- inherit git-r3
-fi
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-
-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."
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2017-05-28 11:14 Pacho Ramos
0 siblings, 0 replies; 16+ messages in thread
From: Pacho Ramos @ 2017-05-28 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 31d176d1894d8d1946b17d176aba7303e6673899
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 10:46:26 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 28 10:46:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d176d1
dev-util/cdiff: Support newer python
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-util/cdiff/cdiff-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 1337df42cc8..0052610eb3f 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1 git-r3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2018-04-03 23:46 Jonas Stein
0 siblings, 0 replies; 16+ messages in thread
From: Jonas Stein @ 2018-04-03 23:46 UTC (permalink / raw
To: gentoo-commits
commit: 1f189a358d6ed0e338e17151696cecdfd44b3bac
Author: Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 3 23:43:45 2018 +0000
Commit: Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Tue Apr 3 23:46:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f189a35
dev-util/cdiff: Fix HOMEPAGE
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-util/cdiff/cdiff-0.9.8.ebuild | 4 ++--
dev-util/cdiff/cdiff-9999.ebuild | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-util/cdiff/cdiff-0.9.8.ebuild b/dev-util/cdiff/cdiff-0.9.8.ebuild
index 0b215981516..a38fa1a360d 100644
--- a/dev-util/cdiff/cdiff-0.9.8.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ 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}"
+HOMEPAGE="https://github.com/ymattw/cdiff"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 0052610eb3f..9d071be628c 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -7,8 +7,8 @@ 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}"
+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"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2018-05-18 21:57 Patrice Clement
0 siblings, 0 replies; 16+ messages in thread
From: Patrice Clement @ 2018-05-18 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 8726af1f368e5feb56997fea2360d47395049a78
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 21:57:26 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri May 18 21:57:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8726af1f
dev-util/cdiff: version bump.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-util/cdiff/Manifest | 1 +
dev-util/cdiff/cdiff-1.0.ebuild | 32 ++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 6e962733187..92bb58b89c3 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1 +1,2 @@
DIST cdiff-0.9.8.tar.gz 34861 BLAKE2B 2b9637c924cb6d2cf436386163af35a0931a1999caa9e63b3a350aef4db32f3c4be82cb1608adb0100d3e96b0b969ae5ca7e870be0fc03055a17f7118a26931d SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3
+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
new file mode 100644
index 00000000000..010b3b89ab7
--- /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."
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2019-02-22 10:31 Mikle Kolyada
0 siblings, 0 replies; 16+ messages in thread
From: Mikle Kolyada @ 2019-02-22 10:31 UTC (permalink / raw
To: gentoo-commits
commit: cdb31e232cab2e126da77fe6cda113ccc1ceecbf
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 10:30:53 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 10:30:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb31e23
dev-util/cdiff: amd64 stable wrt bug #676506
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
dev-util/cdiff/cdiff-1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
index e30bb906a50..44e8bc31bed 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2019-02-23 9:43 Pacho Ramos
0 siblings, 0 replies; 16+ messages in thread
From: Pacho Ramos @ 2019-02-23 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 370a15880896a05ea63528a98df2b75f54a51f98
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 09:28:38 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 09:28:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370a1588
dev-util/cdiff: Drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
dev-util/cdiff/Manifest | 1 -
dev-util/cdiff/cdiff-0.9.8.ebuild | 33 ---------------------------------
2 files changed, 34 deletions(-)
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 92bb58b89c3..ddb8ebc017c 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,2 +1 @@
-DIST cdiff-0.9.8.tar.gz 34861 BLAKE2B 2b9637c924cb6d2cf436386163af35a0931a1999caa9e63b3a350aef4db32f3c4be82cb1608adb0100d3e96b0b969ae5ca7e870be0fc03055a17f7118a26931d SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3
DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe
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 a38fa1a360d..00000000000
--- 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."
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2020-02-09 13:14 David Seifert
0 siblings, 0 replies; 16+ messages in thread
From: David Seifert @ 2020-02-09 13:14 UTC (permalink / raw
To: gentoo-commits
commit: 69315de9c53246d90a79b6ce85c650f665a2a5cf
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 13:12:49 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 13:12:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69315de9
dev-util/cdiff: [QA] Fix NonexistentBlocker
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-util/cdiff/cdiff-1.0.ebuild | 1 -
dev-util/cdiff/cdiff-9999.ebuild | 1 -
dev-util/cdiff/metadata.xml | 13 +++++--------
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
index 326c78bb675..f7b4111c9f6 100644
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ b/dev-util/cdiff/cdiff-1.0.ebuild
@@ -16,7 +16,6 @@ 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}"
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 0040b498084..88b0810474c 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -17,7 +17,6 @@ KEYWORDS=""
IUSE=""
DEPEND="
- !<app-misc/colordiff-1.0.13-r1
dev-python/setuptools[${PYTHON_USEDEP}]
sys-apps/less"
RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
index 8298304ad28..4ec31f8291a 100644
--- a/dev-util/cdiff/metadata.xml
+++ b/dev-util/cdiff/metadata.xml
@@ -1,12 +1,9 @@
<?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>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="pypi">cdiff</remote-id>
+ <remote-id type="github">ymattw/cdiff</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2020-02-11 12:16 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2020-02-11 12:16 UTC (permalink / raw
To: gentoo-commits
commit: 198176db0e5dbe2fdebee28969a53de3cb036e4c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 11:55:18 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 12:16:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198176db
dev-util/cdiff: Remove py2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/cdiff/cdiff-1.0.ebuild | 2 +-
dev-util/cdiff/cdiff-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
index f7b4111c9f6..c3187506572 100644
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ b/dev-util/cdiff/cdiff-1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 88b0810474c..3b5ae5181b2 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -3,7 +3,7 @@
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1 git-r3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/
@ 2020-03-18 0:42 Sebastian Pipping
0 siblings, 0 replies; 16+ messages in thread
From: Sebastian Pipping @ 2020-03-18 0:42 UTC (permalink / raw
To: gentoo-commits
commit: 6868e6f31fca7a3ed0ee803b4f4eb7f405a5a31a
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 00:37:36 2020 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 00:42:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6868e6f3
dev-util/cdiff: 1.1, transition to dev-util/ydiff
Bug: https://bugs.gentoo.org/710538
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.92, Repoman-2.3.20
dev-util/cdiff/cdiff-1.1.ebuild | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/dev-util/cdiff/cdiff-1.1.ebuild b/dev-util/cdiff/cdiff-1.1.ebuild
new file mode 100644
index 00000000000..173ec06646e
--- /dev/null
+++ b/dev-util/cdiff/cdiff-1.1.ebuild
@@ -0,0 +1,21 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2020-03-18 0:42 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-22 10:31 [gentoo-commits] repo/gentoo:master commit in: dev-util/cdiff/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2020-03-18 0:42 Sebastian Pipping
2020-02-11 12:16 Michał Górny
2020-02-09 13:14 David Seifert
2019-02-23 9:43 Pacho Ramos
2018-05-18 21:57 Patrice Clement
2018-04-03 23:46 Jonas Stein
2017-05-28 11:14 Pacho Ramos
2017-04-27 12:17 Michael Palimaka
2017-04-26 7:40 Agostino Sarubbo
2017-04-24 9:31 Pacho Ramos
2017-04-23 20:48 Michał Górny
2016-02-25 14:30 Patrice Clement
2016-02-14 17:54 Justin Lecher
2016-01-21 8:33 Justin Lecher
2015-12-09 12:01 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox