summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/simplejson/ChangeLog5
-rw-r--r--dev-python/simplejson/Manifest18
-rw-r--r--dev-python/simplejson/simplejson-2.6.2.ebuild4
3 files changed, 15 insertions, 12 deletions
diff --git a/dev-python/simplejson/ChangeLog b/dev-python/simplejson/ChangeLog
index 178042f2e822..073ddef661da 100644
--- a/dev-python/simplejson/ChangeLog
+++ b/dev-python/simplejson/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/simplejson
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/ChangeLog,v 1.75 2012/09/23 03:47:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/ChangeLog,v 1.76 2012/09/23 22:00:02 radhermit Exp $
+
+ 23 Sep 2012; Tim Harder <radhermit@gentoo.org> simplejson-2.6.2.ebuild:
+ Revert return value on failure.
23 Sep 2012; Tim Harder <radhermit@gentoo.org> -simplejson-2.3.0.ebuild,
-simplejson-2.5.0.ebuild, -simplejson-2.5.2.ebuild:
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index bcc9a13d1fe0..c1b17a42b6c6 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -6,17 +6,17 @@ DIST simplejson-2.6.1.tar.gz 53180 SHA256 b15befbd41157ec21795efcd960828be193cec
DIST simplejson-2.6.2.tar.gz 53228 SHA256 1b28d0896a76d4db1ab759204c039ab1ca4bf28bd30d6bf9c79172454e750dd3 SHA512 58dc99952507562d22aab8cfeb2480a9fea1422ebc588bffd148ac1579be4ef7f03ec1bafab4339447dd56c566a28132011f51a5d44584ae7b46762e61e4ac7b WHIRLPOOL c45f19b234dde5daae05659032c5ce8be39471a014abd2a11cb9d2a0f5f912010887e64e7be0761f59c04ffe73ecb3b308fd13ae30da9c1853150ad878e9c0e4
EBUILD simplejson-2.6.0.ebuild 1221 SHA256 4653a8d1add893a63623deab6b0c60805904cddbf50c2705f0421ebd668d2071 SHA512 afef88ebc84ac820b2edbd8f0e52ff9d2644fbeb889e004aff7529023fc8cf25d2383152bedb7544e0d05dad96aebc64d8015b0c9d00f710d7bf075f2ca53268 WHIRLPOOL 2621abe92172e7a40441f5a8c44c687ad179ce359bd3e518a43949cf2615a32f2fcd0bbc47c759f8caf461506cf266e4510b5787fa5e57eda1de27986e34c8a9
EBUILD simplejson-2.6.1.ebuild 1224 SHA256 3e7604dab1f0505c9599d303edd85ab933a815a2a468a2b8f52d8a3fe68eb647 SHA512 0ec163f5d7d6bdbe2e5b9600c1af6ad9ba4cba412be524511cb692b8588d7829f738da57e1596f1fee96b2125680d04d01f3771651be7cf8edd0a99d1f542d1f WHIRLPOOL cd483243e517d4261bb9ed86d2ffdabc6691107d1048e9b7a96b501b23233cbe00bcaa9cfdb2e4968656847bd03c0ef8fb33cd22227c535166b9a970e3d3c898
-EBUILD simplejson-2.6.2.ebuild 1199 SHA256 9170470adb8eaaea34fbf6a5b73120bd928be1031f50116005ce85ecc99f3705 SHA512 0ede0664e5bf11022256424551c181febf878b0c0feb938965581f3ae7702a428c4afba2572e7fa7cb9410d0eced304178c0a0be581eda188b5c52056618d978 WHIRLPOOL 7520d772909f6f6af5971d1de3cde660111ae36a1b40868e7111d8687a395326ae6034c874661726b3061220ebafc5fb15dd31ddf113a45974a4e594c5171b5a
-MISC ChangeLog 9743 SHA256 6757873ade58661717b857ef19f0c254913d3210205f390a26ff2d920f428949 SHA512 bbf738d9c2b16404b35bf9914d3f2156dd6bc978cb78a5e7b7426ce6cb96332d38be39e30a1230d720adae59dda82c56ff450f1f7ce4a0cc32e65b43d50299db WHIRLPOOL b66ef69348af4c79fb027c6d586fa02f2f988dcc0959e8ec0314f2844107394262f2a9c321798025fcbcdfd806b36e52b9f6cbf10db3a01fb6439d385df885ba
+EBUILD simplejson-2.6.2.ebuild 1204 SHA256 4f4591796b2d949babb159d7cc17ea331e9f082c10c4955b34a7fc99a74aa32b SHA512 37924fe93763d6595d30ca46d7a67050ce3e01b8ab90ae1f081306d5178569a46c33c718de62d4642952eaed5acfcf9b7f023ab5e8ab390af03f58da68b97235 WHIRLPOOL 59ee5f862e609c8e86c1a72239609e8ddee4b9de6908a542a689ace70f56022c3855060971e119a3391c2a659962d27c463b42cd392f983adc28159a4f6ac05a
+MISC ChangeLog 9852 SHA256 4343303548584cdd44d08bffd0110d1fccf3b7191c042941233664793c05bb33 SHA512 c318eac0ff78f5ec93be8d961d65e9aefdfd390836e76caa9b30518b60e58d89aef6394b61342ed6aca56e927d4ec7ffd005a2f63dd8810509bf65d9ecb56027 WHIRLPOOL 85933c55ab4211f3536be9bd95a20c1b289acc17c374b3f60ed6c9e13dd41a48ccb448dc8c9f3f822aa87c323fb71b684801283b3e7398eec34fa960a12476bd
MISC metadata.xml 233 SHA256 872d046b48b5804b0b483642b88ca48f273dc388f5cc892d80b68f948c4e2bd3 SHA512 967fc234f15e45c96feff01405f19a359b1e91e853c688c678b9cff132f9cb2026d1727134a7909af3823f4a647b18afc547487211ab8e58d87ef1e76dd6d039 WHIRLPOOL f7bf7867a1668638bcf61e9a3506c9cd749839d08ab66ecfb3b8d0fb0b760fac2960739c684180c2826157356f6b12008e4b4d09011b636899b3bbc54cb0b1bd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQXoZiAAoJEEqz6FtPBkyj4ZsH/ikADs12SEq0ZddYZJUGbeli
-hxw16KTJUHoeuUddENcIYg/tp477ov1WGmGEImNwG+Z6UXT9N1raxiTYYzMUu4+X
-4QfqogunVlw2SaO9u58W9ddq2Kzd4qx+GFOAnPW5lqH8oPUbgwwdzR2BflQHJY2q
-MeRJCtverh0Uzwc9OZFkaI84/dnarm6Ou9lxywW+7AxVatLiv7vQcmRZFfP7Wi1t
-k28Ts/NkdsXFsG7QdM1dSF4kdOvAs1vvxXjPipuGHLSo3en0DaTdtheWcOAMGZPk
-rpNhJZSI903wLdHwKbt6lDepqnO4j5M3p/ogKmiuxezMGoNQEewbO4xoh4vr/WA=
-=nl+p
+iQEcBAEBCAAGBQJQX4ZsAAoJEEqz6FtPBkyjhxYH+gMJI10bWoGdIPVTFQcBmHCE
+LqWfJVnaMGVC1CLaitCJgKpDeDGlKkb/9IQzH/UzEkaVapAvo0JnbKrB5IR8edIz
+47Xz4QV3PtIf28LuNaTO+vUnTJSdHPwvUVsRFD/IoIfRuLiUyBbe81C/IQM34j9c
+14UbUiAmivj09aSUhTKDHh1mpqUMj7F6VCEV/8zGDg1LmWShfLIZnwPx8jXEJiLN
+HvOMdAzSrYVMAqIZp4josnmJfxSK3rW0zwXGEb/v6IY8o97pDlCjFEcKBvVo3ziA
+uyokS8dC3TPrlZhTeu3HPrAsCxtl8r2fvGtC0ClkiquG9FLAEGmymIfL5M5MKyU=
+=uwiU
-----END PGP SIGNATURE-----
diff --git a/dev-python/simplejson/simplejson-2.6.2.ebuild b/dev-python/simplejson/simplejson-2.6.2.ebuild
index 8faf973001e6..3c9d74232ed3 100644
--- a/dev-python/simplejson/simplejson-2.6.2.ebuild
+++ b/dev-python/simplejson/simplejson-2.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.6.2.ebuild,v 1.1 2012/09/23 03:45:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.6.2.ebuild,v 1.2 2012/09/23 22:00:02 radhermit Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -23,7 +23,7 @@ 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 || die
+ 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
}