From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-libs/libpreludedb/Manifest | 13 +- .../files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch | 13 + .../files/libpreludedb-5.1.0-fix_py38.patch | 11 + .../libpreludedb-5.1.0-update_m4_postgresql.patch | 544 +++++++++++++++++++++ dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild | 74 --- dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild | 72 --- dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild | 4 +- dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild | 4 +- dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild | 95 ++++ 9 files changed, 674 insertions(+), 156 deletions(-) create mode 100644 dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch create mode 100644 dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch create mode 100644 dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch delete mode 100644 dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild delete mode 100644 dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild create mode 100644 dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild (limited to 'dev-libs/libpreludedb') diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest index ec779853062e..d0287a1fbfa6 100644 --- a/dev-libs/libpreludedb/Manifest +++ b/dev-libs/libpreludedb/Manifest @@ -1,10 +1,11 @@ AUX libpreludedb-4.0.0-fix-python-bindings.patch 1075 BLAKE2B 414a9308a10b2c0aeeb12b462c8a972341161c308bfce2ab9c94d25a63dc14f01f2ed3484f690b994e8f509262f99406e19c25ec9a70ee5eeaca3b7c5823c055 SHA512 61309ae2d68aeeca5321fb2592f7d01e57b00b10ed04e63d1c011aa96115855087abd0fb4687f09d04b01b488dda840bef08cc9c1d0ec714064c1322f9589a2e -DIST libpreludedb-3.0.0.tar.gz 1269937 BLAKE2B 6f6bad7b9529b88bd03b224c1ea4066b9e806ff82960d1c2e336ebc5c345353a3b63224e0ea84407f159443b6ec53c1cb6bba8009d48dfb53a26bab96960467e SHA512 9d80e01be8cf028b8a843e68e45eeb84c561ff37e688fe5b8156e717f337b1db4d3de983f37a0544bf018238bec07580dce0c7208df005113efbba0aab34b981 -DIST libpreludedb-3.1.0.tar.gz 1291186 BLAKE2B 90b3b6264f0042b14e54abfc3068071419646076fc6cfa3dd84ba6c14797fb0ea88885edef47b8a5d0dc455468e6daaa8e795b621a4f9001d19d8edc33630a88 SHA512 dcb98eff2521979c2956bdd6f3b661c346c0f6748ef820a75d77c948e426a996de26c7fc6b6c2abddc93277db3820eb2f44b61c87feb86483e720cf9b0e0124c +AUX libpreludedb-5.1.0-fix_gtkdoc_1.32.patch 431 BLAKE2B 243bda8c42be083a0c5d38bf8a9f6c5553b4801b527212e38b8b3f81096656d6ef1592f9b86c3ed39b5767addfde71bc796c90e90fc046b4759fc092fd02c491 SHA512 afd38dfdec1f946946ad3f7ca17f5e5c7a0c16bd4a296b639132ec801cccce23594c047b7936bbcb85c28dd9ca9eef7a302b92c3bb4aa71305b33ae0fb700688 +AUX libpreludedb-5.1.0-fix_py38.patch 326 BLAKE2B 1d568b80b66dd919d990233fdb2602a5de9f68055524c0b20adad82c6b0844bcb9a62af55d4ae538b8e3fb63f3d56c7948e164cec21f5eb9a0e135897a666709 SHA512 7068f2aed2eb79186dc3eb77845fb828d3b6e5d7ae8bc809352c83f0e19d342b77459d495cd568d022df34299c43082fa23b7e49754a17207d63b3a2326ca301 +AUX libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf DIST libpreludedb-4.0.0.tar.gz 1325812 BLAKE2B 7a506f7cd7b51898e26201f2cc640b1f34227f9cf7c5c6e2385480f1fc0ad854b6d747293ab502b641cc65f1ee9ae4a8f225e6a1d4489bcaa59901c6342f1279 SHA512 13f5dbcfa6af965f2075d60c645ebb19cbd6b18807b26f4f13a7a05f1cf552996f9846e856728a4e1dc621efda693016e82623d4a3cbf74849b3e7114f19faca DIST libpreludedb-4.1.0.tar.gz 1333638 BLAKE2B 380a6d4ef8836555510f9f9882b6100417f2567520c421355fb7eec8d2cd7e2f3942c4cb90ea21fa1557327026edd5c1e35e338a79e06a21cfb2bd6813a289c2 SHA512 de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4 -EBUILD libpreludedb-3.0.0-r1.ebuild 1569 BLAKE2B 09f528561880901c210847920fc2b1243b60141ca36f25e3f07158fef17bf029d4f2850f61db982b6bbe61a2f3a9ca488809d41132477ac4835568c8b2afa164 SHA512 a9e9f519c6ff194194a40f8a1073290c03ad1d3ca3829123524fde910d2c04343d0b0ff7ebb92e421438184511a3a4c4f326adc8cf734724419e9fbd22b1cb75 -EBUILD libpreludedb-3.1.0-r1.ebuild 1493 BLAKE2B ac1a9350ef9f151861afb2c228091ef128ed6e8a2ae3111268014aeec900a728c561799830a5694798a8b1c4b54b36920351a759306c0ea5a5555b6059eda928 SHA512 462da351b9cf2653d621a0284dedb52f26ceb9f64185d5cc70099bd80af6d79108baa3d2a1c7edc2c2cc1c90dee2289e611837c8f8bab8ca72ec87d0f0a0f2a4 -EBUILD libpreludedb-4.0.0-r1.ebuild 1740 BLAKE2B 2b8401a5fd6e7392b911a4772d108736f07fcde60a023eff9c4af1a5008723c86897a9359f0dc5582774b02f500edf8e0f309376c7dfe65312fa0379e13d904e SHA512 61ebcdb2fdb231a01f5e8d592958f31fe2d6c7723617bf35b44f4101ed80e1cb5a155efde9c561d2ceb7ce9f7f93d040cd892dec759685cc3469392f57e12f49 -EBUILD libpreludedb-4.1.0-r1.ebuild 1748 BLAKE2B 25b78382047147f273b9a3e2d8a267dddf3f45453bbc0cd5cb66a0e9fef0d7449ceaac1b687862ff49ea4301d6e94373cbe17b5830fc161cfddce51803ef8ec3 SHA512 bd14c7edb767f805a19fcec51491a52020e4548d8a0d93020cb59a60c4e29708a353474c465106dfd923c9ed7f2310992a0c4f23bfc75b44cc303b56b909a722 +DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f8924a8dced923859cdc393289acf0c0cf098ae6e0f9f572a707c85aa9af4a27bbaa0927e20d610b423e2aae86718d232b SHA512 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481 +EBUILD libpreludedb-4.0.0-r1.ebuild 1736 BLAKE2B 7c96b0c0b81e152b8a64c429d60b86dc9bec0c7921e2ddee3e983dc04bb12f24b8250ecb1ea19fa9662aa06bcf6199a28bde15e0421e2bc5d6468cfc4132dfac SHA512 7a6594fbc278948ec3508c7bd855f7505402178c3344963940e009dfcc8c4e2d7e63b1323093a4055d4b59bd11feba7a45bbc94cf05aade39c5a8a1f726d651a +EBUILD libpreludedb-4.1.0-r1.ebuild 1744 BLAKE2B 626c2bc74f9a02d8bf33d42240a045032ecb2dd15b56e13ad4bf1b210e12f409b6de6dd16fa9e3706ef3ba98816194a0cb4c4b5bed31c68add081e4157be4ca8 SHA512 74b2a854a741cb2b5febc3817da2eb41503b64d2e2a022dee99d569fd794b4f010d1c38896531eb81ea25697acde9dfca4b7efa960b4bb33f0b38e0ae0f2747b +EBUILD libpreludedb-5.1.0.ebuild 1900 BLAKE2B 170d1cb68ab1306895badc7938d714c58fbcd8cbe0777d2de66f6a9e537e3d4c3a7d719f481e6bd489a105896658f7578467ae3741f647cb88555ba9c0d93e7c SHA512 ff9bf092b649467f5aa033a35cd72df8d5e9f9a7b190fea1426e9aa79d5f3c72e7b6e2efa3ad991868a3f8ecc04c1470bdc5dd3194f0cfe3a99efb03fe4741da MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973 diff --git a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch new file mode 100644 index 000000000000..ecc6d5dc4e02 --- /dev/null +++ b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch @@ -0,0 +1,13 @@ +--- a/docs/api/libpreludedb-docs.xml ++++ b/docs/api/libpreludedb-docs.xml +@@ -26,10 +26,6 @@ + + + +- +- Object Hierarchy +- +- + + API Index + diff --git a/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch new file mode 100644 index 000000000000..a2a6a0a8be04 --- /dev/null +++ b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-fix_py38.patch @@ -0,0 +1,11 @@ +--- a/bindings/python/_preludedb.cxx ++++ b/bindings/python/_preludedb.cxx +@@ -3133,7 +3133,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/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch new file mode 100644 index 000000000000..5bd38a6f4c16 --- /dev/null +++ b/dev-libs/libpreludedb/files/libpreludedb-5.1.0-update_m4_postgresql.patch @@ -0,0 +1,544 @@ +--- a/m4/ax_lib_postgresql.m4 ++++ b/m4/ax_lib_postgresql.m4 +@@ -1,10 +1,10 @@ + # =========================================================================== +-# http://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html ++# https://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html + # =========================================================================== + # + # SYNOPSIS + # +-# AX_LIB_POSTGRESQL([MINIMUM-VERSION]) ++# AX_LIB_POSTGRESQL([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + # + # DESCRIPTION + # +@@ -23,133 +23,225 @@ + # should be in the PATH) + # + # path - complete path to pg_config utility, use this option if pg_config +-# can't be found in the PATH ++# can't be found in the PATH (You could set also PG_CONFIG variable) + # + # This macro calls: + # +-# AC_SUBST(POSTGRESQL_CFLAGS) ++# AC_SUBST(POSTGRESQL_CPPFLAGS) + # AC_SUBST(POSTGRESQL_LDFLAGS) ++# AC_SUBST(POSTGRESQL_LIBS) + # AC_SUBST(POSTGRESQL_VERSION) + # + # And sets: + # + # HAVE_POSTGRESQL + # ++# It execute if found ACTION-IF-FOUND (empty by default) and ++# ACTION-IF-NOT-FOUND (AC_MSG_FAILURE by default) if not found. ++# + # LICENSE + # + # Copyright (c) 2008 Mateusz Loskot ++# Copyright (c) 2014 Sree Harsha Totakura ++# Copyright (c) 2018 Bastien Roucaries + # + # Copying and distribution of this file, with or without modification, are + # permitted in any medium without royalty provided the copyright notice + # and this notice are preserved. This file is offered as-is, without any + # warranty. + +-#serial 9 ++#serial 22 ++ ++AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[ ++ found_postgresql="no" ++ _AX_LIB_POSTGRESQL_OLD_fail="no" ++ while true; do ++ AC_CACHE_CHECK([for the pg_config program], [ac_cv_path_PG_CONFIG], ++ [AC_PATH_PROGS_FEATURE_CHECK([PG_CONFIG], [pg_config], ++ [[ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \ ++ && ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:]], ++ [ac_cv_path_PG_CONFIG=""])]) ++ PG_CONFIG=$ac_cv_path_PG_CONFIG ++ AS_IF([test "X$PG_CONFIG" = "X"],[break]) ++ ++ AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS], ++ [ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes]) ++ AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break]) ++ POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS" ++ ++ AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS], ++ [ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes]) ++ AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break]) ++ POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS" ++ ++ AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS], ++ [ac_cv_POSTGRESQL_LIBS="-lpq"]) ++ POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS" ++ ++ AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION], ++ [ ++ ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \ ++ || _AX_LIB_POSTGRESQL_OLD_fail=yes ++ ]) ++ AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break]) ++ POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION" ++ ++ ++ dnl ++ dnl Check if required version of PostgreSQL is available ++ dnl ++ AS_IF([test X"$postgresql_version_req" != "X"],[ ++ AC_MSG_CHECKING([if PostgreSQL version $POSTGRESQL_VERSION is >= $postgresql_version_req]) ++ AX_COMPARE_VERSION([$POSTGRESQL_VERSION],[ge],[$postgresql_version_req], ++ [found_postgresql_req_version=yes],[found_postgresql_req_version=no]) ++ AC_MSG_RESULT([$found_postgresql_req_version]) ++ ]) ++ AS_IF([test "Xfound_postgresql_req_version" = "Xno"],[break]) ++ ++ found_postgresql="yes" ++ break ++ done ++]) ++ ++AC_DEFUN([_AX_LIB_POSTGRESQL_PKG_CONFIG], ++[ ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++ found_postgresql=no ++ ++ while true; do ++ PKG_PROG_PKG_CONFIG ++ AS_IF([test X$PKG_CONFIG = X],[break]) ++ ++ _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=no; ++ AS_IF([test "X$postgresql_version_req" = "X"], ++ [PKG_CHECK_EXISTS([libpq],[found_postgresql_pkg_config=yes],[found_postgresql=no])], ++ [PKG_CHECK_EXISTS([libpq >= "$postgresql_version_req"], ++ [found_postgresql=yes],[found_postgresql=no])]) ++ AS_IF([test "X$found_postgresql" = "no"],[break]) ++ ++ AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS], ++ [ac_cv_POSTGRESQL_CPPFLAGS="`$PKG_CONFIG libpq --cflags-only-I`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes]) ++ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break]) ++ POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS" ++ ++ ++ AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS], ++ [ac_cv_POSTGRESQL_LDFLAGS="`$PKG_CONFIG libpq --libs-only-L --libs-only-other`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes]) ++ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break]) ++ POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS" ++ ++ ++ AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS], ++ [ac_cv_POSTGRESQL_LIBS="`$PKG_CONFIG libpq --libs-only-l`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=ye]) ++ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break]) ++ POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS" ++ ++ dnl already checked by exist but need to be recovered ++ AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION], ++ [ac_cv_POSTGRESQL_VERSION="`$PKG_CONFIG libpq --modversion`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes]) ++ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break]) ++ POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION" ++ ++ found_postgresql=yes ++ break; ++ done ++ ++]) ++ ++ + + AC_DEFUN([AX_LIB_POSTGRESQL], + [ + AC_ARG_WITH([postgresql], +- AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@], +- [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config] +- ), +- [ +- if test "$withval" = "no"; then +- want_postgresql="no" +- elif test "$withval" = "yes"; then +- want_postgresql="yes" +- else +- want_postgresql="yes" +- PG_CONFIG="$withval" +- fi +- ], +- [want_postgresql="yes"] ++ AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@], ++ [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config] ++ ), ++ [ ++ AS_CASE([$withval], ++ [[[nN]][[oO]]],[want_postgresql="no"], ++ [[[yY]][[eE]][[sS]]],[want_postgresql="yes"], ++ [ ++ want_postgresql="yes" ++ PG_CONFIG="$withval" ++ ]) ++ ], ++ [want_postgresql="yes"] + ) + +- POSTGRESQL_CFLAGS="" +- POSTGRESQL_LDFLAGS="" +- POSTGRESQL_VERSION="" ++ AC_ARG_VAR([POSTGRESQL_CPPFLAGS],[cpp flags for PostgreSQL overriding detected flags]) ++ AC_ARG_VAR([POSTGRESQL_LIBFLAGS],[libs for PostgreSQL overriding detected flags]) ++ AC_ARG_VAR([POSTGRESQL_LDFLAGS],[linker flags for PostgreSQL overriding detected flags]) ++ ++ # populate cache ++ AS_IF([test "X$POSTGRESQL_CPPFLAGS" != X],[ac_cv_POSTGRESQL_CPPFLAGS="$POSTGRESQL_CPPFLAGS"]) ++ AS_IF([test "X$POSTGRESQL_LDFLAGS" != X],[ac_cv_POSTGRESQL_LDFLAGS="$POSTGRESQL_LDFLAGS"]) ++ AS_IF([test "X$POSTGRESQL_LIBS" != X],[ac_cv_POSTGRESQL_LIBS="$POSTGRESQL_LIBS"]) + +- dnl +- dnl Check PostgreSQL libraries (libpq) +- dnl ++ postgresql_version_req=ifelse([$1], [], [], [$1]) ++ found_postgresql="no" + +- if test "$want_postgresql" = "yes"; then +- AC_MSG_CHECKING([for $PG_CONFIG]) +- if test -z "$PG_CONFIG" -o test; then +- AC_PATH_PROG([PG_CONFIG], [pg_config], []) +- fi +- +- if test ! -x "$PG_CONFIG"; then +- AC_MSG_RESULT([$PG_CONFIG does not exist or it is not an exectuable file]) +- PG_CONFIG="no" +- found_postgresql="no" +- fi +- +- if test "$PG_CONFIG" != "no"; then +- AC_MSG_CHECKING([for PostgreSQL libraries]) +- +- POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`" +- POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq" +- +- POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` +- +- AC_DEFINE([HAVE_POSTGRESQL], [1], +- [Define to 1 if PostgreSQL libraries are available]) +- +- found_postgresql="yes" +- AC_MSG_RESULT([yes]) +- else +- found_postgresql="no" +- AC_MSG_RESULT([no]) +- fi +- fi ++ POSTGRESQL_VERSION="" + + dnl +- dnl Check if required version of PostgreSQL is available ++ dnl Check PostgreSQL libraries (libpq) + dnl ++ AS_IF([test X"$want_postgresql" = "Xyes"],[ ++ _AX_LIB_POSTGRESQL_PKG_CONFIG + + +- postgresql_version_req=ifelse([$1], [], [], [$1]) +- +- if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then +- +- AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req]) ++ AS_IF([test X"$found_postgresql" = "Xno"], ++ [_AX_LIB_POSTGRESQL_OLD]) + +- dnl Decompose required version string of PostgreSQL +- dnl and calculate its number representation +- postgresql_version_req_major=`expr $postgresql_version_req : '\([[0-9]]*\)'` +- postgresql_version_req_minor=`expr $postgresql_version_req : '[[0-9]]*\.\([[0-9]]*\)'` +- postgresql_version_req_micro=`expr $postgresql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` +- if test "x$postgresql_version_req_micro" = "x"; then +- postgresql_version_req_micro="0" +- fi +- +- postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \ +- \+ $postgresql_version_req_minor \* 1000 \ +- \+ $postgresql_version_req_micro` +- +- dnl Decompose version string of installed PostgreSQL +- dnl and calculate its number representation +- postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([[0-9]]*\)'` +- postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` +- postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` +- if test "x$postgresql_version_micro" = "x"; then +- postgresql_version_micro="0" +- fi +- +- postgresql_version_number=`expr $postgresql_version_major \* 1000000 \ +- \+ $postgresql_version_minor \* 1000 \ +- \+ $postgresql_version_micro` +- +- postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number` +- if test "$postgresql_version_check" = "1"; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- fi +- fi ++ AS_IF([test X"$found_postgresql" = Xyes],[ ++ _AX_LIB_POSTGRESQL_OLD_CPPFLAGS="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" ++ _AX_LIB_POSTGRESQL_OLD_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS" ++ _AX_LIB_POSTGRESQL_OLD_LIBS="$LIBS" ++ LIBS="$LIBS $POSTGRESQL_LIBS" ++ while true; do ++ dnl try to compile ++ AC_CHECK_HEADER([libpq-fe.h],[],[found_postgresql=no]) ++ AS_IF([test "X$found_postgresql" = "Xno"],[break]) ++ dnl try now to link ++ AC_CACHE_CHECK([for the PostgreSQL library linking is working],[ac_cv_postgresql_found], ++ [ ++ AC_LINK_IFELSE([ ++ AC_LANG_PROGRAM( ++ [ ++ #include ++ ], ++ [[ ++ char conninfo[]="dbname = postgres"; ++ PGconn *conn; ++ conn = PQconnectdb(conninfo); ++ ]] ++ ) ++ ],[ac_cv_postgresql_found=yes], ++ [ac_cv_postgresql_found=no]) ++ ]) ++ found_postgresql="$ac_cv_postgresql_found" ++ AS_IF([test "X$found_postgresql" = "Xno"],[break]) ++ break ++ done ++ CPPFLAGS="$_AX_LIB_POSTGRESQL_OLD_CPPFLAGS" ++ LDFLAGS="$_AX_LIB_POSTGRESQL_OLD_LDFLAGS" ++ LIBS="$_AX_LIB_POSTGRESQL_OLD_LIBS" ++ ]) ++ ++ ++ AS_IF([test "x$found_postgresql" = "xyes"],[ ++ AC_DEFINE([HAVE_POSTGRESQL], [1], ++ [Define to 1 if PostgreSQL libraries are available])]) ++ ]) + + AC_SUBST([POSTGRESQL_VERSION]) +- AC_SUBST([POSTGRESQL_CFLAGS]) ++ AC_SUBST([POSTGRESQL_CPPFLAGS]) + AC_SUBST([POSTGRESQL_LDFLAGS]) ++ AC_SUBST([POSTGRESQL_LIBS]) ++ ++ AS_IF([test "x$found_postgresql" = "xyes"], ++ [ifelse([$2], , :, [$2])], ++ [ifelse([$3], , AS_IF([test X"$want_postgresql" = "Xyes"],[AC_MSG_ERROR([Library requirements (PostgreSQL) not met.])],[:]), [$3])]) ++ + ]) +--- a/configure.ac ++++ b/configure.ac +@@ -158,7 +158,7 @@ + dnl ******************************************************** + dnl * Check for the PostgreSQL library (PostgreSQL plugin) * + dnl ******************************************************** +-AX_LIB_POSTGRESQL() ++AX_LIB_POSTGRESQL([9.0]) + + with_pgsql="no" + if test x$POSTGRESQL_VERSION != x; then +--- /dev/null ++++ b/m4/ax_compare_version.m4 +@@ -0,0 +1,177 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_compare_version.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) ++# ++# DESCRIPTION ++# ++# This macro compares two version strings. Due to the various number of ++# minor-version numbers that can exist, and the fact that string ++# comparisons are not compatible with numeric comparisons, this is not ++# necessarily trivial to do in a autoconf script. This macro makes doing ++# these comparisons easy. ++# ++# The six basic comparisons are available, as well as checking equality ++# limited to a certain number of minor-version levels. ++# ++# The operator OP determines what type of comparison to do, and can be one ++# of: ++# ++# eq - equal (test A == B) ++# ne - not equal (test A != B) ++# le - less than or equal (test A <= B) ++# ge - greater than or equal (test A >= B) ++# lt - less than (test A < B) ++# gt - greater than (test A > B) ++# ++# Additionally, the eq and ne operator can have a number after it to limit ++# the test to that number of minor versions. ++# ++# eq0 - equal up to the length of the shorter version ++# ne0 - not equal up to the length of the shorter version ++# eqN - equal up to N sub-version levels ++# neN - not equal up to N sub-version levels ++# ++# When the condition is true, shell commands ACTION-IF-TRUE are run, ++# otherwise shell commands ACTION-IF-FALSE are run. The environment ++# variable 'ax_compare_version' is always set to either 'true' or 'false' ++# as well. ++# ++# Examples: ++# ++# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) ++# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) ++# ++# would both be true. ++# ++# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) ++# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) ++# ++# would both be false. ++# ++# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) ++# ++# would be true because it is only comparing two minor versions. ++# ++# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) ++# ++# would be true because it is only comparing the lesser number of minor ++# versions of the two values. ++# ++# Note: The characters that separate the version numbers do not matter. An ++# empty string is the same as version 0. OP is evaluated by autoconf, not ++# configure, so must be a string, not a variable. ++# ++# The author would like to acknowledge Guido Draheim whose advice about ++# the m4_case and m4_ifvaln functions make this macro only include the ++# portions necessary to perform the specific comparison specified by the ++# OP argument in the final configure script. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Tim Toolan ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 13 ++ ++dnl ######################################################################### ++AC_DEFUN([AX_COMPARE_VERSION], [ ++ AC_REQUIRE([AC_PROG_AWK]) ++ ++ # Used to indicate true or false condition ++ ax_compare_version=false ++ ++ # Convert the two version strings to be compared into a format that ++ # allows a simple string comparison. The end result is that a version ++ # string of the form 1.12.5-r617 will be converted to the form ++ # 0001001200050617. In other words, each number is zero padded to four ++ # digits, and non digits are removed. ++ AS_VAR_PUSHDEF([A],[ax_compare_version_A]) ++ A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ ++ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ ++ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ ++ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ ++ -e 's/[[^0-9]]//g'` ++ ++ AS_VAR_PUSHDEF([B],[ax_compare_version_B]) ++ B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ ++ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ ++ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ ++ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ ++ -e 's/[[^0-9]]//g'` ++ ++ dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary ++ dnl # then the first line is used to determine if the condition is true. ++ dnl # The sed right after the echo is to remove any indented white space. ++ m4_case(m4_tolower($2), ++ [lt],[ ++ ax_compare_version=`echo "x$A ++x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` ++ ], ++ [gt],[ ++ ax_compare_version=`echo "x$A ++x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` ++ ], ++ [le],[ ++ ax_compare_version=`echo "x$A ++x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` ++ ], ++ [ge],[ ++ ax_compare_version=`echo "x$A ++x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` ++ ],[ ++ dnl Split the operator from the subversion count if present. ++ m4_bmatch(m4_substr($2,2), ++ [0],[ ++ # A count of zero means use the length of the shorter version. ++ # Determine the number of characters in A and B. ++ ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` ++ ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` ++ ++ # Set A to no more than B's length and B to no more than A's length. ++ A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` ++ B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` ++ ], ++ [[0-9]+],[ ++ # A count greater than zero means use only that many subversions ++ A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` ++ B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` ++ ], ++ [.+],[ ++ AC_WARNING( ++ [invalid OP numeric parameter: $2]) ++ ],[]) ++ ++ # Pad zeros at end of numbers to make same length. ++ ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" ++ B="$B`echo $A | sed 's/./0/g'`" ++ A="$ax_compare_version_tmp_A" ++ ++ # Check for equality or inequality as necessary. ++ m4_case(m4_tolower(m4_substr($2,0,2)), ++ [eq],[ ++ test "x$A" = "x$B" && ax_compare_version=true ++ ], ++ [ne],[ ++ test "x$A" != "x$B" && ax_compare_version=true ++ ],[ ++ AC_WARNING([invalid OP parameter: $2]) ++ ]) ++ ]) ++ ++ AS_VAR_POPDEF([A])dnl ++ AS_VAR_POPDEF([B])dnl ++ ++ dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. ++ if test "$ax_compare_version" = "true" ; then ++ m4_ifvaln([$4],[$4],[:])dnl ++ m4_ifvaln([$5],[else $5])dnl ++ fi ++]) dnl AX_COMPARE_VERSION +--- a/configure.ac ++++ b/configure.ac +@@ -170,7 +170,7 @@ + LIBS=$LIBS_bkp; + + CPPFLAGS_bkp=$CPPFLAGS +- CPPFLAGS="$POSTGRESQL_CFLAGS" ++ CPPFLAGS="$POSTGRESQL_CPPFLAGS" + AC_CHECK_HEADER(libpq-fe.h, with_pgsql=yes, with_pgsql=no) + CPPFLAGS=$CPPFLAGS_bkp; + fi +--- a/plugins/sql/pgsql/Makefile.am ++++ b/plugins/sql/pgsql/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CFLAGS@ ++AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CPPFLAGS@ + pgsql_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@ + + if HAVE_PGSQL diff --git a/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild deleted file mode 100644 index 4e7679606af1..000000000000 --- a/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild +++ /dev/null @@ -1,74 +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} ) - -inherit autotools eutils python-r1 - -DESCRIPTION="Framework to easy access to the Prelude database" -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 python mysql postgres sqlite" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="dev-libs/libgcrypt:0= - net-libs/gnutls - dev-libs/libprelude - python? ( ${PYTHON_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 )" - -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - sys-devel/flex - virtual/yacc - >=dev-lang/swig-3.0.7 - virtual/pkgconfig" - -src_prepare() { - default_src_prepare - - 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_enable doc gtk-doc) \ - ${python2_configure} \ - ${python3_configure} \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with sqlite sqlite3) -} - -src_install() { - default_src_install - prune_libtool_files --modules -} diff --git a/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild deleted file mode 100644 index 2fedf289e705..000000000000 --- a/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild +++ /dev/null @@ -1,72 +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} ) - -inherit autotools python-r1 - -DESCRIPTION="Framework to easy access to the Prelude database" -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 python mysql postgres sqlite" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="dev-libs/libgcrypt:0= - net-libs/gnutls:= - ~dev-libs/libprelude-${PV} - python? ( ${PYTHON_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 )" - -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - sys-devel/flex - virtual/yacc - >=dev-lang/swig-3.0.7 - virtual/pkgconfig" - -src_prepare() { - default - - 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_enable doc gtk-doc) \ - ${python2_configure} \ - ${python3_configure} \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with sqlite sqlite3) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild index 54bb58c0faac..6445bc84d8a9 100644 --- a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild +++ b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.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/libpreludedb/libpreludedb-4.1.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild index 3c44652a69d1..1ae5c7d228b7 100644 --- a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild +++ b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.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/libpreludedb/libpreludedb-5.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild new file mode 100644 index 000000000000..dd429b891a4f --- /dev/null +++ b/dev-libs/libpreludedb/libpreludedb-5.1.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) +DISTUTILS_OPTIONAL=1 + +inherit autotools distutils-r1 + +DESCRIPTION="Framework to easy access to the Prelude database" +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="mysql postgres python sqlite" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=">=dev-libs/libprelude-5.1.0 +