gentoo resync : 22.01.2021

3 files changed, 166 insertions, 4 deletions

diff --git a/dev-libs/rlog/Manifest b/dev-libs/rlog/Manifest
index 94a39d7153b1..ad2aa73eba69 100644
--- a/dev-libs/rlog/Manifest
+++ b/dev-libs/rlog/Manifest
@@ -1,5 +1,6 @@
 AUX rlog-1.3.7-gcc-4.3.patch 203 BLAKE2B 805bae9fa8ab6f9d069056cd8c0c2df96f5b50994a7f14cc4f4e1efbd69ff1be433edcd200dadc986462ed9d8cc0caacfd515dd1480638d48a9156a3aeebd4a1 SHA512 e3d07bcd0aad871c5cbda75335cd20f598bbe25401ee5a6fb735f0d0f5a37946c78c9eb8190fa8ae31351704c2e0806b89d06db56d225d7e6f477a2a9b78ae1d
+AUX rlog-1.4-autoconf-2.70.patch 4845 BLAKE2B 3bbbec363089a3da1d10419aa18f41fd20949b14e730bd4fe24001568031e6a2de955445903e24368239ae4c69b81bff9d6794d73fa617c317b392d54d74a01d SHA512 4c2fe7803a2048cd7e808de6711da69c107f66b7711e8b60b713d092ba56019307ea5f399f70e4729c312d7676997babb9980080b2026389df30db76aa0de59a
 AUX rlog-1.4-fix-build-system.patch 1283 BLAKE2B 2e7d38de9be902224dd82ade699ed9aedb56cdbf9ea272373e74d541c126c4edf2a5814cd078e4309887c8f732c3731ed035bf3018ebfbee55adc3f74328198d SHA512 e956ae108f61d8e71379d0b2722e670d52d9954713725629309f91176f419b9a188578e4e3381992ad4bbf577fb2b747d8680ad01b5e92864f4c6be721095b4f
 DIST rlog-1.4.tar.gz 640641 BLAKE2B ff17c9cefb20045a95d69954dd6d1756a342a5a97b640e8a286db98e5e55d1cb05da48a5df7ba1ad4b5f23678cfefd677cbf6f9f45ab647373858a2ddf25881e SHA512 a0af9afd6c5329ec4269a7778c3236b9e0b438cba65ed0a6f9cd7e802d196b7908eed5ab663f52905869cacffc7f1964b20ab2a53b37dbe65f1c8a9226cc423e
-EBUILD rlog-1.4.ebuild 578 BLAKE2B 2468285a3a8bcc744e48b78f9553c814dd0f20471c604ed84f338d82af57e904521335cf74f6288baa6a3eca7923cfc0ab7c3a47ff8f66986acdc3846dd6c208 SHA512 8854dea14986aa02096672f162ebb653fc486b2af2369e2a47ebff5674ae6f360ec2d5c4131dc8f7202221fc0f372a9589bb64c3a866fb3cf46bbbbfa77b588d
+EBUILD rlog-1.4.ebuild 624 BLAKE2B 4fd43ccc0cf22f6807827ab8a3cdcf0b1e2a48a3b05894a3df4b064dc6587f0c3c1a346f8a85e9a2bd0cf81b67aa42c489dab34a5ff3c48cec621a70480bd5fd SHA512 23f926379118f571ed09c594e4ad9eb1eb32ae008c59cde730f942850abf515685238f1558d73c7142a51b96149015e584fd95169da9dc612622f9cae6bb8107
 MISC metadata.xml 241 BLAKE2B d2fb5a8dd2362e8f7e35773ec2cba521024c9c707ee575cd4f88175ea7a485e4b3ba15c849292276fde6616067a03e13513e1aef73a0dc1e9d92c01b80ea4178 SHA512 619305d12905676e8b9becfcda5d3f843c14c89060fe6a2260aa4563cc98e9966ef48e4a896625274abbfb47c146c69f9c98b83e0c5cf1010e718c30440a837f
diff --git a/dev-libs/rlog/files/rlog-1.4-autoconf-2.70.patch b/dev-libs/rlog/files/rlog-1.4-autoconf-2.70.patch
new file mode 100644
index 000000000000..f8e07813786d
--- /dev/null
+++ b/dev-libs/rlog/files/rlog-1.4-autoconf-2.70.patch
@@ -0,0 +1,160 @@
+--- rlog-1.4/configure.ac
++++ rlog-1.4/configure.ac
+@@ -64,15 +64,15 @@
+ ACX_PTHREAD
+ 
+ AC_ARG_ENABLE(printffp,
+-    AS_HELP_STRING([--disable-printffp],
+-	    [disables printf attribute on function pointers]),
+-    with_printffp=$enableval,with_printffp="test")
++    [AS_HELP_STRING([--disable-printffp],
++	    [disables printf attribute on function pointers])],
++    [with_printffp=$enableval], [with_printffp="test"])
+ 
+-if test "x$with_printffp" = "xtest"; then
++AS_IF([test "x$with_printffp" = "xtest"], [
+ 
+     # check if we can use printf attribute on a function..
+     AC_MSG_CHECKING(if __printf__ attribute can apply to function pointers)
+-    AC_COMPILE_IFELSE( [[
++    AC_COMPILE_IFELSE([
+ 	    void testfunc(const char *format, ...)
+ 	    { }
+ 	    void (*funcProto)(const char *, ...) 
+@@ -85,28 +85,28 @@
+ 
+ 		return 0;
+ 	    }
+-	 ]],
++	 ], [
+ 	with_printffp="yes",
+-	with_printffp="no")
++	with_printffp="no"])
+ 
+     AC_MSG_RESULT($with_printffp)
+-fi
++])
+ 
+-if test "x$with_printffp" = "xyes"; then
++AS_IF([test "x$with_printffp" = "xyes"], [
+     HAVE_PRINTF_FP_PROTOTYPE="1"
+-else
++], [
+     HAVE_PRINTF_FP_PROTOTYPE="0"
+-fi
++])
+ AC_SUBST(HAVE_PRINTF_FP_PROTOTYPE)
+ 
+ AC_ARG_ENABLE(vararg,
+-    AS_HELP_STRING([--disable-vararg],
+-	    [don't use vararg macros even if the compiler supports them]),
+-    enable_vararg=$enableval)
+-if test "x$enable_vararg" != "xno"; then
++    [AS_HELP_STRING([--disable-vararg],
++	    [don't use vararg macros even if the compiler supports them])],
++    [enable_vararg=$enableval])
++AS_IF([test "x$enable_vararg" != "xno"], [
+     # check if the compiler understands __VA_ARGS__ 
+ AC_MSG_CHECKING(if compiler has C99 variadac macro)
+-AC_COMPILE_IFELSE( [[
++AC_COMPILE_IFELSE([
+ #include <stdio.h>
+ 
+ #define PRINT(FMT, ...) printf( FMT, __VA_ARGS__ )
+@@ -115,7 +115,7 @@
+ {
+     PRINT("hello %s", "world");
+     return 0;
+-} ]], [C99_VARIADAC_MACROS="1" 
++} ], [C99_VARIADAC_MACROS="1" 
+        AC_MSG_RESULT(yes)], 
+     [C99_VARIADAC_MACROS="0"
+      AC_MSG_RESULT(no)])
+@@ -123,7 +123,7 @@
+ 
+ # check if the compiler understands pre-c99 variadac macros
+ AC_MSG_CHECKING(if compiler has pre-C99 variadac macro)
+-AC_COMPILE_IFELSE( [[
++AC_COMPILE_IFELSE([
+ #include <stdio.h>
+ 
+ #define PRINT(FMT, ARGS...) printf( FMT, ##ARGS )
+@@ -132,15 +132,15 @@
+ {
+     PRINT("hello %s", "world");
+     return 0;
+-} ]], [PREC99_VARIADAC_MACROS="1" 
++} ], [PREC99_VARIADAC_MACROS="1" 
+        AC_MSG_RESULT(yes)], 
+     [PREC99_VARIADAC_MACROS="0"
+      AC_MSG_RESULT(no)])
+-else
++], [
+ dnl vararg support disabled
+     C99_VARIADAC_MACROS=0
+     PREC99_VARIADAC_MACROS=0
+-fi # enable_vararg
++]) # enable_vararg
+ 
+ AC_SUBST(C99_VARIADAC_MACROS)
+ AC_SUBST(PREC99_VARIADAC_MACROS)
+@@ -148,42 +148,42 @@
+ 
+ # check if the computer has hardware cycle counter
+ AC_ARG_ENABLE(rdtsc,
+-    AS_HELP_STRING([--enable-rdtsc],
+-	    [use rdtsc for benchmarking rlog in test programs]),
+-    with_rdtsc=$enableval,with_rdtsc="no")
+-if test "x$with_rdtsc" = "xyes"; then
++    [AS_HELP_STRING([--enable-rdtsc],
++	    [use rdtsc for benchmarking rlog in test programs])],
++    [with_rdtsc=$enableval], [with_rdtsc="no"])
++AS_IF([test "x$with_rdtsc" = "xyes"], [
+     AC_DEFINE([USE_RDTSC], [1], [Define to use RDTSC calls for benchmark test])
+-else
++], [
+     AC_DEFINE([USE_RDTSC], [0], [Define to use RDTSC calls for benchmark test])
+-fi
++])
+ 
+ AC_ARG_ENABLE(valgrind,
+-    AS_HELP_STRING([--disable-valgrind],
+-		   [disables valgrind support code.]),
+-    with_valgrind=$enableval, with_valgrind="yes" )
++    [AS_HELP_STRING([--disable-valgrind],
++		   [disables valgrind support code.])],
++    [with_valgrind=$enableval], [with_valgrind="yes"])
+ USE_VALGRIND="0"
+-if test "x$with_valgrind" = "xyes"; then
+-    AC_CHECK_HEADER([valgrind/valgrind.h],
++AS_IF([test "x$with_valgrind" = "xyes"], [
++    AC_CHECK_HEADER([valgrind/valgrind.h], [
+ 	AC_CHECK_DECLS([VALGRIND_PRINTF_BACKTRACE],
+-	    USE_VALGRIND="1",,[#include <valgrind/valgrind.h>]))
+-fi
++	    [USE_VALGRIND="1"],,[#include <valgrind/valgrind.h>])])
++])
+ AC_SUBST(USE_VALGRIND)
+ 
+ 
+ # allow documentation build to be disabled manually
+ AC_ARG_ENABLE(docs,
+-    AS_HELP_STRING([--disable-docs],[disable documentation build]),
+-    build_docs=$enableval, build_docs="yes")
++    [AS_HELP_STRING([--disable-docs],[disable documentation build])],
++    [build_docs=$enableval], [build_docs="yes"])
+ 
+ # check for tools necessary to build documentation
+ AC_PATH_PROG(DOXYGEN, doxygen, [no])
+ AC_PATH_PROG(LATEX, latex, [no])
+ AC_PATH_PROG(PDFLATEX, pdflatex, [no])
+ 
+-AM_CONDITIONAL(BUILD_DOCS, test "x$build_docs" = "xyes" \
++AM_CONDITIONAL([BUILD_DOCS], [test "x$build_docs" = "xyes" \
+ 			     -a "x$DOXYGEN" != "xno" \
+ 			     -a "x$LATEX" != "xno" \
+-			     -a "x$PDFLATEX" != "xno" )
++			     -a "x$PDFLATEX" != "xno"])
+ 
+ AC_CHECK_FUNCS(localtime_r)
+ 
diff --git a/dev-libs/rlog/rlog-1.4.ebuild b/dev-libs/rlog/rlog-1.4.ebuild
index 386f5c328d21..1f58e0626556 100644
--- a/dev-libs/rlog/rlog-1.4.ebuild
+++ b/dev-libs/rlog/rlog-1.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -17,6 +17,7 @@ IUSE=""
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.7-gcc-4.3.patch
 	"${FILESDIR}"/${PN}-1.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.4-autoconf-2.70.patch
 )
 
 src_prepare() {
@@ -28,5 +29,5 @@ src_install() {
 	default
 
 	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }