Version bump to 0.9.3. Remove old ebuilds before 0.9. Added 9999 version for easier testing.

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

5 files changed, 36 insertions, 54 deletions

diff --git a/dev-util/cdiff/ChangeLog b/dev-util/cdiff/ChangeLog
index b7b7c789d974..fa89089fcace 100644
--- a/dev-util/cdiff/ChangeLog
+++ b/dev-util/cdiff/ChangeLog
@@ -1,6 +1,15 @@
 # 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.20 2013/09/05 18:40:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.21 2013/10/12 12:49:18 tomwij Exp $
+
+*cdiff-0.9.3 (12 Oct 2013)
+*cdiff-9999 (12 Oct 2013)
+
+  12 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +cdiff-0.9.3.ebuild,
+  +cdiff-9999.ebuild, -cdiff-0.6.ebuild, -cdiff-0.7.1.ebuild, -cdiff-0.7.ebuild,
+  -cdiff-0.8.ebuild:
+  Version bump to 0.9.3. Remove old ebuilds before 0.9. Added 9999 version for
+  easier testing.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> cdiff-0.6.ebuild,
   cdiff-0.7.1.ebuild, cdiff-0.7.ebuild, cdiff-0.8.ebuild, cdiff-0.9.1.ebuild,
diff --git a/dev-util/cdiff/cdiff-0.7.ebuild b/dev-util/cdiff/cdiff-0.7.ebuild
deleted file mode 100644
index 4c8b10fb9e29..000000000000
--- a/dev-util/cdiff/cdiff-0.7.ebuild
+++ /dev/null
@@ -1,23 +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.7.ebuild,v 1.3 2013/09/05 18:40:34 mgorny 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"
-
-DEPEND="!app-misc/colordiff
-	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
deleted file mode 100644
index aae9ab13337c..000000000000
--- a/dev-util/cdiff/cdiff-0.8.ebuild
+++ /dev/null
@@ -1,23 +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.8.ebuild,v 1.3 2013/09/05 18:40:34 mgorny 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"
-
-DEPEND="!app-misc/colordiff
-	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.9.3.ebuild
index 76dbfc14c45a..df79ab43d8a7 100644
--- a/dev-util/cdiff/cdiff-0.7.1.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.3.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2013/09/05 18:40:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.3.ebuild,v 1.1 2013/10/12 12:49:18 tomwij Exp $
 
-EAPI=5
+EAPI="5"
 
 PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DOCS=( CHANGES README.rst )
@@ -15,9 +15,20 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="!app-misc/colordiff
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-apps/less"
+
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
+
+src_test() {
+	python_export_best
+
+	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
+
+	./tests/regression.sh || die "Regression tests failed."
+}
\ No newline at end of file
diff --git a/dev-util/cdiff/cdiff-0.6.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 2590f0c20435..5d1c4eb67022 100644
--- a/dev-util/cdiff/cdiff-0.6.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -1,23 +1,31 @@
 # 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.3 2013/09/05 18:40:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-9999.ebuild,v 1.1 2013/10/12 12:49:18 tomwij Exp $
 
-EAPI=5
+EAPI="5"
 
 PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
 
+if [[ "${PV}" != *"9999"* ]] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+else
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
+	inherit git-r3
+fi
+
 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}]
 	sys-apps/less"
+
 RDEPEND="${DEPEND}"