bump; upgrade patch for tests, rm disused patch and old

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

diff --git a/dev-python/jsonpickle/ChangeLog b/dev-python/jsonpickle/ChangeLog
index f5885f7a515d5d818f8b74ac359321eb1f9f163f..3f679972eb7bc1696ce4a2993a2e1fb2db8c3e93 100644 (file)
--- a/dev-python/jsonpickle/ChangeLog
+++ b/dev-python/jsonpickle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/jsonpickle
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/ChangeLog,v 1.24 2014/10/04 10:33:23 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/ChangeLog,v 1.25 2015/02/07 08:15:56 idella4 Exp $
+
+*jsonpickle-0.9.0 (07 Feb 2015)
+
+  07 Feb 2015; Ian Delaney <idella4@gentoo.org>
+  +files/0.9.0-drop-broken-backend.patch, +jsonpickle-0.9.0.ebuild,
+  -files/jsonpickle-0.6.1-test-fix-backport.patch, -jsonpickle-0.4.0-r1.ebuild,
+  -jsonpickle-0.6.1.ebuild, -jsonpickle-0.7.1.ebuild:
+  bump; upgrade patch for tests, rm disused patch and old
 
 *jsonpickle-0.8.0 (04 Oct 2014)
 

diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 4f790654b9dc52882e1e1d219948168fe1784245..382f2762dba18cfd22620ceafc980540e8565436 100644 (file)
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0.9.0-drop-broken-backend.patch 491 SHA256 e8321f8e10af38ee8adde08342ae415b30d470984077d6c6ef2fd3b29d3fadd0 SHA512 dfff7c7ace27d56198e44c9f0d0839ea9d6dde4bc74545c240ca65bd8b2a16668ef08f79d0254ad0389cf71471a5c0944203b8e23746b306abbdd83b9a639a29 WHIRLPOOL f7651657c19f7a388f84ec706eee10c4bfbfbf91f1c7b6afaa2c0470ce9d1ba359a4b8cc990c7a0f3ad92bb439686c489d112b027c664564d907b84f7da5c7ae
 AUX jsonpickle-0.6.1-drop-brocken-backend.patch 575 SHA256 e78fa083db9766508ad3158114ad4578075a0c266bcf0d9dd8a0fd4022f7fd09 SHA512 3234249ef1c8b0d83c57734162ec525aa59ebab55bc26e50efce7ee797fe04a0ea6dac03827f28cf3acb9fc87e78f6a67b5ed227a324cabacb66936a36a9f9a2 WHIRLPOOL 517c2bd5744263ce8f772021694e5d0ae261142715742576a4fe6c7ae4bf210a5a3eed94c3becdffef688e87ecc7d8cef740daa6a6b9ab3bcc2cb2b9dd038b19
-AUX jsonpickle-0.6.1-test-fix-backport.patch 870 SHA256 91fcaedf3fd76323716b7aa63498e47e4e8205744ad787b5d8908a32031d5151 SHA512 0a72827c14c3a339cb37fae5c8652df2db85623413b5fb66bb94211b1a177b53a8d294091235d532465c9c0ad677b1c1ec2fa522542e8485ac50a3192127faf4 WHIRLPOOL 50506518c20f8f5ed23b4b75e16a49dd19f808c9c28aeebcfacbb5671a872e2c4ec35f4667df69f31d24043cc98f67e047202bda616279b060bb82ed38f1d960
-DIST jsonpickle-0.4.0.tar.gz 25352 SHA256 546cd22d361ef7019f60e2fb6dd032c1e78d731fac962bda7c15806e6c0285a8 SHA512 ad572c43a0b9f2b6e3cf553c976efbe74e2667313ce52f4bdafbdf8b5c48e54633b1f707cc61bf4dfc6b2a8b531ae7d5a9810ae48901d686cd4d4accf73f0611 WHIRLPOOL 1c569ccb49fe7314991a5741f8e0320b61a2af64a602bc630b123c62be8b4125563bb2e225fe0b4f4300319d2d92f139c15d4a5c37a4ac7df4733c00a4380f8d
-DIST jsonpickle-0.6.1.tar.gz 31922 SHA256 8ede5bef60e94173c7c4bcfa3d63187d6415d2a425a1ec164687baa4d5bfb8f7 SHA512 8cf6c3a4c56c392a94b75f2fa54031e7f264f3cdafde7eeae65d76566f28736fff9a79e8b48703bdf5f39820343b8990907850fcb17c5d73ab36da594030acd2 WHIRLPOOL 3572593d5d2d29ef1fda3b4c376311b2456805decac670d779b2086ecd0949f13dd71ac647a143ec703faa4770070acf2d057b64f4b110ed414bbad51f044a0d
-DIST jsonpickle-0.7.1.tar.gz 35301 SHA256 9b9ca60d3c02cc0b44717f6bb37678feac6be9730c51fae4da7fb2bb3db77ef9 SHA512 fa0e87484c621ca7fb9e11faf2695c89e344f4ee7b7c985e18bea93146e88a70cfdc7c57915c17ef078e6b10f9ff71c9d0aef5187c048ab54523536633a06207 WHIRLPOOL 0bc23797b47be3bb5cf0272970e7c68ff6f151a7dcf6f131054a450bbd1d9f2c5b40cf91357e6a7a7f7ec21d958ba0eb271061479c9cc7437939dd417f1601a7
 DIST jsonpickle-0.7.2.tar.gz 36613 SHA256 77782ba433e067498e174af90bc963b59897f1a37469d34ef3f205cbefd9bc1f SHA512 a3bd56a82231eef9325c8045922a746f865b349721c1eb03de0ad34524222c2001215d61419f5413fe64765d31411689fc466e78c340f0394c4a2bf3914408c6 WHIRLPOOL 90acc887dbe19f3989d3505d353d4e4e69a3841181e59d5f9d9c6baa1cb2de34d48c3c189f0ff1ead48ac6e5211418bbe59244b0c0273d3926a017a9713d5b9e
 DIST jsonpickle-0.8.0.tar.gz 53246 SHA256 fbdff63cad3af5313b186bd44b0977a28fa0aa7d0fc1677e440b5512bea1f99a SHA512 955da4cf18cd76b5fc7777f74babe820b02bc79438e51e606d24f98ed8f655510293f77db5b7919d9f3607431a2c5a76fb6710a97a23f7a041392c1b3d3b65b6 WHIRLPOOL b61ce4a55ac57d8a5e5f8621ccb4404a9a1b6d73291945007bec1625a06f8ea84d229e05ddde023b4ce1d6d9cc21f34494fa94e0554db19f13d01602cd662070
-EBUILD jsonpickle-0.4.0-r1.ebuild 786 SHA256 0c7580720eaacfda7ec909537fd033aaa0ddc1f3074773c3a93d8c51dc1b9c76 SHA512 472011eda9ec5834bdb7c12692c899cac63b056ec7203b7288067cf6778ff037d9dd7714f8b2548e58cf9d5f0a66a82db10cf8f4fbda51c590b70da75f2cf78c WHIRLPOOL d2e89eeb395ed33aff8c2df54085591b1aa70dae8ef86e3497cb8288a334bc13a12d321138dacd8a85d148aeda8f7b328a54922fb657f5bffd10f7089eac1a19
-EBUILD jsonpickle-0.6.1.ebuild 917 SHA256 1869597eed577dc739eec27ead83331b84ccea64ee9d724f600d4b4d1f1861eb SHA512 201cd767e4e6f99e460901a846e507f8111937e07bed934379920e4384744baeca60c7ebd595dfb6ed2d8890b5a8b04fc1ed7ef8b7e5f8683677c73cf74ca793 WHIRLPOOL c9d5b347462072746de6889f6892de94ce18c1982a54229acc82fa83a5b26eb2335ab0fe47c5376961e62b1e44caae5606d5bac6a0f8c2b3732f4d3a056adb4b
-EBUILD jsonpickle-0.7.1.ebuild 882 SHA256 01e95ce0dea6f2fe29e997b8ca6e490ee165d8a4886e9b6bcfbf5e88a4c5825b SHA512 dae92f1414e670cbe70f3b0af6446f0a7f68d170cf13dc1ee64093c02dd064d1a902c28601aa98cece34d09ace77dfddac8d56966f4395b0333cfe308373e9bd WHIRLPOOL aeb59d7bb98687c107b579087161b914ed6f9cbd6db4ac5e013d4f0cd8c0973ed1357684ffff28340deca24d6141a0ea195685ca2e85ec1e1993f635d64d7fe3
+DIST jsonpickle-0.9.0.tar.gz 58850 SHA256 3abde4db37e9f350124eb64b224f428a650dbe49dbadd7321e96d69b3a90e194 SHA512 126ee9449a223ef9bac374c9e5225d5b03fc0affd0c3ff2ad8e5df1a035dec0bc6adcc4e3c273966ca338352d9abb3158f034ca3ed38b5069aa87e6c557a33b1 WHIRLPOOL f06386a39a7a1c0b09fae1141413dd44dd63736db665afb9a9284e598af636d60f6e01262f1c66236880b7ae1b357a9e7d67860775cb6b563b8f1630021d878e
 EBUILD jsonpickle-0.7.2.ebuild 1463 SHA256 071900f37244f43309670866b37456acad0cfdf1c3729146ef3f959a9fe58f64 SHA512 7b1b1a86cb7a94c34cfe9fe48296b7c9b0e223f6e5b7f9f0962e8b79e6219a4eda6309a4fd8a0ac177f18f3369911ddb8bb38832288f03a773bb199f532d81b6 WHIRLPOOL 0b2cea205890fbf3d16dff325359bb4c908a0528b96bb30363624e8c2cdad3e2dca514868493fa52c8731198f446cadf76ec257e0737b2fc94d3a3ec0100fdee
 EBUILD jsonpickle-0.8.0.ebuild 1567 SHA256 39ec2174fe284b8cbafc288431b3c02546084ba2f379da89c43b894434e11d66 SHA512 fa629adaa3aa6d075124b8225d477918dc634676e6f8eb15498973e2ab2464c58b44d59931ea0db1da1f0b5c2fc497953777992a8df905c3aa39fdb3d0059b09 WHIRLPOOL 547cc427a49472f2471ef6fa7a6443e61d3337ad48ead1069bf9eb54df28da4802d94064ce370593921c573d5653a47169f53c023bfb0d510ef651953d2f30d2
-MISC ChangeLog 3531 SHA256 9a8f1ab62390ca932daf66804ea91cd7ed73a521d43ba183c0ef9100f6450fb8 SHA512 5f6553a1b98b17f2560da774af171d085ff75a25c85376f1e4869baf1e2418b6f790c69fe4c46f3c875af4920d6e82a71f475413b300b963c235df77befd8cfb WHIRLPOOL 23cf78b16dab2b16eb8c69bcf45c5801e57e02f24a12857dea1ee7cbc4a7decb8c31818b0751a08a1acd144f94d1e0f9dd543799649e58b61eb98785273159c7
+EBUILD jsonpickle-0.9.0.ebuild 1560 SHA256 4d8c32949f70219a2eece6be48239d1ed09a77180b82b1c316e3b1aca21369e7 SHA512 4b6ba477d4afbcbc5e3a1ccedbd386c2774d56eb7b16927a64d6dd21f3b6a62a4492eebc93a077705722073aea9c0b861b088929374fed4c2cebcd3bf97d69e5 WHIRLPOOL ca04a24b3766a80f6979ec659b507d3c79496b4171c2f1b1d7b8ced1c5f377d055343e5112e1cf9b8d83fc141e3d60e93043058f82148e84713b5dd063e7e4b1
+MISC ChangeLog 3873 SHA256 7a324bb5d8e7501e37365d4e2e3a925efab537ba9c7253bdf70937d71d3b61a0 SHA512 7d67aebfafd3e04c26b3b3fdaefc84b39d30c9eeb6d7cb5a242ce9a3022ca2c97f16d916a786f2c6c8b5fc2a76f7b05660d0fc107af9fb36bada97e745a99d36 WHIRLPOOL 69a0b596d60273c4afe4cdf40a37e77bbe44cc59f254e4cf5b9899c5658ecbc1aa9d5eaebd2538b0e3e8004a06645c9819088589ef828367682b37933c74cdad
 MISC metadata.xml 238 SHA256 f42bdbf9f8c9af22dede30f8c3a0b16ee9d196ed8d2d7ae337d20cdfbf8a3c88 SHA512 c6b78a8a76228bbfd6112bf25f68ed7d6e5cc3dff3793bb6d3e0f1528ef1028057c6af76558eaa9532a1b3863ff6f2411ceff35f910c4f85756a5a41512b6eb6 WHIRLPOOL 0b9033bd586d95333818491d964ebffa4901e1f1b211f79c9e9419831b948be5c1e8d2a6f5875dfb269dfcf869faf6d3140a3c29b35b5fba8592eb755ce690cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlQvzQsACgkQso7CE7gHKw1hMwCgvacHcMz4lHMswPtrHv+YVOT8
-yNYAoKFg2eEHiZFZccHijQCmoqwfV89m
-=Csqr
+iEYEAREIAAYFAlTVydgACgkQso7CE7gHKw18VwCgmhXNpnM551PUMm5sIC2dIGku
+8OcAoKJEmPDzhNdsSFz5vbGz1rVNQvT4
+=hsA/
 -----END PGP SIGNATURE-----

diff --git a/dev-python/jsonpickle/files/0.9.0-drop-broken-backend.patch b/dev-python/jsonpickle/files/0.9.0-drop-broken-backend.patch
new file mode 100644 (file)
index 0000000..92f1a65
--- /dev/null
+++ b/dev-python/jsonpickle/files/0.9.0-drop-broken-backend.patch
@@ -0,0 +1,11 @@
+diff -ur jsonpickle-0.9.0.orig/tests/thirdparty_test.py jsonpickle-0.9.0/tests/thirdparty_test.py
+--- tests/thirdparty_test.py   2014-09-08 15:28:09.000000000 +0800
++++ tests/thirdparty_test.py   2015-02-07 15:55:51.962308731 +0800
+@@ -61,6 +61,7 @@
+     def setUp(self):
+         try:
+             import feedparser
++            feedparser.PREFERRED_XML_PARSERS.remove('drv_libxml2')
+         except ImportError:
+             if hasattr(self, 'skipTest'):
+                 doit = self.skipTest

diff --git a/dev-python/jsonpickle/files/jsonpickle-0.6.1-test-fix-backport.patch b/dev-python/jsonpickle/files/jsonpickle-0.6.1-test-fix-backport.patch
deleted file mode 100644 (file)
index e8b3f64..0000000
--- a/dev-python/jsonpickle/files/jsonpickle-0.6.1-test-fix-backport.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4302389b1e4e5ba753b2f76427408910c05f683c Mon Sep 17 00:00:00 2001
-From: David Aguilar <davvid@gmail.com>
-Date: Thu, 13 Feb 2014 13:44:01 -0800
-Subject: [PATCH] tests: replace our single use of assertEquals with
- assertEqual
-
-Signed-off-by: David Aguilar <davvid@gmail.com>
----
- tests/thirdparty_tests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/thirdparty_tests.py b/tests/thirdparty_tests.py
-index 70f7f2c..b069641 100644
---- a/tests/thirdparty_tests.py
-+++ b/tests/thirdparty_tests.py
-@@ -71,7 +71,7 @@ def setUp(self):
-     def test(self):
-         pickled = jsonpickle.encode(self.doc)
-         unpickled = jsonpickle.decode(pickled)
--        self.assertEquals(self.doc['feed']['title'], unpickled['feed']['title'])
-+        self.assertEqual(self.doc['feed']['title'], unpickled['feed']['title'])
- 
- 
- def suite():
--- 
-1.8.5.5
-

diff --git a/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild b/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild
deleted file mode 100644 (file)
index ee3d014..0000000
--- a/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,26 +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/jsonpickle/jsonpickle-0.4.0-r1.ebuild,v 1.5 2014/03/31 20:33:21 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="http://jsonpickle.github.com/ http://pypi.python.org/pypi/jsonpickle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       test? ( dev-python/feedparser[${PYTHON_USEDEP}] )"
-
-python_test() {
-       ${PYTHON} tests/runtests.py || die
-}

diff --git a/dev-python/jsonpickle/jsonpickle-0.6.1.ebuild b/dev-python/jsonpickle/jsonpickle-0.6.1.ebuild
deleted file mode 100644 (file)
index 56cb05b..0000000
--- a/dev-python/jsonpickle/jsonpickle-0.6.1.ebuild
+++ /dev/null
@@ -1,33 +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/jsonpickle/jsonpickle-0.6.1.ebuild,v 1.5 2014/02/24 09:12:10 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="http://jsonpickle.github.com/ http://pypi.python.org/pypi/jsonpickle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       test? (
-               dev-python/feedparser[${PYTHON_USEDEP}]
-               dev-python/ujson[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-       "${FILESDIR}"/${P}-test-fix-backport.patch
-       "${FILESDIR}"/${P}-drop-brocken-backend.patch
-)
-
-python_test() {
-       ${PYTHON} tests/runtests.py || die
-}

diff --git a/dev-python/jsonpickle/jsonpickle-0.7.1.ebuild b/dev-python/jsonpickle/jsonpickle-0.7.1.ebuild
deleted file mode 100644 (file)
index e41478c..0000000
--- a/dev-python/jsonpickle/jsonpickle-0.7.1.ebuild
+++ /dev/null
@@ -1,30 +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/jsonpickle/jsonpickle-0.7.1.ebuild,v 1.1 2014/05/12 09:18:27 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="http://jsonpickle.github.com/ http://pypi.python.org/pypi/jsonpickle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       test? (
-               dev-python/feedparser[${PYTHON_USEDEP}]
-               dev-python/ujson[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.6.1-drop-brocken-backend.patch )
-
-python_test() {
-       ${PYTHON} tests/runtests.py || die
-}

diff --git a/dev-python/jsonpickle/jsonpickle-0.9.0.ebuild b/dev-python/jsonpickle/jsonpickle-0.9.0.ebuild
new file mode 100644 (file)
index 0000000..0ae2333
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-0.9.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/jsonpickle-0.9.0.ebuild,v 1.1 2015/02/07 08:15:56 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
+HOMEPAGE="http://jsonpickle.github.com/ http://pypi.python.org/pypi/jsonpickle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# There are optional json backends in addition to those selected here
+# jsonlib, demjson, yajl, jsonlib
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
+               dev-python/feedparser[${PYTHON_USEDEP}]
+               dev-python/ujson[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} )
+       doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+               $(python_gen_cond_dep 'dev-python/sphinxtogithub[${PYTHON_USEDEP}]' python2_7) )"
+
+PATCHES=( "${FILESDIR}"/${PV}-drop-broken-backend.patch )
+
+python_prepare_all() {
+       # Prevent un-needed d'loading during doc build
+       sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+       distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+       use doc && sphinx-build -b html -c docs/source/ docs/source/ docs/source/html
+}
+
+python_test() {
+       einfo "testsuite has optional tests for package demjson"
+       ${PYTHON} tests/runtests.py || die
+}
+
+python_install_all() {
+       use doc && local HTML_DOCS=( docs/source/html/. )
+       distutils-r1_python_install_all
+}