gentoo resync : 17.02.2020

3 files changed, 128 insertions, 3 deletions

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 52bf33ba68da..7b8a8c001e4e 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -9,6 +9,7 @@ AUX netbox.initd 432 BLAKE2B 500eeb7a042c930e38e5417eab92fb141dae14ae5dcb62257cd
 DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d
 DIST netbox-2.5.12.tar.gz 2364874 BLAKE2B efe1360fd7c1105e5c6010ee22a882fb4fc796ff0f907974984dba35a0ab6da7724fd6042b102cebe3e3e291c3a1c65c347a5967edbaf443ece6fe61648a93be SHA512 e105a351f1150139c5bce36527ea650f95504ccc1c7b6a82c41396d69bc8671758cc3b33789c95c81785c5ff54d34c7310cd3e03e65bd006606e85021dcd1795
 DIST netbox-2.6.1.tar.gz 2393902 BLAKE2B 027115458cbb873cb7aa7660a6cd1df46a7768dc05c9280f94c23368336752034b8ede591ed4337f6b65ade1db7fac740533c3c2d932043172cf296ddd2e3f8a SHA512 8cfe4384ed4ad682ff5268e83d72716230683e86e858c857fd694838227a8b3eddfe02c1fc39b00cb36b33519d8cbb942dd4008544943e8b8f7f2d5904c10e5a
+DIST netbox-2.6.12.tar.gz 2463692 BLAKE2B 38386569b651e516cf587561f06c11be0d0e6bb9b5e664ba2403367693d29961e1379b7b0754bb2379b9af636aba03d8c9d1b611d607a2a234467b25a956bd35 SHA512 9ebb540541401a3e81a10a2345b54053c8bcb73c4e217732b2d07badf40d08bd3600b50ada13e83fdf28db447233d710b4cf0989d978117cd16a1f7220b40e4c
 DIST netbox-2.6.4.tar.gz 2408970 BLAKE2B 47fa3473e893e8443aace8b587df0065a3024a34f9509644deddce7c53e5ac8b3832df55604f3328d699f8f703ae15ad5b52312e1af8fcccabb7cd06377c8a09 SHA512 b137ec7f2d33bb7b48bcb38719ac9ea8cc31d7d38e33cedfb3279b8be2078c9a48ede10db1e4b4cab4a08c77e010060936e445cb6a1d2e6247bcc8d935cc9c3a
 DIST netbox-2.6.5.tar.gz 2408180 BLAKE2B d119a1bf8256e0d6265eda7122a1d436ecb0e8e640acd12890d242c2c93768b21b5f8ebdbaecdfa31c0eaab0150edf52f08a1f424102fd940dd359bd8eafd4af SHA512 0b76e5bc3f56effbf7493680d10d549caf36e7769e21a2c24449cbe329379369f3428354c228d0cbbbc153dc62efb5c0e56c4a0d71c99f3267acd2446f48fb8a
 DIST netbox-2.6.6.tar.gz 2414895 BLAKE2B b27e1bd5bf810627a4ec563b2eb5dbd7c86bf3d98e52555e511ee16492fd96a6cb7604dce8f5954120ab8b3a48d6acf7878721005bcfd2bd9e3880294dfbcd4d SHA512 9b44442cea1f76cdecb37faee8fe32012b869ff63c1b0bc678d2bb8624851941e9296854a9d85abea24e49a75fd5b31b968e4adbd56e5bc03a1c9f28fc8b846e
@@ -18,10 +19,11 @@ DIST netbox-2.7.2.tar.gz 4936914 BLAKE2B 905e2667d0637d2edb655efcba1d697eacb097d
 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.12.ebuild 4419 BLAKE2B 6b6d44d739de39dbd0ae9022c2471d7deb246f51d8f20c7550fe3a0f5c83bcb2d0d7cfd253dd4117ae9d18451ec46947ac3a6dae343b4eec888b502b069cd0bb SHA512 562710d0d8733fa8c3e44b58e420b7fbd6d101ba567a00dd04350d27f0b40d98b208b0aa45fe8e2b158f2e55887830aef2b02205b730ea6c48310a18e8349481
 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
+EBUILD netbox-2.7.2.ebuild 4425 BLAKE2B 667e32b5e472a4e48d70dc784701911836b1ec52057f5d245d1e5cb7def4350379d0dacf9b39be03d424845d6b06de671f5a5fde25e1cd6f64bde4121dede8de SHA512 9a5d44bd4d2efaac8a7f2c13b7c11f9db3caa300ed8f609c6b9874c7507e9d000f055945c853d01625270ad2adf49b8b6f42d2e18de1ebddaa8f354da9e3fc17
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/netbox-2.6.12.ebuild b/www-apps/netbox/netbox-2.6.12.ebuild
new file mode 100644
index 000000000000..d6676c7aca58
--- /dev/null
+++ b/www-apps/netbox/netbox-2.6.12.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="IP address and data center infrastructure management tool"
+HOMEPAGE="https://github.com/netbox-community/netbox"
+SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	acct-group/netbox
+	acct-user/netbox
+	${PYTHON_DEPS}
+	$(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=(
+	"${FILESDIR}"/${PN}-2.6.7-no-pip.patch
+	)
+
+DISABLE_AUTOFORMATTING=YES
+DOC_CONTENTS="
+netbox is installed on your system. However, there are some manual steps
+you need to complete from the installation guide [1].
+
+On Gentoo, the configuration files you need to edit are located in
+/etc/netbox, not /opt/netbox as shown in the installation guide.
+
+If this is a new installation, please follow the installation guide
+other than this difference. Also, if you need ldap or webhooks, set the
+appropriate use flags when you emerge netbox to install the
+dependencies.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you have webhooks turned on,  you should also add the netbox-rqworker
+service to the default runlevel and start it.
+
+If this is an upgrade, follow these instructions:
+
+Stop the netbox service. If the  netbox-rqworker service is running,
+stop it as well.
+
+Next, run the upgrade script as described in the upgrading guide[2].
+
+Next, check for new configuration options and set them as appropriate
+for your system.
+
+Next, start the netbox service.
+
+Finally, if you are using webhooks, start the netbox-rqworker service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
+"
+
+src_install() {
+	dodir /opt
+	cp -a ../${P} "${ED}"/opt
+	dosym ${P} /opt/netbox
+dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
+	dosym ../../../../etc/netbox/configuration.py \
+	/opt/netbox/netbox/netbox/configuration.py
+	dodir /etc/netbox
+	insinto /etc/netbox
+	newins netbox/netbox/configuration.example.py configuration.py
+	doins "${FILESDIR}"/gunicorn_config.py
+	fowners -R netbox:netbox /etc/netbox /opt/${P}
+	fowners -h netbox:netbox /opt/netbox
+	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use webhooks &&
+		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
+	keepdir /var/log/netbox
+	fowners -R netbox:netbox /var/log/netbox
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	local r
+	for r in $REPLACING_VERSIONS; do
+		if [[ $r = "2.5.10" ]]; then
+			ewarn "The home directory of the netbox user is now /var/lib/netbox"
+			ewarn "Please adjust your system."
+		fi
+	done
+}
diff --git a/www-apps/netbox/netbox-2.7.2.ebuild b/www-apps/netbox/netbox-2.7.2.ebuild
index 0ebfe2a208b8..5039bddd8d7e 100644
--- a/www-apps/netbox/netbox-2.7.2.ebuild
+++ b/www-apps/netbox/netbox-2.7.2.ebuild
@@ -16,8 +16,8 @@ IUSE="ldap"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
-acct-group/netbox
-acct-user/netbox
+	acct-group/netbox
+	acct-user/netbox
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]