set version border to peewee, update test phase, rm old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

8 files changed, 9 insertions, 194 deletions

diff --git a/dev-python/wtf-peewee/ChangeLog b/dev-python/wtf-peewee/ChangeLog
index 6df872916a30..744d92950462 100644
--- a/dev-python/wtf-peewee/ChangeLog
+++ b/dev-python/wtf-peewee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/wtf-peewee
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/ChangeLog,v 1.8 2014/06/04 08:22:32 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/ChangeLog,v 1.9 2014/07/07 02:45:44 idella4 Exp $
+
+  07 Jul 2014; Ian Delaney <idella4@gentoo.org> -wtf-peewee-0.1.3.ebuild,
+  -wtf-peewee-0.1.4.ebuild, -wtf-peewee-0.1.5.ebuild, -wtf-peewee-0.2.0.ebuild,
+  -wtf-peewee-0.2.1.ebuild, -wtf-peewee-0.2.2.ebuild, wtf-peewee-0.2.3.ebuild:
+  set version border to peewee, update test phase, rm old
 
 *wtf-peewee-0.2.3 (04 Jun 2014)
 
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.1.3.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.1.3.ebuild
deleted file mode 100644
index 33621e352425..000000000000
--- a/dev-python/wtf-peewee/wtf-peewee-0.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.1.3.ebuild,v 1.1 2013/08/17 04:36:02 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-RESTRICT="test" # broken
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/peewee[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]
-	"
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.1.4.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.1.4.ebuild
deleted file mode 100644
index e0b105aec96b..000000000000
--- a/dev-python/wtf-peewee/wtf-peewee-0.1.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.1.4.ebuild,v 1.1 2013/10/21 05:04:39 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-RESTRICT="test" # broken
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/peewee[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]
-	"
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.1.5.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.1.5.ebuild
deleted file mode 100644
index 2389ea6e55aa..000000000000
--- a/dev-python/wtf-peewee/wtf-peewee-0.1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.1.5.ebuild,v 1.1 2013/11/22 06:56:41 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-RESTRICT="test" # broken
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/peewee[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]
-	"
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.0.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.0.ebuild
deleted file mode 100644
index 841ebe61f7c5..000000000000
--- a/dev-python/wtf-peewee/wtf-peewee-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.2.0.ebuild,v 1.1 2014/05/03 08:03:02 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-RESTRICT="test" # broken
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/peewee[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]
-	"
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.1.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.1.ebuild
deleted file mode 100644
index fe2aa01b112c..000000000000
--- a/dev-python/wtf-peewee/wtf-peewee-0.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.2.1.ebuild,v 1.2 2014/05/25 03:28:41 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RDEPEND="dev-python/peewee[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( "${RDEPEND}" )"
-
-python_prepare_all() {
-	 # https://github.com/coleifer/peewee/issues/361
-	sed -e s':test_choices:_&:' \
-		-e s':test_null_form_saving:_&:' \
-		-i "${PN/\-/}"/tests.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" ./runtests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.2.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.2.ebuild
deleted file mode 100644
index 22306b3d5c97..000000000000
--- a/dev-python/wtf-peewee/wtf-peewee-0.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.2.2.ebuild,v 1.1 2014/05/26 07:48:43 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RDEPEND="dev-python/peewee[${PYTHON_USEDEP}]
-	dev-python/wtforms[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( "${RDEPEND}" )"
-
-python_prepare_all() {
-	 # https://github.com/coleifer/peewee/issues/361
-	sed -e s':test_choices:_&:' \
-		-e s':test_null_form_saving:_&:' \
-		-i "${PN/\-/}"/tests.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" ./runtests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild
index 93c3aff7ce95..00faee7fe091 100644
--- a/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild
+++ b/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild,v 1.1 2014/06/04 08:22:32 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wtf-peewee/wtf-peewee-0.2.3.ebuild,v 1.2 2014/07/07 02:45:44 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,16 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
 
-RDEPEND="dev-python/peewee[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/peewee-2.0.0[${PYTHON_USEDEP}]
 	dev-python/wtforms[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( "${RDEPEND}" )"
 
 python_prepare_all() {
 	 # https://github.com/coleifer/peewee/issues/361
-	sed -e s':test_choices:_&:' \
-		-e s':test_null_form_saving:_&:' \
-		-i "${PN/\-/}"/tests.py || die
+	sed -e s':test_null_form_saving:_&:' -i "${PN/\-/}"/tests.py || die
 	distutils-r1_python_prepare_all
 }