From: Dirkjan Ochtman <djc@gentoo.org>
Date: Fri, 9 Sep 2011 08:49:28 +0000 (+0000)
Subject: Version bump simplejson to 2.2.1.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=94803a4ae46bf5b11c8ca26396f590961ceecf9a;p=gentoo.git

Version bump simplejson to 2.2.1.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64
---

diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index afb2982d6df8..22c741fdaa0e 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -2,23 +2,15 @@
 Hash: SHA512
 
 DIST Mako-0.4.1.tar.gz 317306 RMD160 cdd3cb92a86b0fc67346c3ed06ade077d12cbd20 SHA1 a4e30660794aab5224e0c776d03c45f3c8b5fa7e SHA256 c282a6bb1c15571e1bc1612df58e6b5bb8d3d7c57169e641434bb50d303af6e9
+DIST Mako-0.4.2.tar.gz 317823 RMD160 a7263ef10a2ee5cf5dc17c16af289759e63733ba SHA1 5d2056553910b033ac50357b94d4dc2d510d0cde SHA256 3751a1a3fde4f3eaaa7037a491cb4f5d40d85ab882e4dabc094085c5deada423
 EBUILD mako-0.4.1.ebuild 1273 RMD160 e0b03d4db39e386b1f8afc4363dc8491376c6cba SHA1 c06bb8afd07c926ac578c7750319bc7b9a33312a SHA256 d50b8509c79a4554cf3497f2a0ce38464089114c6862bdcf0fc978bdbcb18a2f
-MISC ChangeLog 4929 RMD160 e6e285a27c244c2f476168ac20a9621e058c7a71 SHA1 8dd29fd32ea24eff5cc643bd7519a0640b6eb508 SHA256 494674dec8f52857297e835be92a4d0e4176cfe3b6c4cd735c75c3d95fd83d60
+EBUILD mako-0.4.2.ebuild 1269 RMD160 7651ccfc373472104fa0c73bffe7a5c4e22280fc SHA1 8c35f95f765be6dcd9d9d7ff733e07d36f1cce39 SHA256 482cfee17577a097b1e57a3894efff1a7297120f76fe55dfc9491a6e682572aa
+MISC ChangeLog 5045 RMD160 29c6d38d5c1b1584e1cc33c56060ec2685f296c4 SHA1 5668e29ed71a3544a7a18740e850448b8487824f SHA256 1bbe986cb8de4074f9b3a053ab690d1879f6fe709ccda5d3a10bedfe7637e25a
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOA1alAAoJEPqDWhW0r/LCBHQP/3TF7ntUSollB9fTbJ6x0y5U
-SiPqZhFqQoGs38fddfr8oO+u31/5aZ/Y7FM6niliIzQjFFk6Jb/JwJwdvYj/58je
-QyHyVIjJ3KuGhYNb3YIJFxgTer4fMRbZT3K+w+7tgB6rXRlDvh44pJSwN8AXcVDA
-XDSub6PZMplDDwpbdBJZOnqTbb4jM35pkL3GUKU3vyiBKPxk56D41j8KKO3Q2e4j
-gZfcK2nxdgUeLdmNdlmW0LB9qfqfvcBDb0wCPMCSrOGpld+NpwMfoBTgr23IYCES
-meB/CjD+9/gK77Cj8OJdZfOZ7ILI+cGYuteKhI2IAV8C5cecSd0ech/zWp/25Yxn
-SF7rhvuVy5HQhI91X58OsbVBwkzDtCQpjs9TElHcH/SLAey75fZGVaXWeQhOXHLd
-m/mzeYtN3YjslGAfjfmxDunP9w9L2n67K41Y9dx1lCMAzuVdHsKJtg6s4S7nYsWp
-vDV91nNAqmfBLGFHsw/mSxtEJGIjGc2ApOVA3PBv8Cqw0aP+o6a+/QKylC/iSouo
-IqpSS/6z2vfIyC7WffKiEL8igXo+mvbd82Hglm4o8Sfk2H3ONwmS0MyHsSq2p8SF
-y6Ndp8McFgCy4H/HuBkZUZ8PSMASYP4xFu/oHwXJjsD7ZAftFtvTgZIOPr9HgDFa
-bfhVZoAKM+3W8L8Gai6Q
-=9yBl
+iEYEAREKAAYFAk5p1AMACgkQxeMuLWsGW/sc2QCghVr616FW0kRETEHktxYacV//
+QhkAnAtpJxr/cuorBsYCrhaGWzkIYnM3
+=l1Kt
 -----END PGP SIGNATURE-----
diff --git a/dev-python/simplejson/ChangeLog b/dev-python/simplejson/ChangeLog
index 90d1e25883d8..9cdca15df905 100644
--- a/dev-python/simplejson/ChangeLog
+++ b/dev-python/simplejson/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/simplejson
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/ChangeLog,v 1.46 2011/09/05 11:36:29 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/ChangeLog,v 1.47 2011/09/09 08:49:28 djc Exp $
+
+*simplejson-2.2.1 (09 Sep 2011)
+
+  09 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> +simplejson-2.2.1.ebuild:
+  Version bump to 2.2.1 (remove setuptools dep, unnecessary since 2.2.0).
 
 *simplejson-2.2.0 (05 Sep 2011)
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index e2a7255ad4be..ac67308d36f1 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -3,14 +3,16 @@ Hash: SHA512
 
 DIST simplejson-2.1.6.tar.gz 52356 RMD160 9e494c400eeae677c4a024c6b1a8b37da912eb5d SHA1 36d07a336390d47d2420fbbe9a4803c1a1fe2eac SHA256 b657d4c83a2ffd9c3bdb511eabd986900182870421dceb6b7b117c5407523927
 DIST simplejson-2.2.0.tar.gz 49802 RMD160 443bbc569eed849296e468d14928a219eca5a2d5 SHA1 7bc5abb7547dcfcf6ff005e51abc08249821c98f SHA256 7c19802af7d44171836f9479f791328913bcfeb9bc193c876465dc758c9be2d5
+DIST simplejson-2.2.1.tar.gz 49957 RMD160 c50cf48bf38a734dbd5905c8b4a136c7c2fa56bc SHA1 e48daf374f6131f7875e790a84c218df7a2a710b SHA256 e85c5ae24dd9827113893c1dd2c799528195057388096f0fc45ad4b32b378c26
 EBUILD simplejson-2.1.6.ebuild 1234 RMD160 5d10b54ad3746c9fa482cd501f498305a11b3de0 SHA1 e313cd606322da2c8dde4419af30200cefe64730 SHA256 c4171c4969535d914f8bbb54105e9cd9b5138fa15e24c9d6652838b1127a9a9e
 EBUILD simplejson-2.2.0.ebuild 1234 RMD160 e9c676408f6fa331b3f008b28e31136ac9d3a3ee SHA1 2cb5397d0a8c27a358957f7c68e3b8ae82af20a4 SHA256 8823ad456da2cb7bde3aa9dd8a43856ff722e4da85c2f34b41299cf264089e1a
-MISC ChangeLog 6144 RMD160 945473bfa9e35404604409b16971767ee1aff123 SHA1 d9e2d0ff7f3c3f6fa95c6d125edb76203b474a5a SHA256 05decdfb99159092fd131ce714d3a69954e07ba26e36bc3460492322ebdb6a57
+EBUILD simplejson-2.2.1.ebuild 1213 RMD160 c4cca826098e232c337a96897af96daac69cb457 SHA1 508fa2b5543eaa5513e16770d42a72b822cbcf83 SHA256 845c7ec92d57a72a53e6453c183a761b9a7bff3a4990ecd06637e0c08a8dc924
+MISC ChangeLog 6326 RMD160 d43bfebea57e21dd9cdff953dba67ff0c2543eec SHA1 2ebec1d6a5e5e0fed87093112b7c570849b9891c SHA256 2cba88abe77215bc6ca0546bf298ad33c84bbba065f300506d5bfe730ebc8f7c
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk5ktEYACgkQxeMuLWsGW/ucAQCgpvCvVganeDObjr1PsA6rvyn0
-axcAn0+UoMgQz1uA/B08CeWkyYw7Oyv7
-=g5Gg
+iEYEAREKAAYFAk5p0yEACgkQxeMuLWsGW/vvawCfQL5vmAA0yU0yDeHkY4trbtGx
+m7oAoK7cNLfZ7ZMM06ViqPR1spKciT+z
+=elIC
 -----END PGP SIGNATURE-----
diff --git a/dev-python/simplejson/simplejson-2.2.1.ebuild b/dev-python/simplejson/simplejson-2.2.1.ebuild
new file mode 100644
index 000000000000..5488941819ee
--- /dev/null
+++ b/dev-python/simplejson/simplejson-2.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.2.1.ebuild,v 1.1 2011/09/09 08:49:28 djc Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="http://undefined.org/python/#simplejson http://pypi.python.org/pypi/simplejson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_test() {
+	testing() {
+		if [[ "$(python_get_implementation)" != "Jython" ]]; then
+			ln -fs ../$(ls -d build-${PYTHON_ABI}/lib*)/simplejson/_speedups.so simplejson/_speedups.so || return 1
+		fi
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" simplejson/tests/__init__.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	delete_tests() {
+		rm -fr "${ED}$(python_get_sitedir)/simplejson/tests"
+	}
+	python_execute_function -q delete_tests
+}