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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

6 files changed, 25 insertions, 145 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/Manifest b/dev-python/turbojson/Manifest
index 58c98d5fc33a..01798d740ab1 100644
--- a/dev-python/turbojson/Manifest
+++ b/dev-python/turbojson/Manifest
@@ -1,31 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST TurboJson-1.1.4.tar.gz 8500 SHA256 3b6128b7266eddb8450abb6a974c8291cc70ad37164a05fed62f0531678ade2b SHA512 a9f00f192643cd71b345508b86375e98d462bb323c165b312974b9fa8ecf3689f1778bf4b3a8a8d37079bc00a551440f37f4554c6dc5895285fa82247c183af4 WHIRLPOOL c5c2af5d7c5ffe3d62f80ed0f3c6290dd5d7d573eecf667dd1bc4f507b352bcf315414e481e7fcf05075941ccc77e79e439f675a94f0f919f363323230c68a34
 DIST TurboJson-1.3.2.tar.gz 6613 SHA256 d517a7bde5346e17867f1eb42721f4d9c600e618e11ab7ad8b3536e66fda7ebe SHA512 5c3a2382f764ad42629b3f992f0fcef61b858a9ade4084b86d96c16efbf398a6ea5f8d04c3cc5618c681fe1a111877aa64777748535e9830495aaf59e53d11b1 WHIRLPOOL fd98bf4afa94b4f5892b09d2f357b3550b5a9bafdb76e638c25b945151cddb428dbc863408fa0e363538b4b561a653959f0672f40318f1c0dff46fe5ed12a4ea
-DIST TurboJson-1.3.tar.gz 6292 SHA256 f4b3449a871186e141e80e4815ba1c7eb2f3f2b280619c629018e9b1bd2d1e69 SHA512 95467e980563969e7997fdc18215ce318b213d47b30969973635326ead52b818e1e2d9175ab5acf8f99a6f65b48098246b247d255c1e8e1bf1a1cce8b6df6597 WHIRLPOOL 4f898d6b0ec9fc0b5d7f94db6df76e3dc7fbadc20df7c8d08336120b26d9609d549128622af9dd890abfadeb4dbe6b0fda728fc0723e5448358fc08472dfc96f
-EBUILD turbojson-1.1.4.ebuild 859 SHA256 4f367198bf1822a85d260c37a15e6f3787c23a3d05e88ad20fd7dbfcb67feb04 SHA512 e2da24c0c02b9c4acc36ce77ea11d016818ec3d3054bf7ca9d970d34fc3f0ef2cafd7eea226086f320ab180907220036fab4489b32745920cda575d332ce58f0 WHIRLPOOL ab7c2d15bcffa278273098ad7d682379b56b281baa5490e10d632ec926dd89ee73c5cfc4fd371895bd046b80112f16b5d20bb55c31fb0339ef3443cd926c6124
-EBUILD turbojson-1.3-r1.ebuild 1317 SHA256 f0de6bc56dd138828d0747153c61606480021e50a7b5cdb360ced98db016ce29 SHA512 5b7722e5a58a0daa81b26149869aafa58d3181888a402ff505fbc0a8d700ab1b6c28e857fde30ae2641f2def3f59a3cd9982e5ca77c06eef80aafec07c086541 WHIRLPOOL 403d8e84600b6b4211ce43b3a389716756dc3259745f2bb068054eefe157f580e41856204c7cc6d50d8b1016432b2ef246fd9059ccd26c8154ffeb716e0c7905
-EBUILD turbojson-1.3.2.ebuild 870 SHA256 6b259b288e57a9832364a8544c1ce3b5443ae3311adc2b0e8a469b8b2397a37e SHA512 12a469499309f9aaa1dfaae3ee6df99f948dec9c02dbc228eaf92729c7473a5ca68f41ff4846c7972d3f3f5bfd5c70118df3db52a605c7bf91f40850ac4513de WHIRLPOOL 345cea5af99300c4d5366a32dde41b13e8525d3fb4c08c485fcdaa3b39d83739d6d887e994a7532ecbf62df79b56668f8613a396d55c52ec05d513fb65883d51
-EBUILD turbojson-1.3.ebuild 857 SHA256 29e9754770ad7283c5ed27e009031e6735012f090bc37513cf8c5be27e47024c SHA512 4efa247c705e84f0ce54bfb8ce480860f8565e953c8efbe31c8d805ef4b31d69d83412c95991fa326cd84792d674533b284b96a12263c6f19077c7ebaca5c4e3 WHIRLPOOL e6146039d24454da247be646f8b54bced832650c54fd0cf07e03dbc4701b77eaef55fa869dc13eb722d6ec407520d4c135c03a0882e92ef66a2935b1eb11a280
-MISC ChangeLog 2245 SHA256 d7cedc51d79e98cd28eb173453a633020c4fcc90f545bf9b872e251232e06f21 SHA512 b6969f09814f0e95140b0610c63c8840123b596b3b88399559de6b87df61910c38279ef3c072224d3fb2f6b2434d37789a0dc87b1b77b6716f24346635e41929 WHIRLPOOL f8d370d10cc91d18eec1545ca575c76a29ea22563f3ee183695247bccce09c4eb852d6383a637e2956e43c89ef676d7b23b62246b6971ba57e90a5c1f1646e7b
+EBUILD turbojson-1.3.2-r1.ebuild 856 SHA256 a9755eb524f9af9cd746ab79f6a5947f37eccd08f7717e290d121149f8d935c9 SHA512 1b242255be3117e4d0d2609c6502a092edc4638222e6bd2da2681622d4433c5bcd467a2f18bc8edab84cd012482b39a8757f29bd4b266543d27d8432f4cd860d WHIRLPOOL 3e97c563347a166b375d82bbfb30155bf6ddf7bb77f04b6591d7a793c4d7ca140e099d1e7ac673a809a68d112f809f4cdef9b1c948447528bcb932db136d4639
+MISC ChangeLog 2568 SHA256 cd058299a29a5fb67eb92b24c17270615b4c462bc895823194d26b015326e7df SHA512 6227038157a82fc396ffdcba8a7f477a5681781b378a879338badde44eb4744e93bf1a6bb364254eef25df7ce9bc4e3630cbd7c6ffd823e1909e579ac1769809 WHIRLPOOL 1333dbf60fc4fda1b990f387774c811eefc22423c39746bd5baf09e5826b59ab5a15bc658407889b92408645ae092bbfbff4dfb1fde03a01577c700a4082bcbe
 MISC metadata.xml 232 SHA256 efa7abacb9830d8ef3f088bd05ff95199cb8017a8a43fb8c6feabe532ef20810 SHA512 58aa356cbcb1bc0ebfef4b1f73ed032e11f4bf744f8ef09fd20871e14ead79054d542d84ec747e3ed328b300009fd1032d57c1ff630e32392c1c7f7ebaf10df7 WHIRLPOOL 4a807b435060a2bb9ae139f226d946a273137569e702b0bd48bbc9503685b07d31ff222a65ce3f8d62c631452beedfe4cf4d9b72f13388b79c2fa9955fbc32aa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTOds6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOx1YP/jbyeFYVz3rFxeWHkRW9Dhiv
-EflAy3Lu/iI4uldnCl1tEaSemG9a74GkX+KTpWIZs8i2SpSCm9WfIY6eV684eoMs
-VzdD9Ey54RnfbNMuSAjAwAmzm29C2/JMB7fGiRKQwaoguIfl2LCI3Q6Ca0d1wrTN
-wPrHlu+qON0i90bhZXK8HVZB/AnS/viUu+jOME4yAL3Tdzyc7S/4oxZtgRhdicVR
-vDZrlBgb4P5u/xFAswRSmVACbbMjWrX41sDBpo7/aDHJ7zs8C6b4SnWoJdGQasOK
-TvnulTgGczxhidBMTVc/Q5Pb1eS9bce9ER8c2ogwbTtG6wjmByOygmPIkOYyEA1X
-9sEpuPdTImrLpomA98jR1Mcu5CsyUA6GO59GJMUBqlstOfTF1i2QA2kKovDDADKE
-wqJUwMpuBivQVZjNVjIwrRiFpW0kjQjVE/e8YjqYvwJyE4r2p7jqyBhpLmc6y1VF
-IfQXar9FjBFf4SNmYzxQTZWsShacvnFfp9+OWb0pFEpcOnmf9mboAqRRwqblLVCs
-1LYuUGxbbyKdx/lXnoxEBwWYRATI402NJxFRm6kcgx8JZ9LI1dlCtiuzFSb8als5
-vSeBpiBGZ6k2ad9lrrY89/Stt/hTpIDIOyqsQ71z1kXhw9D8aC8ARP6ce08j++vA
-v2rIJPBw4FhS5jC99KAZ
-=Qsxf
+iEYEAREIAAYFAlSb/psACgkQso7CE7gHKw3HEgCgkIFWGTDw+wJEQJA+eeQRkCso
+OesAoODHdOTDpxhJfmlwd9bDH1RFDKRB
+=MZpq
 -----END PGP SIGNATURE-----
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}"