[gentoo-commits] repo/gentoo:master commit in: dev-python/jsonmerge/

[Manuel Rüger]

commit:     dff07a9e6c9a582d63561492d8fcd6fe112d190f
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  7 00:15:22 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 00:15:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff07a9e

dev-python/jsonmerge: Version bump to 1.3.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-python/jsonmerge/Manifest               |  1 +
 dev-python/jsonmerge/jsonmerge-1.3.0.ebuild | 26 ++++++++++++++++++++++++++
 dev-python/jsonmerge/metadata.xml           |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index d8611c680f8..8e88587222d 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1 +1,2 @@
 DIST jsonmerge-1.1.0.tar.gz 12556 SHA256 
2ae73a058474e75f27d4ac2595d9da28084ae42be506f04d077ccea3a853b921 SHA512 
52ca9d17098533ada09365caddaaa92b0e0ac696c99b92db6aabc8942183a6d9e06ebf002213d8cebbd25d4905a6a7bfa17ad9d296c838b0019b9f30e403ce94
 WHIRLPOOL 
610597ffb82cc1cf92d40e2c54fe4877c6e38431611855328a6dba5246f2e12420cf7994e00b296a7880588cc4976df62e359e78b6402ec74275d4f343d8618a
+DIST jsonmerge-1.3.0.tar.gz 16569 SHA256 
422d3373905270d4ad53530e1bc184c8b8ab1934853b9108b14ec71c69c2e484 SHA512 
2d44b52441651c090b7439880a1fcda7acbf958fa60bf64b91297b0267500a992e80b3fc51f45c7c97d94af327b02984b110a0e157e62b33f39e1c83a3fdcc32
 WHIRLPOOL 
7eca6661c1a142dc8483ebdf2247f64851d517c51d6fa3c0ade9463f2e354d35fe6f594ecddfebdbc98934128379c386ca67bc22b7a6ed712d8cb4873d01556d

diff --git a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild 
b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
new file mode 100644
index 00000000000..22627bb346c
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ 
https://pypi.python.org/pypi/jsonmerge/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# See https://github.com/avian2/jsonmerge/issues/20
+REPEND="<=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]"
+DEPEND="${REPEND}
+       dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+       PYTHONPATH="${PWD}" python -m unittest \
+               $(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 
's:/:.:' -e 's:.py$::') || die
+}

diff --git a/dev-python/jsonmerge/metadata.xml 
b/dev-python/jsonmerge/metadata.xml
index bf01833be6d..d4bd319f27b 100644
--- a/dev-python/jsonmerge/metadata.xml
+++ b/dev-python/jsonmerge/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <upstream>
                <remote-id type="pypi">jsonmerge</remote-id>
-               <remote-id type="github">omergertel/jsonmerge</remote-id>
+               <remote-id type="github">avian2/jsonmerge</remote-id>
        </upstream>
        <maintainer type="person">
                <email>zmed...@gentoo.org</email>