Removed old vulnerable versions

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

20 files changed, 16 insertions, 1541 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 87dbf316bff9..52eaf2db7687 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.127 2014/10/16 10:26:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.128 2014/10/17 06:07:57 polynomial-c Exp $
+
+  17 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> -rsyslog-7.4.4.ebuild,
+  -rsyslog-8.4.1.ebuild, -files/7-stable/50-default.conf,
+  -files/7-stable/rsyslog.conf,
+  -files/7-stable/rsyslog-7.4.3-fix-runtime.patch,
+  -files/7-stable/README.gentoo, -files/7-stable/rsyslog.confd,
+  -files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch,
+  -files/7-stable/bugfix_52.patch, -files/7-stable/rsyslog.confd-r1,
+  -files/7-stable/rsyslog-7.x-mmjsonparse.patch,
+  -files/7-stable/bugfix_73.patch,
+  -files/7-stable/fix-omruleset-default-value.patch,
+  -files/7-stable/rsyslog.initd, -files/7-stable/rsyslog.initd-r1,
+  -files/7-stable/rsyslog.logrotate, -files/7-stable/rsyslog.logrotate-r1,
+  -files/7-stable/rsyslog-gentoo.conf, metadata.xml:
+  Removed old vulnerable versions.
 
   16 Oct 2014; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.4.1.ebuild:
   Stable for x86, wrt bug #524058
diff --git a/app-admin/rsyslog/files/7-stable/50-default.conf b/app-admin/rsyslog/files/7-stable/50-default.conf
deleted file mode 100644
index 9ae8578215bb..000000000000
--- a/app-admin/rsyslog/files/7-stable/50-default.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-#######################
-### DEFAULT ACTIONS ###
-#######################
-
-auth,authpriv.* action(
-	type="omfile"
-	File="/var/log/auth.log"
-	FileCreateMode="0600"
-	FileOwner="root"
-	FileGroup="adm"
-	Sync="off"
-)
-
-cron.* action(
-	type="omfile"
-	File="/var/log/cron.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-daemon.* action(
-	type="omfile"
-	File="/var/log/daemon.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-kern.* action(
-	type="omfile"
-	File="/var/log/kern.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-lpr.* action(
-	type="omfile"
-	File="/var/log/lpr.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-mail.* action(
-	type="omfile"
-	File="/var/log/mail.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-news.* action(
-	type="omfile"
-	File="/var/log/news.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-user.* action(
-	type="omfile"
-	File="/var/log/user.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-*.=debug;auth,authpriv,news,mail.none action(
-	type="omfile"
-	File="/var/log/debug.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
-	type="omfile"
-	File="/var/log/messages"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-# Uncomment the following directive to re-enable the
-# deprecated "/var/log/syslog" log file (don't forget to re-enable log
-# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
-#*.*;auth,authpriv.none action(
-#	type="omfile"
-#	File="/var/log/syslog"
-#	FileOwner="root"
-#	FileGroup="adm"
-#)
-
-*.emerg action(
-	type="omusrmsg"
-	Users="*"
-	action.execOnlyOnceEveryInterval="10"
-)
-
-# Create an additional socket for the default chroot location
-# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
-input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/app-admin/rsyslog/files/7-stable/README.gentoo b/app-admin/rsyslog/files/7-stable/README.gentoo
deleted file mode 100644
index 9f0666c86b0a..000000000000
--- a/app-admin/rsyslog/files/7-stable/README.gentoo
+++ /dev/null
@@ -1,36 +0,0 @@
-Introduction
-============
-
-Since rsyslog version 7.6 we are shipping a new default Gentoo
-configuration. See bug #501982 to learn more about what we were trying to
-achieve by rewriting the entire configuration.
-
-
-Important changes
-=================
-
-1. "/var/log/syslog" log file is now deprecated
-
-   Beginning with rsyslog-7.6, the "/var/log/syslog" log file will no
-   longer being written per default. We are considering this file as
-   deprecated/obsolet for the typical user/system.
-   The content from this log file is still availble through other
-   (dedicated) log files, see
-   
-     - /var/log/cron.log
-     - /var/log/daemon.log
-     - /var/log/mail.log
-     - /var/log/messages
-   
-   If you really need the old "/var/log/syslog" log file, all you have to
-   do is uncommenting the corresponding configuration directive in
-   "/etc/rsyslog.d/50-default.conf".
-   
-   If you do so, don't forget to re-enable log rotation in
-   "/etc/logrotate.d/rsyslog", too.
-
-
-2. An additional input socket in "/var/empty/dev/log" (default chroot
-   location) will be created per default
-
-   See bug #490744 for further details.
diff --git a/app-admin/rsyslog/files/7-stable/bugfix_52.patch b/app-admin/rsyslog/files/7-stable/bugfix_52.patch
deleted file mode 100644
index f5da7b92f3bf..000000000000
--- a/app-admin/rsyslog/files/7-stable/bugfix_52.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From b017e29aad70702c69e6016b07a932b7825a83e5 Mon Sep 17 00:00:00 2001
-From: Thomas D <whissi@whissi.de>
-Date: Sat, 3 May 2014 14:45:25 +0200
-Subject: [PATCH] Remove "--enable-cached-man-pages" switch and make rst2man
- optional when required man pages already exist
-
-This commit backports the bugfix for issue #52 for the v7-stable branch.
----
- configure.ac | 61 +++++++++++++++++++++++++++++++++++-------------------------
- 1 file changed, 36 insertions(+), 25 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0dd40c2..07d96dd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1087,30 +1087,6 @@ fi
- AM_CONDITIONAL(ENABLE_GUARDTIME, test x$enable_guardtime = xyes)
- 
- 
--# Support using cached man file copies, to avoid the need for rst2man
--# in the build environment
--AC_ARG_ENABLE(cached_man_pages,
--        [AS_HELP_STRING([--enable-cached-man-pages],[Enable using cached versions of man files (avoid rst2man) @<:@default=no@:>@])],
--        [case "${enableval}" in
--         yes) enable_cached_man_pages="yes" ;;
--          no) enable_cached_man_pages="no" ;;
--           *) AC_MSG_ERROR(bad value ${enableval} for --enable-cached-man-pages) ;;
--         esac],
--        [enable_cached_man_pages=no]
--)
--if test "x$enable_cached_man_pages" = "xno"; then
--# obtain path for rst2man
--  if test "x$enable_libgcrypt" = "xyes" || \
--     test "x$enable_guardtime" = "xyes"; then
--        AC_PATH_PROG([RST2MAN], [rst2man])
--        if test "x${RST2MAN}" == "x"; then
--            AC_MSG_FAILURE([rst2man not found in PATH])
--        fi
--  fi
--fi
--
--
--
- # RFC 3195 support
- AC_ARG_ENABLE(rfc3195,
-         [AS_HELP_STRING([--enable-rfc3195],[Enable RFC3195 support @<:@default=no@:>@])],
-@@ -1519,6 +1495,41 @@ AM_CONDITIONAL(ENABLE_OMHIREDIS, test x$enable_omhiredis = xyes)
- 
- # END HIREDIS SUPPORT
- 
-+
-+AC_CHECKING([if required man pages already exist])
-+have_to_generate_man_pages="no"
-+
-+# man pages for libgcrypt module
-+if test "x$enable_usertools" = "xyes" && test "x$enable_libgcrypt" = "xyes"; then
-+    AC_CHECK_FILES(["tools/rscryutil.1" "tools/rsgtutil.1"],
-+        [],
-+        [have_to_generate_man_pages="yes"]
-+    )
-+fi
-+
-+# man pages for GuardTime module
-+if test "x$enable_usertools" = "xyes" && test "x$enable_guardtime" = "xyes"; then
-+    AC_CHECK_FILES(["tools/rscryutil.1" "tools/rsgtutil.1"],
-+        [],
-+        [have_to_generate_man_pages="yes"]
-+    )
-+fi
-+
-+if test "x$have_to_generate_man_pages" = "xyes"; then
-+    AC_MSG_RESULT([Some man pages are missing. We need rst2man to generate the missing man pages from source...])
-+else
-+    AC_MSG_RESULT([All required man pages found. We don't need rst2man!])
-+fi
-+
-+if test "x$have_to_generate_man_pages" = "xyes"; then
-+    # We need rst2man to generate our man pages
-+    AC_CHECK_PROGS([RST2MAN], [rst2man rst2man.py], [])
-+    if test -z "$RST2MAN"; then
-+        AC_MSG_ERROR([rst2man is required to build man pages. You can use the release tarball with pregenerated man pages to avoid this depedency.])
-+    fi
-+fi
-+
-+
- AC_CONFIG_FILES([Makefile \
- 		runtime/Makefile \
- 		compat/Makefile \
-@@ -1594,7 +1605,7 @@ echo "    Zlib compression support enabled:         $enable_zlib"
- echo "    rsyslog runtime will be built:            $enable_rsyslogrt"
- echo "    rsyslogd will be built:                   $enable_rsyslogd"
- echo "    GUI components will be built:             $enable_gui"
--echo "    cached man files will be used:            $enable_cached_man_pages"
-+echo "    have to generate man pages:               $have_to_generate_man_pages"
- echo "    Unlimited select() support enabled:       $enable_unlimited_select"
- echo "    uuid support enabled:                     $enable_uuid"
- echo "    Log file signing support:                 $enable_guardtime"
--- 
-1.9.2
-
diff --git a/app-admin/rsyslog/files/7-stable/bugfix_73.patch b/app-admin/rsyslog/files/7-stable/bugfix_73.patch
deleted file mode 100644
index cc295d614def..000000000000
--- a/app-admin/rsyslog/files/7-stable/bugfix_73.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-This patch will update the pre-generated rscryutil man page from the release
-tarball so we don't need to depend on dev-python/docutils.
-
-https://github.com/rsyslog/rsyslog/issues/73
-
-diff -rupN old/rsyslog-7.6.3/tools/rscryutil.1 new/rsyslog-7.6.3/tools/rscryutil.1
---- old/rsyslog-7.6.3/tools/rscryutil.1	2013-10-29 16:31:21.000000000 +0100
-+++ new/rsyslog-7.6.3/tools/rscryutil.1	2014-05-03 20:41:46.143825094 +0200
-@@ -1,4 +1,4 @@
--.\" Man page generated from reStructeredText.
-+.\" Man page generated from reStructuredText.
- .
- .TH RSCRYUTIL 1 "2013-04-15" "" ""
- .SH NAME
-@@ -31,12 +31,16 @@ level margin: \\n[rst2man-indent\\n[rst2
- .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
- ..
- .SH SYNOPSIS
-+.INDENT 0.0
-+.INDENT 3.5
- .sp
- .nf
- .ft C
- rscryutil [OPTIONS] [FILE] ...
- .ft P
- .fi
-+.UNINDENT
-+.UNINDENT
- .SH DESCRIPTION
- .sp
- This tool performs various operations on encrypted log files.
-@@ -44,46 +48,46 @@ Most importantly, it provides the abilit
- .SH OPTIONS
- .INDENT 0.0
- .TP
--.B \-d,  \-\-decrypt
-+.B \-d\fP,\fB  \-\-decrypt
- Select decryption mode. This is the default mode.
- .TP
--.BI \-W,  \-\-write\-keyfile \ <file>
-+.BI \-W\fP,\fB  \-\-write\-keyfile \ <file>
- Utility function to write a key to a keyfile. The key can be obtained
- via any method.
- .TP
--.B \-v,  \-\-verbose
-+.B \-v\fP,\fB  \-\-verbose
- Select verbose mode.
- .TP
--.B \-f,  \-\-force
-+.B \-f\fP,\fB  \-\-force
- Forces operations that otherwise would fail.
- .TP
--.BI \-k,  \-\-keyfile \ <file>
-+.BI \-k\fP,\fB  \-\-keyfile \ <file>
- Reads the key from <file>. File _must_ contain the key, only, no headers
- or other meta information. Keyfiles can be generated via the
- \fI\-\-write\-keyfile\fP option.
- .TP
--.BI \-p,  \-\-key\-program \ <path\-to\-program>
-+.BI \-p\fP,\fB  \-\-key\-program \ <path\-to\-program>
- In this mode, the key is provided by a so\-called "key program". This program
- is executed and must return the key to (as well as some meta information)
- via stdout. The core idea of key programs is that using this interface the
- user can implement as complex (and secure) method to obtain keys as
- desired, all without the need to make modifications to rsyslog.
- .TP
--.BI \-K,  \-\-key \ <KEY>
-+.BI \-K\fP,\fB  \-\-key \ <KEY>
- TESTING AID, NOT FOR PRODUCTION USE. This uses the KEY specified
- on the command line. This is the actual key, and as such this mode
- is highly insecure. However, it can be useful for intial testing
- steps. This option may be removed in the future.
- .TP
--.BI \-a,  \-\-algo \ <algo>
-+.BI \-a\fP,\fB  \-\-algo \ <algo>
- Sets the encryption algorightm (cipher) to be used. See below
- for supported algorithms. The default is "AES128".
- .TP
--.BI \-m,  \-\-mode \ <mode>
-+.BI \-m\fP,\fB  \-\-mode \ <mode>
- Sets the ciphermode to be used. See below for supported modes.
- The default is "CBC".
- .TP
--.BI \-r,  \-\-generate\-random\-key \ <bytes>
-+.BI \-r\fP,\fB  \-\-generate\-random\-key \ <bytes>
- Generates a random key of length <bytes>. This option is
- meant to be used together with \fI\-\-write\-keyfile\fP (and it is hard
- to envision any other valid use for it).
-@@ -97,7 +101,7 @@ multiple operations mode are set on the
- unpredictable.
- .SS decrypt
- .sp
--The provided log files are decrypted. Note that the \fI.encinfo\fP side files
-+The provided log files are decrypted. Note that the \fI\&.encinfo\fP side files
- must exist and be accessible in order for decryption to to work.
- .SS write\-keyfile
- .sp
-@@ -198,5 +202,4 @@ LGPLv2.
- .SH AUTHOR
- Rainer Gerhards <rgerhards@adiscon.com>
- .\" Generated by docutils manpage writer.
--.\" 
- .
diff --git a/app-admin/rsyslog/files/7-stable/fix-omruleset-default-value.patch b/app-admin/rsyslog/files/7-stable/fix-omruleset-default-value.patch
deleted file mode 100644
index 816471caffa7..000000000000
--- a/app-admin/rsyslog/files/7-stable/fix-omruleset-default-value.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 14f3b45151864aa4170de515f406a69ad2931eba Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Thu, 31 Oct 2013 18:21:47 +0100
-Subject: [PATCH] module omruleset is no longer enabled by default.
-
-Note that it has been deprecated in v7 and been replaced by the "call"
-statement. Also, it can still be build without problems, the option must
-just explicitely be given.
----
-diff --git a/configure.ac b/configure.ac
-index 3abd559..de4c3ea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1353,7 +1353,7 @@ AC_ARG_ENABLE(omruleset,
-           no) enable_omruleset="no" ;;
-            *) AC_MSG_ERROR(bad value ${enableval} for --enable-omruleset) ;;
-          esac],
--        [enable_omruleset=yes]
-+        [enable_omruleset=no]
- )
- AM_CONDITIONAL(ENABLE_OMRULESET, test x$enable_omruleset = xyes)
- 
--- 
-1.9.1
-
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch b/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch
deleted file mode 100644
index b3e6f25b474d..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/runtime/Makefile.am b/runtime/Makefile.am
-index dea06fe..34384be 100644
---- a/runtime/Makefile.am
-+++ b/runtime/Makefile.am
-@@ -97,12 +97,13 @@ librsyslog_la_SOURCES = \
- #
- 
- if WITH_MODDIRS
--librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" $(PTHREADS_CFLAGS) -I\$(top_srcdir)/tools
-+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\"
- else
--librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(PTHREADS_CFLAGS) -I\$(top_srcdir)/tools -I\$(top_srcdir)/grammar
-+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar
- endif
- #librsyslog_la_LDFLAGS = -module -avoid-version
--librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS)
-+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
-+librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
- 
- #
- # regular expression support
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch b/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch
deleted file mode 100644
index 6a0feb5a8eae..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff --git a/action.c b/action.c
-index 259fb66..6b52d70 100644
---- a/action.c
-+++ b/action.c
-@@ -98,7 +98,7 @@
- #include <strings.h>
- #include <time.h>
- #include <errno.h>
--#include <json/json.h>
-+#include <json.h>
- 
- #include "dirty.h"
- #include "template.h"
-diff --git a/configure.ac b/configure.ac
-index d6d5c92..1970f60 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,7 +33,9 @@ PKG_PROG_PKG_CONFIG
- 
- # modules we require
- PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.5)
--PKG_CHECK_MODULES([JSON_C], [json])
-+PKG_CHECK_MODULES([JSON_C], [json],, [
-+	PKG_CHECK_MODULES([JSON_C], [json-c])
-+])
- 
- case "${host}" in
-   *-*-linux*)
-@@ -821,7 +823,7 @@ if test "x$enable_rsyslogrt" = "xyes"; then
-   RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
- fi
- AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
--RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"
-+RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
- RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
- AC_SUBST(RSRT_CFLAGS1)
- AC_SUBST(RSRT_LIBS1)
-diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c
-index 822d3db..172ff4d 100644
---- a/plugins/imkmsg/kmsg.c
-+++ b/plugins/imkmsg/kmsg.c
-@@ -34,7 +34,7 @@
- #include <ctype.h>
- #include <sys/klog.h>
- #include <sys/sysinfo.h>
--#include <json/json.h>
-+#include <json.h>
- 
- #include "rsyslog.h"
- #include "srUtils.h"
-diff --git a/plugins/mmaudit/mmaudit.c b/plugins/mmaudit/mmaudit.c
-index 6b6b804..c7cff2c 100644
---- a/plugins/mmaudit/mmaudit.c
-+++ b/plugins/mmaudit/mmaudit.c
-@@ -43,7 +43,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <ctype.h>
--#include <json/json.h>
-+#include <json.h>
- #include "conf.h"
- #include "syslogd-types.h"
- #include "template.h"
-diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
-index 35f69aa..b16aef0 100644
---- a/plugins/mmjsonparse/mmjsonparse.c
-+++ b/plugins/mmjsonparse/mmjsonparse.c
-@@ -35,7 +35,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <ctype.h>
--#include <json/json.h>
-+#include <json.h>
- #include "conf.h"
- #include "syslogd-types.h"
- #include "template.h"
-diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
-index fcadc32..f93974a 100644
---- a/plugins/mmnormalize/mmnormalize.c
-+++ b/plugins/mmnormalize/mmnormalize.c
-@@ -40,7 +40,7 @@
- #include <unistd.h>
- #include <libestr.h>
- #include <libee/libee.h>
--#include <json/json.h>
-+#include <json.h>
- #include <liblognorm.h>
- #include "conf.h"
- #include "syslogd-types.h"
-diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
-index dd99741..64d501d 100644
---- a/plugins/ommongodb/ommongodb.c
-+++ b/plugins/ommongodb/ommongodb.c
-@@ -33,7 +33,7 @@
- #include <stdint.h>
- #include <time.h>
- #include <mongo.h>
--#include <json/json.h>
-+#include <json.h>
- /* For struct json_object_iter, should not be necessary in future versions */
- #include <json/json_object_private.h>
- 
-diff --git a/runtime/msg.c b/runtime/msg.c
-index a227567..e683cdb 100644
---- a/runtime/msg.c
-+++ b/runtime/msg.c
-@@ -41,7 +41,7 @@
- #endif
- #include <netdb.h>
- #include <libestr.h>
--#include <json/json.h>
-+#include <json.h>
- /* For struct json_object_iter, should not be necessary in future versions */
- #include <json/json_object_private.h>
- #if HAVE_MALLOC_H
-diff --git a/runtime/msg.h b/runtime/msg.h
-index 6faf066..ac220b6 100644
---- a/runtime/msg.h
-+++ b/runtime/msg.h
-@@ -30,7 +30,7 @@
- 
- #include <pthread.h>
- #include <libestr.h>
--#include <json/json.h>
-+#include <json.h>
- #include "obj.h"
- #include "syslogd-types.h"
- #include "template.h"
-diff --git a/template.c b/template.c
-index b675255..9cefa05 100644
---- a/template.c
-+++ b/template.c
-@@ -34,7 +34,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <assert.h>
--#include <json/json.h>
-+#include <json.h>
- #include "stringbuf.h"
- #include "syslogd-types.h"
- #include "template.h"
-diff --git a/template.h b/template.h
-index 318db6f..87a1c77 100644
---- a/template.h
-+++ b/template.h
-@@ -30,7 +30,7 @@
- #ifndef	TEMPLATE_H_INCLUDED
- #define	TEMPLATE_H_INCLUDED 1
- 
--#include <json/json.h>
-+#include <json.h>
- #include <libestr.h>
- #include "regexp.h"
- #include "stringbuf.h"
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch b/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch
deleted file mode 100644
index ad5c8ea777d9..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d6f5d5aae579455badb2d546f8ef292956720824 Mon Sep 17 00:00:00 2001
-From: Thomas D <whissi@whissi.de>
-Date: Tue, 15 Apr 2014 17:56:05 +0200
-Subject: [PATCH] Fix for https://github.com/rsyslog/rsyslog/issues/61
-
-Based on Maxim Koltsov proposed patch from https://bugs.gentoo.org/show_bug.cgi?id=507730
----
- plugins/mmjsonparse/mmjsonparse.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
-index b16aef0..a5bfaa2 100644
---- a/plugins/mmjsonparse/mmjsonparse.c
-+++ b/plugins/mmjsonparse/mmjsonparse.c
-@@ -146,7 +146,7 @@ processJSON(instanceData *pData, msg_t *pMsg, char *buf, size_t lenBuf)
- 
- 			err = pData->tokener->err;
- 			if(err != json_tokener_continue)
--				errMsg = json_tokener_errors[err];
-+				errMsg = json_tokener_error_desc(err);
- 			else
- 				errMsg = "Unterminated input";
- 		} else if((size_t)pData->tokener->char_offset < lenBuf)
--- 
-1.9.1
-
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog-gentoo.conf b/app-admin/rsyslog/files/7-stable/rsyslog-gentoo.conf
deleted file mode 100644
index 5f3fa1f1603b..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog-gentoo.conf
+++ /dev/null
@@ -1,100 +0,0 @@
-#################
-#### MODULES ####
-#################
-
-$ModLoad imuxsock # provides support for local system logging
-$ModLoad imklog   # provides kernel logging support
-#$ModLoad immark  # provides --MARK-- message capability
-
-# provides UDP syslog reception
-#$ModLoad imudp
-#$UDPServerRun 514
-
-# provides TCP syslog reception
-#$ModLoad imtcp
-#$InputTCPServerRun 514
-
-
-###########################
-#### GLOBAL DIRECTIVES ####
-###########################
-
-# Use traditional timestamp format.
-# To enable high precision timestamps, comment out the following line.
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-# Set the default permissions for all log files.
-$FileOwner root
-$FileGroup adm
-$FileCreateMode 0640
-$DirCreateMode 0755
-$Umask 0022
-
-# Where to place spool and state files
-$WorkDirectory /var/spool/rsyslog
-
-# Check config syntax on startup and abort if unclean (default off)
-#$AbortOnUncleanConfig on
-
-# Reduce repeating messages (default off)
-#$RepeatedMsgReduction on
-
-# Include all config files in /etc/rsyslog.d/
-$IncludeConfig /etc/rsyslog.d/*.conf
-
-
-###############
-#### RULES ####
-###############
-
-# First some standard log files.  Log by facility.
-auth,authpriv.*				/var/log/auth.log
-*.*;auth,authpriv.none		-/var/log/syslog
-#cron.*						/var/log/cron.log
-daemon.*					-/var/log/daemon.log
-kern.*						-/var/log/kern.log
-lpr.*						-/var/log/lpr.log
-mail.*						-/var/log/mail.log
-user.*						-/var/log/user.log
-
-# Logging for the mail system.  Split it up so that
-# it is easy to write scripts to parse these files.
-mail.info			-/var/log/mail.info
-mail.warn			-/var/log/mail.warn
-mail.err			/var/log/mail.err
-
-# Logging for INN news system.
-news.crit			/var/log/news/news.crit
-news.err			/var/log/news/news.err
-news.notice			-/var/log/news/news.notice
-
-# Some "catch-all" log files.
-*.=debug;\
-	auth,authpriv.none;\
-	news.none;mail.none	-/var/log/debug
-*.=info;*.=notice;*.=warn;\
-	auth,authpriv.none;\
-	cron,daemon.none;\
-	mail,news.none		-/var/log/messages
-
-# Emergencies are sent to everybody logged in.
-*.emerg				:omusrmsg:*
-
-# I like to have messages displayed on the console, but only on a virtual
-# console I usually leave idle.
-#daemon,mail.*;\
-#	news.=crit;news.=err;news.=notice;\
-#	*.=debug;*.=info;\
-#	*.=notice;*.=warn	/dev/tty8
-
-# The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
-# you must invoke `xconsole' with the `-file' option:
-#
-#    $ xconsole -file /dev/xconsole [...]
-#
-# NOTE: adjust the list below, or you'll go crazy if you have a reasonably
-#      busy site..
-#daemon.*;mail.*;\
-#	news.err;\
-#	*.=debug;*.=info;\
-#	*.=notice;*.=warn	|/dev/xconsole
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.conf b/app-admin/rsyslog/files/7-stable/rsyslog.conf
deleted file mode 100644
index da484598a652..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-# /etc/rsyslog.conf
-# 
-# This configuration is based on RainerScript, the new recommended syntax
-# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
-# details.
-# 
-# But if you don't want to learn something new at moment, don't worry: The
-# legacy syntax is still supported.
-# 
-# You may want to use the new RSYSLOG configuration builder to create your
-# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
-
-# Check config syntax on startup and abort if unclean (default: off)
-#$AbortOnUncleanConfig on
-
-
-###############
-### MODULES ###
-###############
-
-# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
-module(load="imuxsock")
-
-# Read messages from the kernel log and submits them to the syslog engine
-module(load="imklog")
-
-# Inject "--MARK--" messages every $Interval (seconds)
-#module(load="immark" Interval="600")
-
-# Read syslog messages from UDP
-#module(load="imudp")
-#input(type="imudp" port="514")
-
-# Read syslog messages from TCP
-#module(load="imtcp")
-#input(type="imtcp" port="514")
-
-
-#########################
-### GLOBAL DIRECTIVES ###
-#########################
-
-# Where to place spool and state files
-$WorkDirectory /var/spool/rsyslog
-
-# Reduce repeating messages (default: off)
-#$RepeatedMsgReduction on
-
-# Set defaults for every output file
-$Umask 0022
-
-module(
-	load="builtin:omfile"
-	Template="RSYSLOG_TraditionalFileFormat"
-	FileCreateMode="0644"
-	DirCreateMode="0755"
-)
-
-
-# Include all conf files in /etc/rsyslog.d/
-$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.confd b/app-admin/rsyslog/files/7-stable/rsyslog.confd
deleted file mode 100644
index f5de7b58eacf..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog.confd,v 1.1 2012/11/20 13:03:36 ultrabug Exp $
-
-# Configuration file
-CONFIGFILE="/etc/rsyslog.conf"
-
-# PID file
-PIDFILE="/var/run/rsyslogd.pid"
-
-# Options to rsyslogd
-# See rsyslogd(8) for more details
-# Notes:
-# * Do not specify another PIDFILE but use the variable above to change the location
-# * Do not specify another CONFIGFILE but use the variable above to change the location
-RSYSLOG_OPTS=""
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.confd-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.confd-r1
deleted file mode 100644
index d8cbe875960a..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog.confd-r1
+++ /dev/null
@@ -1,30 +0,0 @@
-# /etc/conf.d/rsyslog
-
-# Configuration file
-RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
-
-# PID file
-# If you should ever change this, remember to update
-# "/etc/logrotate.d/rsyslog", too.
-RSYSLOG_PIDFILE="/run/rsyslogd.pid"
-
-# You can use this configuration option to pass additional options to the
-# start-stop-daemon, see start-stop-daemon(8) for more details.
-# Per default we wait 1000ms after we have started the service to ensure
-# that the daemon is really up and running.
-RSYSLOG_SSDARGS="--wait 1000"
-
-# The termination timeout (start-stop-daemon parameter "retry") ensures
-# that the service will be terminated within a given time (60 + 5 seconds
-# per default) when you are stopping the service.
-# You need to increase the value when you are working with a large queue.
-# See http://www.rsyslog.com/doc/queues.html for further information.
-RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
-
-
-# Options to rsyslogd
-# See rsyslogd(8) for more details
-# Notes:
-# * Do not specify another PIDFILE but use the variable above to change the location
-# * Do not specify another CONFIGFILE but use the variable above to change the location
-RSYSLOG_OPTS=""
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.initd b/app-admin/rsyslog/files/7-stable/rsyslog.initd
deleted file mode 100644
index 65ed11bb2c34..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog.initd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog.initd,v 1.1 2012/11/20 13:03:36 ultrabug Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	provide logger
-}
-
-start() {
-	ebegin "Starting rsyslogd"
-	start-stop-daemon \
-		--start --quiet --exec /usr/sbin/rsyslogd --pidfile "${PIDFILE}" \
-		-- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping rsyslogd"
-	start-stop-daemon \
-		--stop --quiet \
-		--pidfile "${PIDFILE}"
-	eend $?
-}
-
-reload() {
-	if [ ! -f "${PIDFILE}" ]; then
-		eerror "rsyslogd not running"
-		return 1
-	fi
-
-	# Baselayout-1 users still use --stop and --oknodo
-	local USEROPT="--name rsyslogd"
-	if [ ! -f /etc/init.d/sysfs ]; then
-		USEROPT="--stop --oknodo"
-	fi
-
-	ebegin "Re-opening rsyslogd log files"
-	start-stop-daemon --signal HUP --pidfile "${PIDFILE}" ${USEROPT}
-	eend $?
-}
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1
deleted file mode 100644
index 1e77c42b82cf..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1,v 1.3 2014/06/16 03:59:03 vapier Exp $
-
-RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
-RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
-
-command="/usr/sbin/rsyslogd"
-command_args="${RSYSLOG_OPTS} -f ${RSYSLOG_CONFIGFILE} -i ${RSYSLOG_PIDFILE}"
-start_stop_daemon_args="${RSYSLOG_SSDARGS}"
-pidfile="${RSYSLOG_PIDFILE}"
-retry="${RSYSLOG_TERMTIMEOUT}"
-
-required_files="${RSYSLOG_CONFIGFILE}"
-
-description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)."
-
-extra_commands="configtest"
-extra_started_commands="rotate"
-
-description_configtest="Run rsyslogd's internal config check."
-
-description_rotate="Sends rsyslogd a signal to re-open its log files."
-
-depend() {
-	need clock hostname localmount
-	provide logger
-}
-
-start_pre() {
-	if [ "${RC_CMD}" != "restart" ]; then
-		configtest || return 1
-	fi
-}
-
-stop_pre() {
-	if [ "${RC_CMD}" = "restart" ]; then
-		configtest || return 1
-	fi
-}
-
-stop_post() {
-	rm -f ${RSYSLOG_PIDFILE}
-}
-
-configtest() {
-	# This will currently only detect fatal errors
-	# See https://github.com/rsyslog/rsyslog/issues/79
-
-	local _test_command="${command} -N 999 -f ${RSYSLOG_CONFIGFILE}"
-	local _retval=0
-
-	ebegin "Checking rsyslogd's configuration"
-	${_test_command} >/dev/null 2>&1
-	_retval=$?
-
-	if [ ${_retval} -ne 0 ]; then
-		${_test_command}
-	fi
-
-	eend ${_retval} "failed, please correct errors above"
-}
-
-rotate() {
-	ebegin "Re-opening rsyslogd logs"
-	start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}"
-	eend $?
-}
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate
deleted file mode 100644
index 0f2b3ff8d71c..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate
+++ /dev/null
@@ -1,37 +0,0 @@
-/var/log/syslog
-{
-	rotate 7
-	daily
-	missingok
-	notifempty
-	delaycompress
-	compress
-	postrotate
-		kill -HUP $(cat /run/rsyslogd.pid) >/dev/null 2>&1 || true
-	endscript
-}
-
-/var/log/mail.info
-/var/log/mail.warn
-/var/log/mail.err
-/var/log/mail.log
-/var/log/daemon.log
-/var/log/kern.log
-/var/log/auth.log
-/var/log/user.log
-/var/log/lpr.log
-/var/log/cron.log
-/var/log/debug
-/var/log/messages
-{
-	rotate 4
-	weekly
-	missingok
-	notifempty
-	compress
-	delaycompress
-	sharedscripts
-	postrotate
-		kill -HUP $(cat /run/rsyslogd.pid) >/dev/null 2>&1 || true
-	endscript
-}
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1
deleted file mode 100644
index 15f32542df8a..000000000000
--- a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1
+++ /dev/null
@@ -1,37 +0,0 @@
-# Uncomment the following directive if you have re-enabled
-# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
-#/var/log/syslog
-#{
-#	rotate 7
-#	daily
-#	missingok
-#	notifempty
-#	delaycompress
-#	compress
-#	postrotate
-#		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) >/dev/null 2>&1
-#	endscript
-#}
-
-/var/log/auth.log
-/var/log/cron.log
-/var/log/daemon.log
-/var/log/kern.log
-/var/log/lpr.log
-/var/log/mail.log
-/var/log/news.log
-/var/log/user.log
-/var/log/debug.log
-/var/log/messages
-{
-	rotate 4
-	weekly
-	missingok
-	notifempty
-	compress
-	delaycompress
-	sharedscripts
-	postrotate
-		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) >/dev/null 2>&1
-	endscript
-}
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index af89009689f2..0e3b66634978 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -14,7 +14,6 @@
 	<use>
 		<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
 		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
-		<flag name="extras">Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-7.4.4.ebuild b/app-admin/rsyslog/rsyslog-7.4.4.ebuild
deleted file mode 100644
index 4e2b7e142676..000000000000
--- a/app-admin/rsyslog/rsyslog-7.4.4.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v 1.10 2014/04/16 16:14:41 maksbotan Exp $
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="amd64 ~arm hppa x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs systemd zeromq zlib"
-
-RDEPEND="
-	dev-libs/json-c
-	dev-libs/libee
-	>=dev-libs/libestr-0.1.5
-	dev-libs/libgcrypt:0
-	dev-libs/liblognorm
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-1.0.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	systemd? ( sys-apps/systemd )
-	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="7-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-src_prepare() {
-	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	# * mongodb : doesnt work with mongo-c-driver ?
-	local myeconfargs=(
-		--enable-cached-man-pages
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
-		--enable-mmanon
-		--enable-omprog
-		--enable-omstdout
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
-		$(use_enable dbi libdbi)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd omjournal)
-		$(use_enable zlib)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-		"$(systemd_with_unitdir)"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(doc/)
-	autotools-utils_src_install
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
-	if use mysql || use postgres; then
-		echo
-		elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-		elog "  /usr/share/doc/${PF}/scripts"
-	fi
-
-	if use ssl; then
-		echo
-		elog "To create a default CA and certificates for your server and clients, run:"
-		elog "  emerge --config =${PF}"
-		elog "on your logging server. You can run it several times,"
-		elog "once for each logging client. The client certificates will be signed"
-		elog "using the CA certificate generated during the first run."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	CERTDIR="${ROOT}/etc/ssl/${PN}"
-	if [ ! -d "${CERTDIR}" ]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.4.1.ebuild b/app-admin/rsyslog/rsyslog-8.4.1.ebuild
deleted file mode 100644
index 1c4e5e1ee206..000000000000
--- a/app-admin/rsyslog/rsyslog-8.4.1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.1.ebuild,v 1.4 2014/10/16 10:26:45 ago Exp $
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="
-	http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-	doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="amd64 ~arm hppa x86"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq"
-
-RDEPEND="
-	>=dev-libs/json-c-0.11:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
-	kerberos? ( virtual/krb5 )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-1.0.0:=
-	)
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.2 )
-	postgres? ( >=dev-db/postgresql-base-8.4.20 )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
-	redis? ( >=dev-libs/hiredis-0.11.0 )
-	relp? ( >=dev-libs/librelp-1.2.5 )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? ( >=dev-libs/openssl-0.9.8y )
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23 )
-	systemd? ( >=sys-apps/systemd-208 )
-	zeromq? ( >=net-libs/czmq-1.2.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="8-stable"
-
-# Test suite requires a special setup or will always fail
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-DOCS=(
-	AUTHORS
-	ChangeLog
-	"${FILESDIR}"/${BRANCH}/README.gentoo
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if use doc; then
-		local doc_tarball="${PN}-doc-${PV}.tar.gz"
-
-		cd "${S}" || die "Cannot change dir into '$S'"
-		mkdir docs || die "Failed to create docs directory"
-		cd docs || die "Failed to change dir into '${S}/docs'"
-		unpack ${doc_tarball}
-	fi
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-generate-man-pages
-		# Input Plugins without depedencies
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		--enable-imttcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug imdiag)
-		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable normalize mmnormalize)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-		"$(systemd_with_unitdir)"
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}/docs/build/" )
-	autotools-utils_src_install
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then
-		# Show this message until rsyslog-8.x
-		echo
-		elog "Since ${PN}-7.6.3 we no longer use the catch-all log target"
-		elog "\"/var/log/syslog\" due to its redundancy to the other log targets."
-
-		advertise_readme=1
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [ ! -d "${CERTDIR}" ]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}