[gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/, www-apps/netbox/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/, www-apps/netbox/files/
@ 2019-09-25 17:38 William Hubbs
  0 siblings, 0 replies; 5+ messages in thread
From: William Hubbs @ 2019-09-25 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     4e82a7f6b4a96ca9335898b81f3c54d1f69cd42e
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Wed Sep 25 17:15:49 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 17:35:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e82a7f6

www-apps/netbox: 2.6.4 bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 www-apps/netbox/Manifest                        |   1 +
 www-apps/netbox/files/netbox-2.6.4-no-pip.patch |  21 ++++
 www-apps/netbox/netbox-2.6.4.ebuild             | 124 ++++++++++++++++++++++++
 3 files changed, 146 insertions(+)

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 51a181dd107..5e9c37e7f7f 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,3 +1,4 @@
 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.4.tar.gz 2408970 BLAKE2B 47fa3473e893e8443aace8b587df0065a3024a34f9509644deddce7c53e5ac8b3832df55604f3328d699f8f703ae15ad5b52312e1af8fcccabb7cd06377c8a09 SHA512 b137ec7f2d33bb7b48bcb38719ac9ea8cc31d7d38e33cedfb3279b8be2078c9a48ede10db1e4b4cab4a08c77e010060936e445cb6a1d2e6247bcc8d935cc9c3a

diff --git a/www-apps/netbox/files/netbox-2.6.4-no-pip.patch b/www-apps/netbox/files/netbox-2.6.4-no-pip.patch
new file mode 100644
index 00000000000..ba281aaea5d
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.6.4-no-pip.patch
@@ -0,0 +1,21 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index 793e72cd..8490d713 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -10,16 +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
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/netbox-2.6.4.ebuild b/www-apps/netbox/netbox-2.6.4.ebuild
new file mode 100644
index 00000000000..24d3873dc16
--- /dev/null
+++ b/www-apps/netbox/netbox-2.6.4.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.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}] )"
+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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/, www-apps/netbox/files/
@ 2020-08-01 20:40 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-08-01 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     35dbc28470985d7aa32e93128ab88c1bb22c5488
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 20:38:12 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 20:40:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35dbc284

www-apps/netbox: Remove old

Acked by William on IRC.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 www-apps/netbox/Manifest                         |   9 --
 www-apps/netbox/files/netbox-2.5.11-no-pip.patch |  27 -----
 www-apps/netbox/files/netbox-2.5.12-no-pip.patch |  27 -----
 www-apps/netbox/files/netbox-2.6.1-no-pip.patch  |  27 -----
 www-apps/netbox/files/netbox-2.6.4-no-pip.patch  |  21 ----
 www-apps/netbox/metadata.xml                     |   3 -
 www-apps/netbox/netbox-2.5.11.ebuild             | 123 ----------------------
 www-apps/netbox/netbox-2.5.12.ebuild             | 123 ----------------------
 www-apps/netbox/netbox-2.6.1.ebuild              | 126 -----------------------
 www-apps/netbox/netbox-2.6.12.ebuild             | 123 ----------------------
 www-apps/netbox/netbox-2.6.4.ebuild              | 126 -----------------------
 www-apps/netbox/netbox-2.6.5.ebuild              | 126 -----------------------
 www-apps/netbox/netbox-2.6.6.ebuild              | 126 -----------------------
 www-apps/netbox/netbox-2.6.7.ebuild              | 126 -----------------------
 www-apps/netbox/netbox-2.6.8.ebuild              | 126 -----------------------
 15 files changed, 1239 deletions(-)

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 671b5fa4944..cae76566f50 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,12 +1,3 @@
-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
-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
 DIST netbox-2.7.6.tar.gz 4949672 BLAKE2B 1847e5a05493f55ca777737c11b4751bc63183d693f742c7f9b9e5d6a498fe786a60619d40394473488881e6ef922a343cacd796126b8c618158eea9ab26216d SHA512 065e9c4338fb876ac626f5dec5c98ba2ee798b2fd6d4d8a8d4e57fff4072c649e51a1db633c2718be9ca10b362e7ead9b70655fa77ae6da9f01706e60135e306
 DIST netbox-2.7.8.tar.gz 5587481 BLAKE2B 9b524ca7acc1d650402a72aa65f75d7205cf29a3a5cfa9256ff47d12f240fc38903a6db76b8cee2b923947f6e31b124ba0bfdfbf4385fb6fd027634b3b8ba675 SHA512 cce73b9bbd79725e4af01a9265c0a9f14a1ac708186123c1a90f267149157a0c174cd32d5e56875b5fdb55ef87b2ec668ec542b1d3a01256544065d6a0457b54

diff --git a/www-apps/netbox/files/netbox-2.5.11-no-pip.patch b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e..00000000000
--- a/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# 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
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/files/netbox-2.5.12-no-pip.patch b/www-apps/netbox/files/netbox-2.5.12-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e..00000000000
--- a/www-apps/netbox/files/netbox-2.5.12-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# 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
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/files/netbox-2.6.1-no-pip.patch b/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e..00000000000
--- a/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# 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
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/files/netbox-2.6.4-no-pip.patch b/www-apps/netbox/files/netbox-2.6.4-no-pip.patch
deleted file mode 100644
index ba281aaea5d..00000000000
--- a/www-apps/netbox/files/netbox-2.6.4-no-pip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 793e72cd..8490d713 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -10,16 +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
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/metadata.xml b/www-apps/netbox/metadata.xml
index f53806a2283..c36c37139fa 100644
--- a/www-apps/netbox/metadata.xml
+++ b/www-apps/netbox/metadata.xml
@@ -5,7 +5,4 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-		<use>
-					<flag name="webhooks">Enable webhooks via django-rq</flag>
-	</use>
 </pkgmetadata>

diff --git a/www-apps/netbox/netbox-2.5.11.ebuild b/www-apps/netbox/netbox-2.5.11.ebuild
deleted file mode 100644
index 64de819ea05..00000000000
--- a/www-apps/netbox/netbox-2.5.11.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${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}
-	$(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}"
-
-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
-}

diff --git a/www-apps/netbox/netbox-2.5.12.ebuild b/www-apps/netbox/netbox-2.5.12.ebuild
deleted file mode 100644
index 64de819ea05..00000000000
--- a/www-apps/netbox/netbox-2.5.12.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${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}
-	$(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}"
-
-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
-}

diff --git a/www-apps/netbox/netbox-2.6.1.ebuild b/www-apps/netbox/netbox-2.6.1.ebuild
deleted file mode 100644
index 04c487ccf5f..00000000000
--- a/www-apps/netbox/netbox-2.6.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${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}
-	$(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=(
-	"${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
-}

diff --git a/www-apps/netbox/netbox-2.6.12.ebuild b/www-apps/netbox/netbox-2.6.12.ebuild
deleted file mode 100644
index d6676c7aca5..00000000000
--- a/www-apps/netbox/netbox-2.6.12.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.6.4.ebuild b/www-apps/netbox/netbox-2.6.4.ebuild
deleted file mode 100644
index a060ba59442..00000000000
--- a/www-apps/netbox/netbox-2.6.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 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}
-	$(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=(
-	"${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
-}

diff --git a/www-apps/netbox/netbox-2.6.5.ebuild b/www-apps/netbox/netbox-2.6.5.ebuild
deleted file mode 100644
index c9b078880e5..00000000000
--- a/www-apps/netbox/netbox-2.6.5.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 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}
-	$(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=(
-	"${FILESDIR}"/${PN}-2.6.4-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
-}

diff --git a/www-apps/netbox/netbox-2.6.6.ebuild b/www-apps/netbox/netbox-2.6.6.ebuild
deleted file mode 100644
index c9b078880e5..00000000000
--- a/www-apps/netbox/netbox-2.6.6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 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}
-	$(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=(
-	"${FILESDIR}"/${PN}-2.6.4-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
-}

diff --git a/www-apps/netbox/netbox-2.6.7.ebuild b/www-apps/netbox/netbox-2.6.7.ebuild
deleted file mode 100644
index 748180d6cc2..00000000000
--- a/www-apps/netbox/netbox-2.6.7.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 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}
-	$(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}"/${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
-}

diff --git a/www-apps/netbox/netbox-2.6.8.ebuild b/www-apps/netbox/netbox-2.6.8.ebuild
deleted file mode 100644
index 233c4920008..00000000000
--- a/www-apps/netbox/netbox-2.6.8.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 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}
-	$(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/
-"
-
-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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/, www-apps/netbox/files/
@ 2019-07-16  0:03 William Hubbs
  0 siblings, 0 replies; 5+ messages in thread
From: William Hubbs @ 2019-07-16  0:03 UTC (permalink / raw
  To: gentoo-commits

commit:     a5d3644286d4745b778f7ef79a2cb30131a797f7
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Tue Jul 16 00:00:14 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 00:02:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d36442

www-apps/netbox: 2.6.1 bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 www-apps/netbox/Manifest                        |   1 +
 www-apps/netbox/files/netbox-2.6.1-no-pip.patch |  27 ++++++
 www-apps/netbox/netbox-2.6.1.ebuild             | 121 ++++++++++++++++++++++++
 3 files changed, 149 insertions(+)

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 70891e41ba8..51a181dd107 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/www-apps/netbox/files/netbox-2.6.1-no-pip.patch b/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
new file mode 100644
index 00000000000..5d1fa595f4e
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
@@ -0,0 +1,27 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index 24e79f5b..248e1cb5 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -8,22 +8,6 @@
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# TODO: Remove this in v2.6 as it is no longer needed under Python 3
+-# Delete stale bytecode
+-COMMAND="find . -name \"*.pyc\" -delete"
+-echo "Cleaning up stale Python bytecode ($COMMAND)..."
+-eval $COMMAND
+-
+-# 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
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/netbox-2.6.1.ebuild b/www-apps/netbox/netbox-2.6.1.ebuild
new file mode 100644
index 00000000000..0b6b0b9de55
--- /dev/null
+++ b/www-apps/netbox/netbox-2.6.1.ebuild
@@ -0,0 +1,121 @@
+# 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/digitalocean/netbox"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+
+RDEPEND=">=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}] )"
+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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/, www-apps/netbox/files/
@ 2019-04-30 21:19 William Hubbs
  0 siblings, 0 replies; 5+ messages in thread
From: William Hubbs @ 2019-04-30 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     389ef2c983b62fdce58731e9cfc7c1a10e835d0d
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Tue Apr 30 21:16:57 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 21:19:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389ef2c9

www-apps/netbox: 2.5.11 bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 www-apps/netbox/Manifest                         |   1 +
 www-apps/netbox/files/netbox-2.5.11-no-pip.patch |  27 ++++++
 www-apps/netbox/files/netbox-rqworker.initd      |   2 +
 www-apps/netbox/files/netbox.initd               |   2 +
 www-apps/netbox/netbox-2.5.11.ebuild             | 118 +++++++++++++++++++++++
 5 files changed, 150 insertions(+)

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 1b395a70295..2f26f7d2126 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1 +1,2 @@
 DIST netbox-2.5.10.tar.gz 2363340 BLAKE2B 9bc946398ac75b585f2bc6fdb01bfb7545c92ccbb239e9ac0309b66be435134a87cde5fcf876cec4c3354e7aedf5af1d9e1976574689dfb0af34404e9c9f907f SHA512 ed71b0efaffd8bad6e53f7b281d1933234161f031110fa901e1b789a964f000f2ff13897685e79193cbee9294c1f50b8c6edef7d0ef6f829a7357640c8034525
+DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d

diff --git a/www-apps/netbox/files/netbox-2.5.11-no-pip.patch b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
new file mode 100644
index 00000000000..5d1fa595f4e
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
@@ -0,0 +1,27 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index 24e79f5b..248e1cb5 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -8,22 +8,6 @@
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# TODO: Remove this in v2.6 as it is no longer needed under Python 3
+-# Delete stale bytecode
+-COMMAND="find . -name \"*.pyc\" -delete"
+-echo "Cleaning up stale Python bytecode ($COMMAND)..."
+-eval $COMMAND
+-
+-# 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
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/files/netbox-rqworker.initd b/www-apps/netbox/files/netbox-rqworker.initd
index 2973e471e03..54794f26fb9 100644
--- a/www-apps/netbox/files/netbox-rqworker.initd
+++ b/www-apps/netbox/files/netbox-rqworker.initd
@@ -8,4 +8,6 @@ command=/usr/bin/python3
 command_args="/opt/netbox/netbox/manage.py rqworker"
 command_user=netbox:netbox
 directory=/opt/netbox/netbox
+error_log=/var/log/netbox/netbox-rcworker.log
+output_log=/var/log/netbox/"${RC_SVCNAME}".log
 supervisor=supervise-daemon

diff --git a/www-apps/netbox/files/netbox.initd b/www-apps/netbox/files/netbox.initd
index d0457a8372f..74e6c3b717f 100644
--- a/www-apps/netbox/files/netbox.initd
+++ b/www-apps/netbox/files/netbox.initd
@@ -7,4 +7,6 @@ command=/usr/bin/gunicorn
 command_args="-c /etc/netbox/gunicorn_config.py netbox.wsgi"
 command_user=netbox:netbox
 directory=/opt/netbox/netbox
+error_log=/var/log/netbox/"${RC_SVCNAME}".log
+output_log=/var/log/netbox/"${RC_SVCNAME}".log
 supervisor=supervise-daemon

diff --git a/www-apps/netbox/netbox-2.5.11.ebuild b/www-apps/netbox/netbox-2.5.11.ebuild
new file mode 100644
index 00000000000..02a00a2c553
--- /dev/null
+++ b/www-apps/netbox/netbox-2.5.11.ebuild
@@ -0,0 +1,118 @@
+# 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/digitalocean/netbox"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+
+RDEPEND=">=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}] )
+	webhooks? ( dev-python/django-rq )"
+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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/, www-apps/netbox/files/
@ 2019-04-11 21:03 William Hubbs
  0 siblings, 0 replies; 5+ messages in thread
From: William Hubbs @ 2019-04-11 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     70e9b5c3ac83e8d6a0c61c6415c4a20358f9d596
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Thu Apr 11 21:01:16 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 21:01:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e9b5c3

www-apps/netbox: IP address and data center infra management tool

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 www-apps/netbox/Manifest                         |   1 +
 www-apps/netbox/files/gunicorn_config.py         |   5 ++
 www-apps/netbox/files/netbox-2.5.10-no-pip.patch |  27 ++++++
 www-apps/netbox/files/netbox-rqworker.initd      |  11 +++
 www-apps/netbox/files/netbox.initd               |  10 +++
 www-apps/netbox/metadata.xml                     |  11 +++
 www-apps/netbox/netbox-2.5.10.ebuild             | 100 +++++++++++++++++++++++
 7 files changed, 165 insertions(+)

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
new file mode 100644
index 00000000000..1b395a70295
--- /dev/null
+++ b/www-apps/netbox/Manifest
@@ -0,0 +1 @@
+DIST netbox-2.5.10.tar.gz 2363340 BLAKE2B 9bc946398ac75b585f2bc6fdb01bfb7545c92ccbb239e9ac0309b66be435134a87cde5fcf876cec4c3354e7aedf5af1d9e1976574689dfb0af34404e9c9f907f SHA512 ed71b0efaffd8bad6e53f7b281d1933234161f031110fa901e1b789a964f000f2ff13897685e79193cbee9294c1f50b8c6edef7d0ef6f829a7357640c8034525

diff --git a/www-apps/netbox/files/gunicorn_config.py b/www-apps/netbox/files/gunicorn_config.py
new file mode 100644
index 00000000000..4cb7111fac4
--- /dev/null
+++ b/www-apps/netbox/files/gunicorn_config.py
@@ -0,0 +1,5 @@
+command = '/usr/bin/gunicorn'
+pythonpath = '/opt/netbox/netbox'
+bind = '127.0.0.1:8001'
+workers = 3
+user = 'netbox'

diff --git a/www-apps/netbox/files/netbox-2.5.10-no-pip.patch b/www-apps/netbox/files/netbox-2.5.10-no-pip.patch
new file mode 100644
index 00000000000..5d1fa595f4e
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.5.10-no-pip.patch
@@ -0,0 +1,27 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index 24e79f5b..248e1cb5 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -8,22 +8,6 @@
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# TODO: Remove this in v2.6 as it is no longer needed under Python 3
+-# Delete stale bytecode
+-COMMAND="find . -name \"*.pyc\" -delete"
+-echo "Cleaning up stale Python bytecode ($COMMAND)..."
+-eval $COMMAND
+-
+-# 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
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."

diff --git a/www-apps/netbox/files/netbox-rqworker.initd b/www-apps/netbox/files/netbox-rqworker.initd
new file mode 100644
index 00000000000..2973e471e03
--- /dev/null
+++ b/www-apps/netbox/files/netbox-rqworker.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 2019 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+name="netbox-rqworker daemon"
+description="nnetbox-rqworker daemon"
+command=/usr/bin/python3
+command_args="/opt/netbox/netbox/manage.py rqworker"
+command_user=netbox:netbox
+directory=/opt/netbox/netbox
+supervisor=supervise-daemon

diff --git a/www-apps/netbox/files/netbox.initd b/www-apps/netbox/files/netbox.initd
new file mode 100644
index 00000000000..d0457a8372f
--- /dev/null
+++ b/www-apps/netbox/files/netbox.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 2019 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+description="netbox daemon"
+command=/usr/bin/gunicorn
+command_args="-c /etc/netbox/gunicorn_config.py netbox.wsgi"
+command_user=netbox:netbox
+directory=/opt/netbox/netbox
+supervisor=supervise-daemon

diff --git a/www-apps/netbox/metadata.xml b/www-apps/netbox/metadata.xml
new file mode 100644
index 00000000000..f53806a2283
--- /dev/null
+++ b/www-apps/netbox/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+		<use>
+					<flag name="webhooks">Enable webhooks via django-rq</flag>
+	</use>
+</pkgmetadata>

diff --git a/www-apps/netbox/netbox-2.5.10.ebuild b/www-apps/netbox/netbox-2.5.10.ebuild
new file mode 100644
index 00000000000..efa1ca65e92
--- /dev/null
+++ b/www-apps/netbox/netbox-2.5.10.ebuild
@@ -0,0 +1,100 @@
+# 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/digitalocean/netbox"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+
+RDEPEND=">=dev-python/django-2.1.5[${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}] )
+	webhooks? ( dev-python/django-rq )"
+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.
+
+If this is a new installation, please follow these instructions:
+
+From the installation instructions [1], you need to configure postgres
+ldap and webhooks if you want to use them.  Then, you need to
+configure and install a web server. Gunicorn is already installed, so
+skip that step.
+
+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
+	to the default runlevel and start it.
+
+The files you need to edit are located in /etc/netbox, not /opt/netbox,
+as shown in the installation instructions.
+
+If this is an upgrade, you just need to stop the netbox service,
+	run the /opt/netbox/upgrade.sh script, check for new configuration
+	options in the installation documentation [1] then restart the
+	service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /opt/${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
+	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
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-08-01 20:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-25 17:38 [gentoo-commits] repo/gentoo:master commit in: www-apps/netbox/, www-apps/netbox/files/ William Hubbs
  -- strict thread matches above, loose matches on Subject: below --
2020-08-01 20:40 Michał Górny
2019-07-16  0:03 William Hubbs
2019-04-30 21:19 William Hubbs
2019-04-11 21:03 William Hubbs

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox