From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 25 Apr 2020 11:37:10 +0100
Subject: gentoo resync : 25.04.2020

---
 dev-python/brotlipy/Manifest                 |  2 +-
 dev-python/brotlipy/brotlipy-0.7.0-r1.ebuild | 55 ++++++++++++++++++++++++++++
 dev-python/brotlipy/brotlipy-0.7.0.ebuild    | 53 ---------------------------
 3 files changed, 56 insertions(+), 54 deletions(-)
 create mode 100644 dev-python/brotlipy/brotlipy-0.7.0-r1.ebuild
 delete mode 100644 dev-python/brotlipy/brotlipy-0.7.0.ebuild

(limited to 'dev-python/brotlipy')

diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index 3bb810ccfeb8..cf150750dd99 100644
--- a/dev-python/brotlipy/Manifest
+++ b/dev-python/brotlipy/Manifest
@@ -1,5 +1,5 @@
 AUX brotlipy-0.7.0-test-deadline.patch 913 BLAKE2B f7a57989defc3cbc6aa0f29d9db73d7aaf5abae22609b4d501699b4e5195f50fa8025feee64e7935584868d5100f3e088abcc2086056058464f3f4ad14a939e6 SHA512 c125622a149582b0e45397877f4f609ced2d9b388ed101a7a5c0bdbdbb849093538be5ba12e6d549c7a9fea1df3c74dc8dcc3d4bc894bb2ebae0117440b1d5af
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
-EBUILD brotlipy-0.7.0.ebuild 1551 BLAKE2B 445751c29a1f6a70eef13db3636b3367c6cc97a126ad69d890ab0e307da42423b31612b022e8464d326d98be30c0af900cc74da5a268a37c133a23774525b7b9 SHA512 14357c9eb3516e02995c06207c702819d12d058dc09e4227afaf7bdd2cee338c73f4e670f6990330a33d6d7edf61cb32ec2490c4f8b55be46b69a2a4d5583722
+EBUILD brotlipy-0.7.0-r1.ebuild 1622 BLAKE2B 1bd30c1056d090af443dfa15fff985e7b1efc2754a744b83436e95302b62d5354fbec9a7caa62553a48174c086464608398c6834b6425dd3a537e25d984d7096 SHA512 cc9bec766b2d7cc88d873297b2dabf6208782286c17f63c4547a6359e659394665a2d96506f56bdcc9833acf821ccf1b8b564d88191290e65e15f8ca246837b5
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r1.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..7cd6af268498
--- /dev/null
+++ b/dev-python/brotlipy/brotlipy-0.7.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+
+inherit distutils-r1
+
+# Commit of the Brotli library bundled within brotlipy.
+BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7"
+
+DESCRIPTION="Python binding to the Brotli library"
+HOMEPAGE="https://github.com/python-hyper/brotlipy/ https://pypi.python.org/pypi/brotlipy"
+SRC_URI="
+	https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz -> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# module name collision with app-arch/brotli
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]
+	!app-arch/brotli[python]"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/brotlipy-0.7.0-test-deadline.patch
+)
+
+src_prepare() {
+	# Inject the brotli lib.
+	rm -r "${WORKDIR}/${P}/libbrotli" || die "Could not remove the bundled brotli lib folder."
+	cp -r "${WORKDIR}/brotli-${BROTLI_BUNDLED_COMMIT}/" "${WORKDIR}/${P}/libbrotli" || die "Could not inject the brotli lib."
+
+	# Tests fail if we have this folder preserved within the lib.
+	rm -r "${WORKDIR}/${P}/libbrotli/python" || die "Could not remove 'python' subfolder."
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv || die "Testing failed"
+}
diff --git a/dev-python/brotlipy/brotlipy-0.7.0.ebuild b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
deleted file mode 100644
index 1842271e95a7..000000000000
--- a/dev-python/brotlipy/brotlipy-0.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
-
-inherit distutils-r1
-
-# Commit of the Brotli library bundled within brotlipy.
-BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7"
-
-DESCRIPTION="Python binding to the Brotli library"
-HOMEPAGE="https://github.com/python-hyper/brotlipy/ https://pypi.python.org/pypi/brotlipy"
-SRC_URI="
-	https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz -> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/brotlipy-0.7.0-test-deadline.patch
-)
-
-src_prepare() {
-	# Inject the brotli lib.
-	rm -r "${WORKDIR}/${P}/libbrotli" || die "Could not remove the bundled brotli lib folder."
-	cp -r "${WORKDIR}/brotli-${BROTLI_BUNDLED_COMMIT}/" "${WORKDIR}/${P}/libbrotli" || die "Could not inject the brotli lib."
-
-	# Tests fail if we have this folder preserved within the lib.
-	rm -r "${WORKDIR}/${P}/libbrotli/python" || die "Could not remove 'python' subfolder."
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv || die "Testing failed"
-}
-- 
cgit v1.2.3