gentoo resync : 04.05.2019

7 files changed, 99 insertions, 37 deletions

diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 6901c6c5e11c..74187c5954f7 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,8 +1,10 @@
 AUX gunicorn_config.py 116 BLAKE2B 44fa3354dce54136bd031012bad2c6cc5ed6208bd253985a29a0e7c6f76aee4f042b8f707d9c09e1c49be8e61b27e44ff2195b8bdc54f4c51659924717f0cdd9 SHA512 43a065aa044a028334a96a0d22ffe1c35ad1f76b605215c4d5a288943cfeeb03e7e71a6d22116764c55bd95aaea103c1026d6355c9ded9577b4a7aefbc6f71c3
-AUX netbox-2.5.10-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
-AUX netbox-rqworker.initd 370 BLAKE2B f80cfa9d1007f4f1a9add484b6cee5d0e07698658fbbf797b9bb479270104bcbb445127e628349338f1ec5e9c3a41dc3962c949b4759fd1b5b2d190c505149b6 SHA512 081236868f3666e2b689702fd1b7aa5c1727de67e97f0990d158ba00210e1b84f412b0882c8cbf6662c5999424dd79a210c06db00e531727319abdec5d5de227
-AUX netbox.initd 339 BLAKE2B fc5d0818a741c683125e1519312760dcfd415eb11e287d3087420f51041486654d4244619629b712054d0768c91285debfa01e46245196454a6b732262200a7f SHA512 578c708941c1d767fc58c471a383130005227123f24350073d4f4f33770e577dc53ad4c47964c023fbfb94ed2533b06012a60990cf7dad00b9495f791faf877d
-DIST netbox-2.5.10.tar.gz 2363340 BLAKE2B 9bc946398ac75b585f2bc6fdb01bfb7545c92ccbb239e9ac0309b66be435134a87cde5fcf876cec4c3354e7aedf5af1d9e1976574689dfb0af34404e9c9f907f SHA512 ed71b0efaffd8bad6e53f7b281d1933234161f031110fa901e1b789a964f000f2ff13897685e79193cbee9294c1f50b8c6edef7d0ef6f829a7357640c8034525
-EBUILD netbox-2.5.10-r1.ebuild 3653 BLAKE2B 19e70c408e871ed171d3bbdbf82a95ccd06c8e70dc3117502150077faa4293dc440bfa1a8b520a12fdf4fbf40400d7cd95b78afe5c72eda13e0fb8babd727166 SHA512 05bcec74c1984235b2c6bc7785cbfd9255108eea141a079091e553fe3ab32c726dbb7ae2fe847063a6458ee6f23e1d27108500fd38fc56b2ffe483884aeb9ee8
-EBUILD netbox-2.5.10.ebuild 3454 BLAKE2B 904ae9677b4226e0ee7d9df94249c702d49b7c4d97aacad2cd11a04adcacc52a450ea2c3ecb1de66ff0d67e052fe5299877cad8794f628f30b47ad00d6ad74cc SHA512 b132f15e1ed9cdb0de0f9ef813716df2ed69896e0bf4fec21e2f2180b3d8553894f7390b48ae207c4dd08a6bd4c0d8f25368590e0cf5650ea56adae02c439575
+AUX netbox-2.5.11-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
+AUX netbox-2.5.12-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
+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
+DIST netbox-2.5.12.tar.gz 2364874 BLAKE2B efe1360fd7c1105e5c6010ee22a882fb4fc796ff0f907974984dba35a0ab6da7724fd6042b102cebe3e3e291c3a1c65c347a5967edbaf443ece6fe61648a93be SHA512 e105a351f1150139c5bce36527ea650f95504ccc1c7b6a82c41396d69bc8671758cc3b33789c95c81785c5ff54d34c7310cd3e03e65bd006606e85021dcd1795
+EBUILD netbox-2.5.11.ebuild 4012 BLAKE2B ef05b1c95423e16c17277f77800c6f4d601f351ba9eec3bfb3ca38a4282315159b20bf928af09bbf52e59a036541d5a5f5e580023ed73b8bf8492e99ffb5c40d SHA512 f51d444450acfb09ebad9f9819a954f92629b04d7829ed3e4c1d53295754a6d048aeb3fef205ff8977fde00db0a651d8257ede3b1fb47e456a24fa42a561657b
+EBUILD netbox-2.5.12.ebuild 4012 BLAKE2B ef05b1c95423e16c17277f77800c6f4d601f351ba9eec3bfb3ca38a4282315159b20bf928af09bbf52e59a036541d5a5f5e580023ed73b8bf8492e99ffb5c40d SHA512 f51d444450acfb09ebad9f9819a954f92629b04d7829ed3e4c1d53295754a6d048aeb3fef205ff8977fde00db0a651d8257ede3b1fb47e456a24fa42a561657b
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/files/netbox-2.5.10-no-pip.patch b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
index 5d1fa595f4e6..5d1fa595f4e6 100644
--- a/www-apps/netbox/files/netbox-2.5.10-no-pip.patch
+++ b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
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
new file mode 100644
index 000000000000..5d1fa595f4e6
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.5.12-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 2973e471e038..54794f26fb90 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 d0457a8372f2..74e6c3b717fb 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.10-r1.ebuild b/www-apps/netbox/netbox-2.5.11.ebuild
index c12e3feb2dc2..02a00a2c5537 100644
--- a/www-apps/netbox/netbox-2.5.10-r1.ebuild
+++ b/www-apps/netbox/netbox-2.5.11.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="ldap webhooks"
 
-RDEPEND=">=dev-python/django-2.1.5[${PYTHON_USEDEP}]
+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}]
@@ -45,30 +45,38 @@ PATCHES=(
 DISABLE_AUTOFORMATTING=YES
 DOC_CONTENTS="
 netbox is installed on your system. However, there are some manual steps
-you need to complete.
+you need to complete from the installation guide [1].
 
-If this is a new installation, please follow these instructions:
+On Gentoo, the configuration files you need to edit are located in
+/etc/netbox, not /opt/netbox as shown in the installation guide.
 
-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.
+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
-	to the default runlevel and start it.
+service 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, follow these 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.
+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() {
@@ -87,11 +95,14 @@ dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
 	insinto /etc/netbox
 	newins netbox/netbox/configuration.example.py configuration.py
 	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox
+	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
 }
 
diff --git a/www-apps/netbox/netbox-2.5.10.ebuild b/www-apps/netbox/netbox-2.5.12.ebuild
index efa1ca65e925..02a00a2c5537 100644
--- a/www-apps/netbox/netbox-2.5.10.ebuild
+++ b/www-apps/netbox/netbox-2.5.12.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="ldap webhooks"
 
-RDEPEND=">=dev-python/django-2.1.5[${PYTHON_USEDEP}]
+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}]
@@ -45,35 +45,43 @@ PATCHES=(
 DISABLE_AUTOFORMATTING=YES
 DOC_CONTENTS="
 netbox is installed on your system. However, there are some manual steps
-you need to complete.
+you need to complete from the installation guide [1].
 
-If this is a new installation, please follow these instructions:
+On Gentoo, the configuration files you need to edit are located in
+/etc/netbox, not /opt/netbox as shown in the installation guide.
 
-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.
+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
-	to the default runlevel and start it.
+service 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, follow these 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.
+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 /opt/${PN} ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
 }
 
 src_install() {
@@ -87,14 +95,24 @@ dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
 	insinto /etc/netbox
 	newins netbox/netbox/configuration.example.py configuration.py
 	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox
+	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
 }