jlec 14/11/14 07:03:25 Modified: colordiff-1.0.13.ebuild ChangeLog Added: colordiff-1.0.13-r1.ebuild Log: app-misc/colordiff: Resolve blocker with dev-util/cdiff (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.12 app-misc/colordiff/colordiff-1.0.13.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/colordiff/colordiff-1.0.13.ebuild?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/colordiff/colordiff-1.0.13.ebuild?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/colordiff/colordiff-1.0.13.ebuild?r1=1.11&r2=1.12 Index: colordiff-1.0.13.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.13.ebuild,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- colordiff-1.0.13.ebuild 26 Oct 2013 16:11:46 -0000 1.11 +++ colordiff-1.0.13.ebuild 14 Nov 2014 07:03:25 -0000 1.12 @@ -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 @@ RDEPEND=" dev-lang/perl - sys-apps/diffutils" + sys-apps/diffutils + !dev-util/cdiff" src_prepare() { # set proper etcdir for Gentoo Prefix 1.104 app-misc/colordiff/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/colordiff/ChangeLog?rev=1.104&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/colordiff/ChangeLog?rev=1.104&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/colordiff/ChangeLog?r1=1.103&r2=1.104 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-misc/colordiff/ChangeLog,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- ChangeLog 26 Oct 2013 16:11:46 -0000 1.103 +++ ChangeLog 14 Nov 2014 07:03:25 -0000 1.104 @@ -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 <[email protected]> colordiff-1.0.13.ebuild, + +colordiff-1.0.13-r1.ebuild: + Resolve blocker with dev-util/cdiff 26 Oct 2013; Justin Lecher <[email protected]> colordiff-1.0.13.ebuild: Add missing dep on perl, #489474 1.1 app-misc/colordiff/colordiff-1.0.13-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/colordiff/colordiff-1.0.13-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/colordiff/colordiff-1.0.13-r1.ebuild?rev=1.1&content-type=text/plain Index: colordiff-1.0.13-r1.ebuild =================================================================== # 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 }
