gentoo resync : 03.11.2021

4 files changed, 107 insertions, 4 deletions

diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
index d57cafa151f1..34ca2c56102b 100644
--- a/dev-python/django-cacheops/Manifest
+++ b/dev-python/django-cacheops/Manifest
@@ -1,3 +1,5 @@
 DIST django-cacheops-5.1.tar.gz 67776 BLAKE2B d89ac7aeccecdb69e02e03a46c9d4250439319a840f4902a51909c762cdcb8b422c2b2be2921ac256cf4a3d3248782ece0378c19b99109038b2f4e2262c57bcd SHA512 c7c5b284af4a7ec4faf88613de8eaf2bee298208ef13efbb4bb337c1e71817f36afe51ae4cbfa566a999e2dcf1361f84684189d9748a08de32675820f8b9c91b
-EBUILD django-cacheops-5.1.ebuild 605 BLAKE2B 73f9c1134ec2743a0b96dc4e3ac8ea8e4fded544a33e1b643177dc0ffe48442b353473570da47a7d0c58e50da553afccce15a174a606db4d74e8496bf2751d4d SHA512 36f26e616eadcc7de8f70aa50a1c4ef0b8aac0586973b55fc82dfce1fc59de720e322e27637e945cf922413152d61846bd7c1eb2e34d6ea5ae6b385c1e6e6ab2
-MISC metadata.xml 297 BLAKE2B a11ae97e0f945cc993c080208140bd02e48a20bbeb8fc98e98994a54eaecba0d93b62daa6f092f5722c8bc736782ae898ffe40d9de1d6cf7a6b52530ea8eabf1 SHA512 0e173e13e9a1115e9566114248bd76cce45f05021bf9b84324f8265ff7a3f1725d0d5840d35ac0d1bd23b527d3a15e6a3e762577b9f75e3d8c4b49a2282a5255
+DIST django-cacheops-6.0.tar.gz 70280 BLAKE2B 9efe5a10d86f9ad25ad67701005de962185d2c491305bb56920203718c2d5fd0b28d43f2463e28c7c00c7592a78a3adea66090b398a205d5e361dfbcf90ae887 SHA512 54ecec62ff255a867b382bb1157117c8d14d7185891aacaae33ea11283beeae2fae60659621699a52f86d536b5a582d31f24f3b00f16c2e81c1a78ea4079504e
+EBUILD django-cacheops-5.1.ebuild 1306 BLAKE2B 6f71486e72aa54870a73d4d224ecd09a425f17ccf99634845be77478f1dc5a23be979499cdea33055b38e130f5b468c859ddb0486b15e720af53ff127d3753eb SHA512 48ac7d10ddfac48557baa65a62ed8d76c3526086c5c6b38df351f306e7500064898bd579a056c8c06eda674f8a053f7f29ed4206ab4bfc17e007c131fe20e34a
+EBUILD django-cacheops-6.0.ebuild 1343 BLAKE2B 4fb0a485ebca18e0826ce6838cf11afb3712c13752537e95d6dc28bf4f13e20f772f940547b5babe38ce6214e7dfb29b6e07647f5bdc93156bd2a8ad279ce388 SHA512 901a88bbe46c43d767c0f68715c251c3df9b4a559f25f316da07598faaf73abc8b679c1b819611c3b5196ff397f3e0adf75f928b66eb576d6da024b1b9fe0d4e
+MISC metadata.xml 381 BLAKE2B b8bf138d65b463c15b22be44750822bf6d49f1e651ecc6884dc008b9f1c93ff314967d8d3793825e129c8ac5d98348ac2726ec36ad43b8ec5d0829a78a16a26b SHA512 ad1f2ac5abcfc3705d70cc717bc076115d299a3b973852a542a7d41fabccc695b79ada0297a48cbe8f04815d66e696b437eca896e291c7da9682a85542d3e469
diff --git a/dev-python/django-cacheops/django-cacheops-5.1.ebuild b/dev-python/django-cacheops/django-cacheops-5.1.ebuild
index 2bcc4a8d1943..35821ca12dd2 100644
--- a/dev-python/django-cacheops/django-cacheops-5.1.ebuild
+++ b/dev-python/django-cacheops/django-cacheops-5.1.ebuild
@@ -13,12 +13,49 @@ SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-python/django-1.8[${PYTHON_USEDEP}]
 	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
 	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-db/redis
+	)
+"
+
+src_prepare() {
+	# Remove test dependent on unpackaged before_after
+	sed -e 's/test_lock/_&/' -i tests/test_extras.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	django-admin test -v 2 || die
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
 
-RDEPEND="${DEPEND}"
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/django-cacheops/django-cacheops-6.0.ebuild b/dev-python/django-cacheops/django-cacheops-6.0.ebuild
new file mode 100644
index 000000000000..ecfd5010beb1
--- /dev/null
+++ b/dev-python/django-cacheops/django-cacheops-6.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
+HOMEPAGE="https://github.com/Suor/django-cacheops"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.8[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-db/redis
+		dev-python/dill[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# Remove test dependent on unpackaged before_after
+	sed -e 's/test_lock/_&/' -i tests/test_extras.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	django-admin test -v 2 || die
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/django-cacheops/metadata.xml b/dev-python/django-cacheops/metadata.xml
index e46e99b8443d..4ee4d9bf5408 100644
--- a/dev-python/django-cacheops/metadata.xml
+++ b/dev-python/django-cacheops/metadata.xml
@@ -4,7 +4,9 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-cacheops</remote-id>
+		<remote-id type="github">Suor/django-cacheops</remote-id>
 	</upstream>
 </pkgmetadata>