gentoo auto-resync : 08:01:2023 - 06:15:27

11 files changed, 331 insertions, 17 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 005fe82fe5a7..825bd7bf7901 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 62903b14b98b..fb1f07c36198 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,8 @@
+AUX diffoscope-231-pypdf.patch 5490 BLAKE2B a0226b4cd7b8b0d257968597c19706bf228c720fb5d13ab93aa68187f739c6dcc8e222c5a79b1e4e3ab6209842535080b52a7885d6538b456de8c94ec9154e19 SHA512 91afae48467e84ac85f70854fee56df731fda445b32e852dcf77f9d3afb8f5c6964e3a9912bb332789c60a79da84e6251e270a977ee2f5b5cf16d12eeb312689
 DIST diffoscope-229.tar.gz 3164192 BLAKE2B bee9fa1561ddcfde98cfa44cd6d66a28c636dbc7f3ec1f4895e91dfd3b66c039b68d53be0528b94c112552069886c3c81de4d9b9bc9038d183afdc9fdde6ddb9 SHA512 825c9c33f3088ba082ea3b998594445987558ee62b8b1fbfcded9b72a739faaa73908f8753b8772b3b1a8a43dbcfd52978265a18bdd92605defcd174884ccb23
 DIST diffoscope-230.tar.gz 3164600 BLAKE2B f5ad44ff36d07fc5724895e661e0946b292146d004e97159fef1cb58ff38669702a3990740e4ea34300a9b48aeb10263aeb6bb332da3ec987c355ed5b910fedd SHA512 e025e5f95ae2fb9de466b886c58a44f64e0f654fb049bf9f035209fe7ca1fd0ccc14a382b17085c13bc9f2be0d368482d57a071a577cb87628ae7eb0060158ad
 DIST diffoscope-231.tar.gz 3164686 BLAKE2B 5fe1546f63a047def4d1c9acc94360085be87460de1c106381532d937d1ad16be64749b9021caa7980a61a0dfd822ed7163e0f52bb0cab0520962b84bb184650 SHA512 544510de0790fc8f0c62030bc557f923bad6d5c39b7364e9944ebcf9bc5c1ecf2b9ecc91cf9142e54a23b1f004f53e96ed5b6f2f4637fa76cebd2ed7d0e4721d
 EBUILD diffoscope-229.ebuild 3562 BLAKE2B 103db80102cb91b40241f3beb9b51118381ff90041a3a2e9f66356b4a16d088c9d0d76de19cf66dce634e96f3f0cf2337c9c5ada17460ec643c406a5be32d274 SHA512 ce0f6e56a4b9ce0ed00f2db3b0fa2143ffef59e253c321ac476d213f6937102c8af747016c6f8f5195b3b49c26bf12aef70309b725625869c20e6dfd2cfb39c4
 EBUILD diffoscope-230.ebuild 3569 BLAKE2B 0f2c90d2ac24f75a70391d46994b148bdc9ee03793cb5548c8fec4acffc507d494b73e9e0d0d77b9128e8087bd4966af9c8c012dd9482304845026831bcb5a0e SHA512 67999a8f3074b144f9b73b99b0b76884fdfdca4afea7c6eb281ed392501289d99bc28c651530a81d2793427de50e24eaccf2fc9a6cfbcb255bd8ed506d15e859
-EBUILD diffoscope-231.ebuild 3568 BLAKE2B 7fd37f690793787c4855071df56e0a6ab88c3aa8d6a7683dc666956165f5830d3eee62f385376acb98f9ff6311fdf48ea5b7686ff670d34fe620936d197417dd SHA512 a6e2a888f506d2f385a6c59ad435398403b85440fd9b89953ac1956de383cffaf4decc6ecfff76ad7f03c90da719fe14bd2869a9726c99c7b0b5e455a33337d5
+EBUILD diffoscope-231-r1.ebuild 3618 BLAKE2B 6fb0b278c039391f4a004c578abbb70fc094b4bfe811a0e88273bd457816673fce97800ab288fd0166a77fbee9f1ed34f7558332577f72fc9545fa17162722fe SHA512 8a95a7ec9c32fd0e933e0559dac11794709b16c2b2ded689c65140ac0ab845436a433d655f64aeb8b523eb2ea8eeb785f8a3b1ecb1bce7cf32c212404553df89
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-231.ebuild b/dev-util/diffoscope/diffoscope-231-r1.ebuild
index 0f8d6d4ddb54..cab11fbd86b6 100644
--- a/dev-util/diffoscope/diffoscope-231.ebuild
+++ b/dev-util/diffoscope/diffoscope-231-r1.ebuild
@@ -117,4 +117,8 @@ EPYTEST_DESELECT=(
 	tests/comparators/test_macho.py::test_llvm_diff
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-231-pypdf.patch
+)
+
 distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/files/diffoscope-231-pypdf.patch b/dev-util/diffoscope/files/diffoscope-231-pypdf.patch
new file mode 100644
index 000000000000..7b4365c80eca
--- /dev/null
+++ b/dev-util/diffoscope/files/diffoscope-231-pypdf.patch
@@ -0,0 +1,180 @@
+https://bugs.gentoo.org/889250
+
+(Can't yet submit upstream as can't login to gitlab.)
+--- a/diffoscope.egg-info/requires.txt
++++ b/diffoscope.egg-info/requires.txt
+@@ -11,7 +11,7 @@ binwalk
+ defusedxml
+ guestfs
+ jsondiff
+-pypdf2
++pypdf
+ python-debian
+ pyxattr
+ rpm-python
+--- a/diffoscope/comparators/pdf.py
++++ b/diffoscope/comparators/pdf.py
+@@ -34,17 +34,23 @@ from .utils.command import Command
+ logger = logging.getLogger(__name__)
+ 
+ try:
+-    import PyPDF2
++    try:
++        import pypdf
++    except ImportError:
++        import PyPDF2
+ 
+     try:
+-        # PyPDF 2.x
+-        from PyPDF2.errors import PdfReadError
++        from pypdf.errors import PdfReadError
+     except ImportError:
+-        # PyPDF 1.x
+-        from PyPDF2.utils import PdfReadError
++        try:
++            # PyPDF 2.x
++            from PyPDF2.errors import PdfReadError
++        except ImportError:
++            # PyPDF 1.x
++            from PyPDF2.utils import PdfReadError
+ 
+ except ImportError:  # noqa
+-    python_module_missing("PyPDF2")
++    python_module_missing("pypdf")
+     PyPDF2 = None
+ 
+ 
+@@ -68,10 +74,10 @@ class PdfFile(File):
+         xs = []
+ 
+         if PyPDF2 is None:
+-            pkg = get_package_provider("pypdf2")
++            pkg = get_package_provider("pypdf")
+             infix = f" from the '{pkg}' package " if pkg else " "
+             self.add_comment(
+-                f"Installing the 'PyPDF2' Python module{infix}may produce a better output."
++                f"Installing the 'pypdf' Python module{infix}may produce a better output."
+             )
+         else:
+             difference = Difference.from_text(
+@@ -119,7 +125,7 @@ class PdfFile(File):
+ 
+             return "\n".join(xs)
+         except PdfReadError as e:
+-            msg = f"Could not extract PyPDF2 metadata from {os.path.basename(file.name)}: {e}"
++            msg = f"Could not extract pypdf metadata from {os.path.basename(file.name)}: {e}"
+             self.add_comment(msg)
+             logger.error(msg)
+             return ""
+@@ -142,7 +148,7 @@ class PdfFile(File):
+ 
+             return "\n".join(xs)
+         except PdfReadError as e:
+-            msg = f"Could not extract PyPDF2 annotations from {os.path.basename(file.name)}: {e}"
++            msg = f"Could not extract pypdf annotations from {os.path.basename(file.name)}: {e}"
+             file.add_comment(msg)
+             logger.error(msg)
+             return ""
+--- a/setup.py
++++ b/setup.py
+@@ -66,7 +66,7 @@ setup(
+             "guestfs",
+             "jsondiff",
+             "python-debian",
+-            "pypdf2",
++            "pypdf",
+             "pyxattr",
+             "rpm-python",
+             "tlsh",
+--- a/tests/comparators/test_pdf.py
++++ b/tests/comparators/test_pdf.py
+@@ -70,7 +70,7 @@ def differences_metadata(pdf1, pdf1a):
+ 
+ 
+ @skip_unless_tools_exist("pdftotext")
+-@skip_unless_module_exists("PyPDF2")
++@skip_unless_module_exists("pypdf")
+ def test_metadata(differences_metadata):
+     assert_diff(differences_metadata[0], "pdf_metadata_expected_diff")
+ 
+@@ -81,7 +81,7 @@ def differences_annotations(pdf3, pdf4):
+ 
+ 
+ @skip_unless_tools_exist("pdftotext")
+-@skip_unless_module_exists("PyPDF2")
++@skip_unless_module_exists("pypdf")
+ def test_annotations(differences_annotations):
+     with open("tests/data/pdf_annotations_expected_diff", "w") as f:
+         f.write(differences_annotations[0].unified_diff)
+--- a/diffoscope/comparators/pdf.py
++++ b/diffoscope/comparators/pdf.py
+@@ -38,6 +38,7 @@ try:
+         import pypdf
+     except ImportError:
+         import PyPDF2
++        pypdf = PyPDF2
+ 
+     try:
+         from pypdf.errors import PdfReadError
+@@ -51,7 +52,7 @@ try:
+ 
+ except ImportError:  # noqa
+     python_module_missing("pypdf")
+-    PyPDF2 = None
++    pypdf = None
+ 
+ 
+ class Pdftotext(Command):
+@@ -73,7 +74,7 @@ class PdfFile(File):
+     def compare_details(self, other, source=None):
+         xs = []
+ 
+-        if PyPDF2 is None:
++        if pypdf is None:
+             pkg = get_package_provider("pypdf")
+             infix = f" from the '{pkg}' package " if pkg else " "
+             self.add_comment(
+@@ -113,7 +114,7 @@ class PdfFile(File):
+ 
+     def dump_pypdf2_metadata(self, file):
+         try:
+-            pdf = PyPDF2.PdfFileReader(file.path)
++            pdf = pypdf.PdfReader(file.path)
+             document_info = pdf.getDocumentInfo()
+ 
+             if document_info is None:
+@@ -133,10 +133,10 @@ class PdfFile(File):
+ 
+     def dump_pypdf2_annotations(self, file):
+         try:
+-            pdf = PyPDF2.PdfFileReader(file.path)
++            pdf = pypdf.PdfReader(file.path)
+ 
+             xs = []
+-            for x in range(pdf.getNumPages()):
++            for x in range(len(pdf.pages)):
+                 page = pdf.getPage(x)
+ 
+                 try:
+--- a/diffoscope/comparators/pdf.py
++++ b/diffoscope/comparators/pdf.py
+@@ -115,7 +115,7 @@ class PdfFile(File):
+     def dump_pypdf2_metadata(self, file):
+         try:
+             pdf = pypdf.PdfReader(file.path)
+-            document_info = pdf.getDocumentInfo()
++            document_info = pdf.metadata
+ 
+             if document_info is None:
+                 return ""
+--- a/diffoscope/comparators/pdf.py
++++ b/diffoscope/comparators/pdf.py
+@@ -137,7 +137,7 @@ class PdfFile(File):
+ 
+             xs = []
+             for x in range(len(pdf.pages)):
+-                page = pdf.getPage(x)
++                page = pdf.pages[x]
+ 
+                 try:
+                     for annot in page["/Annots"]:
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 1abcb80aecd2..219cabf20e16 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,9 +4,11 @@ DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed
 DIST systemtap-4.5.tar.gz 5549909 BLAKE2B 3c180a49c81070cb374ae23f95f1e90cc3cf2550170363793f46584b201c2284b2ee639f395d73ed6c5b44160825b3cf128bd360b81bc243e71c98e71d779f48 SHA512 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3
 DIST systemtap-4.6.tar.gz 5588126 BLAKE2B 7a0b1ed201f3661d5737bbf2c8b10b8bcf708df0c9aeeb941d501f5001e13b254ff779e20ed6af72b457a9e8236f064b9d5ee6d79438f96abb09d913f5732db3 SHA512 835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402
 DIST systemtap-4.7.tar.gz 5611495 BLAKE2B 839a824c3ef249add3edb2c9329c7bcb297d36d268d463c2913d945688845b7a6af8d811b2a533c4da8ce496cabccbdfabd080be847c754c2614f9c9efb22c61 SHA512 7d7c213dc4f7c5430f81763668da21403fbc351d1701b1096eb1ad233e3f0325e35f01dfd0a33e75f277b26fdde88c46d42dd32e32e4d4f27a45d53e2dd0f831
-EBUILD systemtap-4.4.ebuild 2885 BLAKE2B 3ab515c217ac8b58b70a2c46e44e2f3fbc55f5f3294e3b019a30048de33c9b908729dd50a13b4866923fe52ae06f33f0653f2db918f46fe214c0b613a8c569e7 SHA512 fdf5b5824f6c3ecd0cf1d926e8674bdd72288aef315803da1ac23188c93571aa525bdccf5ba09a23faed7c099990247452243ffb1b44c3b278e569dd19bac974
-EBUILD systemtap-4.5-r1.ebuild 3257 BLAKE2B 820e5ab1f3e123c2e265c89f77dd02964603641ac9b47c1de1187f130b8d4b68b039c6f44ad4e6d8792ab705570aa0982fe8d8676001abf672d4d36812505497 SHA512 5522e91b54d98aec2a304b7b26c450e48ddf50a315db51d35c09246a1f9ef4fe60b2db9d8ecec4d605e571a843b403163239f59b16f13edee0858eb75a6e72c6
-EBUILD systemtap-4.5.ebuild 2821 BLAKE2B 45cd56187b5b8da6a7e815f0953c2d826ce668f1018910501c267ab7a145c7cabe4a615643a05b4180dbbe59e679c8fb913d3235a0f1d7bd03a57f7b7ffbb00d SHA512 b19089f6c2efc45620045abe7be37963136beb5c453645be1f7f1b52ed007c733291907334843de71cbb11e4089b5935703cd0f17ff6ecf9672a40ba13649cae
-EBUILD systemtap-4.6.ebuild 3264 BLAKE2B 36768eae7877b68327662f9b125689c51ab74a44915709a58136af03031d88aad996c377dd8d8d66f14007a7b013cdb4d88339fb049ecf2a9712f276d260958e SHA512 c3ab1a88139b673e5c13e72d44b4e4dd60c296319a249e9f789bfa9b99c4e26e7d6cd0fb1eaff066c54bc45f9b03842ed4e1a7b0464b79ccb108d6ca8aaac0fc
-EBUILD systemtap-4.7-r1.ebuild 3287 BLAKE2B b6f8c1179ad6f73228def171d8a1913e2ebfc57dc6adc67b7e8d0ddaf371425ff1c520611f2456645f10a3bbe12b4d2156c355b63aadd5c4be5a405990c71579 SHA512 a49af63d3bab7b444f0b3cd43e5826eebec1c13df61e326016529a276af5a9a0da601419cf8c8439129265a5e5575e894fce6edee1a94e521fc64cf4d832c6ce
+DIST systemtap-4.8.tar.gz 5628003 BLAKE2B 9f5050eba29d390c907b117187f94ef088f16bb739b4971bc32ffe88b1024a4157cd4e9793a8fc1e149a5a182a28330e3b4fd9d51213bb3637d616fbb9867f6d SHA512 fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2
+EBUILD systemtap-4.4.ebuild 2885 BLAKE2B afc4119402093613c0f9bf203b1bd3ef89ebee3440c4974bdc5b33503fab5e327d9098fb9b481e34e336cc77da1d7bd279185a36dc5a5f786be279f80e025800 SHA512 ce515f327b4d378227bdbe2066e228489b36ba49faa55517a286c217d8eb25bb3ecae7186cbe7cf76fcba1a82bdd086c60c03d98af46dbaf669830b709aa2c97
+EBUILD systemtap-4.5-r1.ebuild 3257 BLAKE2B 7b1951cb0bbf78977836940baf2aebd893d9bccf6313776c728b0b739260a6e745200689b22a3a02ea99b1f87222edf711bc9ed6d8419516b665da9df1bfc47f SHA512 5f68f7134496ea36f4d2c3d35e74d404a6be1024921631ed12ea502287b0350a4237d862928df98a85d4fcd476a413b7f1339a4d282f2c1b8569556590321f8d
+EBUILD systemtap-4.5.ebuild 2821 BLAKE2B 71a279d9542fcea1ce4e2812189015adef3a65026fd5d97ecf939322a3dfcefd2ce15882ef39ac7a82230df935c4b1499ba67a805b00d86d7565f690c4864339 SHA512 d01b80a08d21b671bccfe4d1533886b94a0ad514f6e5da9c86f9d5900d7d9235db9d51a254eebbb5ec9096beb14ddc34cc8d75a82e707046e2f1c841d5594449
+EBUILD systemtap-4.6.ebuild 3264 BLAKE2B 8f21b747189a1a818aea0304c7b13fb0e54ea44127f510af8fad195ab70d7c0eed23c4037d6d7d4659be911a67d23f83c77d21e6e66f3db0d10e7382f81b7f3f SHA512 c25d5f4f7412518ea904b8d512060264df60ae06c5ac10b310dc2a700322c043aa2e89ce33e10cf71a6ac38de51b27ebc899e27fe5ccfd5058a7fa09079094cd
+EBUILD systemtap-4.7-r1.ebuild 3281 BLAKE2B d4a09ebd804780bb4e6b611adbf37e752d0378cdd696dceb05426dfff6f857a6141a5e47b9839a41992b748816bcb41fc50cf7f17e310828446ce17ea6ba4f37 SHA512 fc8143ea329eedc28e79e7b4f4f126fee77067d31a3a11572d56878883cbcd15146b6e7ee42976520beac4bb8c000a2ec9ff96fe563cda5e936870c71774d18b
+EBUILD systemtap-4.8.ebuild 3287 BLAKE2B a610e1309dfd2584d8b321e03a6a5875f98dbab2476e5defd355928696174cbb3444001cff78b5970c8869d7acf9f47036bed81c4c0befd2cbd1f5a7e376275f SHA512 5985d2c420f68c7aa133d4257cc0c492609e3b998fb67b22d69d0a0dafb449ef5503eba33947b5c89952ffaa0355d255eed8768f8fee671d0ecb6460a6832064
 MISC metadata.xml 303 BLAKE2B 5db95d500a08d656d0221a474d297c8357712f19334f45db347e36f14a10365d65777e0d24c68f75d4855b3ee1778dca1ecf4a05b19d2dd3975acf25a12b4523 SHA512 27261bc875c881495a9b0e1fffc811dff40b763a9e6453ca47143cb8d7d867682becd7266f8d559ad8c32bb5d7de9698341055d483f3e6a68b107895aa174b77
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
index 66c961a9af04..946c23171f14 100644
--- a/dev-util/systemtap/systemtap-4.4.ebuild
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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"
+SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/systemtap/systemtap-4.5-r1.ebuild b/dev-util/systemtap/systemtap-4.5-r1.ebuild
index cb7728fb5a3e..a35be78bb4e5 100644
--- a/dev-util/systemtap/systemtap-4.5-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit autotools linux-info 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"
+SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/systemtap/systemtap-4.5.ebuild b/dev-util/systemtap/systemtap-4.5.ebuild
index e7f4ac64b083..aa41697922d8 100644
--- a/dev-util/systemtap/systemtap-4.5.ebuild
+++ b/dev-util/systemtap/systemtap-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit linux-info 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"
+SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/systemtap/systemtap-4.6.ebuild b/dev-util/systemtap/systemtap-4.6.ebuild
index a4f2a7d2663b..1fbc7fe72cd3 100644
--- a/dev-util/systemtap/systemtap-4.6.ebuild
+++ b/dev-util/systemtap/systemtap-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit autotools linux-info 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"
+SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/systemtap/systemtap-4.7-r1.ebuild b/dev-util/systemtap/systemtap-4.7-r1.ebuild
index a799c1c73759..2b6073415d25 100644
--- a/dev-util/systemtap/systemtap-4.7-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,11 +9,11 @@ inherit autotools linux-info 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"
+SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
 
 CDEPEND="
diff --git a/dev-util/systemtap/systemtap-4.8.ebuild b/dev-util/systemtap/systemtap-4.8.ebuild
new file mode 100644
index 000000000000..dfa3480d365b
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.8.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit autotools linux-info python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="https://www.sourceware.org/systemtap"
+SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="libvirt selinux sqlite +ssl test zeroconf"
+
+CDEPEND="
+	${PYTHON_DEPS}
+
+	dev-libs/boost:=
+	>=dev-libs/elfutils-0.142
+	dev-libs/json-c:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+
+	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="
+	${CDEPEND}
+	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="
+	${CDEPEND}
+	acct-group/stapdev
+	acct-group/stapsys
+	acct-group/stapusr
+"
+BDEPEND="test? ( dev-util/dejagnu )"
+
+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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1-ia64.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
+		# Our toolchain sets this for us already and adding in
+		# -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation.
+		# This option (at least as of 4.5) doesn't pass -fno* etc,
+		# it just doesn't _add_ options, which is good. If it changes
+		# to actually pass -fno-stack-protector and friends, we'll
+		# need to change course. Forcing =2 also has problems for
+		# setting it to 3.
+		# bug #794667.
+		--disable-ssp
+		--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
+}