app-misc/colordiff: Resolve blocker with dev-util/cdiff

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 71 insertions, 21 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/Manifest b/app-misc/colordiff/Manifest
index 71affdf12a42..03c21074bdc3 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -2,23 +2,26 @@
 Hash: SHA512
 
 DIST colordiff-1.0.13.tar.gz 19960 SHA256 ce2805a130c81545711df94bc00a93545da3f323d835cc38b452d3396ef86c2a SHA512 8a47ea9e0c703d6b577a01e9a63df58233f752d4e72bb7f8213fcc076efcc52869df5e694126abbdc8a63816010786a577fa37ed3e175162dece3f17bd79fdda WHIRLPOOL 355d7ee12f37c19cf243bedff3d883ccd188da0e68c1531be932cec2d19055e67028cc5ca069f0bfe71d2c26538721989f13d1557d359338b534343b3c3faa4c
-EBUILD colordiff-1.0.13.ebuild 1101 SHA256 4d50be86ff433bcb05c3e7b5dea0e4e266f59f63f7b764b1f843fd8de4407064 SHA512 2378761d3e1b3d1d047f4c8ca220ad410fa3c2bee0cf3ae830e3ee5df47da21e62eb9d7e8760702d474dbfc20f61cfcee45b72f6f69cda558fcdbf6bad24ad5e WHIRLPOOL 3348f213fa88de6c1f99662cb0bd264ca0899c3085635dab9f48b243b43483a711103e7a1bf99da57bc9afeaee6216d6eb906818fbec4a2cae44e0a6132f7825
-MISC ChangeLog 13021 SHA256 ff7644bf28e11e34f59a6ca359280f846c8f9917b170ffb61e765f3b38a83e46 SHA512 62eefa892172d78f9230c216b00bf3d2e1cb4e1fef06773ac3ecba9c4c549a9ed8982430463f4da1d0b8515e20d16287d6a9018f3be83b93982b376b50461f8f WHIRLPOOL 7e22dfd0ee938e3425e2e267c26a00d4b2f7a68c66e2971f46ebf94072d3aea0f5676a3a236e06ca0e2a6c111b735c85bc511d649bd1ee988ac6bb18a96c2ad3
+EBUILD colordiff-1.0.13-r1.ebuild 1105 SHA256 4321e51216ddb2ecba35aa3533fc46c4ab9d810d6978b00acd2831fca819f305 SHA512 62ffb8c84195515c881b8343bd2b0ec4201370e8b4e4f36620212883ed5032ea22e1be6f2c22df6d77ec3801554c2f46bc3f823bf19cdf90cfb658746140bad9 WHIRLPOOL 27284c9aeb03e5d4d89187ec72b314647050098cb2674c0ebc42056df595d19d0b7d64b208410fab95dbab1b78c7c142d2e727bbc90294c863889e0f2c940262
+EBUILD colordiff-1.0.13.ebuild 1118 SHA256 a7351fc6a36ccec1dd4304296a837441257697529832b2937946e41f25eacde0 SHA512 8f660030468c35c336df596a6f8855b9e87460120ec49341e194046dda49ff4bd44a524b970515a127390aa8de8d63476ea80779984beafe442ca348acd583ec WHIRLPOOL 787728bf2f699dacf8a8689646a3557a5aaed73ac065d35ffe7a7d3c7fd6eba109d9080822fda44bd360ae9915ae2c75aa6b9d2e6ec70ede780f1e9c85211304
+MISC ChangeLog 13199 SHA256 b60d1693609223db0d9cba50c76f9bdb69298f5628c159828197902190916ae2 SHA512 f4831c8da368f5b3ba8a93e75c73734c35dc9b069e090caa0f462c338885da1487b8da70f0ed7c6c01676e3c13cafe401436f7be4e8c6b64c4101b7e04fe0741 WHIRLPOOL 3afbdfdac656acc5fa309d7c7b52c290be617428d960e52f7919c828caaeb1eec754771a6c5eba61904ba2aa83da63490bd2908262628727d0986e873267ef78
 MISC metadata.xml 166 SHA256 064eb80cc86913e2a47d1088f1b0ebd5b64b5dab1c73d38b8501cd77891cfbbf SHA512 3fc05bf28a906b223e9bb5baeac755dd7e4edb755b5a6c054c3e4d46d294f28df948e1195e71d5a836783daefafa53fe1417aacc0ba17dd49e9b10d51e99c275 WHIRLPOOL 814a3f6a650e4373ac90ba43969b8dab3215f5da936ef5e180fe134adc05a571dc1390c80be173797c421de7f22488b19979353f7aa52536bbfcf6e0541bf748
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJSa+nDAAoJELnU8jG9FVirTvgP/316APdVnasQViEQ21c8d+78
-Xhp8ksdo86KcQCiIqde4ra2520n8a3qwTITeNmB6a9XfxzHmm9TrQax3wHbI6Lsw
-1GKaMords7gccLrLxP+4iXuoFmzQ+RVZXW6XU7vF68PpMC01V6XqEzlo7nw5jokB
-OB+jVHMeu6jBoSrCXhMbfO38yop9xkOKraIiHc1y3UrE8vR1HhM21DPL3Z7skUoR
-P6WdA+A4zz4PMJBc6g2elCJbXZrEAoh62WC3f8y9ZxTPH5je9umMEY7WAuVAmdwM
-qt2dLvVRcD16992dW7YE3lVoQDrrTq4vvdEo6H24BtBKjYnrzqqyfj5iMWs/TOxQ
-to6wFKYhsiHoGDW6RLM6iky5mfw4z+AXJgcjyGLglkaOSZHAE6+k6tUQS+nsGkod
-YJZ/WeIjjF9XCjQomCZwsnIx/Yk3Wom34ciFuT6r4w7w2iXosyEa3NUfcsKbXs17
-mKT/6bcPcl/RXxCi3JUpZqvQyAjiolJ1HXoXAq3zkU+g2qoBoRYRO8qxEOBxjf9W
-uL4YBGl9Yr5X0plR9JnBWsliKoxFKDc1vhnR0B4MS2kTLq2tqqM/W9V/A/PnBz3g
-dFDycMg6xDqsXPrx7UXb8g06Twn4N9+srPVz2cSVIuoJC5CTI09WE/cQ2KNFw4fc
-+eVWfiOUBLEKobhyyadO
-=niXD
+iQJ8BAEBCgBmBQJUZak9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirsFEP/jMdm3CRmS7mU7zhHmk5fVAi
+XAXM4iNDBrFEz4QOjB15X5vIp0ffTVqWJnfcmqkNfIBRplMx/pWCjRibP53iO6ka
+VdXaeyu+VEQULZwL/A+0miA0SfGFb+wv8eh1y9WcRI23dGw6bLNya8fNgoSYfOwO
+tRN5QHf5EbzmfNjEo1FIxVg9Nn/hXqzGLZGBOdZ+HGLnCm+/+8zj4WUeomogAC2R
+CksQG1B9nin0520B3Wrjy8WotgpWV5MsfgyyS4/GBJS9VP5qPwmjvWq+mXT7R8CY
+Pf1i5NNGwEo9VSKvSPKZI/zLZsKqbEDnKG9G/d2kC4Hw7elrTeygInO4vnPEVVBM
+DFmJb90b9KIaip+d+SW8kVu8vVBI0nqlvNAdXXB2OCH4S8Eu2w1S4SDPOWHlQ5cv
+uEZspfzwfy/akTlrdTQdz8+CVmNcFAgmEEI6zfidDG9EJr59IrvohBKIntBhMhcG
+SyoBqHKVMhNHWYmmmHK98bHehq6QMjMPGmz1+05KUC8Nc+1KEqp821huRfOPfo1x
+63fessf8yRa9DrE68NpIWcCLagC7h3gtVcsr6UOKIG7bmMqygrXpwMRE20huEsvN
++0Z+1gbt+O47LBPWKMMCw4IH5VGpxf/PW/VZSewcKRcmZn2Sb+UyWz79U3PXntD+
+v2I3x35I2aZ/FP3rtCxn
+=2P2u
 -----END PGP SIGNATURE-----
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