From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 dev-python/nbdime/Manifest            |  4 +--
 dev-python/nbdime/nbdime-0.1.2.ebuild | 54 -----------------------------------
 dev-python/nbdime/nbdime-0.2.0.ebuild |  1 +
 3 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 dev-python/nbdime/nbdime-0.1.2.ebuild

(limited to 'dev-python/nbdime')

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index a6c47f7b4b10..eafeceda4b57 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,5 +1,3 @@
-DIST nbdime-0.1.2.tar.gz 3864624 BLAKE2B dbf51b7eb07d08870fe1c629aa294b784fd95c0d547de3a4ea4fcf7da5ad6c490df3b61f3cb353723b3139137a54b534460c2a25a6480f7316b6fd17d742d661 SHA512 9f704645ef1e64b0da260841769068db6f6aba37f30b3c6506a1876af1276acb452ed78f66b9e6d7029f06ed9fabf01a1484b4b86055f27a451d623a7eda90cf
 DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
-EBUILD nbdime-0.1.2.ebuild 1352 BLAKE2B b2ebb2c82b4ee8d84733a9d165512394515300f956f4061bb8abf1ad9d1e554573f57d7c815e7ba08ec7b51332528d76e332553e316a1b87bd873479a4ce096a SHA512 9fc47ca242ef87508bac7fb2fcf672ca83eef16f4dea3efed44b6b61726a7585d2c055dc8d5585baee85333421168171f62a049f12250cc019b9e06cdf1b42fc
-EBUILD nbdime-0.2.0.ebuild 1604 BLAKE2B 5512035cfd987f67ecaabf154c884e4387dde2281867b616f554c4433b820decfc508b158d2f9f71ccd202029bf745f37b1ddff51826c7fbbe98699618c076eb SHA512 c4870bc67feccd91116ae3c99f480e1ef140567426aac8a8891e58509774fe2530790564ac914d907a819fe0e4184f3b7ee0064b784ab1a161fd6ccdb2d5190e
+EBUILD nbdime-0.2.0.ebuild 1631 BLAKE2B 4af4e35ba869c5c4542803b01781d801b1df729bfe3c9a8241512e2db971e3e91ea51192eb087cb0070fd484a4032d345368f66a4d51bfc0d28bd7c1096c9822 SHA512 8d43799c79a4e7b22854f4f24b399820057517b6b48a542a6342e91c04de49b438df2d8fd934bb8b884153ec52bdb2524c03c5d44394def95a2c1778fc1ba7c7
 MISC metadata.xml 601 BLAKE2B eeec61d75fb90ef3e0f0dd13264d7864a204f560c047dedf6a3ddb5a2df0faffcd344127d8a7bafe8a1f2d0b6382081d56901c6f8c5e0b9e94c8d52088f29442 SHA512 27deefa922e39c76bf3b3ea96aa1f1b5ef478a0b5cf6bbc9832977cf35bce6f9c0f38bb69fd54b0a27877087aab719c34b5811a6063890fdfebab28c57d6ff94
diff --git a/dev-python/nbdime/nbdime-0.1.2.ebuild b/dev-python/nbdime/nbdime-0.1.2.ebuild
deleted file mode 100644
index 3822c2edf178..000000000000
--- a/dev-python/nbdime/nbdime-0.1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test webtools"
-
-RDEPEND="
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	webtools? ( net-libs/nodejs[npm] )
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-	"
-# The package recommonmark is required to build the docs, not in portage yet.
-# Furthermore, backports.shutil_which is required for python2_7.
-
-python_configure_all() {
-	if ! use webtools; then
-		mydistutilsargs=( --skip-npm )
-	fi
-}
-
-python_test() {
-	# user.email and user.name are not configured in the sandbox.
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-
-	distutils_install_for_testing
-
-	py.test -l || die
-}
diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild b/dev-python/nbdime/nbdime-0.2.0.ebuild
index 3e3581e122d9..2059ce503092 100644
--- a/dev-python/nbdime/nbdime-0.2.0.ebuild
+++ b/dev-python/nbdime/nbdime-0.2.0.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="~amd64"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test webtools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/nbformat[${PYTHON_USEDEP}]
-- 
cgit v1.2.3