dev-util/cdiff: Took package, drop old, Version Bump

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

7 files changed, 31 insertions, 62 deletions

diff --git a/dev-util/cdiff/ChangeLog b/dev-util/cdiff/ChangeLog
index 7f5b1de66401..fc37e42a0d06 100644
--- a/dev-util/cdiff/ChangeLog
+++ b/dev-util/cdiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cdiff
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.27 2014/11/14 01:23:25 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.28 2014/11/14 07:10:58 jlec Exp $
+
+*cdiff-0.9.6 (14 Nov 2014)
+
+  14 Nov 2014; Justin Lecher <jlec@gentoo.org> -cdiff-0.9.ebuild,
+  -cdiff-0.9.1.ebuild, -cdiff-0.9.2.ebuild, cdiff-0.9.3.ebuild,
+  +cdiff-0.9.6.ebuild, cdiff-9999.ebuild, metadata.xml:
+  Took package, drop old, Version Bump
 
   14 Nov 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Maintainer needed.
diff --git a/dev-util/cdiff/cdiff-0.9.1.ebuild b/dev-util/cdiff/cdiff-0.9.1.ebuild
deleted file mode 100644
index 7541c8b2a35f..000000000000
--- a/dev-util/cdiff/cdiff-0.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.1.ebuild,v 1.5 2014/08/10 21:26:08 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
-DOCS=( CHANGES README.rst )
-
-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"
-
-DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/less"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-0.9.3.ebuild b/dev-util/cdiff/cdiff-0.9.3.ebuild
index d233907cc90c..bae7d3afe45d 100644
--- a/dev-util/cdiff/cdiff-0.9.3.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.3.ebuild,v 1.6 2014/08/10 21:26:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.3.ebuild,v 1.7 2014/11/14 07:10:58 jlec Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
@@ -24,7 +24,8 @@ HOMEPAGE="https://github.com/ymattw/${PN}"
 LICENSE="BSD"
 SLOT="0"
 
-DEPEND="!app-misc/colordiff
+DEPEND="
+	!<app-misc/colordiff-1.0.13-r1
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-apps/less"
 
diff --git a/dev-util/cdiff/cdiff-0.9.2.ebuild b/dev-util/cdiff/cdiff-0.9.6.ebuild
index 593f5275d308..4dc607f100fb 100644
--- a/dev-util/cdiff/cdiff-0.9.2.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.6.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.2.ebuild,v 1.8 2014/08/10 21:26:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.6.ebuild,v 1.1 2014/11/14 07:10:58 jlec Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-DOCS=( CHANGES README.rst )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
 inherit distutils-r1
 
 if [[ "${PV}" != *"9999"* ]] ; then
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 else
 	KEYWORDS=""
@@ -24,16 +23,21 @@ HOMEPAGE="https://github.com/ymattw/${PN}"
 LICENSE="BSD"
 SLOT="0"
 
-DEPEND="!app-misc/colordiff
+DEPEND="
+	!<app-misc/colordiff-1.0.13-r1
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-apps/less"
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-disable-unimportant-failing-test.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
+
+DOCS=( CHANGES.rst README.rst )
 
 python_test() {
 	python_export_best
+
 	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
+
 	./tests/regression.sh || die "Regression tests failed."
 }
diff --git a/dev-util/cdiff/cdiff-0.9.ebuild b/dev-util/cdiff/cdiff-0.9.ebuild
deleted file mode 100644
index 41965295ba9a..000000000000
--- a/dev-util/cdiff/cdiff-0.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.ebuild,v 1.6 2014/08/10 21:26:08 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
-DOCS=( CHANGES README.rst )
-
-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"
-
-DEPEND="!app-misc/colordiff
-	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 20b9a0b46e39..053bf69a6ecb 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-9999.ebuild,v 1.3 2014/08/10 21:26:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-9999.ebuild,v 1.4 2014/11/14 07:10:58 jlec Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-DOCS=( CHANGES README.rst )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
 inherit distutils-r1
 
@@ -24,7 +23,8 @@ HOMEPAGE="https://github.com/ymattw/${PN}"
 LICENSE="BSD"
 SLOT="0"
 
-DEPEND="!app-misc/colordiff
+DEPEND="
+	!<app-misc/colordiff-1.0.13-r1
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-apps/less"
 
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
 
+DOCS=( CHANGES.rst README.rst )
+
 python_test() {
 	python_export_best
 
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
index bf93908a32a5..ebf35368e308 100644
--- a/dev-util/cdiff/metadata.xml
+++ b/dev-util/cdiff/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
   </maintainer>
   <longdescription>
     Colored, side-by-side diff terminal viewer.