gentoo resync : 15.01.2020

12 files changed, 248 insertions, 222 deletions

diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 4ea7e5500ea5..bce39c2a80c8 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -1,13 +1,11 @@
-AUX libprelude-3.0.0-perl-hardening.patch 1019 BLAKE2B 5e59c001ef66a1a24193b2f83e15527caec44154730ed4e02846b367c98fc25e2fcc073fbaad4cd1a35a689c2f57391fd932330182d5614511aef329f6b31f34 SHA512 0e6b08eb4e3a00ad3f78afb0ea6360bb82cbc21a2a5f419629d865a0c5598450f6923327c160b15a2874c98bc313e185d5a1f0379b55366b50a2fe6dd15ab7cb
-AUX libprelude-3.0.0-ruby-configure.patch 619 BLAKE2B 8c1d0c21ffd0de7defb87becb0f0e56b234e1512cc1b01df3928e30006ee20bd58bfa6e5005d9faac246b8277cadf9b1a8ca204f1ed5f52a709a026e84f6d93c SHA512 a268dd1ca72ff8295bc8cb9fd037c8bdfcdcacf68122cefdf17b056c8828770be205853aaf7a7ad18f0e6369bc325703583405f5372ed8c731f2591f1da5d09d
-AUX libprelude-3.0.0-ruby-m4.patch 1539 BLAKE2B 26934566408e3271c25f30902bfbb86a68cfa80e4bd174f21eda92e3cafd5394da1e34709beef1c706383df77d4779335a34232276beb841c8d447748aa332c4 SHA512 cd98e208260e497b46a56a4ca0430f0650282de949259caedfb06ce1d348af52a630def53c39c812d08247c289e551e9b6f70d8da17fb9b9627fb773af4e55a2
 AUX libprelude-4.0.0-fix-python-bindings.patch 1136 BLAKE2B 287f5e3c049ef4d3af54932f968f1973aebe0541e50403e4154512772e9d625324e879a06ff4c5810bb90f3d2c968c09fa361067435e7e4bc6131ea78f6ad794 SHA512 6990cd9e79d6e9e42c9f377f1c9a9f48920310aaf47d9bc731fc133c743256874a613ad5740eb4bc25825b341e313f79c8cfa1160a58e6eda228b9ca6bfef2b2
-DIST libprelude-3.0.0.tar.gz 2900153 BLAKE2B dd03b46a11b673252dc36701e4568c445fe1e3a61a79c92ce04ed6fefac804983ba03e39928038a67768d9e5e0542d74703c07254c0112d5a6906a7c37ae4403 SHA512 a1fd51aa3bb1b68759a00dd1636cb96379f0e954a66f4e39887ab20a5b4c191a0455dd6bd5f41b20ad94d06fff59af7f89b258f42e1c0dd4cfc99185a77d1797
-DIST libprelude-3.1.0.tar.gz 2949462 BLAKE2B 52764791766c54e2c1baa96231c6578f06219a6d1c48a97ad318fc8445fc64f90a63019654f7350d65ec4e0a336eef66bd449484321c590d1ee4596a6a386724 SHA512 f2878b19b4ba3cc74b0530f8741525ecf1425540d30356d182c4e0a797dbb5f4023792351bd059105dafc6b7818d4caa2e9c8b39be9a7039a89680244fcf1239
+AUX libprelude-5.1.0-fix_awk_error.patch 3243 BLAKE2B 2be6fe51c2edfd85b851f7080cc6b205703ba8ff25752392f1bd1a6a33c9101e45c937160cc593b66d851aa010723cefaa50577e6760d421139d321e421fedd9 SHA512 be78d258e81ae010301ce29f5de5cadc44bca50a1f20a7de85e1f2dfdcda22acaa11d0a497f440a3aeea3bb1e34b74ce238af2da0d6854059c67c76b2bfaa90f
+AUX libprelude-5.1.0-fix_gtkdoc_1.32.patch 416 BLAKE2B 9717541a0d57a0fb97a7f4f2b9d466d65f8091e96707cb7a20e61ce3aef925d44b93a71f03d90c074592e0bf91a133c7a2b87996ceabb10810a3795a595d874c SHA512 1b35a8b5af4701c51e3d9a20eaf501cf81f429b2f2f16c0d8fecefa51a3438b35cf237db3c4696c56e53a2a87b0663a08a73d72edac207ae04b067ef2c4dc6fe
+AUX libprelude-5.1.0-fix_py38.patch 322 BLAKE2B 0dd047f4a6c634b4f4f7c01aad619634228898a951c2ea629c07a5df087f8998df27f532ea9d893df2b233ebb0dde094f1acd6c5bb7b95a6688fdcb5e805c449 SHA512 b35c74578a2e00358a7da8f7301f9c4d1055e53c99bea71cc3ef90020a93ff7d0d41f1cf6d3ea3a5c6fc18a3ca1bcc9ed0baafdd8110c1fa51db34e005a1c874
 DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311 SHA512 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7
 DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
-EBUILD libprelude-3.0.0.ebuild 1788 BLAKE2B c135c5b3528ed6805cbde9aeebf426cdf0c35a850c3b9a58a8cfcc5f07c39f6aee8d7dd77393f951f572ece49437d97ef1761cbe8b40c236898ca6d094a5a538 SHA512 e8b250f83bcce7d4ca0463eb6004a3d7ac82c99bf497118100eec955bc62ef40fbabbf308e91756a462481fc2f7550ea6c71bda2b12ff09a26bfb08b436dec6b
-EBUILD libprelude-3.1.0-r1.ebuild 1623 BLAKE2B 3c24cf9b7246d2fb0285b0e97c9eb3b40a39dd04024c03ffbca276ab6ab9b37e6e6205196b3e15ccf9ce5b63e31908eacfb565ef9c7ccf3d20bd740a7129596a SHA512 1eefd4d9e6f9f8092e9f4b3341931eb58e874d6022f1f24b4f166c43f5b437d59496772f362fb5b6bf051a84433b59959df1ee594ecc9d74e73aeb3bb552870b
-EBUILD libprelude-4.0.0.ebuild 1838 BLAKE2B b298fcf4173d95a799ae4fec465836f0592745c6df4516b316d92cf02d90851899e33cdf9f8530c02eaaf5bb8cc7ceb79e475c632d69550bdfb0da85006f05d5 SHA512 de3bd2334e7c0cba003fc6f1a297a2870ab9fb0d9ae47bf4607b4e311ed1865c81c83bf7cfefb0fbc78da3a81930eff0b623e387f335ad092877b477d5b40cf8
-EBUILD libprelude-4.1.0.ebuild 1846 BLAKE2B 2c777e1e285d4804121cb3b6e9d08f7128ed154dba97c274d035e5739a4f676a322db4c6a9ac390a17430d41e979153f486f376f52214252c6d0f7d71b1858c3 SHA512 509b976333c3ea2b1e40d66b1e2e6b8fee12f5b176bfa375376d0e643b8cdecd0a72cd60a52dda183cea4a9661c8cbf353fdbab1cb6a23b581a5a4ea85e5ca39
+DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
+EBUILD libprelude-4.0.0.ebuild 1834 BLAKE2B 4373a22bd28a75b4bc031015970e93d953c6df7c6fa2206e137e0197139d8c176becb86112feab203658080ee6f2197151b3f003d59847b7d6a6e783d0e775d4 SHA512 61e037b6d2e16867a4ce4428a4450720519dece5a5f53db9eec16ff80151096e05c0f733e963befcbc15403440337868a4a2b099c865a151c6ccf9f9b0681ac6
+EBUILD libprelude-4.1.0.ebuild 1842 BLAKE2B 04e53934e8cf0f4b9233c1d5e8a6fe9bf70c5d6551578d50e5c9534fbc8f0024996666b057da4b5db6de7942e81b9c9cd2765a4edd8813e0c6953de93004095b SHA512 4ab4b569668de03614b9176e6a98818efb327a6bd1bcbc00db6f023cf111dc262320da3e0dd00d10cda208bd4f351c736a6e01338b946b9cf0c83999a68e825b
+EBUILD libprelude-5.1.1.ebuild 2086 BLAKE2B 4410015a5e2f086979c4996ecfd607c306a718b104ed65950b6cb4bbdaf19332968fba82104b98be1b767fe5716f19737ecfa32432522ebd39ee12c598b57f80 SHA512 fea178f6e2be8e773dafb15d338e219843add4147907192a4e54370c993f9727cc174892ba2a662ed4705a2729963c697eadbc8fc161040470560165364f5d08
 MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
diff --git a/dev-libs/libprelude/files/libprelude-3.0.0-perl-hardening.patch b/dev-libs/libprelude/files/libprelude-3.0.0-perl-hardening.patch
deleted file mode 100644
index df77899c82fa..000000000000
--- a/dev-libs/libprelude/files/libprelude-3.0.0-perl-hardening.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-When : when building perl bindings. Without this patch, it does not take care of LDFLAGS.
-Why : It is required if you want to customize your own LDFLAGS, example : for hardening
-Upstream : https://www.prelude-siem.org/issues/761 It should be added in the next version of Prelude.
---- a/bindings/perl/Makefile.PL.in
-+++ b/bindings/perl/Makefile.PL.in
-@@ -27,7 +27,7 @@
- my %attributs = (NAME => 'Prelude',
- 		 INC => '-I@top_builddir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include',
- 		 LIBS => ["-L@top_builddir@/src/.libs -lprelude -L@top_builddir@/bindings/c++/.libs -lpreludecpp", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ],
--		 LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags}");
-+		 LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags} @LDFLAGS@,-rpath");
- 
- if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) {
-     foreach my $filename ( qw/Prelude.cxx Prelude.pm/ ) {
diff --git a/dev-libs/libprelude/files/libprelude-3.0.0-ruby-configure.patch b/dev-libs/libprelude/files/libprelude-3.0.0-ruby-configure.patch
deleted file mode 100644
index fc09beace223..000000000000
--- a/dev-libs/libprelude/files/libprelude-3.0.0-ruby-configure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -525,9 +525,9 @@
- dnl * Ruby support                                   *
- dnl **************************************************
- 
--
--AM_PATH_RUBY(,with_ruby=yes, with_ruby=no)
-+AC_ARG_WITH(ruby, AC_HELP_STRING(--with-ruby@<:@=PATH@:>@, Enable support for ruby binding @<:@default=auto@:>@),,with_ruby=no)
- if test x$with_ruby != xno; then
-+    AM_PATH_RUBY(,with_ruby=yes, with_ruby=no)
-     RUBY_ARCHDIR=`$RUBY -e 'require "rbconfig.rb"; puts RbConfig::expand("\$(archdir)")'`
-     RUBY_LIBRUBYARG=`$RUBY -e 'require "rbconfig.rb"; puts RbConfig::expand("\$(LIBRUBYARG)")'`
- 
diff --git a/dev-libs/libprelude/files/libprelude-3.0.0-ruby-m4.patch b/dev-libs/libprelude/files/libprelude-3.0.0-ruby-m4.patch
deleted file mode 100644
index b02555afb65f..000000000000
--- a/dev-libs/libprelude/files/libprelude-3.0.0-ruby-m4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-When : when building ruby bindings, it can not find ruby versin so configure will never enable ruby support
-Why : It is required if you want to use libprelude with ruby
-Upstream : https://www.prelude-siem.org/issues/759 It should be added in the next version of Prelude.
---- a/m4/am_path_ruby.m4
-+++ b/m4/am_path_ruby.m4
-@@ -96,11 +96,11 @@
-   dnl   (shared libraries)
-   AC_CACHE_CHECK([for $am_display_RUBY extension module directory],
-     [am_cv_ruby_rbexecdir],
--    [am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG[['prefix']])); \\$prefix = RbConfig::CONFIG[['prefix']].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG[['sitearchdir']].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`])
-+    [am_cv_ruby_rbexecdir=`$RUBY -r rbconfig -e "print RbConfig::CONFIG[['vendorarchdir']]"`])
-   AC_SUBST([rbexecdir], [$am_cv_ruby_rbexecdir])
- 
--  RUBY_INCLUDES=`$RUBY -r rbconfig -e 'if RbConfig::CONFIG[["archdir"]] then print " -I" + RbConfig::CONFIG[["archdir"]] end
--                                       if RbConfig::CONFIG[["rubyhdrdir"]] then print " -I" + RbConfig::CONFIG[["rubyhdrdir"]] end'`
-+  RUBY_VER=`$RUBY -rrbconfig -e "print RbConfig::CONFIG[['ruby_pc']]" | sed 's/.pc//g'`
-+  RUBY_INCLUDES=`pkg-config $RUBY_VER --cflags`
-   AC_SUBST([RUBY_INCLUDES])
- 
-   dnl pkgrbexecdir -- $(rbexecdir)/$(PACKAGE)
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch
new file mode 100644
index 000000000000..c3dca1b93d1c
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-5.1.0-fix_awk_error.patch
@@ -0,0 +1,112 @@
+--+ a/src/libprelude-error/Makefile.am
++++ b/src/libprelude-error/Makefile.am
+@@ -53,7 +53,7 @@
+ 
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ 	LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-	-v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
++	-v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
+ 	$(srcdir)/errnos.in >$@
+ 
+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
+--+ a/src/libprelude-error/Makefile.in
++++ b/src/libprelude-error/Makefile.in
+@@ -1834,7 +1834,7 @@
+ 
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ 	LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-	-v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
++	-v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
+ 	$(srcdir)/errnos.in >$@
+ 
+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
+--+ a/src/libprelude-error/mkerrcodes.awk
++++ b/src/libprelude-error/mkerrcodes.awk
+@@ -78,7 +78,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+--+ a/src/libprelude-error/mkerrcodes1.awk
++++ b/src/libprelude-error/mkerrcodes1.awk
+@@ -78,7 +78,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+--+ a/src/libprelude-error/mkerrcodes2.awk
++++ b/src/libprelude-error/mkerrcodes2.awk
+@@ -91,7 +91,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+--+ a/src/libprelude-error/mkerrnos.awk
++++ b/src/libprelude-error/mkerrnos.awk
+@@ -80,7 +80,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+--+ a/src/libprelude-error/mkstrtable.awk
++++ b/src/libprelude-error/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+ 
+ BEGIN {
+@@ -102,7 +102,7 @@
+       print "/* The purpose of this complex string table is to produce";
+       print "   optimal code with a minimum of relocations.  */";
+       print "";
+-      print "static const char " namespace "msgstr[] = ";
++      print "static const char " pkg_namespace "msgstr[] = ";
+       header = 0;
+     }
+   else
+@@ -110,7 +110,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+@@ -150,14 +150,14 @@
+   else
+     print "  gettext_noop (\"" prefix last_msgstr "\");";
+   print "";
+-  print "static const int " namespace "msgidx[] =";
++  print "static const int " pkg_namespace "msgidx[] =";
+   print "  {";
+   for (i = 0; i < coded_msgs; i++)
+     print "    " pos[i] ",";
+   print "    " pos[coded_msgs];
+   print "  };";
+   print "";
+-  print "#define " namespace "msgidxof(code) (0 ? -1 \\";
++  print "#define " pkg_namespace "msgidxof(code) (0 ? -1 \\";
+ 
+ # Gather the ranges.
+   skip = code[0];
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch
new file mode 100644
index 000000000000..3495ebf62ccb
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-5.1.0-fix_gtkdoc_1.32.patch
@@ -0,0 +1,13 @@
+--- a/docs/api/libprelude-docs.xml
++++ b/docs/api/libprelude-docs.xml
+@@ -51,10 +51,6 @@
+     <xi:include href="xml/idmef-value.xml"/>
+ 
+   </chapter>
+-  <chapter id="object-tree">
+-    <title>Object Hierarchy</title>
+-     <xi:include href="xml/tree_index.sgml"/>
+-  </chapter>
+   <index id="api-index-full">
+     <title>API Index</title>
+     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch b/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch
new file mode 100644
index 000000000000..079a90125df3
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-5.1.0-fix_py38.patch
@@ -0,0 +1,11 @@
+--- a/bindings/python/_prelude.cxx
++++ b/bindings/python/_prelude.cxx
+@@ -3132,7 +3132,7 @@
+ 
+ SWIGINTERN void
+ SwigPyStaticVar_dealloc(PyDescrObject *descr) {
+-  _PyObject_GC_UNTRACK(descr);
++  PyObject_GC_UnTrack(descr);
+   Py_XDECREF(PyDescr_TYPE(descr));
+   Py_XDECREF(PyDescr_NAME(descr));
+   PyObject_GC_Del(descr);
diff --git a/dev-libs/libprelude/libprelude-3.0.0.ebuild b/dev-libs/libprelude/libprelude-3.0.0.ebuild
deleted file mode 100644
index 8c39b4b52446..000000000000
--- a/dev-libs/libprelude/libprelude-3.0.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-USE_RUBY="ruby23 ruby24"
-
-inherit autotools eutils python-r1 ruby-single
-
-DESCRIPTION="Prelude-SIEM Framework Library"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc lua python ruby perl"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	net-libs/gnutls
-	perl? ( dev-lang/perl virtual/perl-ExtUtils-MakeMaker )
-	lua? ( dev-lang/lua:* )
-	ruby? ( ${RUBY_DEPS} )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	sys-devel/flex
-	virtual/yacc
-	>=dev-lang/swig-3.0.7
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-perl-hardening.patch"
-	"${FILESDIR}/${P}-ruby-m4.patch"
-	"${FILESDIR}/${P}-ruby-configure.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-
-	# Avoid null runpaths in Perl bindings.
-	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
-
-	mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local python2_configure=--without-python2
-	local python3_configure=--without-python3
-
-	chk_python() {
-		if [[ ${EPYTHON} == python2* ]]; then
-			python2_configure=--with-python2
-		elif [[ ${EPYTHON} == python3* ]]; then
-			python3_configure=--with-python3
-		fi
-	}
-
-	if use python; then
-		python_foreach_impl chk_python
-	fi
-
-	econf \
-		--enable-easy-bindings \
-		--with-swig \
-		$(use_with perl) \
-		$(use_enable doc gtk-doc) \
-		$(use_with lua) \
-		$(use_with ruby) \
-		${python2_configure} \
-		${python3_configure}
-}
-
-src_install() {
-	default_src_install
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild b/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild
deleted file mode 100644
index 3ba688728c3a..000000000000
--- a/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-USE_RUBY="ruby23 ruby24"
-
-inherit autotools python-r1 ruby-single
-
-DESCRIPTION="Prelude-SIEM Framework Library"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc lua python ruby perl"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
-	lua? ( dev-lang/lua:* )
-	ruby? ( ${RUBY_DEPS} )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	sys-devel/flex
-	virtual/yacc
-	>=dev-lang/swig-3.0.7
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Avoid null runpaths in Perl bindings.
-	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local python2_configure=--without-python2
-	local python3_configure=--without-python3
-
-	chk_python() {
-		if [[ ${EPYTHON} == python2* ]]; then
-			python2_configure=--with-python2
-		elif [[ ${EPYTHON} == python3* ]]; then
-			python3_configure=--with-python3
-		fi
-	}
-
-	if use python; then
-		python_foreach_impl chk_python
-	fi
-
-	econf \
-		--enable-easy-bindings \
-		--with-swig \
-		$(use_with perl) \
-		$(use_with perl perl-installdirs vendor) \
-		$(use_enable doc gtk-doc) \
-		$(use_with lua) \
-		$(use_with ruby) \
-		${python2_configure} \
-		${python3_configure}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libprelude/libprelude-4.0.0.ebuild b/dev-libs/libprelude/libprelude-4.0.0.ebuild
index 74235ac17716..73fdf8a867d4 100644
--- a/dev-libs/libprelude/libprelude-4.0.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libprelude/libprelude-4.1.0.ebuild b/dev-libs/libprelude/libprelude-4.1.0.ebuild
index 121297dc39d5..78593bbffa9a 100644
--- a/dev-libs/libprelude/libprelude-4.1.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libprelude/libprelude-5.1.1.ebuild b/dev-libs/libprelude/libprelude-5.1.1.ebuild
new file mode 100644
index 000000000000..4f71c7c6adaf
--- /dev/null
+++ b/dev-libs/libprelude/libprelude-5.1.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+USE_RUBY="ruby24 ruby25 ruby26"
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 ruby-single
+
+DESCRIPTION="Prelude-SIEM Framework Library"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lua perl python ruby"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="net-libs/gnutls:=
+	lua? ( dev-lang/lua:* )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND=">=dev-lang/swig-3.0.11
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	lua? ( dev-lang/lua:* )
+	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
+	"${FILESDIR}/${PN}-5.1.0-fix_awk_error.patch"
+	"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
+	"${FILESDIR}/${PN}-5.1.0-fix_py38.patch"
+)
+
+src_prepare() {
+	default
+
+	# Avoid null runpaths in Perl bindings.
+	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
+
+	eautoreconf
+
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-easy-bindings
+		--with-swig
+		$(use_with lua)
+		$(use_with perl)
+		$(usex perl '--with-perl-installdirs=vendor' '')
+		$(use_with ruby)
+	)
+
+	if use python; then
+		python_setup
+		if python_is_python3; then
+			myconf+=(--without-python2 --with-python3="${EPYTHON}")
+		else
+			myconf+=(--without-python3 --with-python2="${EPYTHON}")
+		fi
+	else
+		myconf+=(--without-python2 --without-python3)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_install
+	fi
+}