gentoo resync : 22.01.2021

6 files changed, 656 insertions, 2 deletions

diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 10f4ceb094df..999766100abe 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,5 +1,10 @@
 AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45e0e4ff4049d6b8d6cf44375f88c752a0130e4229a5ccf83a414db8f91504f4ef828d3a7d3d94a5eee78a9e90f SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd
 AUX systemtap-4.0-AR.patch 193 BLAKE2B 270a00dcba6cc982fb60075e00bbc3f7d6e23b77f8b595f4f84eae25519452d53a355571f0ce0515c187591796e245b9e683458842c0e9eac06e205b0f3cb3f5 SHA512 b59a56cf64ade81df11b629f9f1eeba8d8aedb5e3984bd0c8b8217ca76cbbb5aaba2120b8ee3ab83c300cbdc674e5c6e7999537371cd76794a2ace65a7a8b19e
+AUX systemtap-4.0-configure.ac-non-posix-test.patch 10038 BLAKE2B ce0bf23977dd5e6e653cfbd67aa16485c0afcd2b30c637d050212441cb4a09c963b66c885ecf03ceeb376ee6d3120c0a225345178a012faabfe97666afd08d3b SHA512 a645c7b8d3be0a8ff60e32737d7ff31085e8f96f1dac87a85e79066f18a80dcbfb69487f5b619b81ab2031d09b01fdf559ecd7385dd1963f4603fc238c77ea4d
+AUX systemtap-4.4-configure.ac-non-posix-test.patch 9435 BLAKE2B df56bc874cc14afce539ad5f52f040abfb44d96401c809aa10ca925a20a9ee158aa809c79561e27dbf33aedcb8d383bc567d45b706e6e0aea101c314cd880b7e SHA512 22dc30701e1bfea872e0fdb1937ac0f43fbe72510c8322579e98b5ad75f37b6c1289718ad1786879d16890bd27ec4f051a27261d33421a7e9f0dc79ae0fba9f1
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
-EBUILD systemtap-4.0-r1.ebuild 2718 BLAKE2B 91d339b14668b8d8bbd2e3d8cb3b414735f1b3cb677160cbf2e14ac3da25b13ea77c4fdd1d873efdfb9b47be462b5caa7b9494ae9c61f869e37e38a42ac4d8e8 SHA512 534c02ebbf088e0f8dc7b5ed094c12905d2421e495d85fcc920675c89fbf4d2012b33882a0a223e14cc5c76b6ca29540fd44d3aa592b27ab0b3173bffad1d1b5
+DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
+EBUILD systemtap-4.0-r1.ebuild 2789 BLAKE2B 46c1e2705f74dd8b9fdc0686592b384cda11d85d95512b5ef4706c59562dbfa25354381b5a026efeab34ca87425d033af0721dcd5f73ec74e80fe4c8e25451be SHA512 305ae98508f92371adf084bf24e108c9c1375a5e3ee44d8bb2f9f56dd0cc7ce9ff60c7800feab0f80df331a819d20cdf202fac36316ac698ce0a83da9cd49360
+EBUILD systemtap-4.0-r2.ebuild 2857 BLAKE2B a208265168e97cbcd37f1a5dcd719f4b174ef0995a89024106c0cf51f18321f88819524d588c0bff816b4c6c902fe4ddf5dc933cfa57a467fab9e89aede361af SHA512 75441525964e1a7820ea115d4cbcd681e409e385fa3e25c725afda75bbb6c29e98df0624d1e47ad58bd198a967a7e72329f43ac7aaeaebe2842488f0881b27b7
+EBUILD systemtap-4.4.ebuild 2823 BLAKE2B a045414a9fa4d7f4c3ddb9251380590d56f92de774d6ea8181bc22a66bbbe7331f3b414f5487a5efcfdc8bc203c4655c5d366235b2854026117359393f026e9a SHA512 4f94efa6e2230ff34386f0a7d02e4dab885048b52d33cf4ea3aabd558c558212a701eccbfbc11699632d7b180fe29fccbcd33667ca62403e7780017a5dc43011
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch b/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
new file mode 100644
index 000000000000..d429ab197ddd
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
@@ -0,0 +1,214 @@
+ configure.ac | 62 ++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 31 insertions(+), 31 deletions(-)
+
+diff --git i/configure.ac w/configure.ac
+index caa62ee28..19db3fb21 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -225,7 +225,7 @@ dnl fi
+ # Compiling without fPIE by default (see PR 9922)
+ AC_ARG_ENABLE([pie],
+   [AS_HELP_STRING([--enable-pie], [enable position-independent-executable])])
+-AS_IF([test "x$enable_pie" == xyes],[
++AS_IF([test "x$enable_pie" = xyes],[
+    PIECFLAGS='-fPIE'
+    PIECXXFLAGS='-fPIE'
+    PIELDFLAGS='-pie -Wl,-z,relro -Wl,-z,now'
+@@ -271,7 +271,7 @@ AC_ARG_ENABLE([translator],
+   AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
+   [],
+   [enable_translator="yes"])
+-AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
++AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
+ 
+ dnl Handle the option to build the crash extension
+ AC_ARG_ENABLE([crash],
+@@ -312,25 +312,25 @@ AC_CHECK_PROG(have_latex, latex, yes, no)
+ AC_CHECK_PROG(have_dvips, dvips, yes, no)
+ AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
+ if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
+-   if test "$enable_docs" == "yes"; then
++   if test "$enable_docs" = "yes"; then
+       AC_MSG_ERROR([cannot find all tools for building documentation])
+    fi
+-  if test "$enable_docs" == "check"; then
++  if test "$enable_docs" = "check"; then
+     AC_MSG_WARN([will not build documentation, cannot find all tools])
+   fi
+ fi
+-if test "$enable_docs" == "prebuilt"; then
++if test "$enable_docs" = "prebuilt"; then
+   AC_MSG_NOTICE([will only install prebuilt documentation])
+ fi
+-if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
++if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
+    building_docs="yes"
+    installing_prebuilt_docs="yes"
+ fi
+-if test "$enable_docs" == "no"; then
++if test "$enable_docs" = "no"; then
+    installing_prebuilt_docs="no"
+ fi
+-AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
+-AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
++AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
++AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
+ 
+ 
+ dnl Handle the option to build the reference documentation
+@@ -340,17 +340,17 @@ AC_ARG_ENABLE([refdocs],
+     [enable building reference documentation (default on if other documentation built).]),
+   [enable_refdocs=$enableval],
+   [enable_refdocs="check"])
+-if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
++if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
+    AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
+ fi
+-if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
++if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
+    building_refdocs="yes"
+ fi
+-AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
++AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
+ 
+ AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
+ AC_CHECK_PROG(have_fop, fop, yes, no)
+-if test "x${have_fop}" == "xyes"; then
++if test "x${have_fop}" = "xyes"; then
+    # Due to rhbz505364 / 830266, we must actually test-run fop, not just
+    # hope that it works.
+    AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
+@@ -362,8 +362,8 @@ if test "x${have_fop}" == "xyes"; then
+    fi
+    rm -f dummy-tapsets.pdf
+ fi
+-AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
+-AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
++AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
++AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
+ 
+ dnl Handle the option to build the html documentation
+ building_htmldocs="no"
+@@ -372,11 +372,11 @@ AC_ARG_ENABLE([htmldocs],
+     [enable building html documentation (default off).]),
+     [building_htmldocs=$enableval],
+     [building_htmldocs="no"])
+-if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
++if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
+    AC_MSG_ERROR([xmlto required for building html documentation])
+ fi
+ 
+-AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
++AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
+ 
+ dnl There is a strange bug in older versions of xmlto when generating pdf.
+ dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
+@@ -396,10 +396,10 @@ cat > conftest.xml << 'EOF'
+    </book>
+ EOF
+ 
+-if test "x${have_xmlto}" == "xyes"; then
++if test "x${have_xmlto}" = "xyes"; then
+ AC_MSG_CHECKING([for xmlto --stringparam support])
+    xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
+-   if test $? == 0; then
++   if test $? = 0; then
+       have_xmlto_stringparam="yes"
+       AC_MSG_RESULT([yes])
+    else
+@@ -407,7 +407,7 @@ AC_MSG_CHECKING([for xmlto --stringparam support])
+    fi
+    rm -f conftest.html
+ fi
+-AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
++AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
+ 
+ rm -f conftest.xml
+ 
+@@ -473,7 +473,7 @@ dnl See if we have enough libraries and tools to build the compile server
+     AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
+   fi		       
+ fi
+-AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
++AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
+ 
+ if test "${have_nss}" != "yes"; then
+   AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
+@@ -514,10 +514,10 @@ if test "$with_rpm" != "no"; then
+                     AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
+                     stap_LIBS="$stap_LIBS -lc -lrpmio"
+                     have_librpmio="yes"], [have_librpmio="no"])
+-  if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
++  if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
+      AC_MSG_ERROR([cannot find librpm])
+   fi
+-  if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
++  if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
+      AC_MSG_WARN([cannot find librpmio])
+   fi
+ fi
+@@ -554,7 +554,7 @@ else
+ 	    [Define if you have the readline library (-lreadline).])
+ fi
+ AC_SUBST([READLINE_LIBS])
+-AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
++AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
+ 
+ dnl End of readline checks: restore LIBS
+ LIBS=$LIBS_no_readline
+@@ -710,7 +710,7 @@ dnl See if we have enough libraries and tools to build the virt server
+     AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
+   fi		       
+ fi
+-AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
++AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
+ 
+ dnl Handle the option to build python2 probe support
+ AC_ARG_WITH([python2-probes],
+@@ -750,7 +750,7 @@ have_python3_support=no
+ AS_IF([test "x$with_python3_probes" != "xno"],
+   [dnl First, check to make sure we have the 'python3-config' script.
+    pathless_python3=$(basename "$PYTHON3")
+-   if test "x${pathless_python3}" == "x"; then
++   if test "x${pathless_python3}" = "x"; then
+ 	pathless_python3="python3"   
+    fi
+    AC_PATH_PROG([PYTHON3_CONFIG], [${pathless_python3}-config], [no])
+@@ -785,8 +785,8 @@ AM_CONDITIONAL([HAVE_PYTHON_PROBES],
+ dnl Check for presence of json-c and ncurses for use in monitor mode
+ PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
+ PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
+-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"])
+-if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
++AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes"])
++if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
+   AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
+ fi
+ 
+@@ -823,7 +823,7 @@ AS_IF([test "x$with_bpf" != "xno"], [
+                [],
+                [#include <linux/bpf.h>])
+     ])
+-AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
++AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
+ AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
+ 
+ if test $build_elfutils = yes -a $enable_translator = yes; then
+@@ -965,7 +965,7 @@ AS_IF([test "x$enable_http" = "xyes"],
+    dnl If we have all of the libraries, the json-c and nss libraries,
+    dnl and full C++11 support, we could build the httpd web
+    dnl compilation service.
+-   AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
++   AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
+ 
+ AS_IF([test "x$have_http_support" = "xyes"],
+   [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
+@@ -1010,7 +1010,7 @@ initscript/99stap/module-setup.sh \
+ initscript/99stap/install \
+ initscript/99stap/check ])
+ AC_CONFIG_SUBDIRS(testsuite)
+-if test $enable_translator == "yes"; then
++if test $enable_translator = "yes"; then
+ 	AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
+ fi
+ AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
diff --git a/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch b/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch
new file mode 100644
index 000000000000..bd1c60376834
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch
@@ -0,0 +1,199 @@
+ configure.ac | 58 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 29 insertions(+), 29 deletions(-)
+
+diff --git i/configure.ac w/configure.ac
+index 9589fa6f2..2d519f1ba 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -287,7 +287,7 @@ AC_ARG_ENABLE([translator],
+   AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
+   [],
+   [enable_translator="yes"])
+-AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
++AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
+ 
+ dnl Handle the option to build the crash extension
+ AC_ARG_ENABLE([crash],
+@@ -328,25 +328,25 @@ AC_CHECK_PROG(have_latex, latex, yes, no)
+ AC_CHECK_PROG(have_dvips, dvips, yes, no)
+ AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
+ if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
+-   if test "$enable_docs" == "yes"; then
++   if test "$enable_docs" = "yes"; then
+       AC_MSG_ERROR([cannot find all tools for building documentation])
+    fi
+-  if test "$enable_docs" == "check"; then
++  if test "$enable_docs" = "check"; then
+     AC_MSG_WARN([will not build documentation, cannot find all tools])
+   fi
+ fi
+-if test "$enable_docs" == "prebuilt"; then
++if test "$enable_docs" = "prebuilt"; then
+   AC_MSG_NOTICE([will only install prebuilt documentation])
+ fi
+-if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
++if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
+    building_docs="yes"
+    installing_prebuilt_docs="yes"
+ fi
+-if test "$enable_docs" == "no"; then
++if test "$enable_docs" = "no"; then
+    installing_prebuilt_docs="no"
+ fi
+-AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
+-AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
++AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
++AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
+ 
+ 
+ dnl Handle the option to build the reference documentation
+@@ -356,17 +356,17 @@ AC_ARG_ENABLE([refdocs],
+     [enable building reference documentation (default on if other documentation built).]),
+   [enable_refdocs=$enableval],
+   [enable_refdocs="check"])
+-if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
++if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
+    AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
+ fi
+-if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
++if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
+    building_refdocs="yes"
+ fi
+-AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
++AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
+ 
+ AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
+ AC_CHECK_PROG(have_fop, fop, yes, no)
+-if test "x${have_fop}" == "xyes"; then
++if test "x${have_fop}" = "xyes"; then
+    # Due to rhbz505364 / 830266, we must actually test-run fop, not just
+    # hope that it works.
+    AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
+@@ -378,8 +378,8 @@ if test "x${have_fop}" == "xyes"; then
+    fi
+    rm -f dummy-tapsets.pdf
+ fi
+-AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
+-AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
++AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
++AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
+ 
+ dnl Handle the option to build the html documentation
+ building_htmldocs="no"
+@@ -388,11 +388,11 @@ AC_ARG_ENABLE([htmldocs],
+     [enable building html documentation (default off).]),
+     [building_htmldocs=$enableval],
+     [building_htmldocs="no"])
+-if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
++if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
+    AC_MSG_ERROR([xmlto required for building html documentation])
+ fi
+ 
+-AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
++AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
+ 
+ dnl There is a strange bug in older versions of xmlto when generating pdf.
+ dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
+@@ -412,10 +412,10 @@ cat > conftest.xml << 'EOF'
+    </book>
+ EOF
+ 
+-if test "x${have_xmlto}" == "xyes"; then
++if test "x${have_xmlto}" = "xyes"; then
+ AC_MSG_CHECKING([for xmlto --stringparam support])
+    xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
+-   if test $? == 0; then
++   if test $? = 0; then
+       have_xmlto_stringparam="yes"
+       AC_MSG_RESULT([yes])
+    else
+@@ -423,7 +423,7 @@ AC_MSG_CHECKING([for xmlto --stringparam support])
+    fi
+    rm -f conftest.html
+ fi
+-AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
++AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
+ 
+ rm -f conftest.xml
+ 
+@@ -489,7 +489,7 @@ dnl See if we have enough libraries and tools to build the compile server
+     AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
+   fi		       
+ fi
+-AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
++AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
+ 
+ if test "${have_nss}" != "yes"; then
+   AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
+@@ -530,10 +530,10 @@ if test "$with_rpm" != "no"; then
+                     AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
+                     stap_LIBS="$stap_LIBS -lc -lrpmio"
+                     have_librpmio="yes"], [have_librpmio="no"])
+-  if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
++  if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
+      AC_MSG_ERROR([cannot find librpm])
+   fi
+-  if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
++  if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
+      AC_MSG_WARN([cannot find librpmio])
+   fi
+ fi
+@@ -570,7 +570,7 @@ else
+ 	    [Define if you have the readline library (-lreadline).])
+ fi
+ AC_SUBST([READLINE_LIBS])
+-AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
++AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
+ 
+ dnl End of readline checks: restore LIBS
+ LIBS=$LIBS_no_readline
+@@ -726,7 +726,7 @@ dnl See if we have enough libraries and tools to build the virt server
+     AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
+   fi		       
+ fi
+-AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
++AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
+ 
+ dnl Handle the option to build python2 probe support
+ AC_ARG_WITH([python2-probes],
+@@ -801,11 +801,11 @@ if test "$enable_monitor" != "no"; then
+ dnl Check for presence of json-c and ncurses for use in monitor mode
+ PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
+ PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
+-if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
++if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
+   AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
+ fi
+ fi
+-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"])
++AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes" -a "$enable_monitor" != "no"])
+ 
+ AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [
+ old_CFLAGS="$CFLAGS"
+@@ -840,7 +840,7 @@ AS_IF([test "x$with_bpf" != "xno"], [
+                [],
+                [#include <linux/bpf.h>])
+     ])
+-AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
++AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
+ AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
+ 
+ dnl determine whether BPF raw tracepoints are available
+@@ -931,7 +931,7 @@ AS_IF([test "x$enable_http" = "xyes"],
+    dnl If we have all of the libraries, the json-c and nss libraries,
+    dnl and full C++11 support, we could build the httpd web
+    dnl compilation service.
+-   AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
++   AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
+ 
+ AS_IF([test "x$have_http_support" = "xyes"],
+   [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
+@@ -976,7 +976,7 @@ initscript/99stap/module-setup.sh \
+ initscript/99stap/install \
+ initscript/99stap/check ])
+ AC_CONFIG_SUBDIRS(testsuite)
+-if test $enable_translator == "yes"; then
++if test $enable_translator = "yes"; then
+ 	AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
+ fi
+ AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index b04e23d320d6..82845ce8d8b6 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,9 @@ RDEPEND=">=dev-libs/elfutils-0.142
 DEPEND="${RDEPEND}
 	app-arch/cpio
 	app-text/xmlto
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
 	>=sys-devel/gettext-0.18.2
 	libvirt? ( dev-libs/libxml2 )
 "
diff --git a/dev-util/systemtap/systemtap-4.0-r2.ebuild b/dev-util/systemtap/systemtap-4.0-r2.ebuild
new file mode 100644
index 000000000000..0b43bdd12a7f
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.0-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info autotools python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="https://www.sourceware.org/systemtap/"
+SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libvirt selinux sqlite +ssl zeroconf"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+	dev-libs/json-c:=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	${PYTHON_DEPS}
+	libvirt? ( >=app-emulation/libvirt-1.0.2 )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+	app-arch/cpio
+	app-text/xmlto
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=sys-devel/gettext-0.18.2
+	libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="${RDEPEND}
+	acct-group/stapdev
+	acct-group/stapsys
+	acct-group/stapusr
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-ia64.patch
+	"${FILESDIR}"/${PN}-4.0-AR.patch
+	"${FILESDIR}"/${P}-configure.ac-non-posix-test.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac \
+		Makefile.am \
+		stapbpf/Makefile.am \
+		stapdyn/Makefile.am \
+		staprun/Makefile.am \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py \
+		|| die "Failed to clean up sources"
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		--enable-pie
+		--with-python3
+		--without-java
+		--without-openssl
+		--without-python2-probes
+		--without-rpm
+		$(use_enable libvirt virt)
+		$(use_enable sqlite)
+		$(use_with zeroconf avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+	PYTHON3="${PYTHON}" \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+}
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
new file mode 100644
index 000000000000..690944a69d14
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info autotools python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="https://www.sourceware.org/systemtap/"
+SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libvirt selinux sqlite +ssl zeroconf"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+	dev-libs/json-c:=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	${PYTHON_DEPS}
+	libvirt? ( >=app-emulation/libvirt-1.0.2 )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+	app-arch/cpio
+	app-text/xmlto
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=sys-devel/gettext-0.18.2
+	libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="${RDEPEND}
+	acct-group/stapdev
+	acct-group/stapsys
+	acct-group/stapusr
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-ia64.patch
+	"${FILESDIR}"/${P}-configure.ac-non-posix-test.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac \
+		Makefile.am \
+		stapbpf/Makefile.am \
+		stapdyn/Makefile.am \
+		staprun/Makefile.am \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py \
+		|| die "Failed to clean up sources"
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		--enable-pie
+		--with-python3
+		--without-java
+		--without-openssl
+		--without-python2-probes
+		--without-rpm
+		$(use_enable libvirt virt)
+		$(use_enable sqlite)
+		$(use_with zeroconf avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+	PYTHON3="${PYTHON}" \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+}