gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /www-apps
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
46 files changed, 513 insertions, 660 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 659775d2a4b2..89cc41781c46 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/curator/Manifest b/www-apps/curator/Manifest
index deff3d5c21a2..d3bb35c8133f 100644
--- a/www-apps/curator/Manifest
+++ b/www-apps/curator/Manifest
@@ -1,3 +1,3 @@
 DIST curator-3.0_pf078f1686a78.tar.xz 408412 BLAKE2B 265827b3e216661810065a0d962c66626f1474ff5d60f4dfbb0ba02acf7f9a9bbac1d350330a9b2bf2d863436440bc32c31572540edd949f0e94b3c29e884955 SHA512 5f6866396762d510319f8f36205ac1caa4468e761431ed1445d57858fab18120da0e3ff38b2aedf6d4d97fc6ed0998a62a3ed55476442b4537a092bc8d435751
-EBUILD curator-3.0_p20110120-r2.ebuild 694 BLAKE2B ed84831a5552c0d7f418c1cc3e8a422313a9dca8720fd3a047a72f53d5b61cc1f27355d62a3632ae1fd1cbfeb203c1e1fdb66b34897d2002710ef4f9b8e41172 SHA512 3609ef82e3809a17ac5da4a43c341013a57197bdc27aff74a41b57a2026888745ca53d69f2789bf7a17bc6f25abb362fbe658fc4b8e72e9de0b1c07008bfd994
+EBUILD curator-3.0_p20110120-r3.ebuild 727 BLAKE2B c5c3f2ad9655ed855b78694050fd61bfd47e9c4181178b245965e89213380002bf6409cff99b14882b668ebda0df88bb4d038d4509605cdf155b6ef4e1e38e67 SHA512 d1c91b17b1e5dd7f98a597667520f74b2db3698a6f5f9ecb59cededd6ed4a63a6e7787d08e602cc93afd71c4579fbb789e0fed3b673ca9cb2864e1dcf7e75bf0
 MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8
diff --git a/www-apps/curator/curator-3.0_p20110120-r2.ebuild b/www-apps/curator/curator-3.0_p20110120-r3.ebuild
index 965e48375b6c..31738bc61f4f 100644
--- a/www-apps/curator/curator-3.0_p20110120-r2.ebuild
+++ b/www-apps/curator/curator-3.0_p20110120-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,9 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+	')
 	virtual/imagemagick-tools"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 3d471d271d51..52bf33ba68da 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -15,13 +15,13 @@ DIST netbox-2.6.6.tar.gz 2414895 BLAKE2B b27e1bd5bf810627a4ec563b2eb5dbd7c86bf3d
 DIST netbox-2.6.7.tar.gz 2416096 BLAKE2B 9c9744b60c3999fa7c3336539937cc20eebac67559444a4512cc4d69e8d38babc147254fd1fc49b8515203a8fd4411bc61c4c30aa3313e1ffe0d0e86abd8c9bb SHA512 63ed6a95a1f33ee5dd19dc2e43fc5c6aa09979c6f6856b28060992a8aaee956363caf20c48e72884adb84d260669d828311c0cf0d143fc0e58fed9677baf76db
 DIST netbox-2.6.8.tar.gz 2416523 BLAKE2B 1624415302696f47f799f8bd42b827bfdac7866e750ad71cca84a3c095aa39e403036d82257c864f0e4ecc1725087cc1253c73fa26928915e2c53213c3a3852a SHA512 12a094434c66f954cdd356a41123d5e6c2df8ba9aa846731ee439fd0bf330a003ca4b96c8889aef7be2e551c1d518e96c83182168049a76e9cf4ca3104533280
 DIST netbox-2.7.2.tar.gz 4936914 BLAKE2B 905e2667d0637d2edb655efcba1d697eacb097ddd67c8e4586ee2a3ce5a81e4fe98a71f574ae5c732190e03e42fd4cab2f781a30622e79d5e9ea4db7c86de263 SHA512 87753ce955e296d9605e44d5f0df58c14876ca8feda3245dee166fba8a51cbfda7def8da39663570cd0e7c9195cc163d9e877b59027ea1161c7eec33702a3ea4
-EBUILD netbox-2.5.11.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
-EBUILD netbox-2.5.12.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
-EBUILD netbox-2.6.1.ebuild 4245 BLAKE2B 8e04b1ee274fa82d7db31627c12c7fe7038dfd7f79640d2c737dd6a6c9cfed6c1c0eb67b355bd6e96f62a1c7840329adfe86c793efb2fd97a2c71f9e485914fd SHA512 a6d53f3b1fd03b6ee2a6e1eb7cf3da083922277350f21d20ff319d4ff09f8e5692e5f2dcc16e8ac85c198a52be1bba0cd6dc53779fa96241679e7ce1e3c36597
-EBUILD netbox-2.6.4.ebuild 4253 BLAKE2B 4eafb9fe1d6784f8560911f6a3de0e991e1e31be022634faf22ea7191a00e720613c6cb03650fdbb49cb9141abddec60d3548ddbef3ad784a7aeb4223c7537b2 SHA512 4b50e5561d746d668d37e0b1f52c8190aba36fba4dbf06dae12078b890dc5cef7038d6b1e5db107e20897509d0381a5205226c78769ea751e4859ff7c7564622
-EBUILD netbox-2.6.5.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc67ff01bbe0ae3034c6797dbb32266ade0e4ba3a3e9f64e4d4e2cc4c05c27e44f9be122bdb00e774a7b3052e2 SHA512 4f8e434d048bff36029485337ef847f44c54333bc50418a3c9b3faa5870642082aff65fb5937801cf975e93c794b00062bc8473672bce79a5a9068e877060756
-EBUILD netbox-2.6.6.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc67ff01bbe0ae3034c6797dbb32266ade0e4ba3a3e9f64e4d4e2cc4c05c27e44f9be122bdb00e774a7b3052e2 SHA512 4f8e434d048bff36029485337ef847f44c54333bc50418a3c9b3faa5870642082aff65fb5937801cf975e93c794b00062bc8473672bce79a5a9068e877060756
-EBUILD netbox-2.6.7.ebuild 4253 BLAKE2B a7bc7d7cc3043236a63973544d2ac7051d474b4b4e2e6cb44e617c20bb61e2abe58ef148fc68b715a0d6513f9a89cc734f527eb1aebbbe94457fd0118b270f35 SHA512 025be51114549859ba406276c1af6cd16ac668cb0982d1bd3cbd0ed87a852a3cef6d16ff9a864b4b7fca7e4be442556702ff8e3e985109f2bc4021efd7886d5e
-EBUILD netbox-2.6.8.ebuild 4260 BLAKE2B d97a4b11d73c392787c116c059e14ff6f7f353e312f29db2e3ff4fe5ac9f9b3ed04f5bf0063cf99db1c2c7e491155925f463d5d6d3404b9f9017a06c1d873513 SHA512 87dd3997a6e9bebc80462c9dc3ad2a50b96f869a47f1cb990b5f223db74ba9cc6ed678f067029bae091c32bcbd4828710c034b0b1299aced6b2be81bbf79be84
-EBUILD netbox-2.7.2.ebuild 4212 BLAKE2B fe91ebc782696d72ff03024a58f53e2807e42eefbfa623642ada8ad0ffec1cc4a92d41dcae8cb6c0515114362286d92d43a9df6fc882b8c4a8663e0546e70fac SHA512 241f852796b64706e6ed70cc1d80a3e6ce4fbcad2925b94d565ffed67b80485ece9da38dbe7edeb9c37c598497ad694ecabc6de5653f5f018a4f630395baa975
+EBUILD netbox-2.5.11.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
+EBUILD netbox-2.5.12.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
+EBUILD netbox-2.6.1.ebuild 4449 BLAKE2B 24567d71dfaeeea03349cfa21ce894eedf2ef5ee982163d2e1b26fd589fd57ab8861284f7a3bd0e67e22d276c380e5d3afccc34eb542334c801797bb29e48dc6 SHA512 673f8f45083827a69f5997affc1d688d5e907e7946a5ec9bb91d339735b3f6fb05333ed02d43e5d08c5bbe4ee6cdb1ee5893f0440b7c1ebd62433b0153cda79e
+EBUILD netbox-2.6.4.ebuild 4457 BLAKE2B e13c5ee4a071dfa2b75f22b9369657c5e4fad707fa88c668a91eec55b31a5f00c8c7932de57c202157c8496527e189299095f0654b0fd81abb2299db16efbc12 SHA512 6d8614ce6fa21c0c1126f1bca90eeb96cd872bf7d2bd6c0525eb514584eff02b067104a4a67fc77b012a2f548edf87446188a338c6e984814dd97a65d1a4cbc8
+EBUILD netbox-2.6.5.ebuild 4464 BLAKE2B 4c1322abab0988fbfb1a6ff7a765401eb29d5dff881f8698f84e8ff1d1761c0a3738663dffddba3a0b2ce0ee59570851a66fc9a90d0ab4f0571290ee44522551 SHA512 6a6e6a23548ed6586caaac4a7116c825a4b8359a74918d1bc442c35218c1a0ac6208689e2576ba6c3d29f6a2530fc15b7293ebe2815e281eeac6b642e85cca2f
+EBUILD netbox-2.6.6.ebuild 4464 BLAKE2B 4c1322abab0988fbfb1a6ff7a765401eb29d5dff881f8698f84e8ff1d1761c0a3738663dffddba3a0b2ce0ee59570851a66fc9a90d0ab4f0571290ee44522551 SHA512 6a6e6a23548ed6586caaac4a7116c825a4b8359a74918d1bc442c35218c1a0ac6208689e2576ba6c3d29f6a2530fc15b7293ebe2815e281eeac6b642e85cca2f
+EBUILD netbox-2.6.7.ebuild 4457 BLAKE2B ca5c253c76db4596ac10d782f4d6e51f479e67a4db4417282c6a8d8e976df9930f1724eb5a38bd1d91a2afff8cc10ea76ac71178caf95bfef007e808e657d36c SHA512 dd70ecd8158c2dd8fadc2efe44f8f90cd38bdecbbc229cd299019cd7ae9203b9f3882383f338a7bbc188b97b0ea53a9a4b6e9d7211cf1f72c62791949f16252c
+EBUILD netbox-2.6.8.ebuild 4464 BLAKE2B 920519600bd479d04b245dd011397acfb994a400af5d1bd4de443eddada71dadd681bf76dc682f381159509327f1440a81764efe22ca27f25178bbbfb9946769 SHA512 76003344da3f5d981f688889a7f83670ae4e1acf3cec631bf58493f0260ca194d3160cb22f39a598e8596d7001ca018d5364c76fc6c80681f144f40ae84df55e
+EBUILD netbox-2.7.2.ebuild 4423 BLAKE2B 4ed733407e768ef91371acd3cedd77754d9c81adba34217266e03e856c0c538d38e224976f1023eff0d7b75b38953584fff009bc84aeb8b72d6d78dd7c2ba0e2 SHA512 0fef56af9d20c10e91852a6e20c200947e1caad0c38f34611608a21ab9cc4ed428584b19f74356ba1744c8cd4fbb7741c4132194e9c27e477e96fecf5bbc6f39
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/netbox-2.5.11.ebuild b/www-apps/netbox/netbox-2.5.11.ebuild
index 12b9bd32830f..64de819ea055 100644
--- a/www-apps/netbox/netbox-2.5.11.ebuild
+++ b/www-apps/netbox/netbox-2.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,27 +17,29 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+	')
 	webhooks? ( dev-python/django-rq )"
 DEPEND="${RDEPEND}"
 
diff --git a/www-apps/netbox/netbox-2.5.12.ebuild b/www-apps/netbox/netbox-2.5.12.ebuild
index 12b9bd32830f..64de819ea055 100644
--- a/www-apps/netbox/netbox-2.5.12.ebuild
+++ b/www-apps/netbox/netbox-2.5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,27 +17,29 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+	')
 	webhooks? ( dev-python/django-rq )"
 DEPEND="${RDEPEND}"
 
diff --git a/www-apps/netbox/netbox-2.6.1.ebuild b/www-apps/netbox/netbox-2.6.1.ebuild
index f9a76d886c58..04c487ccf5f5 100644
--- a/www-apps/netbox/netbox-2.6.1.ebuild
+++ b/www-apps/netbox/netbox-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.4.ebuild b/www-apps/netbox/netbox-2.6.4.ebuild
index 24d3873dc160..a060ba59442d 100644
--- a/www-apps/netbox/netbox-2.6.4.ebuild
+++ b/www-apps/netbox/netbox-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.5.ebuild b/www-apps/netbox/netbox-2.6.5.ebuild
index 4416e86bdeeb..c9b078880e56 100644
--- a/www-apps/netbox/netbox-2.6.5.ebuild
+++ b/www-apps/netbox/netbox-2.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.6.ebuild b/www-apps/netbox/netbox-2.6.6.ebuild
index 4416e86bdeeb..c9b078880e56 100644
--- a/www-apps/netbox/netbox-2.6.6.ebuild
+++ b/www-apps/netbox/netbox-2.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.7.ebuild b/www-apps/netbox/netbox-2.6.7.ebuild
index 5058c6208136..748180d6cc27 100644
--- a/www-apps/netbox/netbox-2.6.7.ebuild
+++ b/www-apps/netbox/netbox-2.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.8.ebuild b/www-apps/netbox/netbox-2.6.8.ebuild
index 62bd2ebdc375..233c4920008f 100644
--- a/www-apps/netbox/netbox-2.6.8.ebuild
+++ b/www-apps/netbox/netbox-2.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.7.2.ebuild b/www-apps/netbox/netbox-2.7.2.ebuild
index f80801767e3f..0ebfe2a208b8 100644
--- a/www-apps/netbox/netbox-2.7.2.ebuild
+++ b/www-apps/netbox/netbox-2.7.2.ebuild
@@ -19,32 +19,34 @@ RDEPEND="
 acct-group/netbox
 acct-user/netbox
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.1[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-rq-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-4.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.10.3[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.17.0[${PYTHON_USEDEP},validation]
-	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.4[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-rq-2.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.10.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.17.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/jinja-2.10.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-7.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyyaml-5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/redis-py-3.3.11[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index d9fad1c4a947..4f80b2037d13 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,21 +1,7 @@
-DIST nextcloud-15.0.12.tar.bz2 56765490 BLAKE2B 6e0c7c00ff419f0041cf271f747003e40ed641ddb7a71345e49ed2e09a61a872f4bf0b978bb78b9426691c221db4f25d484f9b068dec5da1c4bfe8c1d67f1105 SHA512 0f30b45cc33ba3a0afccdb14f7c1ca171ee63f5a3deae98973ef48806b2b2418a52422b0ed33db1e1b455ddcc4d35169f355418c85e847c8b7b7371ea3da296f
-DIST nextcloud-15.0.13.tar.bz2 56983967 BLAKE2B 2a062df7426cf47a4872eced8e2eff664b16d39a60d6ed962d0720ce56a1ed2e526b6b7b414145ee9e429965076b6e9b0531316c702566a0be7eecca18a89f91 SHA512 638c73e971fe08951f6abf3f5b8d53feecfa0dbeaf57ff5ed9805e1e12d75ac62131af6e2c7b6c91d2c59a55a0722a836e2896a202952d51345897ef5b17e2bb
-DIST nextcloud-15.0.14.tar.bz2 56873105 BLAKE2B 07a733796856d835b800c58f85966afb820fb9b729e0b57242b6ff6e0648372c0633df8f9fcd2141d3ceaca5061c7938c6748a35121a18f6a762a96e0465d114 SHA512 7de64811bc64b13c09e12b69d5e514759047ee94f1d0339a2214ad2373024175d8c32f6b5eaf86489635222b1ae4b454a06df8fcc0b148ef529651e95cdbe401
-DIST nextcloud-16.0.5.tar.bz2 62129676 BLAKE2B 733729f3d36f133cb7fb31e73690a56d8a4507a2fb12437d2061d62194ae8fd437777c32bd6fb0dd652a3a1ce3065b9aec2bdcbd89c2fdc07ea391cdc7f98435 SHA512 ace0e3fa343838e89dba0e1c9411b98c851498107bb34b38376e1f4970a3c1efd6b0c15e2ddceca13c00923c868a5c917aa8d5fd25d61b31f1ab9752e9b65622
-DIST nextcloud-16.0.6.tar.bz2 62110436 BLAKE2B f0cdd447507a6cd5f02718d16604f0a3a77662aebb1909a1f1dbfc33f7b7dcf46e17bb22ae954ccc348f3601c314bc75b43dd627aba5bc28d7b1e205c8c99967 SHA512 7716f6365123162ea106a3d7d80cc4f436f8f1e02d2bcc3ed2e42723bc83040a3d80aa7e9e589bdf7db052c0bf4720f4775e066bcfd84a5c2e7d404d08a8620e
-DIST nextcloud-16.0.7.tar.bz2 62297342 BLAKE2B 0e6724007987a07f66d6be27c55bcc8a6b04da0ad70bc28e16f92e9b39bc1d0f72b59f536aaec8ef1d027d61ce67f8e59f43cd4b44c8dcad2dc572a34a69b189 SHA512 5f45f70f45d1293b3eeaae858ec8dd26f491d5822b918de971d467f3dc10b89b39be61ffebe5e5e5301c95defb50072f675d300cc01a2cff7a269ee777c28445
-DIST nextcloud-17.0.0.tar.bz2 64500339 BLAKE2B 91fdd182347816e69f668dc6558e519556aae38abee1e86230610f6c935e82aaec5f003359c5744aa5d4c4b8299cdeaf2b58736124d3c9fe32b07445a6f4e609 SHA512 d271d6220c72473f0ccc1ca776fb883e0d2cf4e338a7aa0143cce8d8ffeecf825eb5e41d42467d22922995dc6adb2751831158923e0dea29405dbb11bea85b04
-DIST nextcloud-17.0.1.tar.bz2 65252188 BLAKE2B 4f9a675636da18ed10d1b92844612e868a4884abf13b15f956bbee0bfc214989840e3d1a135b399fea3a6a5993f638c180363291543f337d6eba572eed514a33 SHA512 74974cd5d19650ecd3f94a397ecce58fea57d62ab0205f87a108f0a57b5745fbe37d5bf272004d5aefef7c17a43558c219afb5304fb14c569beaa8a5fc5fe00d
-DIST nextcloud-17.0.2.tar.bz2 65475747 BLAKE2B 5d51998e57652b7fb3aebd5486dbb51ad689bcf68cacde0901a8fec854e5f19eac1291d9e2348aa3168b08c33ed13f42ae310c66e38b5d230fa13c26c9861d1b SHA512 ea3788958b37e68c88e03d8a39c0284f14fb82e1e4e20f59df1d6acbdd2eb8a50f791ea48abbe2a91f9fa59de93237763f19ded441973bc2834a64721a210aa1
+DIST nextcloud-16.0.8.tar.bz2 62583505 BLAKE2B 07a228833eca7174722a2264eba5fb26d0cbd3329b3a2bc52df118897f59f535416fae39ebfc8be54f1936fd2546f144ce9775c77c224059934fda0966d7767c SHA512 7f1dc29a318ad456d0f46358bf85128abd916274f90df381b7470be69cc94894fc878b9da59cd93971c2c9f97d22ed54f33a59db1d39f3ca64929011f559d2d2
+DIST nextcloud-17.0.3.tar.bz2 65974151 BLAKE2B 08e5e4c02fa970d9dbb5baa7bfdace73dfef19269db8d30306e6c6e8b537ed8c38c27f062afd886edd5346199d6d0a607b2e28fa5aedab57fb9d3870c482d0d9 SHA512 1d139d4ad2072d4195e5a6be15a814370d1df94e7c82a4759fc18d9dc36cf48ab8e96eb7276c82bd449cd8045d3c52a23b18eed9d937cd5fdbd9bbc516a2740c
 DIST nextcloud-18.0.0.tar.bz2 85867628 BLAKE2B fd070bf259f4f087146707c4c2242fa7e0d587979576bbab0241ffc119afd7402f1afe93dba7ada6a1c272b483567bf08193b4ed9aab775aff846813da1365c4 SHA512 c6a3b2bb2abed416fdebecd0c35b2547298370ef8a3a2cc884da877b39ab4a03d205653d94b20fdc0660fa355966771f65a7c0aa1c2117bb5abc85d2f091d4f7
-EBUILD nextcloud-15.0.12.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-15.0.13.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-15.0.14.ebuild 1020 BLAKE2B e3e55ba5589caba6cba6fabf928e57056acee24ca9ab5b2e4ee5f19d6fe027e116da32090427767be5fcebbee12a08ad8ff442562e583e257231357f12cbc720 SHA512 8abfdc3f53e29ab4d6c7db03c3b28a4761ce7764d85944e2134a64109b00bb006ac23695df07436f7dfe7ed79a60568c264372279de9081abf390dacc8819def
-EBUILD nextcloud-16.0.5.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-16.0.6.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-16.0.7.ebuild 1020 BLAKE2B e3e55ba5589caba6cba6fabf928e57056acee24ca9ab5b2e4ee5f19d6fe027e116da32090427767be5fcebbee12a08ad8ff442562e583e257231357f12cbc720 SHA512 8abfdc3f53e29ab4d6c7db03c3b28a4761ce7764d85944e2134a64109b00bb006ac23695df07436f7dfe7ed79a60568c264372279de9081abf390dacc8819def
-EBUILD nextcloud-17.0.0.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-17.0.1.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-17.0.2.ebuild 1020 BLAKE2B e3e55ba5589caba6cba6fabf928e57056acee24ca9ab5b2e4ee5f19d6fe027e116da32090427767be5fcebbee12a08ad8ff442562e583e257231357f12cbc720 SHA512 8abfdc3f53e29ab4d6c7db03c3b28a4761ce7764d85944e2134a64109b00bb006ac23695df07436f7dfe7ed79a60568c264372279de9081abf390dacc8819def
+EBUILD nextcloud-16.0.8.ebuild 1020 BLAKE2B c62ab6863b7d15c3be059c29d190078d2f3893facc03c5b0bcd71d60c09feede548c2feac934aedb6a04d9ad653b830eaf48186b92a4660d88e1df34f1c4a7bb SHA512 7ce9ffb9768e72369052dc6f1301bdc56a67aee7cb2dcc65162ca089b222d7e21a2c4202d5982365777860a51ef33c39c8014d0aa779ea1062f86af6705fdda8
+EBUILD nextcloud-17.0.3.ebuild 1020 BLAKE2B c62ab6863b7d15c3be059c29d190078d2f3893facc03c5b0bcd71d60c09feede548c2feac934aedb6a04d9ad653b830eaf48186b92a4660d88e1df34f1c4a7bb SHA512 7ce9ffb9768e72369052dc6f1301bdc56a67aee7cb2dcc65162ca089b222d7e21a2c4202d5982365777860a51ef33c39c8014d0aa779ea1062f86af6705fdda8
 EBUILD nextcloud-18.0.0.ebuild 1020 BLAKE2B c62ab6863b7d15c3be059c29d190078d2f3893facc03c5b0bcd71d60c09feede548c2feac934aedb6a04d9ad653b830eaf48186b92a4660d88e1df34f1c4a7bb SHA512 7ce9ffb9768e72369052dc6f1301bdc56a67aee7cb2dcc65162ca089b222d7e21a2c4202d5982365777860a51ef33c39c8014d0aa779ea1062f86af6705fdda8
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-15.0.12.ebuild b/www-apps/nextcloud/nextcloud-15.0.12.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-15.0.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-15.0.13.ebuild b/www-apps/nextcloud/nextcloud-15.0.13.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-15.0.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-15.0.14.ebuild b/www-apps/nextcloud/nextcloud-15.0.14.ebuild
deleted file mode 100644
index 0748d546dffc..000000000000
--- a/www-apps/nextcloud/nextcloud-15.0.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-16.0.5.ebuild b/www-apps/nextcloud/nextcloud-16.0.5.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-16.0.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-16.0.6.ebuild b/www-apps/nextcloud/nextcloud-16.0.6.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-16.0.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-16.0.7.ebuild b/www-apps/nextcloud/nextcloud-16.0.8.ebuild
index 0748d546dffc..34b21dfe1a7c 100644
--- a/www-apps/nextcloud/nextcloud-16.0.7.ebuild
+++ b/www-apps/nextcloud/nextcloud-16.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/nextcloud/nextcloud-17.0.0.ebuild b/www-apps/nextcloud/nextcloud-17.0.0.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-17.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-17.0.1.ebuild b/www-apps/nextcloud/nextcloud-17.0.1.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-17.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-17.0.2.ebuild b/www-apps/nextcloud/nextcloud-17.0.3.ebuild
index 0748d546dffc..34b21dfe1a7c 100644
--- a/www-apps/nextcloud/nextcloud-17.0.2.ebuild
+++ b/www-apps/nextcloud/nextcloud-17.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 28072ac626a9..fd475a752da4 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,4 +1,7 @@
+AUX nikola-8.0.4-setup-py.patch 1340 BLAKE2B 7eb27b287eaf588dfc50b21b4be27ec7239a745c2d61ee665d0c4578de4bdbcd5050ae38a2376d2fe7caae0fd41ed62e3e3e0e0bd67ac71a3b66c71c00dd6a6d SHA512 b3d16bd453192bc14208c55d0502192a24577b422fc9ca865512a5693544e238bf15d0bf79ca67bf279a4259e2f70894579f81e3b8ea1914f09bccdcd467b366
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
-EBUILD nikola-7.8.15-r1.ebuild 2336 BLAKE2B 06a8f34a515ae6399a6e0877aea8f12f099da43241c569e923595c18e876468f7c5e5aa939173ad870cb56dd2d73d4a579164fc46942ee47e4284f98d8b5c048 SHA512 4a6d2ea1f357080fc2faf18a2ebe33e058864771caabfc6d603adb8c7240a58e3ec204a4977f5a975dbfb751e732580fc3854deab78d5b0cef7e49427236cc44
+DIST Nikola-8.0.4.tar.gz 4137494 BLAKE2B 04db8b83f34ca9b3cee785c5eed9d0421d27acf750c4f17dc3bec0df6fd4f462af52a65c0c97a07777922da3bf3fa855d58d546479b19bfb152e8190d2f74524 SHA512 eb6774d11be4eab81fbe41115d80e5d0d38694b734431d5d6355fcd3e3d8ae5ff4a02114c5dd0dbbc9e1ea5a625e9ac2b6b91e82f6e017b4376e4ca8d56cfec7
+EBUILD nikola-7.8.15-r1.ebuild 2310 BLAKE2B e06c418bb41204e0fef07348829e762472f51e572c6bf93800a8fe090dc0f1f50bedd011f1dd3059dc9238458546dead07ce62f84a476dc4d87363a4c798e58c SHA512 59b3cb56629185eb7ab9d3713318d54b443622c0a5c6a9cf93892c752a9cd3e53428989c018869476b5180b148d049ea4d7778ae8fa9f30b8d867f0b00233f10
 EBUILD nikola-7.8.15.ebuild 2434 BLAKE2B 66d90061f9679ee9738861c1a7e0b5cb95aac9954aba8cbdd39ad27468f539391d567f86332ad869e2e2635b10e444a254a37ce473fd13f84f54fceeeff4aa8b SHA512 3cbef0fab73ef77fcd4dfc331e251c86c88d5146d094ce516f019e5efe9bdf34f82c8f6ddf9bd3f9f26c426b85f4bed465d070454f3b49de9005b6a191a59e29
+EBUILD nikola-8.0.4.ebuild 2358 BLAKE2B 9e7285413dd8ac344ffcd670edf947bf53294ebbd57991ba155fbb5792a7fcd9fc844db088797d09d420b275b09711a504aaddc061e1c2078a3607a7a5e846df SHA512 36a184844520c54b1e74c42c0c19d574af5070e5516af8c644f51ecd45261c4aa79eabb44d682a47324893ce0ffa57bd0b07d678ed20e6c732f18151a72efb06
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/files/nikola-8.0.4-setup-py.patch b/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
new file mode 100644
index 000000000000..8089b4ee8b24
--- /dev/null
+++ b/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
@@ -0,0 +1,47 @@
+From 89bfbfb5bb0ffc823664557ff59f90db03f7b10f Mon Sep 17 00:00:00 2001
+From: Chris Warrick <kwpolska@gmail.com>
+Date: Fri, 7 Feb 2020 13:06:06 +0100
+Subject: [PATCH] =?UTF-8?q?Fix=20#3348=20=E2=80=94=20don=E2=80=99t=20ship?=
+ =?UTF-8?q?=20tests=20to=20site-packages?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ CHANGES.txt | 12 ++++++++++++
+ setup.py    |  2 +-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGES.txt b/CHANGES.txt
+index e76f24bee..815b37849 100644
+--- a/CHANGES.txt
++++ b/CHANGES.txt
+@@ -1,3 +1,15 @@
++New in master
++============
++
++Features
++--------
++
++Bugfixes
++--------
++
++* Avoid installing ``tests`` package to site-packages, remove it from
++  your environment if it was inadvertently added (Issue #3348)
++
+ New in v8.0.4
+ =============
+ 
+diff --git a/setup.py b/setup.py
+index f6ca027b7..e4f2c7fc7 100755
+--- a/setup.py
++++ b/setup.py
+@@ -105,7 +105,7 @@ def run(self):
+       author='Roberto Alsina and others',
+       author_email='ralsina@netmanagers.com.ar',
+       url='https://getnikola.com/',
+-      packages=find_packages(exclude=('tests',)),
++      packages=find_packages(exclude=('tests', 'tests.*')),
+       license='MIT',
+       keywords='website, blog, static',
+       classifiers=['Development Status :: 5 - Production/Stable',
diff --git a/www-apps/nikola/nikola-7.8.15-r1.ebuild b/www-apps/nikola/nikola-7.8.15-r1.ebuild
index c989d8059c4f..f7d523787787 100644
--- a/www-apps/nikola/nikola-7.8.15-r1.ebuild
+++ b/www-apps/nikola/nikola-7.8.15-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_6 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -32,7 +33,6 @@ RDEPEND="${DEPEND}
 	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
 	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
@@ -58,6 +58,5 @@ src_install() {
 	rm -rv "${D}/usr/share/doc/${PN}" || die
 
 	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	gunzip "docs/man/${PN}.1.gz" || die
-	doman "docs/man/${PN}.1"
+	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
 }
diff --git a/www-apps/nikola/nikola-8.0.4.ebuild b/www-apps/nikola/nikola-8.0.4.ebuild
new file mode 100644
index 000000000000..abec5ee581f6
--- /dev/null
+++ b/www-apps/nikola/nikola-8.0.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.30.1[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-setup-py.patch
+)
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${D}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
+	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
+}
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 2901d96e5112..a1d13648d846 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -4,9 +4,9 @@ DIST otrs-6.0.3.tar.bz2 24314514 BLAKE2B 97d794d59269d354b28003879bf0d30cc9b0f7a
 DIST otrs-6.0.4.tar.bz2 24355298 BLAKE2B 2f27e7a34b1bad0d58193c834503f051a1a1822afb53dca185ae2f8329d048446acc4e27e823b6f27660c79179bbb48f1976c0b3a6710bc083f791c0a777152c SHA512 23e9a29a6f080c6afa92704d25363687d50073c94192ba81e69ddab55fb9f945a38a5757a4c60c2d46bfc5a0002ca13bbbce1cc0c945f40e23bb864ebc57edd1
 DIST otrs-6.0.5.tar.bz2 24368010 BLAKE2B 20511dfbca16d275a1c4f7f07f8cc9e350c182661c95932f59899400b232612aed95fecac422528e37dd01b772225e78f25464bae40490abd88b391b05ac7b15 SHA512 fe669fb83acef8252cc53b24378757e498201e916a7fc1cb5f509efe777ec2bf36925264a7080f02e50a115285c26429506927390e3b10b35622f3c65a8cd066
 DIST otrs-6.0.7.tar.bz2 24475129 BLAKE2B 595fd84251289ef120b9a35abcde927ef33557adf386dec919e6eb61a973cac3414d148531760f68549a1f0f67faaba258268e761fdfa2be5471a592e96c08b7 SHA512 bb1910a005940f17884da4e8b9b785c9a52aa8a58f434b5c3e65768912b42838d12d69ebb3f7daed2f12dc385829a5a603a1755338d44e0313c35a0a589cbb6f
-EBUILD otrs-5.0.25.ebuild 4116 BLAKE2B acd72a3d46fc25ee805a32df1e13c7a3e724f2a6c2809993aec7870fa4fdea3448375ff371a1ee229dc6f280133b68f059c8f167a2e140dbdea6fa26b6b65bfd SHA512 b388b96afdfe456c560a917b830f617dbd4939c9147a55e3bfb3fa2d487f016093274a86f0cdfcccab0f6c7c549978a58395eb3a15da5a97a15b9ed00bd158cd
-EBUILD otrs-6.0.3.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
-EBUILD otrs-6.0.4.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
-EBUILD otrs-6.0.5.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
-EBUILD otrs-6.0.7.ebuild 4164 BLAKE2B 2a947afa1d5fe3f29e9a9a5a405fc65ed71f3bb41cc0c57615225354cc58e1a783233e9a451623434ad59b60715a4554c700dfa442dc8067974a2af3733782f5 SHA512 74cdde8b76975c4d6f72c68e4363e558a4269dadf13deb39b970e0c9edfb6a70c4cc1258a6c48301afea21b2bd31e7497f22d253ec7e13ef03c5cdb72bea50b1
+EBUILD otrs-5.0.25.ebuild 4106 BLAKE2B d14870896caa76806084bbb7606868f8a9d424d1ddbde0934e888510299b567653d60cac0a148e4bb6404bba54ad919dbce5d0cfacec69dae746cc14413793b7 SHA512 94d66480a4a81bc58075eba5d2347416d4f4ca1027487e05ee91406df49fc435331cf22ec563d7e8a94171179351032857fa289b8b634a84d613b3a29eac3b7a
+EBUILD otrs-6.0.3.ebuild 4153 BLAKE2B feeeffb3f8b0a6d6ecc176c912683f7dbe9ebaab15a8277f909a7bef0febd4f48c55db5409d5d23010f90f4b936ab138b39a789ab051a6988070151b37177f3d SHA512 81793ad7a66ed38ae44905de740d963ba8a5486a56500fedcb74d773bfeacc122593bcc199f445c0cb3bcd9e16960f9337e218e8bd31d1f96fad171fdd5bdd43
+EBUILD otrs-6.0.4.ebuild 4153 BLAKE2B feeeffb3f8b0a6d6ecc176c912683f7dbe9ebaab15a8277f909a7bef0febd4f48c55db5409d5d23010f90f4b936ab138b39a789ab051a6988070151b37177f3d SHA512 81793ad7a66ed38ae44905de740d963ba8a5486a56500fedcb74d773bfeacc122593bcc199f445c0cb3bcd9e16960f9337e218e8bd31d1f96fad171fdd5bdd43
+EBUILD otrs-6.0.5.ebuild 4153 BLAKE2B feeeffb3f8b0a6d6ecc176c912683f7dbe9ebaab15a8277f909a7bef0febd4f48c55db5409d5d23010f90f4b936ab138b39a789ab051a6988070151b37177f3d SHA512 81793ad7a66ed38ae44905de740d963ba8a5486a56500fedcb74d773bfeacc122593bcc199f445c0cb3bcd9e16960f9337e218e8bd31d1f96fad171fdd5bdd43
+EBUILD otrs-6.0.7.ebuild 4154 BLAKE2B 1b9efe65b063a05a13452d79ae50d7d92bd5c634bd6117641d1cb7b882d3d9ca91346860df56dd3054685f0903032dad5cfbf1b2e3cae76212243ba335ed3580 SHA512 6329e8c775efb853a65d7ec0e61fa847b945a5a0f1dd4e63483e020652724db19964ec1456f85f63604d6258f7848c2bb471d7493633b5322a75f77c041fdae6
 MISC metadata.xml 356 BLAKE2B 01ce80250b32ee5bb55945f5753006caa150efe3d771eb5f16eb4ee05e5827ade93ca8d3ba691b08a5a06555d9a8463bbc072662a1c83f838cb94c0a7c32d636 SHA512 f3a9aa7354c5e544f5b904c5b875686c656432f84baf1b769c347057bde6919921fce09162dd6b1eb549fc468e0ac22b0c9709ed52016bfd414e6494f6ba70af
diff --git a/www-apps/otrs/otrs-5.0.25.ebuild b/www-apps/otrs/otrs-5.0.25.ebuild
index 3701f495278f..a21c129d913c 100644
--- a/www-apps/otrs/otrs-5.0.25.ebuild
+++ b/www-apps/otrs/otrs-5.0.25.ebuild
@@ -90,18 +90,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/otrs/otrs-6.0.3.ebuild b/www-apps/otrs/otrs-6.0.3.ebuild
index 3158404230ca..8a49432f6abf 100644
--- a/www-apps/otrs/otrs-6.0.3.ebuild
+++ b/www-apps/otrs/otrs-6.0.3.ebuild
@@ -92,18 +92,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/otrs/otrs-6.0.4.ebuild b/www-apps/otrs/otrs-6.0.4.ebuild
index 3158404230ca..8a49432f6abf 100644
--- a/www-apps/otrs/otrs-6.0.4.ebuild
+++ b/www-apps/otrs/otrs-6.0.4.ebuild
@@ -92,18 +92,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/otrs/otrs-6.0.5.ebuild b/www-apps/otrs/otrs-6.0.5.ebuild
index 3158404230ca..8a49432f6abf 100644
--- a/www-apps/otrs/otrs-6.0.5.ebuild
+++ b/www-apps/otrs/otrs-6.0.5.ebuild
@@ -92,18 +92,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/otrs/otrs-6.0.7.ebuild b/www-apps/otrs/otrs-6.0.7.ebuild
index fa7797934ae0..c1ab3165754a 100644
--- a/www-apps/otrs/otrs-6.0.7.ebuild
+++ b/www-apps/otrs/otrs-6.0.7.ebuild
@@ -93,18 +93,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/trac-mercurial/Manifest b/www-apps/trac-mercurial/Manifest
index 5a8f651a21bd..5eded3b24104 100644
--- a/www-apps/trac-mercurial/Manifest
+++ b/www-apps/trac-mercurial/Manifest
@@ -1,4 +1,4 @@
 DIST TracMercurial-0.12.0.29dev-r10899.tar.gz 26248 BLAKE2B e9734b7fcce215c7929869bd1f857e3bc07026a275c3eee34cd0bddbe06811ee8c190b95934ca118d6680ffe3e7bcd45454ffb3e50a236e406454ba17ff1dcd1 SHA512 bc2ea9676dadc926cb9caf65219924953e36ccdfd2d4a6a8f1fdedc05486578b16972f4cb66bf948737e08160ebe366193a5071f293927f573c940c92fa7e31d
-EBUILD trac-mercurial-0.12.0.29_pre10899-r1.ebuild 598 BLAKE2B 12d2229351cf539f0137d7c2a96f8e48e7196f958ca5144aa34bbb05144a1716dde888630f8cab83298d22877ea5e5ad9f1efd13ee7b522c2ba38e0b31d298f7 SHA512 b0f59a6abefec46871fd52b429a0d9133d1fb5a1d48d283a247449a999463e3513b39aac2351c36e3392694598932b6f0eac7b2bcd39c2f0dbc7815c1aa7b733
-EBUILD trac-mercurial-1.0.0.3_pre20130206-r1.ebuild 626 BLAKE2B 3be90007bd24258b6efd77712461b54fc115bff82f02138bb93734bb330b01e1a05d3c0c2a06671ea2681877bcc4687325456057253e4023fa5996e6d5830a46 SHA512 7661e92f7579a02436748716d2f22ddfa3a2ff90f98dd857441a9a491e43807a73626e6faefa9ace633c9e7293777efeb71964b770fdcda91de90ce43909662c
+EBUILD trac-mercurial-0.12.0.29_pre10899-r2.ebuild 613 BLAKE2B 6b7d81ae2eddc31d146d1f02649ea23d64063f48603b3b3ae42fcd84391e76a4b2060751546eb363d1f7e99cb9dcccfe98b2d5ba1bb7d7c38886426eda8220e1 SHA512 6b15bfbfae0b05e9f83a06401fd2814b77bf9a9426a345cc70056de36b565672be93b0f4f3aa3172779b9053ddfb1c3132e7d283b735973f238aaff14023ef75
+EBUILD trac-mercurial-1.0.0.3_pre20130206-r1.ebuild 640 BLAKE2B a15d8eb34cdceb7ccd140a781c52be8ed759880038f596ee2fcbb41e83125bd483dc95b151e8efe462eb5c1d847be19ddfd341e3aff12e73f9a24552c152b994 SHA512 e830f121ae7220cac568e36091cb9df0b0fb68127c48c8ebabf093cce7ecd40815ffb6db2900e14b98130fbfb15298fd1ef180d26a1f16674b7266ab35362abd
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild
index e661cc957b68..705c196994e6 100644
--- a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild
+++ b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -19,8 +20,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=www-apps/trac-0.12[${PYTHON_USEDEP}]
-	>=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-0.12[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-vcs/mercurial-1.1[${PYTHON_MULTI_USEDEP}]
+	')"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
index 9b4f678dd53a..6aa50c5b940c 100644
--- a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
+++ b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 mercurial
@@ -20,8 +21,9 @@ SLOT="0"
 # KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=www-apps/trac-1.0[${PYTHON_USEDEP}]
-		>=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-1.0[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-vcs/mercurial-1.1[${PYTHON_MULTI_USEDEP}]
+	')"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/trac-tags/Manifest b/www-apps/trac-tags/Manifest
index 02181df84271..a7a40ff7f4bb 100644
--- a/www-apps/trac-tags/Manifest
+++ b/www-apps/trac-tags/Manifest
@@ -1,3 +1,3 @@
 DIST trac-tags-0.6.zip 50426 BLAKE2B 843dbf8be57ec04015151368545d0893e2dcdaa9811082d079c34de9ed74270b14144faa53ac661a329e6c06d59ed530e15fe2880667f74d081cb5a2ba5eff02 SHA512 7fb82a5eeaf267defaac24a1b886b0f4be00ee78c39120a4e3703d78aa41a9328a483682826d74ec87bde897d269ed0e96d37ca07c0fe96abd79bdae59ac763b
-EBUILD trac-tags-0.6-r1.ebuild 668 BLAKE2B f78c89969a2b4194e886f35e8fffd003256c1f1b57552b770c8836dd5240a83d6ffc618e0f25d37fde624aafe0b3154bd14aaeadf85c66261dad39a60fe82785 SHA512 c2d37bc4ddd51fce6d7584d2bd7e2a9cbebc0bfd9d65f28f33e6f149dce421ce94b36f4b075b418062feda0456927bdc3c420e43389c6389ad57d3d9c23193e1
+EBUILD trac-tags-0.6-r2.ebuild 693 BLAKE2B e053c70d2f1893f33343ba6d44384449a1eb74ffe033c3fcdb2ad2a5524dae3e1de15d4ec17fc9903cb3bb2d729aec02d0d462d547876b689cb34e1deba42c22 SHA512 f1dedd7903a564f09f8c1928e2ce0388ff0056bc119823d0f9313f95eaa26ca74370f84dd5b9a0a46f06623eeed36ad1cd534330466169595aecb0cb3a0f7913
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/www-apps/trac-tags/trac-tags-0.6-r1.ebuild b/www-apps/trac-tags/trac-tags-0.6-r2.ebuild
index 43896d792b6f..025d60b0a73f 100644
--- a/www-apps/trac-tags/trac-tags-0.6-r1.ebuild
+++ b/www-apps/trac-tags/trac-tags-0.6-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -20,11 +21,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-CDEPEND=">=dev-python/genshi-0.6[${PYTHON_USEDEP}]"
+CDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/genshi-0.6[${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	app-arch/unzip"
 RDEPEND="${CDEPEND}
-	>=www-apps/trac-0.11[${PYTHON_USEDEP}]"
+	>=www-apps/trac-0.11[${PYTHON_SINGLE_USEDEP}]"
 
 S="${WORKDIR}/${MY_DIR}"
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 12f17be3df74..57fa28517667 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -4,6 +4,6 @@ AUX tracd.confd 359 BLAKE2B 5bf14f9828f3eb22c39a27dd20da219032cc3157d45b16a54a0a
 AUX tracd.initd 823 BLAKE2B 4325de1322cda7885539859c2b2ea3d27acaf636bde728c50fcc4c769acec308e6b56d3449109171ce9bdd2bdda9f9364f93c7069debd0a0ecb1009ce0bbf29b SHA512 88a2c92fc1f947d794e68b158db1786cd9c2891de5d3d0d5b738e1245f35998e17741176ecd2a9562d21058f480668cfa61628c7a7b4bccf62e1373728db5be6
 DIST Trac-1.0.9.tar.gz 3642845 BLAKE2B de0a6fdfc59c5c3f1e795a7e0a006e724491d1d084c9fefcc35185a40430e06ed781c94cf9190d394b943064fd87a34a6fffea7f57c3d4b55b591a6aab5a83ad SHA512 af429db720049ab344ce3c3b430dcf0ab7530013f59ccd2334633de9babc3f31b14829b9b5aa48aa05f614ca72d1d557953c58bbfb93faae2267afeac72e6304
 DIST Trac-1.2.1.tar.gz 6212917 BLAKE2B 6445ec515b295d0fdd3a75e93da853d136f19083b6e87cbe9c856e2502d217c433bfd7f885d8ff45556882e8c99a7d6e966761027f72e32e675278ee83a67eb6 SHA512 0ee008ce0d890873eb6db7eca60e362760c4a4857dd74bda67c30e566dcb5bd64ccd6d5e7317da904e8dcfb7d4a017004d3bb794dd405936c94803b2fcc4829f
-EBUILD trac-1.0.9.ebuild 2858 BLAKE2B eb0ec099e286642749fef941a8ee38cf05c67c3cdc94534a7aa2ea76d70fe0cf1609d2666b09c246688bc18665cc17a9c373593a09db00e7b4ff29d479ca6ea1 SHA512 9050d01f27b70a6738086199239ca4ac6b63aeb7eb1a91fd52f104a669cbc8f63b518248ba50f2de45a09a9d04d75d9d0aca06844c83cb0681eae152960dab6a
-EBUILD trac-1.2.1.ebuild 2535 BLAKE2B cd0067c253874f924768fb49ec7694132c6b51f83850a286a5d1d426e2d1b97b0e6589ef96fe66004cbf93e6cc005dd5de80f4b3604155af4cc41284cf34df70 SHA512 f7868d3cb2f5701359413549236e5716bc8ff6d8414786104aad1dd841abcdb1b70b08ccf7c0bf26f5e2a8ea6acae093d74579203508fccb19a663420ebc63f6
+EBUILD trac-1.0.9-r1.ebuild 2960 BLAKE2B 265020873a4d0e48615176c67b69b5c014bafd64daa1f83015455fc7bd7b772dc1fec63e49a318f6718dd49d857ddd145f611eb32b77143352c333afd03f2b46 SHA512 bc93908766ba71b15df748971a430ea4727147e110a4dca45a8f5ba77346f9fd7a0ac4fb6569b04c3d237b67d3d90738531584d4b5e501dfd9752e1d0d6fcf45
+EBUILD trac-1.2.1-r1.ebuild 2635 BLAKE2B 03e604c12440fc7c8f55d0c2599ce3a361839e599ef672ce7fbac2d2a46580087a9af54c6bbf6dcb00270ea69986c84b85291e6d545ede1382553e39951e225e SHA512 052b5e79aaf4932fc77476715e7962a20d61dc08f10694b216701316e41f4b460984f49b695260d7e9b187fb5ce75f71db194fccab72ed953af5410c2feba487
 MISC metadata.xml 506 BLAKE2B 4b408bc9a05c2bddccf9c733ea9f58c6f2be64f3dc8b04f4a3f3330b3ac21157f3468144a62f6473c253e8e8019c759a3d2bfbd1ad36633c3097bc061b88a8b4 SHA512 06c8b9589b20dfa824822b3129d7f62bc2aaad12f37b16e735604469a94ed51c6c8b57cce53efb1e81d748bae56ae90d74837d60667a4826ac53044e2afdf048
diff --git a/www-apps/trac/trac-1.0.9.ebuild b/www-apps/trac/trac-1.0.9-r1.ebuild
index 4925adedf918..92856efa6ec7 100644
--- a/www-apps/trac/trac-1.0.9.ebuild
+++ b/www-apps/trac/trac-1.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,25 +24,27 @@ IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subve
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/genshi[${PYTHON_MULTI_USEDEP}]
+		dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+		i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_MULTI_USEDEP}] )
+		highlight? (
+			|| (
+				dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+				app-text/silvercity
+				app-text/pytextile
+				app-text/enscript
+			)
 		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	cgi? ( virtual/httpd-cgi )
-	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+		restructuredtext? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		cgi? ( virtual/httpd-cgi )
+		fastcgi? ( virtual/httpd-fastcgi )
+		mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
+		postgres? ( >=dev-python/psycopg-2[${PYTHON_MULTI_USEDEP}] )
+		sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+		subversion? ( dev-vcs/subversion[python,${PYTHON_MULTI_USEDEP}] )
+	')
 	"
 DEPEND="${RDEPEND}"
 
diff --git a/www-apps/trac/trac-1.2.1.ebuild b/www-apps/trac/trac-1.2.1-r1.ebuild
index 94523e6929b7..d80396e3d00d 100644
--- a/www-apps/trac/trac-1.2.1.ebuild
+++ b/www-apps/trac/trac-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,23 +24,25 @@ IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subve
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/genshi[${PYTHON_MULTI_USEDEP}]
+		dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+		i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_MULTI_USEDEP}] )
+		highlight? (
+			|| (
+				dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+				app-text/silvercity
+				app-text/pytextile
+				app-text/enscript
+			)
 		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+		restructuredtext? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
+		postgres? ( >=dev-python/psycopg-2[${PYTHON_MULTI_USEDEP}] )
+		sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+		subversion? ( dev-vcs/subversion[python,${PYTHON_MULTI_USEDEP}] )
+	')
 	"
 DEPEND="${RDEPEND}"
 
diff --git a/www-apps/venus/Manifest b/www-apps/venus/Manifest
index 7a082ed98d20..b8c39b644686 100644
--- a/www-apps/venus/Manifest
+++ b/www-apps/venus/Manifest
@@ -2,6 +2,6 @@ AUX postinstall-en.txt 192 BLAKE2B e64917b92cc44853bca099f672be29b78a58679490dd8
 AUX venus-bsddb3.patch 1366 BLAKE2B a764ee9447dd8034f9b3b50ee4d0fb0e977edb006f861b20a114a1589c38672bb7a16abfc895d64ecb3c9cde6e0ea9f4a8f52adfa879031d27e9675c6da7b32d SHA512 cb3cca0415a9d12356dd85aa1434270612e09153c443a2f207af8d0be53c64e8a87bdd10b3e89b4d5a3fa56334cc691f3c44221078fbe2931c99b6215fc1925d
 AUX venus-xml-utf8.patch 4058 BLAKE2B 03d24dd8265754e006e5083b3aff7c4894fd4cf039c8b7177ff3a25b6529e4da42e1b031837490e1c9af480106b1c4f02297bbee2167f6d07067bcf06d4c2e81 SHA512 1466ec1fabaef90b7907cc7587ff994a8a9d8935eed77c725ebb65b9b86f3daa15d6e0da907ce84ce7090d14c82e1c96739b3a4a7c862bcc22af60cb74e0ad6c
 DIST venus-20100911.tar.bz2 349639 BLAKE2B 386b6b7381b9dbf9515fdad03179a844dcf884a928d291b8a7b3a1897b4f67bec9418e2fec5373f640b5eab7c028671e28ff92e08461f779869b81c0388fd54b SHA512 516a503e1e43e4bf694f007382603d6415bf508f79feb8db55dba533ca9b8b367f922ede84b2ef4ec74684f81ad17919ba754abfe5e79aac51da732ceb8c2897
-EBUILD venus-20100911-r1.ebuild 1558 BLAKE2B efb0c8876dd33ac963d81848f0535ccf9b337cc5e727004f9fbf1d031f9f73eeaf858e1d40c3692e68e52a876ebff9d84d048fd950eeb672936cb4f9f1358dfc SHA512 d58ad99f891ac6cdd93d3dcd608aa65ffe5ed3e2c85c6e47250b523522630e874129c5f1662bb0629ff700612414281fe65aea5f13273fc9f2d6fdd0cd83b93a
-EBUILD venus-20100911-r2.ebuild 1610 BLAKE2B 3a854d9b07ec980ddffd3b819847283652b74d648d7374bb4210e16243cf15ed3f9e93567f5580d448364653a6a26d924c3fdbaef0e0f39f01f91ac8ba00caa1 SHA512 8cd5412a3d3e48b15be10e31142121593f82b07ce6badbcde591b27c866b46360a6b5cef689c5ce4d69813ce9b1b276c6df45a32b8868320a52f707730d847b0
+EBUILD venus-20100911-r3.ebuild 1636 BLAKE2B 8356d1ef984737bdf87be28a1b1ee371dcdd2ea661981a3befb72d1d88201a877928b66fe097306ffcefb4ac952611c871abd4c53ab527d4e3ee123e1943a7fb SHA512 b56a6dbf8b77e477cdaf8eb4760b32f1102f0c7c4c15acda60a2ffae9c34db52058a3bb706b37cbceb59f94fd32df59bb42b053364519b92c98580a520a8c6cd
+EBUILD venus-20100911-r4.ebuild 1688 BLAKE2B 7605112b1e5fbae391d0d8f2ca9ab2c14e836b4206ae7a40ef7d387f4b65922d84444f2a502f356cf441c0251e01c875bc8fc904b81c3864e3fff5b178e580ac SHA512 d141b55ea1f46e7924c299b531f1864a6fb4c6ada1d33c3a0b022e5f5bd2448750af0412af5cc5dba1d78d31baebd53914df97f492aa1cd41498bd4dccd41fee
 MISC metadata.xml 480 BLAKE2B 997ccc6bcd7147a44d4928d558f82170bbb032c57b0dd4d9a7daf5584cbdd66f3733e6bf2d5c5711a843b199552d82f00a4508586ee1de7fb922cdccaeb95db1 SHA512 0caa5f4788096b3eaaa02c6cbc2f0685975e25f95ce1775e330acae28c708a0cf1bf38f31c8384068da0258948ada6ce09c6c864dac680753fb83a0d272d3bc9
diff --git a/www-apps/venus/venus-20100911-r1.ebuild b/www-apps/venus/venus-20100911-r3.ebuild
index 44d5059cd316..228801836103 100644
--- a/www-apps/venus/venus-20100911-r1.ebuild
+++ b/www-apps/venus/venus-20100911-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,13 +19,15 @@ RESTRICT="!test? ( test )"
 SLOT="0"
 
 RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/utidylib[${PYTHON_USEDEP}]
-	django? ( dev-python/django[${PYTHON_USEDEP}] )
-	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
-	redland? ( dev-python/rdflib[redland,${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/utidylib[${PYTHON_MULTI_USEDEP}]
+		django? ( dev-python/django[${PYTHON_MULTI_USEDEP}] )
+		genshi? ( dev-python/genshi[${PYTHON_MULTI_USEDEP}] )
+		redland? ( dev-python/rdflib[redland,${PYTHON_MULTI_USEDEP}] )
+	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
diff --git a/www-apps/venus/venus-20100911-r2.ebuild b/www-apps/venus/venus-20100911-r4.ebuild
index dd264089df00..cd6f9036e379 100644
--- a/www-apps/venus/venus-20100911-r2.ebuild
+++ b/www-apps/venus/venus-20100911-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,13 +19,15 @@ RESTRICT="!test? ( test )"
 SLOT="0"
 
 RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/utidylib[${PYTHON_USEDEP}]
-	django? ( dev-python/django[${PYTHON_USEDEP}] )
-	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
-	redland? ( dev-python/rdflib[redland,${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/utidylib[${PYTHON_MULTI_USEDEP}]
+		django? ( dev-python/django[${PYTHON_MULTI_USEDEP}] )
+		genshi? ( dev-python/genshi[${PYTHON_MULTI_USEDEP}] )
+		redland? ( dev-python/rdflib[redland,${PYTHON_MULTI_USEDEP}] )
+	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index ba92c9e74b2a..2f2706abff51 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,3 +1,3 @@
 DIST viewvc-1.1.26.tar.gz 616103 BLAKE2B e622dbf247641ddcdd68d54a8e10168d4b7506c2cb53f6d2e30b9bac36207520cde57d81875e1e0106287da9b4bf312abc2c69b15d206e557cf93a2b26cae446 SHA512 af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e
-EBUILD viewvc-1.1.26.ebuild 2559 BLAKE2B 6ed71fe42d8556438b4946aac14992688d5dcddc28cf3011dab0f1ff3c593f8e46c95d9226a3b6c2f94191e1d233e5e0dccbbb0c7adf237cc5b5a2387e83d220 SHA512 c6997566f74e0804d8b8562568135e9f39423b1368de0d12b36d4b4ce85379e7ee7a43a6140d9740225854ac000dcca105d20023928d4ebf239192b4bab47e78
+EBUILD viewvc-1.1.26-r1.ebuild 2618 BLAKE2B 421d26caf4a49f2f8a3276a54c920a573797d575e60453dda15f49a8bd5e90d418debef0631a3fab1404309258cc998bd099e5a5d9b0f03043971ed2f67211ac SHA512 a6ff0fcfdecb2ecff6a8e3da98490ed28552cac5bf572d2c414b56ac32048321072e2100cd22acbc4ea0d33d3856b8bd55a7a4f6580818b4665eac07f7a0c423
 MISC metadata.xml 558 BLAKE2B 3e08174918193e922abeea23a32ec3b6732d300380cd01aafd3e15476c1c0eba2bdd9e63750c9fe37addd11ea03c03c03f25cf2184b372b14430b583148eba1d SHA512 9623aa98ccf5ab79b5784e6cf7773ffb769ebd2c73847df3be6f0caa1cfaa59c73b5f820b13a02ccbf0398e3e33e20174f5d81c279ec707d5a574fa0cdde24db
diff --git a/www-apps/viewvc/viewvc-1.1.26.ebuild b/www-apps/viewvc/viewvc-1.1.26-r1.ebuild
index 787b46c03658..fa7bfd6b69c2 100644
--- a/www-apps/viewvc/viewvc-1.1.26.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,17 +20,21 @@ IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	cvs? ( dev-vcs/rcs )
-	subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_USEDEP}] )
 
-	mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_USEDEP}] )
+	mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_SINGLE_USEDEP}] )
 	!mod_wsgi? ( virtual/httpd-cgi )
 
 	cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
-	mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_USEDEP}] )
-	pygments? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		app-misc/mime-types
-	)
+
+	$(python_gen_cond_dep '
+		subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_MULTI_USEDEP}] )
+
+		mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_MULTI_USEDEP}] )
+		pygments? (
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			app-misc/mime-types
+		)
+	')
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /www-apps
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)