www-servers/uwsgi: remove unused patches/files

Closes: https://github.com/gentoo/gentoo/pull/3989

13 files changed, 0 insertions, 1068 deletions

diff --git a/www-servers/uwsgi/files/1.1.2-threaded-php.patch b/www-servers/uwsgi/files/1.1.2-threaded-php.patch
deleted file mode 100644
index ed75ad9b2f16..000000000000
--- a/www-servers/uwsgi/files/1.1.2-threaded-php.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -r a6dd30e36bc0 plugins/php/php_plugin.c
---- a/plugins/php/php_plugin.c	Fri Apr 20 16:27:00 2012 +0200
-+++ b/plugins/php/php_plugin.c	Sun Apr 22 11:54:49 2012 +0200
-@@ -116,7 +116,7 @@
- }
- 
- 
--static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers)
-+static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
- {
- 	sapi_header_struct *h;
- 	zend_llist_position pos;
-@@ -237,7 +237,7 @@
- }
- 
- 
--static char *sapi_uwsgi_read_cookies(void)
-+static char *sapi_uwsgi_read_cookies(TSRMLS_D)
- {
- 	uint16_t len = 0;
- 	struct wsgi_request *wsgi_req = (struct wsgi_request *) SG(server_context);
-@@ -624,6 +624,10 @@
- 	struct uwsgi_string_list *pset = uphp.set;
- 	struct uwsgi_string_list *append_config = uphp.append_config;
- 
-+#ifdef ZTS
-+	tsrm_startup(1, 1, 0, NULL);
-+#endif
-+
- 	sapi_startup(&uwsgi_sapi_module);
- 
- 	// applying custom options
-@@ -721,6 +725,7 @@
- 
- 	zend_file_handle file_handle;
- 
-+   	TSRMLS_FETCH(); // fetch the threading state in case PHP is built with threading
- 	SG(server_context) = (void *) wsgi_req;
- 
- 	if (uwsgi_parse_vars(wsgi_req)) {
diff --git a/www-servers/uwsgi/files/1.2.3-pyerl.patch b/www-servers/uwsgi/files/1.2.3-pyerl.patch
deleted file mode 100644
index 1d4794d8f6e1..000000000000
--- a/www-servers/uwsgi/files/1.2.3-pyerl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/plugins/pyerl/pyerl.c b/plugins/pyerl/pyerl.c
-index a335f03..aee98e2 100644
---- a/plugins/pyerl/pyerl.c
-+++ b/plugins/pyerl/pyerl.c
-@@ -537,7 +537,7 @@ void pyerl_init() {
- }
- 
- struct uwsgi_plugin pyerl_plugin = {
--
-+        .name = "pyerl",
-         .post_init = pyerl_init,
- };
- 
-diff --git a/plugins/pyerl/uwsgiplugin.py b/plugins/pyerl/uwsgiplugin.py
-index 161d722..ae9c68d 100644
---- a/plugins/pyerl/uwsgiplugin.py
-+++ b/plugins/pyerl/uwsgiplugin.py
-@@ -1,7 +1,12 @@
- from distutils import sysconfig
-+import os
- 
- NAME='pyerl'
--CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True)]
-+
-+ERLANGPATH = os.environ.get('UWSGICONFIG_ERLANGPATH', 'erl')
-+includedir = os.popen(ERLANGPATH + " -noshell -noinput -eval \"io:format('~s~n', [code:lib_dir(erl_interface, include)])\" -s erlang halt").read().rstrip()
-+
-+CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True),  '-I' + includedir ]
- LDFLAGS = []
- LIBS = []
- 
diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r1.conf b/www-servers/uwsgi/files/42_mod_uwsgi-r1.conf
deleted file mode 100644
index bcb383ee3abc..000000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfDefine PROXY_UWSGI>
-    LoadModule uwsgi_module modules/mod_proxy_uwsgi.so
-</IfDefine>
-<IfDefine RUWSGI>
-    LoadModule uwsgi_module modules/mod_Ruwsgi.so
-</IfDefine>
-<IfDefine UWSGI>
-    LoadModule uwsgi_module modules/mod_uwsgi.so
-</IfDefine>
diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
deleted file mode 100644
index 85ede87b037b..000000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfDefine PROXY_UWSGI>
-    LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
-</IfDefine>
-<IfDefine RUWSGI>
-    LoadModule uwsgi_module modules/mod_Ruwsgi.so
-</IfDefine>
-<IfDefine UWSGI>
-    LoadModule uwsgi_module modules/mod_uwsgi.so
-</IfDefine>
diff --git a/www-servers/uwsgi/files/42_mod_uwsgi.conf b/www-servers/uwsgi/files/42_mod_uwsgi.conf
deleted file mode 100644
index a619baeafeeb..000000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<IfDefine UWSGI>
-    LoadModule uwsgi_module modules/mod_uwsgi.so
-</IfDefine>
-<IfDefine RUWSGI>
-    LoadModule uwsgi_module modules/mod_Ruwsgi.so
-</IfDefine>
-
diff --git a/www-servers/uwsgi/files/uwsgi.confd-r1 b/www-servers/uwsgi/files/uwsgi.confd-r1
deleted file mode 100644
index 3b0a005b8e63..000000000000
--- a/www-servers/uwsgi/files/uwsgi.confd-r1
+++ /dev/null
@@ -1,53 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# YOU SHOULD ONLY MODIFY THIS FILE IF YOU USE THE UWSGI EMPEROR MODE!
-# IF YOU WANT TO RUN A SINGLE APP INSTANCE, CREATE A COPY AND MODIFY THAT INSTEAD!
-
-# Path (or name) of UNIX/TCP socket to bind to
-# Example : UWSGI_SOCKET=127.0.0.1:1234
-UWSGI_SOCKET=
-
-# Enable threads? (1 = yes, 0 = no). The default is 0
-#
-UWSGI_THREADS=0
-
-# The path to your uWSGI application.
-#
-UWSGI_PROGRAM=
-
-# The path to your uWSGI xml config file.
-#
-UWSGI_XML_CONFIG=
-
-# The number of child processes to spawn. The default is 1.
-#
-UWSGI_PROCESSES=1
-
-# The log file path. If empty, log only errors
-#
-UWSGI_LOG_FILE=
-
-# If you want to run your application inside a chroot then specify the
-# directory here. Leave this blank otherwise.
-#
-UWSGI_CHROOT=
-
-# If you want to run your application from a specific directiory specify
-# it here. Leave this blank otherwise.
-#
-UWSGI_DIR=
-
-# The user and group to run your application as. If you do not specify these,
-# the application will be run as root:root.
-#
-UWSGI_USER=
-
-# Run the uwsgi emperor which loads vassals dynamically from this PATH
-# see http://projects.unbit.it/uwsgi/wiki/Emperor
-# The advised Gentoo folder is /etc/uwsgi.d/
-UWSGI_EMPEROR_PATH=
-
-# Additional options you might want to pass to uWSGI
-#
-UWSGI_EXTRA_OPTIONS=
diff --git a/www-servers/uwsgi/files/uwsgi.confd-r3 b/www-servers/uwsgi/files/uwsgi.confd-r3
deleted file mode 100644
index fa0158029b1d..000000000000
--- a/www-servers/uwsgi/files/uwsgi.confd-r3
+++ /dev/null
@@ -1,63 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# YOU SHOULD ONLY MODIFY THIS FILE IF YOU USE THE UWSGI EMPEROR MODE!
-# IF YOU WANT TO RUN A SINGLE APP INSTANCE, CREATE A COPY AND MODIFY THAT INSTEAD!
-
-# Path (or name) of UNIX/TCP socket to bind to
-# Example : UWSGI_SOCKET=127.0.0.1:1234
-UWSGI_SOCKET=
-
-# Enable threads? (1 = yes, 0 = no). The default is 0
-#
-UWSGI_THREADS=0
-
-# The path to your uWSGI application.
-#
-UWSGI_PROGRAM=
-
-# The path to your uWSGI xml config file.
-#
-UWSGI_XML_CONFIG=
-
-# The number of child processes to spawn. The default is 1.
-#
-UWSGI_PROCESSES=1
-
-# The log file path. If empty, log only errors
-#
-UWSGI_LOG_FILE=
-
-# If you want to run your application inside a chroot then specify the
-# directory here. Leave this blank otherwise.
-#
-UWSGI_CHROOT=
-
-# If you want to run your application from a specific directiory specify
-# it here. Leave this blank otherwise.
-#
-UWSGI_DIR=
-
-# The user to run your application as. If you do not specify these,
-# the application will be run as user root.
-#
-UWSGI_USER=
-
-# The group to run your application as. If you do not specify these,
-# the application will be run as group root.
-#
-UWSGI_GROUP=
-
-# Run the uwsgi emperor which loads vassals dynamically from this PATH
-# see http://projects.unbit.it/uwsgi/wiki/Emperor
-# The advised Gentoo folder is /etc/uwsgi.d/
-UWSGI_EMPEROR_PATH=
-
-# The group the emperor should run as. This is different from the UWSGI_GROUP
-# as you could want your apps share some sockets with other processes such as
-# www servers while preserving your emperor logs from being accessible by them.
-UWSGI_EMPEROR_GROUP=
-
-# Additional options you might want to pass to uWSGI
-#
-UWSGI_EXTRA_OPTIONS=
diff --git a/www-servers/uwsgi/files/uwsgi.initd-r1 b/www-servers/uwsgi/files/uwsgi.initd-r1
deleted file mode 100644
index 67a8009bf821..000000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r1
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PROGNAME=${SVCNAME#*.}
-
-UWSGI_EXEC=/usr/bin/uwsgi
-PIDPATH=/var/run/uwsgi
-PIDFILE="${PIDPATH}/${PROGNAME}.pid"
-
-extra_started_commands="${opts} reload stats"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o "${UWSGI_USER}":root "${PIDPATH}"
-}
-
-start_emperor() {
-	local OPTIONS
-	OPTIONS="--daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	ebegin "Starting uWSGI emperor"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		-- --emperor "${UWSGI_EMPEROR_PATH}" ${OPTIONS} \
-		--pidfile "${PIDFILE}"
-	return $?
-}
-
-start_app() {
-	local OPTIONS
-	OPTIONS="--master --daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	if [ "${UWSGI_THREADS}" = "1" ]; then
-		OPTIONS="${OPTIONS} --enable-threads"
-	fi
-
-	if [ -n "${UWSGI_SOCKET}" ]; then
-		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
-	fi
-
-	if [ -n "${UWSGI_PROCESSES}" ]; then
-		OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}"
-	fi
-
-	if [ -n "${UWSGI_CHROOT}" ]; then
-		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
-	fi
-
-	if [ -n "${UWSGI_PROGRAM}" ]; then
-		OPTIONS="${OPTIONS} --fileserve-mode ${UWSGI_PROGRAM}"
-	fi
-
-	if [ -n "${UWSGI_XML_CONFIG}" ]; then
-		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
-	fi
-
-	ebegin "Starting uWSGI application ${PROGNAME}"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		-- ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start() {
-	if [ "${SVCNAME}" == "uwsgi" ]; then
-		if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-			start_emperor
-			eend $?
-		else
-			eerror "You are not supposed to run this script directly unless you"
-			eerror "want to run in Emperor mode. In that case please set the UWSGI_EMPEROR_PATH."
-			eerror "Otherwise create a symlink for the uwsgi application you want to run as well as"
-			eerror "a copy of the configuration file and modify it appropriately like so..."
-			eerror
-			eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
-			eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
-			eerror "  nano /etc/conf.d/uwsgi.trac"
-			eerror
-			return 1
-		fi
-	else
-		start_app
-		eend $?
-	fi
-}
-
-stop() {
-	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-		ebegin "Stopping uWSGI emperor"
-	else
-		ebegin "Stopping uWSGI application ${PROGNAME}"
-	fi
-	start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading uWSGI"
-	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-	eend $?
-}
-
-stats() {
-	ebegin "Logging uWSGI statistics"
-	start-stop-daemon --signal USR1 --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/www-servers/uwsgi/files/uwsgi.initd-r2 b/www-servers/uwsgi/files/uwsgi.initd-r2
deleted file mode 100644
index 4b202d451add..000000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r2
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PROGNAME=${SVCNAME#*.}
-
-UWSGI_EXEC=/usr/bin/uwsgi
-if [ "${SVCNAME}" == "uwsgi" ]; then
-	PIDPATH=/var/run/uwsgi
-else
-	PIDPATH="/var/run/uwsgi_${PROGNAME}"
-fi
-PIDFILE="${PIDPATH}/${PROGNAME}.pid"
-
-extra_started_commands="${opts} reload stats"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o "${UWSGI_USER}":root "${PIDPATH}"
-}
-
-start_emperor() {
-	local OPTIONS
-	OPTIONS="--daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	ebegin "Starting uWSGI emperor"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		-- --emperor "${UWSGI_EMPEROR_PATH}" ${OPTIONS} \
-		--pidfile "${PIDFILE}"
-	return $?
-}
-
-start_app() {
-	local OPTIONS
-	OPTIONS="--master --daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	if [ "${UWSGI_THREADS}" = "1" ]; then
-		OPTIONS="${OPTIONS} --enable-threads"
-	fi
-
-	if [ -n "${UWSGI_SOCKET}" ]; then
-		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
-	fi
-
-	if [ -n "${UWSGI_PROCESSES}" ]; then
-		OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}"
-	fi
-
-	if [ -n "${UWSGI_CHROOT}" ]; then
-		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
-	fi
-
-	if [ -n "${UWSGI_PROGRAM}" ]; then
-		OPTIONS="${OPTIONS} --fileserve-mode ${UWSGI_PROGRAM}"
-	fi
-
-	if [ -n "${UWSGI_XML_CONFIG}" ]; then
-		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
-	fi
-
-	ebegin "Starting uWSGI application ${PROGNAME}"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		-- ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start() {
-	if [ "${SVCNAME}" == "uwsgi" ]; then
-		if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-			start_emperor
-			eend $?
-		else
-			eerror "You are not supposed to run this script directly unless you"
-			eerror "want to run in Emperor mode. In that case please set the UWSGI_EMPEROR_PATH."
-			eerror "Otherwise create a symlink for the uwsgi application you want to run as well as"
-			eerror "a copy of the configuration file and modify it appropriately like so..."
-			eerror
-			eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
-			eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
-			eerror "  nano /etc/conf.d/uwsgi.trac"
-			eerror
-			return 1
-		fi
-	else
-		start_app
-		eend $?
-	fi
-}
-
-stop() {
-	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-		ebegin "Stopping uWSGI emperor"
-	else
-		ebegin "Stopping uWSGI application ${PROGNAME}"
-	fi
-	start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading uWSGI"
-	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-	eend $?
-}
-
-stats() {
-	ebegin "Logging uWSGI statistics"
-	start-stop-daemon --signal USR1 --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/www-servers/uwsgi/files/uwsgi.initd-r3 b/www-servers/uwsgi/files/uwsgi.initd-r3
deleted file mode 100644
index 28f03d05635d..000000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r3
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PROGNAME=${SVCNAME#*.}
-
-UWSGI_EXEC=/usr/bin/uwsgi
-if [ "${SVCNAME}" == "uwsgi" ]; then
-	PIDPATH=/var/run/uwsgi
-else
-	PIDPATH="/var/run/uwsgi_${PROGNAME}"
-fi
-PIDFILE="${PIDPATH}/${PROGNAME}.pid"
-
-extra_started_commands="${opts} reload stats"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_GROUP}" "${PIDPATH}"
-}
-
-start_emperor() {
-	local OPTIONS
-	OPTIONS="--daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	ebegin "Starting uWSGI emperor"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		--group ${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}} \
-		-- --emperor "${UWSGI_EMPEROR_PATH}" ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start_app() {
-	local OPTIONS
-	OPTIONS="--master --daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	if [ "${UWSGI_THREADS}" = "1" ]; then
-		OPTIONS="${OPTIONS} --enable-threads"
-	fi
-
-	if [ -n "${UWSGI_SOCKET}" ]; then
-		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
-	fi
-
-	if [ -n "${UWSGI_PROCESSES}" ]; then
-		OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}"
-	fi
-
-	if [ -n "${UWSGI_CHROOT}" ]; then
-		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
-	fi
-
-	if [ -n "${UWSGI_PROGRAM}" ]; then
-		OPTIONS="${OPTIONS} --fileserve-mode ${UWSGI_PROGRAM}"
-	fi
-
-	if [ -n "${UWSGI_XML_CONFIG}" ]; then
-		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
-	fi
-
-	ebegin "Starting uWSGI application ${PROGNAME}"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --group "${UWSGI_GROUP}" \
-		--exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start() {
-	if [ "${SVCNAME}" == "uwsgi" ]; then
-		if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-			start_emperor
-			eend $?
-		else
-			eerror "You are not supposed to run this script directly unless you"
-			eerror "want to run in Emperor mode. In that case please set the UWSGI_EMPEROR_PATH."
-			eerror "Otherwise create a symlink for the uwsgi application you want to run as well as"
-			eerror "a copy of the configuration file and modify it appropriately like so..."
-			eerror
-			eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
-			eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
-			eerror "  nano /etc/conf.d/uwsgi.trac"
-			eerror
-			return 1
-		fi
-	else
-		start_app
-		eend $?
-	fi
-}
-
-stop() {
-	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-		ebegin "Stopping uWSGI emperor"
-	else
-		ebegin "Stopping uWSGI application ${PROGNAME}"
-	fi
-	start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading uWSGI"
-	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-	eend $?
-}
-
-stats() {
-	ebegin "Logging uWSGI statistics"
-	start-stop-daemon --signal USR1 --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/www-servers/uwsgi/files/uwsgi.initd-r4 b/www-servers/uwsgi/files/uwsgi.initd-r4
deleted file mode 100644
index 146355ba7020..000000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r4
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PROGNAME=${SVCNAME#*.}
-
-UWSGI_EXEC=/usr/bin/uwsgi
-if [ "${SVCNAME}" = "uwsgi" ]; then
-	PIDPATH=/var/run/uwsgi
-else
-	PIDPATH="/var/run/uwsgi_${PROGNAME}"
-fi
-PIDFILE="${PIDPATH}/${PROGNAME}.pid"
-
-extra_started_commands="${opts} reload stats"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_GROUP}" "${PIDPATH}"
-}
-
-start_emperor() {
-	local OPTIONS
-	OPTIONS="--daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	ebegin "Starting uWSGI emperor"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		--group ${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}} \
-		-- --emperor "${UWSGI_EMPEROR_PATH}" ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start_app() {
-	local OPTIONS
-	OPTIONS="--master --daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	if [ "${UWSGI_THREADS}" = "1" ]; then
-		OPTIONS="${OPTIONS} --enable-threads"
-	fi
-
-	if [ -n "${UWSGI_SOCKET}" ]; then
-		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
-	fi
-
-	if [ -n "${UWSGI_PROCESSES}" ]; then
-		OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}"
-	fi
-
-	if [ -n "${UWSGI_CHROOT}" ]; then
-		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
-	fi
-
-	if [ -n "${UWSGI_PROGRAM}" ]; then
-		OPTIONS="${OPTIONS} --fileserve-mode ${UWSGI_PROGRAM}"
-	fi
-
-	if [ -n "${UWSGI_XML_CONFIG}" ]; then
-		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
-	fi
-
-	ebegin "Starting uWSGI application ${PROGNAME}"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --group "${UWSGI_GROUP}" \
-		--exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start() {
-	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-		start_emperor
-		eend $?
-	else
-		if [ "${SVCNAME}" = "uwsgi" ]; then
-			eerror "You are not supposed to run this script directly unless you"
-			eerror "want to run in Emperor mode. In that case please set the UWSGI_EMPEROR_PATH."
-			eerror "Otherwise create a symlink for the uwsgi application you want to run as well as"
-			eerror "a copy of the configuration file and modify it appropriately like so..."
-			eerror
-			eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
-			eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
-			eerror "  nano /etc/conf.d/uwsgi.trac"
-			eerror
-			return 1
-		else
-			start_app
-			eend $?
-		fi
-	fi
-}
-
-stop() {
-	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-		ebegin "Stopping uWSGI emperor"
-	else
-		ebegin "Stopping uWSGI application ${PROGNAME}"
-	fi
-	start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading uWSGI"
-	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-	eend $?
-}
-
-stats() {
-	ebegin "Logging uWSGI statistics"
-	start-stop-daemon --signal USR1 --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/www-servers/uwsgi/files/uwsgi.initd-r5 b/www-servers/uwsgi/files/uwsgi.initd-r5
deleted file mode 100644
index 42381caf8fa7..000000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r5
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PROGNAME=${SVCNAME#*.}
-
-UWSGI_EXEC=/usr/bin/uwsgi
-if [ "${SVCNAME}" = "uwsgi" ]; then
-	PIDPATH=/var/run/uwsgi
-else
-	PIDPATH="/var/run/uwsgi_${PROGNAME}"
-fi
-PIDFILE="${PIDPATH}/${PROGNAME}.pid"
-
-extra_started_commands="${opts} reload stats"
-
-depend() {
-	need net
-}
-
-start_emperor() {
-	local OPTIONS
-	OPTIONS="--daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	ebegin "Starting uWSGI emperor"
-	checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}}" "${PIDPATH}"
-
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		--group ${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}} \
-		-- --emperor "${UWSGI_EMPEROR_PATH}" ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start_app() {
-	local OPTIONS
-	OPTIONS="--master --daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	if [ "${UWSGI_THREADS}" = "1" ]; then
-		OPTIONS="${OPTIONS} --enable-threads"
-	fi
-
-	if [ -n "${UWSGI_SOCKET}" ]; then
-		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
-	fi
-
-	if [ -n "${UWSGI_PROCESSES}" ]; then
-		OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}"
-	fi
-
-	if [ -n "${UWSGI_CHROOT}" ]; then
-		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
-	fi
-
-	if [ -n "${UWSGI_PROGRAM}" ]; then
-		OPTIONS="${OPTIONS} --fileserve-mode ${UWSGI_PROGRAM}"
-	fi
-
-	if [ -n "${UWSGI_XML_CONFIG}" ]; then
-		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
-	fi
-
-	ebegin "Starting uWSGI application ${PROGNAME}"
-	checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_GROUP}" "${PIDPATH}"
-
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --group "${UWSGI_GROUP}" \
-		--exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start() {
-	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-		start_emperor
-		eend $?
-	else
-		if [ "${SVCNAME}" = "uwsgi" ]; then
-			eerror "You are not supposed to run this script directly unless you"
-			eerror "want to run in Emperor mode. In that case please set the UWSGI_EMPEROR_PATH."
-			eerror "Otherwise create a symlink for the uwsgi application you want to run as well as"
-			eerror "a copy of the configuration file and modify it appropriately like so..."
-			eerror
-			eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
-			eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
-			eerror "  nano /etc/conf.d/uwsgi.trac"
-			eerror
-			return 1
-		else
-			start_app
-			eend $?
-		fi
-	fi
-}
-
-stop() {
-	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-		ebegin "Stopping uWSGI emperor"
-	else
-		ebegin "Stopping uWSGI application ${PROGNAME}"
-	fi
-	start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading uWSGI"
-	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-	eend $?
-}
-
-stats() {
-	ebegin "Logging uWSGI statistics"
-	start-stop-daemon --signal USR1 --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/www-servers/uwsgi/files/uwsgi.initd-r6 b/www-servers/uwsgi/files/uwsgi.initd-r6
deleted file mode 100644
index a0c7ad6da599..000000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r6
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PROGNAME=${SVCNAME#*.}
-
-UWSGI_EXEC=/usr/bin/uwsgi
-if [ "${SVCNAME}" = "uwsgi" ]; then
-	PIDPATH=/var/run/uwsgi
-else
-	PIDPATH="/var/run/uwsgi_${PROGNAME}"
-fi
-PIDFILE="${PIDPATH}/${PROGNAME}.pid"
-
-extra_started_commands="${opts} reload stats"
-
-depend() {
-	need net
-}
-
-start_emperor() {
-	local OPTIONS
-	OPTIONS="--daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	ebegin "Starting uWSGI emperor"
-	checkpath -d -m 0770 -o "${UWSGI_USER}":"${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}}" "${PIDPATH}"
-
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		--group ${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}} \
-		-- --emperor "${UWSGI_EMPEROR_PATH}" ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start_app() {
-	local OPTIONS
-	OPTIONS="--master --daemonize"
-
-	if [ -n "${UWSGI_LOG_FILE}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
-	else
-		OPTIONS="${OPTIONS} /dev/null --disable-logging"
-	fi
-
-	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
-	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
-	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	if [ "${UWSGI_THREADS}" = "1" ]; then
-		OPTIONS="${OPTIONS} --enable-threads"
-	fi
-
-	if [ -n "${UWSGI_SOCKET}" ]; then
-		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
-	fi
-
-	if [ -n "${UWSGI_PROCESSES}" ]; then
-		OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}"
-	fi
-
-	if [ -n "${UWSGI_CHROOT}" ]; then
-		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
-	fi
-
-	if [ -n "${UWSGI_PROGRAM}" ]; then
-		OPTIONS="${OPTIONS} --fileserve-mode ${UWSGI_PROGRAM}"
-	fi
-
-	if [ -n "${UWSGI_XML_CONFIG}" ]; then
-		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
-	fi
-
-	ebegin "Starting uWSGI application ${PROGNAME}"
-	checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_GROUP}" "${PIDPATH}"
-
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --group "${UWSGI_GROUP}" \
-		--exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start() {
-	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-		start_emperor
-		eend $?
-	else
-		if [ "${SVCNAME}" = "uwsgi" ]; then
-			eerror "You are not supposed to run this script directly unless you"
-			eerror "want to run in Emperor mode. In that case please set the UWSGI_EMPEROR_PATH."
-			eerror "Otherwise create a symlink for the uwsgi application you want to run as well as"
-			eerror "a copy of the configuration file and modify it appropriately like so..."
-			eerror
-			eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
-			eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
-			eerror "  nano /etc/conf.d/uwsgi.trac"
-			eerror
-			return 1
-		else
-			start_app
-			eend $?
-		fi
-	fi
-}
-
-stop() {
-	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-		ebegin "Stopping uWSGI emperor"
-	else
-		ebegin "Stopping uWSGI application ${PROGNAME}"
-	fi
-	start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading uWSGI"
-	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
-	eend $?
-}
-
-stats() {
-	ebegin "Logging uWSGI statistics"
-	start-stop-daemon --signal USR1 --pidfile "${PIDFILE}"
-	eend $?
-}