gentoo resync : 14.07.2018

5 files changed, 95 insertions, 0 deletions

diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
new file mode 100644
index 000000000000..c95860211e39
--- /dev/null
+++ b/dev-python/jsonmerge/Manifest
@@ -0,0 +1,7 @@
+DIST jsonmerge-1.1.0.tar.gz 12556 BLAKE2B 52039cb1ca349ad9e74cb0bd835796b4e211a2f4cb1eda063e9b3a06efc2dfa8ac1fdab34a3d75bb069dd527c777c086b72b987e4e4149a45eb4593eff6b79ca SHA512 52ca9d17098533ada09365caddaaa92b0e0ac696c99b92db6aabc8942183a6d9e06ebf002213d8cebbd25d4905a6a7bfa17ad9d296c838b0019b9f30e403ce94
+DIST jsonmerge-1.3.0.tar.gz 16569 BLAKE2B 19ec00c06379ac74e18c9a0e0542532e7c9691ca187f189b97252d3265dd80f0584c5495021dff790c44e7fd95571a368f8db008ec30252322a927306e8749fa SHA512 2d44b52441651c090b7439880a1fcda7acbf958fa60bf64b91297b0267500a992e80b3fc51f45c7c97d94af327b02984b110a0e157e62b33f39e1c83a3fdcc32
+DIST jsonmerge-1.4.0.tar.gz 17953 BLAKE2B 625c38fc83bec73f1bca3a8950ec2ee2294ab7da665f4c3b7d78329e5df8a0ed6ceef723eeb5757463b1d702ecfae4a2fa7580915917a7c621c762b90c257504 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122
+EBUILD jsonmerge-1.1.0.ebuild 685 BLAKE2B 6c519ccfcba90f6c59f627330becc41b892b38889a4083e7550cd31592df24001058c3527b340968d39b0552829798ec02c4195267c507b3f0fa45bb064d12dd SHA512 c583c83a4566ef3b1f1def64bcfdc3c0fadbbe98e65421682c1504d07f27e269b77e9124b657c972c0ff123e880ef750012110ec3e657586639a4279868b29fc
+EBUILD jsonmerge-1.3.0.ebuild 740 BLAKE2B c5ee3f5495dd83f090734e3a3f78dcc263aa74d6cc58f075e678e974dd076ca0e9dad3e7a56a8457a4dcd477b2f6d1124261b550f4e767bf431b8020ee220d6a SHA512 48babb502acad6708ada305c6f58e5f6acf3749fd7d7594edb5e0b82920dc3ef3f4851203afd7fdde512b8177a0751bfc52c0c62df51bbacd538188664bfe268
+EBUILD jsonmerge-1.4.0.ebuild 680 BLAKE2B b69cd7a1afc34324d0acfbecea4667391500fa6f629f9c1091ad747f93c6db3dbbe6eab10a0c6dd471cf33958fb84fbae7c1630016c10c26067111b609c2a47a SHA512 22bb0783944d7e4e821035a00c78435d206f8980b39b5619f2c85e230dabb215c1fe7b193c4a5c949234f9f7c4233f083a846efc484ebb27bf6cd8371570d7be
+MISC metadata.xml 372 BLAKE2B 1490ad4a4f5950599628f9bbd3f7cabb2ab2cd52e0cea7fdb814674d3f50804675bac91180392a013294c72e3b7b4d551b0ade20331927ad9773ae4eaf2cdb3f SHA512 ecf2f464f37f4f00ccad0d697216fdb669ab31f26a571023597f8d7bffe2e9101bc618c437ce381879c64701f13d3b81c03dba57bf1a67df5b13c81a137865ea
diff --git a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
new file mode 100644
index 000000000000..0e5ff019a269
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents."
+HOMEPAGE="https://github.com/omergertel/jsonmerge/ https://pypi.org/project/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REPEND="dev-python/jsonschema[${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/jsonmerge-1.3.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
new file mode 100644
index 000000000000..42c5b7bc2166
--- /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.org/project/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/jsonmerge-1.4.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
new file mode 100644
index 000000000000..ff1df63374fd
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
@@ -0,0 +1,25 @@
+# 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.org/project/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REPEND="dev-python/jsonschema[${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
new file mode 100644
index 000000000000..d4bd319f27b3
--- /dev/null
+++ b/dev-python/jsonmerge/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">jsonmerge</remote-id>
+		<remote-id type="github">avian2/jsonmerge</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>