Explicitly depend on sys-apps/less, will look into reporting / patching this. Dropped old (<0.6) versions.

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

10 files changed, 22 insertions, 99 deletions

diff --git a/dev-util/cdiff/ChangeLog b/dev-util/cdiff/ChangeLog
index 324c332d3d7d..150be7df89b9 100644
--- a/dev-util/cdiff/ChangeLog
+++ b/dev-util/cdiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cdiff
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.11 2013/05/16 09:38:18 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.12 2013/05/16 16:45:05 tomwij Exp $
+
+  16 May 2013; Tom Wijsman <TomWij@gentoo.org> -cdiff-0.3.ebuild,
+  -cdiff-0.4.ebuild, -cdiff-0.5.1.ebuild, -cdiff-0.5.ebuild, cdiff-0.6.ebuild,
+  cdiff-0.7.1.ebuild, cdiff-0.7.ebuild, cdiff-0.8.ebuild, cdiff-0.9.ebuild:
+  Explicitly depend on sys-apps/less, will look into reporting / patching this.
+  Dropped old (<0.6) versions.
 
   16 May 2013; Sergey Popov <pinkbyte@gentoo.org> cdiff-0.9.ebuild:
   Add ~amd64-linux and ~x86-linux keywords
diff --git a/dev-util/cdiff/cdiff-0.3.ebuild b/dev-util/cdiff/cdiff-0.3.ebuild
deleted file mode 100644
index f4e26e67352a..000000000000
--- a/dev-util/cdiff/cdiff-0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.3.ebuild,v 1.2 2013/02/10 00:46:06 tomwij Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,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"
-
-DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-0.4.ebuild b/dev-util/cdiff/cdiff-0.4.ebuild
deleted file mode 100644
index 05f2b05143df..000000000000
--- a/dev-util/cdiff/cdiff-0.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.4.ebuild,v 1.1 2013/02/17 18:11:41 tomwij Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,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"
-
-DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-0.5.1.ebuild b/dev-util/cdiff/cdiff-0.5.1.ebuild
deleted file mode 100644
index ca3dc42c0f27..000000000000
--- a/dev-util/cdiff/cdiff-0.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.5.1.ebuild,v 1.1 2013/02/19 18:40:06 tomwij Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,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"
-
-DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-0.5.ebuild b/dev-util/cdiff/cdiff-0.5.ebuild
deleted file mode 100644
index 13ba796bd7dd..000000000000
--- a/dev-util/cdiff/cdiff-0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.5.ebuild,v 1.1 2013/02/19 18:40:06 tomwij Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,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"
-
-DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-0.6.ebuild b/dev-util/cdiff/cdiff-0.6.ebuild
index 4825e49c8f72..01f0df7556fa 100644
--- a/dev-util/cdiff/cdiff-0.6.ebuild
+++ b/dev-util/cdiff/cdiff-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.6.ebuild,v 1.1 2013/02/22 17:27:35 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.6.ebuild,v 1.2 2013/05/16 16:45:05 tomwij Exp $
 
 EAPI=5
 
@@ -18,5 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-0.7.1.ebuild b/dev-util/cdiff/cdiff-0.7.1.ebuild
index ef72c2020bb8..caa4533954d4 100644
--- a/dev-util/cdiff/cdiff-0.7.1.ebuild
+++ b/dev-util/cdiff/cdiff-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.7.1.ebuild,v 1.1 2013/03/12 19:04:26 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.7.1.ebuild,v 1.2 2013/05/16 16:45:05 tomwij Exp $
 
 EAPI=5
 
@@ -18,5 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-0.7.ebuild b/dev-util/cdiff/cdiff-0.7.ebuild
index f70469ca72cf..526c024f9f26 100644
--- a/dev-util/cdiff/cdiff-0.7.ebuild
+++ b/dev-util/cdiff/cdiff-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.7.ebuild,v 1.1 2013/02/22 17:27:35 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.7.ebuild,v 1.2 2013/05/16 16:45:05 tomwij Exp $
 
 EAPI=5
 
@@ -18,5 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-0.8.ebuild b/dev-util/cdiff/cdiff-0.8.ebuild
index d87d8d92ee00..65e0205e22aa 100644
--- a/dev-util/cdiff/cdiff-0.8.ebuild
+++ b/dev-util/cdiff/cdiff-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.8.ebuild,v 1.1 2013/03/13 14:41:34 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.8.ebuild,v 1.2 2013/05/16 16:45:05 tomwij Exp $
 
 EAPI=5
 
@@ -18,5 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-0.9.ebuild b/dev-util/cdiff/cdiff-0.9.ebuild
index 7c5a99db40c2..9c86d08bcfdf 100644
--- a/dev-util/cdiff/cdiff-0.9.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.3 2013/05/16 09:38:18 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.ebuild,v 1.4 2013/05/16 16:45:05 tomwij Exp $
 
 EAPI=5
 
@@ -18,5 +18,6 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="!app-misc/colordiff
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
 RDEPEND="${DEPEND}"