gentoo resync : 18.11.2019

3 files changed, 159 insertions, 0 deletions

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index a1b5d4ac761d..a3567a867620 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -3,6 +3,7 @@ AUX netbox-2.5.11-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99
 AUX netbox-2.5.12-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
 AUX netbox-2.6.1-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
 AUX netbox-2.6.4-no-pip.patch 652 BLAKE2B 22612628cfa2ca10303a4328ed3c09bb7859c84eda1253330639e3b3576470b34b62bd775b2888043f7d01fefff746cb044bfbf0851eb0245009f46d42c2ab5a SHA512 a331b155ee9bed9a77bfd50eb2008f7281294fe16d280a4d7dc4ecc91fcd014a7cf581a7c9d01f02e2085fb6858bb377029906fd1fcdc042610c0bdda5464537
+AUX netbox-2.6.7-no-pip.patch 1062 BLAKE2B c134503d9c65bdc82147dcf045b69531276c021d650842b28407ed92ac6c7811e98be83b73279f93db2838e2edf7c651ab4e2a43f5421487029c708edb5a6f8f SHA512 e0ac02fcb65a5b7a0e199ef1d82993f75018fd45779bd073b3cfa75b18c221b17db390d5f6a81545505771effa5cd7aabfc96da107b3968b8f7e2a8bcbed9ade
 AUX netbox-rqworker.initd 463 BLAKE2B 9a77e8366018cc6d6a3130580df1ce5e84db06f44857a89243f6f7f527c94477669d2da1f1b588386ca341acd2825484761635346e1cd61ff576c85b506525b7 SHA512 881ef3745aeab79f641e5648301d5584b9ebc8e75c550c01ce6f8d78731b5dde4d4f4b47e2f01d55c788f755eea7e633c82b2dd6027b9cd32385f7d66ff3e1ef
 AUX netbox.initd 432 BLAKE2B 500eeb7a042c930e38e5417eab92fb141dae14ae5dcb62257cd0a6ae6ca4fd0034fdf3dada4cc49a259edd9e565571102351eca447f568ab9becbd7e6a86099e SHA512 14e4544717f17d37209a1613a962fad9110ae0ec39512649d50776eaa2270fd8ba8a4456b11fb66941081aa96553668d7b3ebd12f631f56d234784bdd25f9de0
 DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d
@@ -11,10 +12,12 @@ DIST netbox-2.6.1.tar.gz 2393902 BLAKE2B 027115458cbb873cb7aa7660a6cd1df46a7768d
 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
+DIST netbox-2.6.7.tar.gz 2416096 BLAKE2B 9c9744b60c3999fa7c3336539937cc20eebac67559444a4512cc4d69e8d38babc147254fd1fc49b8515203a8fd4411bc61c4c30aa3313e1ffe0d0e86abd8c9bb SHA512 63ed6a95a1f33ee5dd19dc2e43fc5c6aa09979c6f6856b28060992a8aaee956363caf20c48e72884adb84d260669d828311c0cf0d143fc0e58fed9677baf76db
 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
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/files/netbox-2.6.7-no-pip.patch b/www-apps/netbox/files/netbox-2.6.7-no-pip.patch
new file mode 100644
index 000000000000..a47e151c0842
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.6.7-no-pip.patch
@@ -0,0 +1,32 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index d17dec06..6972ed2f 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -10,27 +10,6 @@ cd "$(dirname "$0")"
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# Uninstall any Python packages which are no longer needed
+-COMMAND="${PIP} uninstall -r old_requirements.txt -y"
+-echo "Removing old Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Install any new Python packages
+-COMMAND="${PIP} install -r requirements.txt --upgrade"
+-echo "Updating required Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Validate Python dependencies
+-COMMAND="${PIP} check"
+-echo "Validating Python dependencies ($COMMAND)..."
+-eval $COMMAND || (
+-  echo "******** PLEASE FIX THE DEPENDENCIES BEFORE CONTINUING ********"
+-  echo "* Manually install newer version(s) of the highlighted packages"
+-  echo "* so that 'pip3 check' passes. For more information see:"
+-  echo "* https://github.com/pypa/pip/issues/988"
+-  exit 1
+-)
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/netbox-2.6.7.ebuild b/www-apps/netbox/netbox-2.6.7.ebuild
new file mode 100644
index 000000000000..5058c6208136
--- /dev/null
+++ b/www-apps/netbox/netbox-2.6.7.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 user 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="
+	${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}] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-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/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+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
+}