commit: a39d07f15cdd7f35dad39c7187d551580672e926
Author: Thomas Andrejak <thomas.andrejak <AT> gmail <DOT> com>
AuthorDate: Thu Nov 7 01:36:36 2019 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 21:54:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a39d07f1
dev-libs/libprelude: Bump version 5.1
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>
dev-libs/libprelude/Manifest | 1 +
.../files/libprelude-5.1.0-fix_awk_error.patch | 112 +++++++++++++++++++++
.../files/libprelude-5.1.0-fix_gtkdoc_1.32.patch | 13 +++
.../files/libprelude-5.1.0-fix_py38.patch | 11 ++
dev-libs/libprelude/libprelude-5.1.1.ebuild | 101 +++++++++++++++++++
5 files changed, 238 insertions(+)
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index d853c53840b..79c0b481ccf 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -2,3 +2,4 @@ DIST libprelude-3.0.0.tar.gz 2900153 BLAKE2B
dd03b46a11b673252dc36701e4568c445fe
DIST libprelude-3.1.0.tar.gz 2949462 BLAKE2B
52764791766c54e2c1baa96231c6578f06219a6d1c48a97ad318fc8445fc64f90a63019654f7350d65ec4e0a336eef66bd449484321c590d1ee4596a6a386724
SHA512
f2878b19b4ba3cc74b0530f8741525ecf1425540d30356d182c4e0a797dbb5f4023792351bd059105dafc6b7818d4caa2e9c8b39be9a7039a89680244fcf1239
DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B
2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311
SHA512
5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7
DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B
a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7
SHA512
073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
+DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B
accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec
SHA512
eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
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 00000000000..c3dca1b93d1
--- /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 00000000000..3495ebf62cc
--- /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 00000000000..079a90125df
--- /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-5.1.1.ebuild
b/dev-libs/libprelude/libprelude-5.1.1.ebuild
new file mode 100644
index 00000000000..67027e58a7e
--- /dev/null
+++ b/dev-libs/libprelude/libprelude-5.1.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,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
+}
