revbump; conversion -> distutils-r1, drop test phase due to absence of required dep in portage, rm old

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

5 files changed, 19 insertions, 122 deletions

diff --git a/dev-python/turbojson/ChangeLog b/dev-python/turbojson/ChangeLog
index 030597e61b24..6ce5bc8e3468 100644
--- a/dev-python/turbojson/ChangeLog
+++ b/dev-python/turbojson/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/turbojson
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/turbojson/ChangeLog,v 1.15 2014/03/31 21:16:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbojson/ChangeLog,v 1.16 2014/12/25 12:09:45 idella4 Exp $
+
+*turbojson-1.3.2-r1 (25 Dec 2014)
+
+  25 Dec 2014; Ian Delaney <idella4@gentoo.org> +turbojson-1.3.2-r1.ebuild,
+  -turbojson-1.1.4.ebuild, -turbojson-1.3-r1.ebuild, -turbojson-1.3.2.ebuild,
+  -turbojson-1.3.ebuild:
+  revbump; conversion -> distutils-r1, drop test phase due to absence of
+  required dep in portage, rm old
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> turbojson-1.3-r1.ebuild:
   Add support for the new PyPy slotting.
diff --git a/dev-python/turbojson/turbojson-1.1.4.ebuild b/dev-python/turbojson/turbojson-1.1.4.ebuild
deleted file mode 100644
index 0989c80c1846..000000000000
--- a/dev-python/turbojson/turbojson-1.1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/turbojson/turbojson-1.1.4.ebuild,v 1.5 2012/02/20 14:20:08 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_PN="TurboJson"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TurboGears JSON file format support plugin"
-HOMEPAGE="http://pypi.python.org/pypi/TurboJson"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/decoratortools-1.4
-	dev-python/ruledispatch
-	>=dev-python/simplejson-1.3"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/turbojson/turbojson-1.3-r1.ebuild b/dev-python/turbojson/turbojson-1.3-r1.ebuild
deleted file mode 100644
index d19f7838b7f2..000000000000
--- a/dev-python/turbojson/turbojson-1.3-r1.ebuild
+++ /dev/null
@@ -1,42 +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/turbojson/turbojson-1.3-r1.ebuild,v 1.4 2014/03/31 21:16:40 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_PN="TurboJson"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TurboGears JSON file format support plugin"
-HOMEPAGE="http://pypi.python.org/pypi/TurboJson"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/decoratortools-1.4[${PYTHON_USEDEP}]
-	>=dev-python/ruledispatch-0.5_pre2306[$(python_gen_usedep 'python2*')]
-	>=dev-python/simplejson-2.6.2[${PYTHON_USEDEP}]
-	>=dev-python/peak-rules-0.5[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[$(python_gen_usedep python{2_6,2_7})]
-		dev-python/sqlobject
-		>=dev-python/peak-rules-0.5[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	cd "${BUILD_DIR}/lib/${PN}/tests/" || die
-	for test in test_*.py; do
-		"${PYTHON}" $test && einfo "Test $test passed under ${EPYTHON}" \
-		|| die "tests failed under ${EPYTHON}"
-	done
-}
diff --git a/dev-python/turbojson/turbojson-1.3.2.ebuild b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
index 125fb196f1c7..6728dd0b922a 100644
--- a/dev-python/turbojson/turbojson-1.3.2.ebuild
+++ b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
@@ -1,14 +1,11 @@
-# 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/dev-python/turbojson/turbojson-1.3.2.ebuild,v 1.2 2013/10/22 14:28:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbojson/turbojson-1.3.2-r1.ebuild,v 1.1 2014/12/25 12:09:45 idella4 Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
 
-inherit distutils
+inherit distutils-r1
 
 MY_PN="TurboJson"
 MY_P="${MY_PN}-${PV}"
@@ -20,13 +17,11 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
+IUSE=""
 
-RDEPEND=">=dev-python/decoratortools-1.4
-	dev-python/ruledispatch
-	>=dev-python/simplejson-1.3"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
+RDEPEND=">=dev-python/simplejson-1.9.1[${PYTHON_USEDEP}]
+	>=dev-python/peak-rules-0.5[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
+# Testsuite requires a package of peak not present in portage
diff --git a/dev-python/turbojson/turbojson-1.3.ebuild b/dev-python/turbojson/turbojson-1.3.ebuild
deleted file mode 100644
index 5da80bfb315e..000000000000
--- a/dev-python/turbojson/turbojson-1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/turbojson/turbojson-1.3.ebuild,v 1.2 2012/02/20 14:20:08 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_PN="TurboJson"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TurboGears JSON file format support plugin"
-HOMEPAGE="http://pypi.python.org/pypi/TurboJson"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/decoratortools-1.4
-	dev-python/ruledispatch
-	>=dev-python/simplejson-1.3"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
-
-S="${WORKDIR}/${MY_P}"