diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-11-14 07:03:25 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-11-14 07:03:25 +0000 |
| commit | 807d49e5adb23aba084c9af405ce8364baa5e5e1 (patch) | |
| tree | cb5a3d3a663f4ca60a85cef52bb3f7c77f412abf /app-misc/colordiff | |
| parent | app-misc/colordiff: Resolve blocker with dev-util/cdiff (diff) | |
| download | gentoo-2-807d49e5adb23aba084c9af405ce8364baa5e5e1.tar.gz gentoo-2-807d49e5adb23aba084c9af405ce8364baa5e5e1.tar.bz2 gentoo-2-807d49e5adb23aba084c9af405ce8364baa5e5e1.zip | |
app-misc/colordiff: Resolve blocker with dev-util/cdiff
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'app-misc/colordiff')
| -rw-r--r-- | app-misc/colordiff/ChangeLog | 10 | ||||
| -rw-r--r-- | app-misc/colordiff/colordiff-1.0.13-r1.ebuild | 40 | ||||
| -rw-r--r-- | app-misc/colordiff/colordiff-1.0.13.ebuild | 7 |
3 files changed, 52 insertions, 5 deletions
diff --git a/app-misc/colordiff/ChangeLog b/app-misc/colordiff/ChangeLog index c9740aec9786..53b099646f7f 100644 --- a/app-misc/colordiff/ChangeLog +++ b/app-misc/colordiff/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/colordiff -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/ChangeLog,v 1.103 2013/10/26 16:11:46 jlec Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/ChangeLog,v 1.104 2014/11/14 07:03:25 jlec Exp $ + +*colordiff-1.0.13-r1 (14 Nov 2014) + + 14 Nov 2014; Justin Lecher <jlec@gentoo.org> colordiff-1.0.13.ebuild, + +colordiff-1.0.13-r1.ebuild: + Resolve blocker with dev-util/cdiff 26 Oct 2013; Justin Lecher <jlec@gentoo.org> colordiff-1.0.13.ebuild: Add missing dep on perl, #489474 diff --git a/app-misc/colordiff/colordiff-1.0.13-r1.ebuild b/app-misc/colordiff/colordiff-1.0.13-r1.ebuild new file mode 100644 index 000000000000..64970338492f --- /dev/null +++ b/app-misc/colordiff/colordiff-1.0.13-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.13-r1.ebuild,v 1.1 2014/11/14 07:03:25 jlec Exp $ + +EAPI=5 + +inherit prefix + +DESCRIPTION="Colorizes output of diff" +HOMEPAGE="http://www.colordiff.org/" +SRC_URI="http://www.colordiff.org/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="" + +RDEPEND=" + dev-lang/perl + sys-apps/diffutils" + +src_prepare() { + # set proper etcdir for Gentoo Prefix + sed \ + -e "s:'/etc:'@GENTOO_PORTAGE_EPREFIX@/etc:" \ + -i "${S}/colordiff.pl" || die "sed etcdir failed" + eprefixify "${S}"/colordiff.pl +} + +# This package has a makefile, but we don't want to run it +src_compile() { :; } + +src_install() { + newbin ${PN}{.pl,} + dobin cdiff.sh + insinto /etc + doins colordiffrc colordiffrc-lightbg + dodoc BUGS CHANGES README + doman {cdiff,colordiff}.1 +} diff --git a/app-misc/colordiff/colordiff-1.0.13.ebuild b/app-misc/colordiff/colordiff-1.0.13.ebuild index a5f237ad5c1a..450b91552ec1 100644 --- a/app-misc/colordiff/colordiff-1.0.13.ebuild +++ b/app-misc/colordiff/colordiff-1.0.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.13.ebuild,v 1.11 2013/10/26 16:11:46 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.13.ebuild,v 1.12 2014/11/14 07:03:25 jlec Exp $ EAPI=5 @@ -17,7 +17,8 @@ IUSE="" RDEPEND=" dev-lang/perl - sys-apps/diffutils" + sys-apps/diffutils + !dev-util/cdiff" src_prepare() { # set proper etcdir for Gentoo Prefix |