diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-12-09 12:57:43 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-12-09 13:01:29 +0100 |
| commit | 6601b6158523f7816d40240a9ec35e5cba18ebae (patch) | |
| tree | 924b909b3a6a17dbb75af129e99de2b150867719 /dev-util | |
| parent | dev-python/wrapt: Version Bump (diff) | |
| download | gentoo-6601b6158523f7816d40240a9ec35e5cba18ebae.tar.gz gentoo-6601b6158523f7816d40240a9ec35e5cba18ebae.tar.bz2 gentoo-6601b6158523f7816d40240a9ec35e5cba18ebae.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cdiff/cdiff-0.9.6.ebuild | 14 | ||||
| -rw-r--r-- | 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 251fa11f3f55..e16cd6efad2f 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 8bbe3dd2c8cc..dba6398baf80 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 ) |