2023-05-11 10:39:49+00:00

81 files changed, 52 insertions, 1519 deletions

diff --git a/Manifest b/Manifest
index 7048059628be0..973d7b8c1165e 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29458 BLAKE2B 939ca451210e9897b1550829e373fcc8a7c911746910b879a26566041badf830e3f9712df90a753acf22e83eff7c5ccad177da9e1a77a1af803b506683577422 SHA512 97412b3dd9315f75645832e74d3d236458038cc3d1e5a267a17152ea2ecfe6fd5b3b9f0060736389ad5d47786e0e88ca56a652cada4720351628281af5ada06f
-TIMESTAMP 2023-05-11T10:09:54Z
+MANIFEST Manifest.files.gz 29455 BLAKE2B 6687d6fedda86e2ae27c9e8e49142f034de1e3fcdfa0355f372461bb84282a5db215db0ef41b7af0ad67cd48fe5fdc08335972750adc986418dfa89f41508c89 SHA512 e7605a0162817b70de85b85c92c165fba81eda4b3f96d9f0ca4a189ca027322d3f7ae2e83d0cc3ee79039ca48e8fc42f05e7f7568b3bf25fe1ac3f59347dde26
+TIMESTAMP 2023-05-11T10:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRcvvJfFIAAAAAALgAo
+iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRcxflfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCm3w//YFiiLZKpT4BOlxrLwoqy8XmF8QG7GcQPxXnMri3JXVV0iD7iYoYT4iWg
-2ZRJpiga7Eob37j2e84OdACA9A6+GcPyDQVTwiHGE7p0oChCMFPHkJGa5cvIQ93h
-APiHZbqNNakudnVURcxUEp7SYmSFPjPDkfZnZyH7yCHvM3/eCGdbTRLIM0aHzV0k
-KqKDMQ4hJ+mNFAd0dYbO0M737k8Q/7U4yKCCYb+ESFvDcyM8b3cdIk17qaA2Ub3A
-7aSkXG2t3xsXAVwzemTxLNZ3Hi8vw6LU9tXFR0Y3KUgea3vPq7Zr/XhysEVxlfTs
-/d0mZJLfh41loxaWLCE7r6CZL5xC1f41oCNgi70bVsuamYmyXvAb2HffYYLODC0A
-+r5aZY7ABsA1COpoDzDEzaRaThtLInh79zGdfMmH9bq5dcofIx0NUarvT60AbE3e
-leu+BS5OUOl3qoym3SPIZZp2acHgEdGxCLeRnmQ7kYPP0Zh9D7vFXiUdpI2LCnKD
-8KiIxbSAZrtHPrkijwCicQSYtMlOnM5c+wINbYzrS73N7qFyTne5qQ0gTwOdw+HM
-wrqVXYr0Us/8Bs44rdx8+122CUQt8uDt/1g6Hg4HxPfsANRwQV4DUE0VNfOB+Rpd
-QL9pwslIR5C4MUhcW5O3lOqW/kai7UDKrI3tbC1Iwqu6fxkGnZc=
-=bcSH
+klC4mw/3enD0tJDkh/0MFI8k/ZZhG67oRiLUhxUdw7WBOQfhFa1rE5KY1BLeGaM2
+O680YYLf046CKeHxvoATu0Slj8Rv+v8I4uUH3w7nlSD8Ud7GPmPgpDKiuB4wmWGx
+4qwIBXxNOA7m5udseBv/BaqIR/PrnHtrd6T3KPqMHyy33qXiSE1fUdqhYIrpAZGL
+2oBWiLWO0J7JTsOIA+jNzDmbJiO2Ot3RLSyVvVTNX+rEhARrmS9VerYyaA/sqoDz
+jrLPUhK0c9lGccPDKmFQwo7HFP3HxV5HM/DukTD6+pnt0wdIdbFNIPqmD1iDe4WU
+cWLQ6hjpCRZthPRs8x8Z3ZdQF8TIeQPENAqDso02sE5wVE1RcwxZKXEI82eBgha9
+/O+YXZwOV/sD97VE6sLNpdrLcydgo5IIldwipBLT1b6MiPe/ZufOUeSw8Q92z9PW
+rYiZens3puXi0U19yV8gRImjBAZGodUo28DxBuY90cZifx2xB3TvE4U1psJWEOOm
+6+b4j2nSiVXNV3EpB7lgHwHTFHpH+Av93anQkoMnl0xO6htHGzDmbHztmZZm0mPA
+pHXd0jE8BSK0znGKsj+u+ROnYylyZmOB12cagdsvuA01+raE+54BvQHk2/JQOmsj
+ye5GqzxzmcLovy917q9JvCPKbPMyYyaN5AAE65MDUEFhvdivrQ==
+=OiPY
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index cca64264a280a..fca98f812fb74 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 08bc9175a119e..087d0f8faa6ad 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/wildq/Manifest b/app-misc/wildq/Manifest
deleted file mode 100644
index 388979167348a..0000000000000
--- a/app-misc/wildq/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wildq-1.1.11.tar.gz 16753 BLAKE2B f95db636b989b4cf99c7612779c2b4f57f7dd5b185741be017a85de546cdc675592f8c846ff2aa15a8afc416e61f780c1682c956de7125e020666e83ea6a7818 SHA512 474869d13c33ae5b053d4f135a288e1a778f201471def20b0f95c5ab16152c828f77a730ed85a39e4f8619523f4685b6da89fb7954134fe2a10776255062b22d
-EBUILD wildq-1.1.11.ebuild 781 BLAKE2B 60cba40da3888fba90055fb7c79149c520f68e0104d20f1fa4126e3f5d86efdf6127da12b864d1c9b7356fc732b1f851a9e7f27078449b27fc9d05b658ecf320 SHA512 60d73d6e3614189a1a1c19a1f384933115d56d833bb9dd182fad5c8e2f9886dbfc26cc77ff84535eb05f9d40bef01cc3cb1e56cd858c07798ecfff30da382d72
-MISC metadata.xml 508 BLAKE2B 695a62ad87abc092ce1239c3af2330b947ed2a80ba004e01e3ec5fe126adbfa1b8a49dd3553a5854806b8a6e1b438032fcb26c3e8f9897d5449052f6a321d9c7 SHA512 b8024902371a1aae89e30f807edc2626520791f14f1f9a1d63e310bc491d7c13a49518fbade2dbeeecb592bb1c1550d6e4a8b0df9d792551b8c3e7e56defd1a7
diff --git a/app-misc/wildq/metadata.xml b/app-misc/wildq/metadata.xml
deleted file mode 100644
index 197807940e93f..0000000000000
--- a/app-misc/wildq/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="pypi">wildq</remote-id>
-		<remote-id type="github">ahmet2mir/wildq</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="hcl">HCL support via pyhcl</flag>
-		<flag name="toml">TOML support via pytoml</flag>
-		<flag name="xml">XML support via xmltodict</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-misc/wildq/wildq-1.1.11.ebuild b/app-misc/wildq/wildq-1.1.11.ebuild
deleted file mode 100644
index 2d5c72c8a2822..0000000000000
--- a/app-misc/wildq/wildq-1.1.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Command-line TOML/JSON/INI/YAML/XML processor using jq c bindings"
-HOMEPAGE="https://pypi.org/project/wildq/ https://github.com/ahmet2mir/wildq"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="hcl toml xml"
-RDEPEND="
-	dev-python/jq[${PYTHON_USEDEP}]
-	hcl? ( dev-python/pyhcl[${PYTHON_USEDEP}] )
-	toml? ( dev-python/toml[${PYTHON_USEDEP}] )
-	xml? ( dev-python/xmltodict[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	# Unpin install_requires versions.
-	sed -e "s|^\\([ []'[[:alnum:]]\+\\)>=[^']*|\\1|" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1568b73e3e738..fee9ab6ec7998 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
deleted file mode 100644
index f7aa4e5a205b7..0000000000000
--- a/dev-java/jython/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX CVE-2016-4000.patch 6415 BLAKE2B 4293384898752343d63986fa19c0d9bc49a336b05d690f3dbea9258e97248c094bb5ac2fb635cea6a05ced8bfc61389f2d7feeef4dcf587cc7a559e6943dd786 SHA512 8fef03e890e70a7a514a03e9b36c8b7b2ab744a7e7f53e9fbf970a2990553cdac9002cb6cdfd9a9fa0635d9bd231c41d98cdf0406889a162b9aa64c407a043f9
-AUX jython-2.5.2-distutils_scripts_location.patch 350 BLAKE2B 12eb41a3fa811643dcff99ba9736002321a8ca5ea4fde08e934ad851251f7b730e8b8f5c3449b6a4aeed8a9972c4590cde108d282840be912af6081a430d5099 SHA512 bf6e32641c539251550c979630311f0d3e4299fb1e4545d6c9fe18d42beace3959dadc22eff39ea53f20960889e19c73acb309414f007980909cf3a32a6b1b5d
-AUX jython-2.5.2-respect_PYTHONPATH.patch 551 BLAKE2B ad8bd92b7cad29074d837391c933a8db75376dab8d54c12138a4a94a278b50bb99b1c97276f226434a6cb686d5156d174d9792d3add2002175bd1b8ee395de98 SHA512 773d595fb05b687dfce63b3c2f67c663135d9faddd811c0d6939bbdd6da3e295f7ece9d913923205ca6fb433d90fd494bccafd8b421f14ced1e493a1a40682c7
-AUX jython-2.7.0-build.xml.patch 547 BLAKE2B 2c779ca1d6c99081bed511462130ccb01c704afd473e6ee5abe73d4f8404c21c70cc3376611076f6b32a6f379ea7233cc84439a7982607ac224557e505f99121 SHA512 d5a9cd75d99482996d3fd09b43c6becd2c45173e1a34116e74b43baba2235863eefbfd509bf714215bb311eb6f620d972249ad4593e067b91b5d7b88467f635a
-AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd6396c304ebe4d8dcddf8547a1464b56c947089cfff3a5b1f740f5cb8f3cfc26fcad1e3c94c0a0d45d8c92ed1bf2 SHA512 9d6888c0af9b0ca39f7e70c3aad868c17b65d2f703b1fcd05fb71fe0cc8a289ca055fadd878afdc7fd509e16099abb2ddf0de9053994010d09757f275d243c70
-AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
-AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
-DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r7.ebuild 4449 BLAKE2B 693cd28b66fdc95153c2b9197f3228598bd4176d5425d20fcb119990db039d6ce7751020fc09ddb9e27de05b8f2b505feb57bae14227f09849b7ec32d6e6c338 SHA512 ea98dad5c25a6f27a1ad0d9f9aaeb68a8a681fbec05e7a92a7ccdb5f9978b0b6df72b00d6c446d5c595416e9ee37f2438d4991993a0b61a46cab980d26b57525
-MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/files/CVE-2016-4000.patch b/dev-java/jython/files/CVE-2016-4000.patch
deleted file mode 100644
index 81785eb05b072..0000000000000
--- a/dev-java/jython/files/CVE-2016-4000.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-
-# HG changeset patch
-# User Jim Baker <jim.baker@rackspace.com>
-# Date 1454384221 25200
-# Node ID d06e29d100c04576735e86c75a26c5f33669bb72
-# Parent  b6735606c13df95f770527e629954407f82808c5
-Do not deserialize PyFunction objects. Fixes #2454
-
-Instead use standard Python pickling; or subclass PyFunction.
-
-diff --git a/Lib/test/test_java_integration.py b/Lib/test/test_java_integration.py
---- a/Lib/test/test_java_integration.py
-+++ b/Lib/test/test_java_integration.py
-@@ -14,8 +14,9 @@ import re
- from collections import deque
- from test import test_support
- 
--from java.lang import (ClassCastException, ExceptionInInitializerError, String, Runnable, System,
--        Runtime, Math, Byte)
-+from java.lang import (
-+    ClassCastException, ExceptionInInitializerError, UnsupportedOperationException,
-+    String, Runnable, System, Runtime, Math, Byte)
- from java.math import BigDecimal, BigInteger
- from java.net import URI
- from java.io import (ByteArrayInputStream, ByteArrayOutputStream, File, FileInputStream,
-@@ -656,13 +657,30 @@ class SerializationTest(unittest.TestCas
-         self.assertEqual(date_list, roundtrip_serialization(date_list))
- 
-     def test_java_serialization_pycode(self):
--
-         def universal_answer():
-             return 42
- 
-         serialized_code = roundtrip_serialization(universal_answer.func_code)
-         self.assertEqual(eval(serialized_code), universal_answer())
- 
-+    def test_java_serialization_pyfunction(self):
-+        # Not directly supported due to lack of general utility
-+        # (globals will usually be in the function object in
-+        # func_globals), and problems with unserialization
-+        # vulnerabilities. Users can always subclass from PyFunction
-+        # for specific cases, as seen in PyCascading
-+        import new
-+        def f():
-+            return 6 * 7 + max(0, 1, 2)
-+        # However, using the new module, it's possible to create a
-+        # function with no globals, which means the globals will come
-+        # from the current context
-+        g = new.function(f.func_code, {}, "g")
-+        # But still forbid Java deserialization of this function
-+        # object. Use pickling or other support instead.
-+        with self.assertRaises(UnsupportedOperationException):
-+            roundtrip_serialization(g)
-+
-     def test_builtin_names(self):
-         import __builtin__
-         names = [x for x in dir(__builtin__)]
-@@ -872,7 +890,7 @@ class SingleMethodInterfaceTest(unittest
-         future.get()
-         self.assertEqual(x, [42])
- 
--    @unittest.skip("FIXME: not working")
-+    @unittest.skip("FIXME: not working; see http://bugs.jython.org/issue2115")
-     def test_callable_object(self):
-         callable_obj = CallableObject()
-         future = self.executor.submit(callable_obj)
-diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py
---- a/Lib/test/test_new.py
-+++ b/Lib/test/test_new.py
-@@ -24,18 +24,10 @@ class NewTest(unittest.TestCase):
-         c = new.instance(C, {'yolks': 3})
- 
-         o = new.instance(C)
--
--        # __dict__ is a non dict mapping in Jython
--        if test_support.is_jython:
--            self.assertEqual(len(o.__dict__), 0, "new __dict__ should be empty")
--        else:
--            self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
-+        self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
-         del o
-         o = new.instance(C, None)
--        if test_support.is_jython:
--            self.assertEqual(len(o.__dict__), 0, "new __dict__ should be empty")
--        else:
--            self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
-+        self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
-         del o
- 
-         def break_yolks(self):
-@@ -109,7 +101,14 @@ class NewTest(unittest.TestCase):
-         test_closure(g, (1, 1), ValueError) # closure is wrong size
-         test_closure(f, g.func_closure, ValueError) # no closure needed
- 
--    if hasattr(new, 'code') and not test_support.is_jython:
-+    # [Obsolete] Note: Jython will never have new.code()
-+    #
-+    # Who said that?!!! guess what, we do! :)
-+    # 
-+    # Unfortunately we still need a way to compile to Python bytecode,
-+    # so support is still incomplete, as seen in the fact that we need
-+    # to get values from CPython 2.7.
-+    if hasattr(new, 'code'):
-         def test_code(self):
-             # bogus test of new.code()
-             def f(a): pass
-@@ -117,16 +116,16 @@ class NewTest(unittest.TestCase):
-             c = f.func_code
-             argcount = c.co_argcount
-             nlocals = c.co_nlocals
--            stacksize = c.co_stacksize
-+            stacksize = 1  # TODO c.co_stacksize
-             flags = c.co_flags
--            codestring = c.co_code
--            constants = c.co_consts
--            names = c.co_names
-+            codestring = 'd\x00\x00S'  # TODO c.co_code
-+            constants = (None,)  # TODO c.co_consts
-+            names = ()  # TODO c.co_names
-             varnames = c.co_varnames
-             filename = c.co_filename
-             name = c.co_name
-             firstlineno = c.co_firstlineno
--            lnotab = c.co_lnotab
-+            lnotab = '' # TODO c.co_lnotab, but also see http://bugs.jython.org/issue1638
-             freevars = c.co_freevars
-             cellvars = c.co_cellvars
- 
-diff --git a/src/org/python/core/PyBytecode.java b/src/org/python/core/PyBytecode.java
---- a/src/org/python/core/PyBytecode.java
-+++ b/src/org/python/core/PyBytecode.java
-@@ -66,6 +66,12 @@ public class PyBytecode extends PyBaseCo
- 
-         debug = defaultDebug;
- 
-+        if (argcount < 0) {
-+            throw Py.ValueError("code: argcount must not be negative");
-+        } else if (nlocals < 0) {
-+            throw Py.ValueError("code: nlocals must not be negative");
-+        }
-+
-         co_argcount = nargs = argcount;
-         co_varnames = varnames;
-         co_nlocals = nlocals; // maybe assert = varnames.length;
-diff --git a/src/org/python/core/PyFunction.java b/src/org/python/core/PyFunction.java
---- a/src/org/python/core/PyFunction.java
-+++ b/src/org/python/core/PyFunction.java
-@@ -545,6 +545,9 @@ public class PyFunction extends PyObject
-     @Override
-     public boolean isSequenceType() { return false; }
- 
-+    private Object readResolve() {
-+        throw new UnsupportedOperationException();
-+    }
- 
-     /* Traverseproc implementation */
-     @Override
-
diff --git a/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch b/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
deleted file mode 100644
index fc9a95be89f9a..0000000000000
--- a/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Lib/distutils/command/install.py
-+++ b/Lib/distutils/command/install.py
-@@ -70,7 +70,7 @@
-         'purelib': '$base/Lib/site-packages',
-         'platlib': '$base/Lib/site-packages',
-         'headers': '$base/Include/$dist_name',
--        'scripts': '$base/bin',
-+        'scripts': '/usr/bin',
-         'data'   : '$base',
-         }
-     }
diff --git a/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch b/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
deleted file mode 100644
index e695122ba1d6c..0000000000000
--- a/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/org/python/core/PySystemState.java
-+++ b/src/org/python/core/PySystemState.java
-@@ -646,6 +646,12 @@
-             if (jythonpath != null) {
-                 registry.setProperty("python.path", jythonpath);
-             }
-+            else {
-+                jythonpath = System.getenv("PYTHONPATH");
-+                if (jythonpath != null) {
-+                    registry.setProperty("python.path", jythonpath);
-+                }
-+            }
-         } catch (SecurityException e) {
-         }
-         registry.putAll(postProperties);
diff --git a/dev-java/jython/files/jython-2.7.0-build.xml.patch b/dev-java/jython/files/jython-2.7.0-build.xml.patch
deleted file mode 100644
index 1f0be614dbe58..0000000000000
--- a/dev-java/jython/files/jython-2.7.0-build.xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.xml.orig	2015-06-27 16:12:08.442000000 +0000
-+++ b/build.xml	2015-06-27 16:12:15.684000000 +0000
-@@ -448,7 +448,7 @@
-     </target>
- 
-     <target name="antlr_gen" depends="prepare-output" unless="antlr.notneeded">
--        <java classname="org.antlr.Tool" failonerror="true" fork="true" dir="${jython.base.dir}">
-+        <java classname="org.antlr.Tool" failonerror="false" fork="true" dir="${jython.base.dir}">
-             <jvmarg value="-Xmx512m"/>
-             <arg value="-Xconversiontimeout"/>
-             <arg value="2000"/>
diff --git a/dev-java/jython/files/jython-2.7_beta1-ant.patch b/dev-java/jython/files/jython-2.7_beta1-ant.patch
deleted file mode 100644
index c86cae894a928..0000000000000
--- a/dev-java/jython/files/jython-2.7_beta1-ant.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- jython-2.7-b1-sources/build.xml
-+++ jython-2.7-b1-sources/build.xml
-@@ -508,6 +509,7 @@
-         </javac>
- 
-         <!-- java files used by tests -->
-+<!--
-         <javac srcdir="${test.source.dir}"
-                destdir="${compile.dir}"
-                target="${jdk.target.version}"
-@@ -529,6 +531,7 @@
-             <compilerarg line="${javac.Xlint}"/>
-             <classpath refid="test.classpath" />
-         </javac>
-+-->
-         <copy file="${source.dir}/org/python/modules/ucnhash.dat"
-               todir="${compile.dir}/org/python/modules"
-               preservelastmodified="true" />
-@@ -826,9 +829,6 @@
- 
-     <target name="copy-javalib" unless="full-build">
-         <copy todir="${dist.dir}/javalib">
--            <fileset dir="${jython.base.dir}/extlibs">
--                <exclude name="profile.properties"/>
--            </fileset>
-             <fileset dir="${work.dir}/build">
-                 <include name="*.jar"/>
-                 <include name="*.properties"/>
diff --git a/dev-java/jython/files/jython-2.7_beta1-dont-always-recompile-classes.patch b/dev-java/jython/files/jython-2.7_beta1-dont-always-recompile-classes.patch
deleted file mode 100644
index 326ef7f62afaa..0000000000000
--- a/dev-java/jython/files/jython-2.7_beta1-dont-always-recompile-classes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/org/python/core/imp.java
-+++ b/src/org/python/core/imp.java
-@@ -228,7 +228,7 @@
-         }
-         if (testing && mtime != NO_MTIME) {
-             long time = ar.getMTime();
--            if (mtime != time) {
-+            if (mtime < time) {
-                 return null;
-             }
-         }
diff --git a/dev-java/jython/files/jython-2.7_beta2-maxrepeat-import.patch b/dev-java/jython/files/jython-2.7_beta2-maxrepeat-import.patch
deleted file mode 100644
index 944bb195cb384..0000000000000
--- a/dev-java/jython/files/jython-2.7_beta2-maxrepeat-import.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r 035eded55c4d lib-python/2.7/sre_constants.py
---- a/lib-python/2.7/sre_constants.py	Wed Apr 16 18:30:13 2014 -0600
-+++ b/lib-python/2.7/sre_constants.py	Fri Jul 25 10:31:27 2014 -0700
-@@ -15,7 +15,11 @@
- 
- MAGIC = 20031017
- 
--from _sre import MAXREPEAT
-+try:
-+    from _sre import MAXREPEAT
-+except ImportError:
-+    import _sre
-+    MAXREPEAT = _sre.MAXREPEAT = 65535
- 
- # SRE standard exception (access as sre.error)
- # should this really be here?
diff --git a/dev-java/jython/jython-2.7.0-r7.ebuild b/dev-java/jython/jython-2.7.0-r7.ebuild
deleted file mode 100644
index b05f5ed59d82d..0000000000000
--- a/dev-java/jython/jython-2.7.0-r7.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.python:jython:2.7.0"
-
-inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="https://www.jython.org"
-SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
-	dev-java/netty:0
-	dev-java/asm:9
-	dev-java/commons-compress:0
-	dev-java/guava:0
-	dev-java/jffi:1.3
-	dev-java/jline:2
-	dev-java/icu4j:70
-	dev-java/jnr-constants:0
-	dev-java/jnr-posix:3.0
-	dev-java/jnr-netdb:1.0
-	dev-java/stringtemplate:0
-	dev-java/xerces:2
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/ant-core:0
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit:0
-	)"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to CDEPEND if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
-	"${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
-	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
-	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
-	"${FILESDIR}"/CVE-2016-4000.patch
-)
-
-src_prepare() {
-	default
-
-	find \( -name '*.jar' -o -name '*.class' \
-		-o -name '*.pyc' -o -name '*.exe' \) -delete
-
-	# needed for launchertest
-	chmod +x tests/shell/test-jython.sh || die
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=833785
-	sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \
-		-i src/org/python/core/Py{,BaseCode,Unicode}.java || die
-
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	# apparently this can cause problems
-	append-flags -fno-stack-protector
-
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local instdir=/usr/share/${PN}-${SLOT}
-
-	java-pkg_newjar dist/${PN}-dev.jar
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto ${instdir}
-	doins -r dist/{Lib,registry}
-
-	dodoc ACKNOWLEDGMENTS NEWS README.txt
-
-	use doc && java-pkg_dohtml -r dist/Doc/javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples Demo/*
-
-	local java_args=(
-		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
-		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
-		-Dpython.cachedir="\${HOME}/.jythoncachedir"
-	)
-
-	java-pkg_dolauncher jython${SLOT} \
-		--main org.python.util.jython \
-		--java_args "${java_args[*]}"
-
-	# we need a wrapper to help python_optimize
-	cat <<-EOF > "${T}"/jython
-		exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
-			-Dpython.home="${ED}${instdir}" \
-			-Dpython.cachedir="${T}/.jythoncachedir" \
-			-Duser.home="${T}" \
-			org.python.util.jython "\${@}"
-	EOF
-	chmod +x "${T}"/jython || die
-
-	local -x PYTHON="${T}"/jython
-	# we can't get the path from the interpreter since it does some
-	# magic that fails on non-installed copy...
-	_python_export jython${SLOT} EPYTHON
-
-	# compile tests (everything else is compiled already)
-	# we're keeping it quiet since jython reports errors verbosely
-	# and some of the tests are supposed to trigger compile errors
-	python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
-	# for python-exec
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
-	python_domodule epython.py
-
-	# some of the class files end up with newer timestamps than the files they
-	# were generated from, make sure this doesn't happen
-	find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
deleted file mode 100644
index 917ad960b7155..0000000000000
--- a/dev-java/jython/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">jython</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bf6e3ddba2e8c..475cc218d9bdc 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
deleted file mode 100644
index 300496a764f39..0000000000000
--- a/dev-python/cbor/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cbor-1.0.0.Fix-broken-test_sortkeys.patch 1621 BLAKE2B 37336807f72b9bef9be366d875efee4fc3b79ce233e8bd8268c39421e123f41f09601c7a41ad3e2f3b04904dc0927ace8e7ef6321d25f7de320cea9ab0af9485 SHA512 d2eb200eafec051ad9eeaba63210732a226d45e06e98c0d90f605e0171ae185f592772a6fa2bd1572d1cfca0ebeade2415a2d516a80c161ebeb0cc3376067770
-AUX cbor-1.0.0.Replace-deprecated-logger.warn.patch 4012 BLAKE2B 443f5a7bf3b30b8b3b313321c01cf48ffb09326f38f524c45dc2cf33de497097d8276f7f4add58b981fac6a6322c8ae5e0919ba854912af3babe4906bb4a4be9 SHA512 02b8bae3c269808884d9c6f23e3ff429f6e11b6ed3d41da0f2e2c3f69569af434aacd9e6c9115c65869b499c32d7cddc20de5a721d89ea7e7ed9c669348ed276
-AUX cbor-1.0.0.zero-length-bytes.patch 361 BLAKE2B 5422309b2a1f40e6553107380548396cceaf142f09eaa776d415690e71bbd5c7d6899a2c38e43ee479a539995e4c1a3816467d19a9ecfdf084915a6047f20e4e SHA512 cc1d11a5e8169271d3a35a41f850e62de8ebab0d3e2e23e480c3aef08c2a77a4670173523564c8c3abb3f021565acc088ecc3a0e4957c0ccf4a7e0a41c7aeddf
-DIST cbor-1.0.0.gh.tar.gz 25541 BLAKE2B dc5491235fee79ad15a8b92aafef2a690a407dfb98792e88b2e87fa7c354277b997ac314dc38279168f50c52f922de4bfe330b860126d4c5b836c019b05a1aee SHA512 88471b1c9c9a4128a4098194e17a4322ea2a01624ae1ffa9c33e433da31a089c45f4b64472d36620797488a451c16771c213b2b9a9ab711232c6658da4cd310f
-EBUILD cbor-1.0.0-r2.ebuild 1287 BLAKE2B f3bf948955514cf6cda6be13061c759e380f5a369bb61257143778487e7d52d134cc584fa545d1783be340b7bfd254ab7b9fa23115a9b24af674bcfcb90177ec SHA512 78e0e95beaaba82a057e852dd09d6e112101c317cd64699f1943dd0f57b4812df65c717883a557dc2937454db9f2b149fe7ec2ce36123714754a25a11e6cf804
-MISC metadata.xml 1000 BLAKE2B f6af9b2fd8f354501011d173d163451a85c9b314aeb9bf0649317cbce451ede698ae753170dfed8d1aab145d9a5d42ed53ef1d1ef7a78e78bd9f139b8749a20a SHA512 f4e4ba5ca5720f19ea9d70d8dd3a397b95308e35770ec0056f070f76b7ecc73ddd592ed9ecba24cefd5b32f7fede650c2515a35b14c3e1ec623aa87913dfb9cd
diff --git a/dev-python/cbor/cbor-1.0.0-r2.ebuild b/dev-python/cbor/cbor-1.0.0-r2.ebuild
deleted file mode 100644
index b6e1bf2033036..0000000000000
--- a/dev-python/cbor/cbor-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/brianolson/cbor_py/
-	https://pypi.org/project/cbor/
-"
-SRC_URI="
-	https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-
-# upstream PR: https://github.com/brianolson/cbor_py/pull/19
-# upstream PR: https://github.com/brianolson/cbor_py/pull/11
-PATCHES=(
-	"${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
-	"${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
-	"${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
-)
-
-python_test() {
-	"${EPYTHON}" cbor/tests/test_cbor.py    || die "Testsuite failed under ${EPYTHON}"
-	"${EPYTHON}" cbor/tests/test_objects.py || die "Testsuite failed under ${EPYTHON}"
-	"${EPYTHON}" cbor/tests/test_usage.py   || die "Testsuite failed under ${EPYTHON}"
-	"${EPYTHON}" cbor/tests/test_vectors.py || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch b/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
deleted file mode 100644
index e7867d12cc292..0000000000000
--- a/dev-python/cbor/files/cbor-1.0.0.Fix-broken-test_sortkeys.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 348041c3ff7104ca5b30e518beb2d2b86bf7bd73 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sun, 19 Jul 2020 16:31:42 -0700
-Subject: [PATCH] Fix issue #6 broken test_sortkeys()
-
-Newer python dictionaries are keeping the order the keys were added in.
-As a result since both lists were pre-sorted and identicle so the later 
-test failed to find any differences causing the failure.
-This change introduces 3 entries that are out of sorted order for both 
-the obytes and xbytes lists.  This ensures a valid test of sorting.
----
- cbor/tests/test_cbor.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
-index 78b3ddb..6ce068b 100644
---- a/cbor/tests/test_cbor.py
-+++ b/cbor/tests/test_cbor.py
-@@ -281,6 +281,10 @@ class XTestCBOR(object):
-         xbytes = []
-         for n in _range(2, 27):
-             ob = {u'{:02x}'.format(x):x for x in _range(n)}
-+            # ensure some "ob" have unsorted key:value entries
-+            if n in [4, 6, 9]:
-+                ob.pop('01')
-+                ob["01"] = 1
-             obytes.append(self.dumps(ob, sort_keys=True))
-             xbytes.append(self.dumps(ob, sort_keys=False))
-         allOGood = True
---- a/setup.py	2016-02-09 15:10:34.000000000 -0800
-+++ b/setup.py	2020-07-19 13:46:18.586936516 -0700
-@@ -75,7 +75,7 @@
-     author='Brian Olson',
-     author_email='bolson@bolson.org',
-     url='https://bitbucket.org/bodhisnarkva/cbor',
--    packages=['cbor'],
-+    packages=['cbor', 'cbor/tests'],
-     package_dir={'cbor':'cbor'},
-     ext_modules=[
-         Extension(
---
-libgit2 1.0.1
-
diff --git a/dev-python/cbor/files/cbor-1.0.0.Replace-deprecated-logger.warn.patch b/dev-python/cbor/files/cbor-1.0.0.Replace-deprecated-logger.warn.patch
deleted file mode 100644
index 66b712b0e40d1..0000000000000
--- a/dev-python/cbor/files/cbor-1.0.0.Replace-deprecated-logger.warn.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From eea2e6c35c0962ca559a96f37ab4eada126da5de Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sun, 19 Jul 2020 17:56:19 -0700
-Subject: [PATCH] Replace deprecated logger.warn() with logger.warning()
-
----
- cbor/tests/test_cbor.py    |  4 ++--
- cbor/tests/test_usage.py   | 10 +++++-----
- cbor/tests/test_vectors.py |  2 +-
- 4 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/cbor/tests/test_cbor.py b/cbor/tests/test_cbor.py
-index 78b3ddb..14ddf69 100644
---- a/cbor/tests/test_cbor.py
-+++ b/cbor/tests/test_cbor.py
-@@ -27,7 +27,7 @@ try:
-     from cbor._cbor import load as cload
- except ImportError:
-     # still test what we can without C fast mode
--    logger.warn('testing without C accelerated CBOR', exc_info=True)
-+    logger.warning('testing without C accelerated CBOR', exc_info=True)
-     cdumps, cloads, cdump, cload = None, None, None, None
- 
- 
-@@ -62,7 +62,7 @@ class TestRoot(object):
-     def testable(cls):
-         ok = (cls._ld[0] is not None) and (cls._ld[1] is not None) and (cls._ld[3] is not None) and (cls._ld[4] is not None)
-         if not ok:
--            logger.warn('non-testable case %s skipped', cls.__name__)
-+            logger.warning('non-testable case %s skipped', cls.__name__)
-         return ok
- 
- # Can't set class level function pointers, because then they expect a
-diff --git a/cbor/tests/test_usage.py b/cbor/tests/test_usage.py
-index d72f2e8..9d7e6a1 100644
---- a/cbor/tests/test_usage.py
-+++ b/cbor/tests/test_usage.py
-@@ -22,7 +22,7 @@ try:
-     from cbor._cbor import load as cload
- except ImportError:
-     # still test what we can without C fast mode
--    logger.warn('testing without C accelerated CBOR', exc_info=True)
-+    logger.warning('testing without C accelerated CBOR', exc_info=True)
-     cdumps, cloads, cdump, cload = None, None, None, None
- 
- 
-@@ -48,7 +48,7 @@ class TestUsage(unittest.TestCase):
-         repeatedly serialize, check that usage doesn't go up
-         '''
-         if cdumps is None:
--            logger.warn('no C dumps(), skipping test_dumps_usage')
-+            logger.warning('no C dumps(), skipping test_dumps_usage')
-             return
-         start_usage = resource.getrusage(resource.RUSAGE_SELF)
-         usage_history = [start_usage]
-@@ -76,7 +76,7 @@ class TestUsage(unittest.TestCase):
-         repeatedly serialize, check that usage doesn't go up
-         '''
-         if (cdumps is None) or (cloads is None):
--            logger.warn('no C fast CBOR, skipping test_loads_usage')
-+            logger.warning('no C fast CBOR, skipping test_loads_usage')
-             return
-         ## Just a string passes!
-         #ob = 'sntaoheusnatoheusnaotehuasnoetuhaosentuhaoesnth'
-@@ -113,7 +113,7 @@ class TestUsage(unittest.TestCase):
-         it, checking usage all along the way.
-         '''
-         if cdump is None:
--            logger.warn('no C dump(), skipping test_tempfile')
-+            logger.warning('no C dump(), skipping test_tempfile')
-             return
-         with tempfile.NamedTemporaryFile() as ntf:
-             # first, write a bunch to temp file
-@@ -168,7 +168,7 @@ class TestUsage(unittest.TestCase):
-     def test_stringio_usage(self):
-         '''serialize data to StringIO, read it back'''
-         if cdump is None:
--            logger.warn('no C dump(), skipping test_tempfile')
-+            logger.warning('no C dump(), skipping test_tempfile')
-             return
- 
-         # warmup the rusage, allocate everything!
-diff --git a/cbor/tests/test_vectors.py b/cbor/tests/test_vectors.py
-index f4d8ca9..afed311 100644
---- a/cbor/tests/test_vectors.py
-+++ b/cbor/tests/test_vectors.py
-@@ -27,7 +27,7 @@ try:
-     from cbor._cbor import loads as cloads
- except ImportError:
-     # still test what we can without C fast mode
--    logger.warn('testing without C accelerated CBOR', exc_info=True)
-+    logger.warning('testing without C accelerated CBOR', exc_info=True)
-     #cdumps, cloads = None, None
-     cloads = None
- from cbor import Tag
---
-libgit2 1.0.1
-
diff --git a/dev-python/cbor/files/cbor-1.0.0.zero-length-bytes.patch b/dev-python/cbor/files/cbor-1.0.0.zero-length-bytes.patch
deleted file mode 100644
index f508b86a0668f..0000000000000
--- a/dev-python/cbor/files/cbor-1.0.0.zero-length-bytes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cbor/cbor.py	2020-07-19 13:24:39.497775767 -0700
-+++ b/cbor/cbor.py	2020-07-19 13:24:39.497775767 -0700
-@@ -260,6 +260,8 @@
-     """
-     if data is None:
-         raise ValueError("got None for buffer to decode in loads")
-+    elif data == b'':
-+        raise ValueError("got zero length string loads")
-     fp = StringIO(data)
-     return _loads(fp)[0]
diff --git a/dev-python/cbor/metadata.xml b/dev-python/cbor/metadata.xml
deleted file mode 100644
index 314bf8c357fe1..0000000000000
--- a/dev-python/cbor/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>bolson@bolson.org</email>
-			<name>Brian Olson</name>
-		</maintainer>
-		<remote-id type="pypi">cbor</remote-id>
-		<remote-id type="github">brianolson/cbor_py</remote-id>
-	</upstream>
-	<longdescription>An implementation of RFC 7049 - Concise Binary Object
-		Representation (CBOR).  CBOR is comparable to JSON, has a superset of
-		JSON's ability, but serializes to a binary format which is smaller and
-		faster to generate and parse.  The two primary functions are
-		cbor.loads() and cbor.dumps().  This library includes a C implementation
-		which runs 3-5 times faster than the Python standard library's
-		C-accelerated implementanion of JSON. This is also includes a 100%
-		Python implementation.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b73749c576189..0f5ab10987e2d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/allison/Manifest b/dev-ruby/allison/Manifest
deleted file mode 100644
index 12a8de577b2cd..0000000000000
--- a/dev-ruby/allison/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST allison-2.0.3.gem 31232 BLAKE2B d112edc2bf5a50d5b861043e567779b07b213d6f19fb6a6f3b88ba95bb123a01256b3b9b9931e6b5ff30bf7c293c804f0faef0b07d0e0d1bdbbcaf531884b19a SHA512 988ed7f244c8b4fc9f629ef2b37a0ad851d9587f688e834041624cc92d8549e403545b83eb270b127e634c99f91ff8b53d2642df73dbfafe20aa41718b97ee5d
-EBUILD allison-2.0.3-r4.ebuild 563 BLAKE2B 6743dd61e865ccd4bdebfee29bdc8cc2c0bb34ab13a8fd53580c353f2da35067240ae8e3dbde5f81fc6f33d928106f3d15ebaf800e1f0bdb0df40214d2eb4ebd SHA512 6e1017ffcfb9cecf31af47e3aad49ba3a16161a2b1be8a14b53ce361d7948da584d20d2159299773cf27757e3f0d4ddd007bd3af032dee4a6b8de2ab236c4014
-MISC metadata.xml 322 BLAKE2B 8bb753283b83bb81fae285c8dce7be78d2c8738b057b961828330ac4795df3c43eb3bdc4fe0432d9a30e72f685cabcc7f756ecdfa45fb99c7cdc56fb5a9d584a SHA512 e9b0224a614fc868a660c64894ebed56c2039293537c1d9e3aaa8b5383dd59406259e31dc6ffe501801957dd5d59638e04ddde6945f86488c251595dc08f7a4d
diff --git a/dev-ruby/allison/allison-2.0.3-r4.ebuild b/dev-ruby/allison/allison-2.0.3-r4.ebuild
deleted file mode 100644
index 122772a4e9fe5..0000000000000
--- a/dev-ruby/allison/allison-2.0.3-r4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-RUBY_FAKEGEM_EXTRAINSTALL="cache"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modern, pretty RDoc template"
-HOMEPAGE="https://github.com/evan/allison"
-
-LICENSE="AFL-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-solaris"
-IUSE=""
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r contrib
-}
diff --git a/dev-ruby/allison/metadata.xml b/dev-ruby/allison/metadata.xml
deleted file mode 100644
index d76e100c9878a..0000000000000
--- a/dev-ruby/allison/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">evan/allison</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 617fd6fe47f39..b653befd46936 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/font-bitstream-speedo/Manifest b/media-fonts/font-bitstream-speedo/Manifest
deleted file mode 100644
index 2e051ac4f836a..0000000000000
--- a/media-fonts/font-bitstream-speedo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST font-bitstream-speedo-1.0.2.tar.bz2 415776 BLAKE2B c9dd88ed2e7e4a4151254ffadf5254aaf460bf72086a798bbb946a3729be4795a477cced5441792e0d6967e6faf4ddcf72a212ec31b5641b5b67357d659b26e8 SHA512 78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb
-EBUILD font-bitstream-speedo-1.0.2-r2.ebuild 295 BLAKE2B 332d92a4be6356aa5156c7dad7076d113bc4facb9a466602bb40b088a8bb711cb29a14c541e8910d8d994ba8ad7818e5e8b54a5403380b0f879f5bcac5017e1a SHA512 e09faa5ba05da04e293be0484be1bab009c7dc9a0aeeba8f234863149d386cc12eff463aa2fee61e87024db93080f0c41e39539affd9ae8bc1defb7b8ec4a7c7
-MISC metadata.xml 348 BLAKE2B 283de69ff593efbc995f4ead5d447084dee5850ef8d50094ca37b200b65d4d4211cc5ab6e66bfe0dcd72766364a9b93f06a002884de890defe067215916af033 SHA512 67682249c5ad3f27906e52a7209ffc35009e6a66b551a6769b99244ee3acdc7933b9c796276a48422a42032d7f498c7ab60b42383e1b8cee4630a2429003fbc2
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
deleted file mode 100644
index a355fa88cfc0b..0000000000000
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-XORG_PACKAGE_NAME="bitstream-speedo"
-inherit xorg-3
-
-DESCRIPTION="Bitstream Speedo fonts"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-speedo/metadata.xml b/media-fonts/font-bitstream-speedo/metadata.xml
deleted file mode 100644
index e216a4fa8a9cd..0000000000000
--- a/media-fonts/font-bitstream-speedo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>x11@gentoo.org</email>
-    <name>X11</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="freedesktop-gitlab">xorg/font/bitstream-speedo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/metadata/.checksum-test-marker b/metadata/.checksum-test-marker
index b3dc253d0d34b..64bdd12f16ca1 100644
--- a/metadata/.checksum-test-marker
+++ b/metadata/.checksum-test-marker
@@ -1,4 +1,4 @@
-1683799825 Thu May 11 10:10:25 AM UTC 2023
+1683801626 Thu May 11 10:40:26 AM UTC 2023
 # Testcase for mirror network:
 # Watch the value over a day, if unchanging then
 # one or more mirrors is missing --checksum
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 08590b5e472d7..ccba11d0cf11c 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8d68cfb51d412..cc2c26b2d00b4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 11 May 2023 10:09:50 +0000
+Thu, 11 May 2023 10:39:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6063e693cc509..b3f7cc97314aa 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-11T10:09:54Z
+TIMESTAMP 2023-05-11T10:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRcvvJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRcxfhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWeQ//V1F3WvTE7sY4mdCtKmGeSwnp+M7+s1bVQ+bOxEv3OxbTMp1ZFsBiiaf5
-93OE6L8BrQdcst/s2VswJTrE4xyArkH92EdnfwpG3LhhQ+SM9zHncw3Uu8rt4UvZ
-/yi/v1VQK4uoXhlnYjg+dZ1oN9bUNIg4cJy71YX/fdauNXY9pravBAXKEZclYd4a
-Vx7FghMtRIAoM/uc3ru7mqxbkdDdykvVoKv3/F9JKiAfNq8/tjD3v0Ki3DGmj7xU
-2vqoU76EG7SCsM/nashNc32FffGFrY/SYzfxs38XHKMQfzlDHv5VgYc0QFfPVGl/
-4wiU7oZw/XHLEXNR4KTEzZQLSmIiC4i4HQ0/asNdVnWnk3V3uoHsH9EtPqd/6FL7
-NaCyHG4z/7RKUd9GcqRsVMwBXDCc4+wO12IxyrTKf35nnapBCYivyeaHj6nuiLri
-tyGZESqlrwMHNA24n4fjB4KMgN1gYmqgFM672KsH6RxXSfyIknmLxokS+mI7uqSB
-hbZ443XNcieWb77Zhwill9qUsSCf834iNNHmZEHSdJNCHyH6BQTipmyNsL8OwBtQ
-UjJmLmY/GVvFl6g7Myl1Y3/eIBbhGO35ZgWnB12BJ5OBPyQuw7XYU7Z9wt7q0vY5
-HtiiKLua2FqQlaCnOxuhaD/0m+2JpK+E+mTPxjCit4uP/B2EGdY=
-=2CFn
+klBlwhAAnPPuoPXsyHuaMUja29RTiq4VgszIN4c+tWtClJDDy8S+So0VT/tuYOm+
+MiZtVQWhuCTR1X0ZrLks95lM9HIcHJpOuUn3hpHeSYksXZZ20e5VgbP+w9K/oopx
+0Lr62phdcbVJ7rfq5dTlknbr10n6bJiNqdzrK8QnjekQs6PHFKj1WtxQYF4u7cdy
+iidN3gdBr4xXJxReG6Bm0s1aTg8IFwRERK/0jRLVjLfnZVDdRP/cWs7EFJ5ceqIR
+XUIbhUWmGzbutk8KImAjnZ9u7pu/Zq4/hjGinVs/DnTgtWXlpEhvQTKGYVKP5ttd
+dh2AT/VO9zYo7G2QXEiqb6RMxjJaB8cIH9l2viDESgt9ntT+cvYDTG6A7ERjla44
+lqyvu2+MQ/iqQwVGV08OsMcIzG3d8d17lAiWUHGDFgxOEECPSi4YqCPFA6l8dKnt
+84YF8Ze6XGmnCghdNl3vivuJWPQPbm82trZJ8POxKDAc2r3pw0DKiH3vWgV1fut/
+a1yH9fbFxlu14+MvXj4KYXNYFk6BGyTXcAfnMECPVZGfqGlJNCtDkZ9A3NjTDW5q
+vHMRymBh+jM5xI069oyv6iYhpYR1t+hNTbELxKFlnFkje0MHLkHSx8kDGWtHHXvI
+mreBrPoorKqcgkGJCT4xH/hRYCOMjauJK15/J34FEteZMBla1FU=
+=gOw2
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8d68cfb51d412..cc2c26b2d00b4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 11 May 2023 10:09:50 +0000
+Thu, 11 May 2023 10:39:49 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6adb09a3c4752..aef5198701f8e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 24cb30559c8cc..97f4d4a7218da 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/wildq-1.1.11 b/metadata/md5-cache/app-misc/wildq-1.1.11
deleted file mode 100644
index ba94e4a0476af..0000000000000
--- a/metadata/md5-cache/app-misc/wildq-1.1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command-line TOML/JSON/INI/YAML/XML processor using jq c bindings
-EAPI=7
-HOMEPAGE=https://pypi.org/project/wildq/ https://github.com/ahmet2mir/wildq
-INHERIT=distutils-r1 pypi
-IUSE=hcl toml xml python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/jq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] hcl? ( dev-python/pyhcl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) toml? ( dev-python/toml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xml? ( dev-python/xmltodict[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/w/wildq/wildq-1.1.11.tar.gz
-_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=94f4b3724f913bf0d50b5991e9e3904c
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index a1f8efad597a8..b24a7fd6817e5 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r7 b/metadata/md5-cache/dev-java/jython-2.7.0-r7
deleted file mode 100644
index d3314877813e6..0000000000000
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/antlr:3 dev-java/netty:0 dev-java/asm:9 dev-java/commons-compress:0 dev-java/guava:0 dev-java/jffi:1.3 dev-java/jline:2 dev-java/icu4j:70 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/servlet-api:3.0 >=virtual/jdk-1.8:* dev-java/ant-core:0 test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An implementation of Python written in Java
-EAPI=8
-HOMEPAGE=https://www.jython.org
-INHERIT=java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-IUSE=examples test doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=dev-java/antlr:3 dev-java/netty:0 dev-java/asm:9 dev-java/commons-compress:0 dev-java/guava:0 dev-java/jffi:1.3 dev-java/jline:2 dev-java/icu4j:70 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2.7
-SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e3ca957bdc1f3bb24b7c7d9575fe9e8d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d3bfd04192e38..e58cabf29dc7c 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/cbor-1.0.0-r2 b/metadata/md5-cache/dev-python/cbor-1.0.0-r2
deleted file mode 100644
index 817f29df37db7..0000000000000
--- a/metadata/md5-cache/dev-python/cbor-1.0.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=RFC 7049 - Concise Binary Object Representation
-EAPI=8
-HOMEPAGE=https://github.com/brianolson/cbor_py/ https://pypi.org/project/cbor/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/brianolson/cbor_py/archive/b3af679e7cf3e12d50acb83c3c591fc5db9a658d.tar.gz -> cbor-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f8591e132e7a1f4098e8f7cc7023091a
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 4b1843e66275c..b2606305775d1 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r4 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r4
deleted file mode 100644
index a353d037ba922..0000000000000
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A modern, pretty RDoc template
-EAPI=8
-HOMEPAGE=https://github.com/evan/allison
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 test
-KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-solaris
-LICENSE=AFL-3.0
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/allison-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	104e1332efb829e2f7cbf89307a474f1	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=85f4e7cc4a7822c3cc354e5c9afb86ea
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index a0769b3c23f29..338498139d125 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r2 b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r2
deleted file mode 100644
index 0ec22e5f1acf1..0000000000000
--- a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
-DESCRIPTION=Bitstream Speedo fonts
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-speedo
-INHERIT=xorg-3
-IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-speedo-1.0.2.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=a02ea762267438ac89a5fa7a5a2011dd
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 63347302b2438..5d3ee470b3e11 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1 b/metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1
deleted file mode 100644
index 4583977ad77a0..0000000000000
--- a/metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=configure install postinst postrm preinst prepare pretend setup unpack
-DESCRIPTION=Unofficial electron-based wrapper around WhatsApp Web
-EAPI=8
-HOMEPAGE=https://github.com/diospiroverde/WazzApp
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=chromium-2 desktop rpm xdg
-IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
-RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://lx-dynamics.com/wazzapp-0.4.2.x86_64.rpm
-_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a9b0648642287856d4d2e73c6c2282da
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index db82c9cfa8bc3..c3f17068a9555 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libdmx-1.1.4 b/metadata/md5-cache/x11-libs/libdmx-1.1.4
deleted file mode 100644
index d593412e0b7eb..0000000000000
--- a/metadata/md5-cache/x11-libs/libdmx-1.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext
-DESCRIPTION=X.Org dmx library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libdmx
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libdmx-1.1.4.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=df7d80d7e7823d6fa1830f52cd4e1466
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index ddac0823a4b8c..c1ec0381d8574 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.20.1 b/metadata/md5-cache/x11-wm/i3-gaps-4.20.1
deleted file mode 100644
index d851bfedd8c17..0000000000000
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.20.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/asciidoc app-text/xmlto dev-lang/perl virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl:= x11-libs/cairo[X,xcb(+)] x11-libs/libxcb:=[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm test? ( dev-perl/ExtUtils-PkgConfig dev-perl/IPC-Run dev-perl/Inline dev-perl/Inline-C dev-perl/X11-XCB dev-perl/XS-Object-Magic x11-apps/xhost x11-base/xorg-server[xephyr,xvfb] x11-misc/xvfb-run )
-DESCRIPTION=i3 fork with gaps and some more features
-EAPI=8
-HOMEPAGE=https://github.com/Airblader/i3
-INHERIT=meson optfeature
-IUSE=doc test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl:= x11-libs/cairo[X,xcb(+)] x11-libs/libxcb:=[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS !x11-wm/i3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Airblader/i3/archive/4.20.1.tar.gz -> i3-gaps-4.20.1.tar.gz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b839c83d3dc6bde4444b8416dd81c6f8
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.21-r2 b/metadata/md5-cache/x11-wm/i3-gaps-4.21-r2
deleted file mode 100644
index 3b6a93665b608..0000000000000
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.21-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/asciidoc app-text/xmlto dev-lang/perl virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre2 dev-libs/yajl:= x11-libs/cairo[X,xcb(+)] x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm test? ( dev-perl/ExtUtils-PkgConfig dev-perl/IPC-Run dev-perl/Inline dev-perl/Inline-C dev-perl/X11-XCB dev-perl/XS-Object-Magic x11-apps/xhost x11-base/xorg-server[xephyr,xvfb] x11-misc/xvfb-run )
-DESCRIPTION=i3 fork with gaps and some more features
-EAPI=8
-HOMEPAGE=https://github.com/Airblader/i3
-INHERIT=meson optfeature
-IUSE=doc test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre2 dev-libs/yajl:= x11-libs/cairo[X,xcb(+)] x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS !x11-wm/i3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Airblader/i3/archive/4.21.tar.gz -> i3-gaps-4.21.tar.gz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c36e4590178d26afad3887bcf2407989
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.21.1 b/metadata/md5-cache/x11-wm/i3-gaps-4.21.1
deleted file mode 100644
index 71c26256502b4..0000000000000
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.21.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/asciidoc app-text/xmlto dev-lang/perl virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre2 dev-libs/yajl:= x11-libs/cairo[X,xcb(+)] x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm test? ( dev-perl/ExtUtils-PkgConfig dev-perl/IPC-Run dev-perl/Inline dev-perl/Inline-C dev-perl/X11-XCB dev-perl/XS-Object-Magic x11-apps/xhost x11-base/xorg-server[xephyr,xvfb] x11-misc/xvfb-run )
-DESCRIPTION=i3 fork with gaps and some more features
-EAPI=8
-HOMEPAGE=https://github.com/Airblader/i3
-INHERIT=meson optfeature
-IUSE=doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre2 dev-libs/yajl:= x11-libs/cairo[X,xcb(+)] x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS !x11-wm/i3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Airblader/i3/archive/4.21.1.tar.gz -> i3-gaps-4.21.1.tar.gz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=610203970c4e19471d0e86171b155093
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 34222205ae85a..2a2b541a848c2 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-05-11T10:09:54Z
+TIMESTAMP 2023-05-11T10:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRcvvJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRcxfhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCZSA//dPsdgVyxbYSjEW52TbBwgoBabf+5g52GXBLtq50NlrY6sEN58MbTWMKN
-pOJfhs9Ey0mwFPUGJX67y71hn4abdf6nigKQf5LRkYgbLNdSog36HEb9HXLY3Oaf
-rBOm1NOz24TpqXOMHHY9+T0WgTFzsX5QkSgrhpWdWnLdPdTeuK4CD41EPIEBS89l
-KumDmML8BpnRMLzzxbDYVWmlZuc2cXF/CpksimFmxzQFksObb9JcTpKO4e/Nma2s
-wM73QriyBN+CGZBPziCehYnBt2NABA8e5tIG9oolJZm58huKLMD5/cw4L5P6p1/C
-fYuQ+AzRwIGxVoE9Iwqt/TPAsfaoBezOmTVDkyx/kd99LfxCLRotCG0OxvAN/vps
-9C3H2e554LOUap0z+C6BX6Bha7kppdd/frFt7/EfSnSBi60D+M27wlXjw6NEt7bW
-wGjbIXrwYk0deVOfNEEvZH2jXAIJxXNR4Q5HuINxZRfM/v9orhqdqjLaexBro5NK
-W6fHYlubqaPzWuNPVNh4yP9QljBC8pm45N1DE8uSpATiQZAF2xh+BYMCwtJ/i7av
-FHfxiVuU2QyRFbwL6nwbFWnVjd81l60p3NkY8pfpkC6dDriS4lLFPa7Ktix9bNV6
-Mu/OthFdUgwqi0Z/GTkEvLP4pmHBn9lG0SVqMM7oCDNbA0jF9gE=
-=mGHV
+klCw9hAAog/u3mdZqmfe9LKfnRWkJXh0zxQyZwke/7QLLIclU1sFVscukvUvExug
+e2+aW7Z5AW3HbWaRYaSBVIpO1Yw8c9PD9HHQEeYrT84o6hPcMlEgDKFQ3n4yJaHI
+TbeavdAA2C/q+sEhWCxjxT76me8ny56JQH+3/UhwT4fmdmGn0sqNnRH0SOU4EVUh
+zIOP/grGA5IycZ6z83hcNFmMBRajdkt4CTPfJPDK3rDY8gNE/BBmkts/nHg7x5GJ
+fNKZ5BtM9uRj7Cg9L0BvzmwXQ8Zppdbo2XM94ZOi9m58IMNhU/QSyZ79owqKXw8V
+CiFOhRiMPTkS4xw8db61IlK5xsUUxbqCKid7vNvVw3MpeZFVfb2r1a1CAX877X6E
+ElIgdQNpJUIblhcDydKH8zYhp6VV9XxWgGXMNC5/z3JHSQ6XzjePDlc2cy6tCGkA
+PaV2WGVOFQfsJt8PaRfNZV555iLUj+OIF+9kjP5r54e+CLMLwIZiVCVMsT24LMWf
+j3kdZIkd+/er/8ZOPJ+IrrDinCNIsVgVD1uswZ2wEqrl67vxgGEwgdo+vsKe3sUk
+k7XO7jtelV3lmKWU2dJVKkFfZ5f33y7bb3xjMDFtpGu34vL9RuLm/nJV0qyN2VLP
+ooEmUXjL9UWAmg2MxpsJAaxGz4l0YQYBtn8Kd6CylcRxfeYXmms=
+=U35K
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8d68cfb51d412..cc2c26b2d00b4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 11 May 2023 10:09:50 +0000
+Thu, 11 May 2023 10:39:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 37b5c88b5f4ef..1ebd4fc563146 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu May 11 10:09:50 AM UTC 2023
+Thu May 11 10:39:49 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index cd3d11b0912dd..1bf38cb1f7a5b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 11 May 2023 10:15:01 +0000
+Thu, 11 May 2023 10:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9c54666e598f0..6cb10b3d4e11a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-da74874ef7c78c28eda99726795d46f1f0c3cf0d 1683797025 2023-05-11T09:23:45+00:00
+2005202a3e292bd1487aa766712adea6359aa649 1683799949 2023-05-11T10:12:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f90c96c2b5512..72df1a64160bc 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1683799801 Thu 11 May 2023 10:10:01 AM UTC
+1683801602 Thu 11 May 2023 10:40:02 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8d68cfb51d412..cc2c26b2d00b4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 11 May 2023 10:09:50 +0000
+Thu, 11 May 2023 10:39:49 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 464894c07de0a..2c4a92d127e96 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/wazzapp-bin/Manifest b/net-im/wazzapp-bin/Manifest
deleted file mode 100644
index 8e3ed1c25a793..0000000000000
--- a/net-im/wazzapp-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wazzapp-0.4.2.x86_64.rpm 56402809 BLAKE2B 11a6f8db4fe91014218b09992e1e3fa36819eb73efc9081ef56af5e6aa5b0dbee78e8974eca86b28701160eb823ae58350f9da4c6d5c0e1826ee95a7ea413a55 SHA512 808fa3721d62def5d93b4b3411f1f7489d22d5c70af07174b41579263d562bb139e951434a211c36e08e7c672925f89e60eb7fdb1d79148c3adc1a9c7beafad7
-EBUILD wazzapp-bin-0.4.2-r1.ebuild 2398 BLAKE2B 2d20bb7cb3f749cb950912e380166694f4b3557fdc2f88407bdbaebeeba4368213a9601a8692af6ea412beae52f81d201105194c19cf50938c438f7490048d2e SHA512 30a5749ef2063370c8606f36bd56a2738966d2eef9c7dea1d02c313df180208e4e196e32d7df30803f368bfca7e5515639b3717106bb7a7dad59c0305000ef3f
-MISC metadata.xml 414 BLAKE2B 9dff28d8ba0b8447b16c0c53f3e9511528e6365b0a628192cd7ef39378e93911d7a10a0753105d679ac6a9c5eae0807ea8ea66589ed45931b3827ecb8535a5e2 SHA512 c52dfd6e0a67fcf96565a746878a48876e8e55af5e2dde074cc0c1986fe6f1c70909b72cabe8100378a7cdbfe2e610a37b19c1d8b986429ad45124bc6fd323d0
diff --git a/net-im/wazzapp-bin/metadata.xml b/net-im/wazzapp-bin/metadata.xml
deleted file mode 100644
index 2b6f2305c1f44..0000000000000
--- a/net-im/wazzapp-bin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="github">diospiroverde/WazzApp</remote-id>
-		<bugs-to>https://github.com/diospiroverde/WazzApp/issues</bugs-to>
-	</upstream>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild b/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild
deleted file mode 100644
index 3bc82dffd99c1..0000000000000
--- a/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
-	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk vi zh-CN zh-TW
-"
-
-inherit chromium-2 desktop rpm xdg
-
-DESCRIPTION="Unofficial electron-based wrapper around WhatsApp Web"
-HOMEPAGE="https://github.com/diospiroverde/WazzApp"
-SRC_URI="https://lx-dynamics.com/wazzapp-${PV}.x86_64.rpm"
-S="${WORKDIR}"
-
-KEYWORDS="-* ~amd64"
-# Electron bundles a bunch of things
-LICENSE="
-	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
-	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
-"
-SLOT="0"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango
-"
-
-QA_PREBUILT="opt/wazzapp/*"
-
-pkg_pretend() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	default
-	# Fix desktop file to pass validation
-	sed -i -e '/MimeType=whatsapp/d' usr/share/applications/wazzapp.desktop || die
-	# cleanup languages
-	pushd "opt/wazzapp/locales" || die
-	chromium_remove_language_paks
-	popd || die
-}
-
-src_configure() {
-	chromium_suid_sandbox_check_kernel_config
-	default
-}
-
-src_install() {
-	for size in {64,128,512}; do
-		doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/wazzapp.png"
-	done
-
-	domenu usr/share/applications/wazzapp.desktop
-
-	local DESTDIR="/opt/wazzapp"
-	pushd "opt/wazzapp" || die
-
-	exeinto "${DESTDIR}"
-	doexe chrome-sandbox wazzapp *.so*
-
-	exeinto "${DESTDIR}/swiftshader"
-	doexe swiftshader/*.so*
-
-	insinto "${DESTDIR}"
-	doins *.pak *.bin *.json *.dat
-	insopts -m0755
-	doins -r locales resources
-
-	# Chrome-sandbox requires the setuid bit to be specifically set.
-	# see https://github.com/electron/electron/issues/17972
-	fperms 4755 "${DESTDIR}"/chrome-sandbox
-
-	dosym "${DESTDIR}"/wazzapp /opt/bin/wazzapp
-	popd || die
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 37ceb18d26ad8..8693ca452a479 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 08b67561ef356..5c433abc63900 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -253,20 +253,6 @@ x11-plugins/ascpu
 # Mask experimental software
 =mail-mta/postfix-3.9*
 
-# Matt Turner <mattst88@gentoo.org> (2023-04-10)
-# DMX support was dropped from the Xserver in v21.1.0 and had been broken for
-# 14 years previous to its removal. See
-# https://cgit.freedesktop.org/xorg/xserver/commit/?id=b3b81c8c2090cd49410960a021baf0d27fdd2ab3
-# Removal on 2023-05-10
-x11-libs/libdmx
-
-# Matt Turner <mattst88@gentoo.org> (2023-04-10)
-# speedo support was dropped from libXfont ~14 years ago. See
-# https://www.x.org/wiki/DeprecatedInX11R7/
-# https://gitlab.freedesktop.org/xorg/lib/libxfont/-/commit/85b66b8a7f3095f10437c8ecb3dcbfe68c9cfced
-# Removal on 2023-05-10
-media-fonts/font-bitstream-speedo
-
 # Ulrich Müller <ulm@gentoo.org> (2023-04-10)
 # Pretest versions, masked for testing.
 <app-editors/emacs-29.0.9999:29-vcs
@@ -279,42 +265,6 @@ dev-lang/ruby:2.7
 =dev-ruby/rubygems-3.1.6
 =dev-ruby/contracts-0.16.1
 
-# Michał Górny <mgorny@gentoo.org> (2023-04-10)
-# Last release in 2016, carries a few patches already.  No revdeps.
-# dev-python/cbor2 is a more modern replacement.
-# Removal on 2023-05-10.  Bug #903261.
-dev-python/cbor
-
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-04-09)
-# Archived upstream, better alternatives available, try:
-# - net-im/whatsapp-desktop-bin (another electron based approach)
-# - net-im/whatsie (a simple yet configurable Qt based app)
-# - net-im/whatsapp-for-linux::guru (a simple app using webkit2gtk)
-# Removal on 2023-05-09
-net-im/wazzapp-bin
-
-# John Helmert III <ajak@gentoo.org> (2023-04-08)
-# i3-gaps has been meregd into upstream i3. Use x11-wm/i3 instead.
-# See also: https://github.com/i3/i3/issues/3724
-# Removal on 2023-05-08.
-x11-wm/i3-gaps
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-04-09)
-# Numerous vulnerabilities, bug #825486.
-# Nothing depends on it. Removal on 2023-05-09
-dev-java/jython
-
-# Hans de Graaff <graaff@gentoo.org> (2023-04-08)
-# Last release in 2008. Upstream is gone. No reverse dependencies. No tests.
-# Removal on 2023-05-08
-dev-ruby/allison
-
-# Michał Górny <mgorny@gentoo.org> (2023-04-07)
-# No Python 3.11 support and the ebuild is not running the test suite.
-# Still uses deprecated dev-python/toml (upstream).  No revdeps.
-# Removal on 2023-05-07.  Bug #878655.
-app-misc/wildq
-
 # Ionen Wolkens <ionen@gentoo.org> (2023-03-30)
 # NVIDIA dropped support for the 390.xx branch in December 2022[1].
 #
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 917d329c9fb85..756bd3a7253a3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -955,9 +955,6 @@ app-misc/vifm:developer - Enable features of interest to developers
 app-misc/vifm:extended-keys - Support for extended keys (arrows, home etc)
 app-misc/vifm:gtk - Use gtk+ to determine mimetypes
 app-misc/vifm:vim - Install the vifm vim plugin and vim-compatible documentation
-app-misc/wildq:hcl - HCL support via pyhcl
-app-misc/wildq:toml - TOML support via pytoml
-app-misc/wildq:xml - XML support via xmltodict
 app-misc/worker:avfs - Enable support for sys-fs/avfs
 app-mobilephone/gammu:curl - Enables curl support
 app-mobilephone/gammu:irda - Enables infrared support
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6cb5677908363..dcfd15ea8cd31 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
deleted file mode 100644
index 73ed8840a16ce..0000000000000
--- a/x11-libs/libdmx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9
-EBUILD libdmx-1.1.4.ebuild 341 BLAKE2B b24d159442a65c919df0ad2cd1d79e99d62e5f0ae3babba2069591ec6d19ab4c0a825dbafad3f335dc915835c9913adb636c0240ef3c2c766041be534c97dafa SHA512 a123d9ed2c4b5ca2091479263c10102482a051d59992de5e8879d59897dff77fa1cd3e8c841076ebae4a8fd1e1b2b4c5265585fbe57e5f708704a2ccf36963a4
-MISC metadata.xml 337 BLAKE2B 6c8050807b6714769b4eab4d1fcc01f1638013cf423649c666ba1e6a389036344bd3601d033944df276014111124a9eff7d20c63e296cbca0bfe38e7dd1a9f10 SHA512 0867b8808e33e09a0c747fc9ebd68bd7c11cc75e888446e59ea93663939bc83a918c7258970db2ff6d76e9ab315f99bb707014307744e6df21d13a3e5a2b3ae4
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
deleted file mode 100644
index ebf1983140f99..0000000000000
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org dmx library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdmx/metadata.xml b/x11-libs/libdmx/metadata.xml
deleted file mode 100644
index 17329a8ba1b10..0000000000000
--- a/x11-libs/libdmx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>x11@gentoo.org</email>
-    <name>X11</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="freedesktop-gitlab">xorg/lib/libdmx</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 57f5e0dbe94c8..1aa851d51fcc8 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
deleted file mode 100644
index 40d39e2e50218..0000000000000
--- a/x11-wm/i3-gaps/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX i3-gaps-4.18-musl.patch 2157 BLAKE2B 4fef024279d11e996c5c204f27b5a8b9fb654b392aeef19b92d5c3f9dfb203290fad7c31c003a046ee91c1201d940f3050a950721da8f58bdfd75495cb9be05c SHA512 14f70f067679b952e1ffc1965ea460173799292a33b5df6d3b2ca2c091219d6cd1f14b2d41b187452a83923b5b34cabe218ecb6fa70702accbef7562dd01f021
-DIST i3-gaps-4.20.1.tar.gz 4199697 BLAKE2B b9297f95d8e29f6bcc2fa89ba99c30bd9c4df3549de8b4eff018c0ad1e39e1c5a89281e5a0994596b6af08e8bdf94b8df866667042023dc757fa2596770484be SHA512 0f3cab505f5dcd11d4d9ab63aa84d7d90e63ffebe6a867c9592c7979fe57d37db69869d555ea2127b84caa108778a028e03fa8fab1432d897c02723e3c83e6ba
-DIST i3-gaps-4.21.1.tar.gz 4214689 BLAKE2B 5194a9b148c9909834f70c6cc3aaf771682bf0f1874358ef8c54004fa62fa4a648ccbf42c7e122a8f1d2769773efb3a39378a426506bff59400258ca0d485687 SHA512 9ef5bd2b658609907b0f76894508fdf2f9b94b85e5d211489f7b4bf7d98e8a66a670a040c8770f85795d929c8e07239cacc50082c6044ee78cf51633a78b4ce4
-DIST i3-gaps-4.21.tar.gz 4212229 BLAKE2B ee871dcb374d3dadbcf3c1b4be230be9b608902c2cc9923a635d2fb8f3896e01361b270c09ec69d5a0bddd4b53181db8e6545346a03a30df53d6dccf6b990514 SHA512 5bf423977a92e8d428eb13019bd683948584c876429290b17e118135e8d9cc16545dd62ee07befd54adfc0f3dba3c0f7748e58e3fe4f3aa484e3f00a9af75a16
-EBUILD i3-gaps-4.20.1.ebuild 1733 BLAKE2B 6c20c7e5d109d486727097152c20e17a57b8766f5c4c3a91632040473319a47fb226134e4dadc8d40620852d458f8abed2b817877c6390cab32d0fa8c75cb885 SHA512 e51d871f0c1c329e6ca700358390669a63e827206365c9f3351fdc811a16b2758d90008366500e73a113f5e8b42763a1a2e86ffd1d8a088bb76c5a01b21ef6e2
-EBUILD i3-gaps-4.21-r2.ebuild 1729 BLAKE2B 3ba94132f2f172f3781800198d6bb55a4be853523c64db496f4cac6c8f44958fcb26588f8f5062e1624da808842f67f2ade9074683a067e1d1f326f9ebf4a2aa SHA512 1c7a38be5b32f33244dc5f6d1471cda2ad8dd6915d7494a7cb4a2f9b55b29c69e853903ef89e16699aa96e261b617e1bb7abeea99a5f8239532b3bf6b8a6e0a6
-EBUILD i3-gaps-4.21.1.ebuild 1731 BLAKE2B 517d13683be5497093af57fe541d39933773435288f67d192254940c1072b14a473e029eed3817e2bad9019b069f7874130610a442ae5420e069fb2c7a38d5f7 SHA512 f4954258f89ad64f8d3f4313f529277ce18a0e3a0e07c94129cdcd0ecac731ee82344125df0260cab257776ac70f549491b7c2125b90598adfefdf70bdf41ff6
-MISC metadata.xml 325 BLAKE2B 9ba8b18821fde643863d03bd1550bb4bf6fb2f69b7fcd427eed48887573ace9d3c387e1444717e071eddee3dd89d48f04075b87926403f2ddab72111d46130c0 SHA512 5a69d3ad5248c785f1bb53e6817277e4fc4bf7ceda661ccf497271df05ea930a6f8581681f9a3b6f48a9b0bc7b905904b5b8940f1a0454dd086611486649bed1
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch
deleted file mode 100644
index bf59b32e3f704..0000000000000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/i3bar/src/main.c
-+++ b/i3bar/src/main.c
-@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
-  *
-  */
- static char *expand_path(char *path) {
--    static glob_t globbuf;
--    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
--        ELOG("glob() failed\n");
--        exit(EXIT_FAILURE);
-+    char *home, *expanded;
-+
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-+        }
-     }
--    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
--    globfree(&globbuf);
--    return result;
-+
-+    return sstrdup(path);
- }
- 
- static void print_usage(char *elf_name) {
---- a/libi3/resolve_tilde.c
-+++ b/libi3/resolve_tilde.c
-@@ -19,28 +19,18 @@
-  *
-  */
- char *resolve_tilde(const char *path) {
--    static glob_t globbuf;
--    char *head, *tail, *result;
-+    char *home, *expanded;
- 
--    tail = strchr(path, '/');
--    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
--
--    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
--    free(head);
--    /* no match, or many wildcard matches are bad */
--    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
--        result = sstrdup(path);
--    else if (res != 0) {
--        err(EXIT_FAILURE, "glob() failed");
--    } else {
--        head = globbuf.gl_pathv[0];
--        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
--        strcpy(result, head);
--        if (tail) {
--            strcat(result, tail);
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-         }
-     }
--    globfree(&globbuf);
- 
--    return result;
-+    return sstrdup(path);
- }
--- 
-2.27.0
-
diff --git a/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild
deleted file mode 100644
index db94abcd1d57c..0000000000000
--- a/x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3"
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/i3-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-libs/glib:2
-	dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl:=
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb:=[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/IPC-Run
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/X11-XCB
-		dev-perl/XS-Object-Magic
-		x11-apps/xhost
-		x11-base/xorg-server[xephyr,xvfb]
-		x11-misc/xvfb-run
-	)"
-BDEPEND="app-text/asciidoc
-	app-text/xmlto
-	dev-lang/perl
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-	!x11-wm/i3"
-
-DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.18-musl.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="/usr/share/doc/${PF}"
-		-Ddocs=$(usex doc true false)
-		-Dmans=true
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	newexe - i3wm <<- EOF
-		#!/usr/bin/env sh
-		exec /usr/bin/i3
-	EOF
-}
-
-pkg_postinst() {
-	optfeature "Application launcher" x11-misc/dmenu
-	optfeature "Simple screen locker" x11-misc/i3lock
-	optfeature "Status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/i3-gaps/i3-gaps-4.21-r2.ebuild b/x11-wm/i3-gaps/i3-gaps-4.21-r2.ebuild
deleted file mode 100644
index c0089941c8380..0000000000000
--- a/x11-wm/i3-gaps/i3-gaps-4.21-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3"
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/i3-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-libs/glib:2
-	dev-libs/libev
-	dev-libs/libpcre2
-	dev-libs/yajl:=
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/IPC-Run
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/X11-XCB
-		dev-perl/XS-Object-Magic
-		x11-apps/xhost
-		x11-base/xorg-server[xephyr,xvfb]
-		x11-misc/xvfb-run
-	)"
-BDEPEND="app-text/asciidoc
-	app-text/xmlto
-	dev-lang/perl
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-	!x11-wm/i3"
-
-DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.18-musl.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="/usr/share/doc/${PF}"
-		-Ddocs=$(usex doc true false)
-		-Dmans=true
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	newexe - i3wm <<- EOF
-		#!/usr/bin/env sh
-		exec /usr/bin/i3
-	EOF
-}
-
-pkg_postinst() {
-	optfeature "Application launcher" x11-misc/dmenu
-	optfeature "Simple screen locker" x11-misc/i3lock
-	optfeature "Status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/i3-gaps/i3-gaps-4.21.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.21.1.ebuild
deleted file mode 100644
index c4a28a87b33fa..0000000000000
--- a/x11-wm/i3-gaps/i3-gaps-4.21.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3"
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/i3-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-libs/glib:2
-	dev-libs/libev
-	dev-libs/libpcre2
-	dev-libs/yajl:=
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/IPC-Run
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/X11-XCB
-		dev-perl/XS-Object-Magic
-		x11-apps/xhost
-		x11-base/xorg-server[xephyr,xvfb]
-		x11-misc/xvfb-run
-	)"
-BDEPEND="app-text/asciidoc
-	app-text/xmlto
-	dev-lang/perl
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-	!x11-wm/i3"
-
-DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.18-musl.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="/usr/share/doc/${PF}"
-		-Ddocs=$(usex doc true false)
-		-Dmans=true
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	newexe - i3wm <<- EOF
-		#!/usr/bin/env sh
-		exec /usr/bin/i3
-	EOF
-}
-
-pkg_postinst() {
-	optfeature "Application launcher" x11-misc/dmenu
-	optfeature "Simple screen locker" x11-misc/i3lock
-	optfeature "Status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/i3-gaps/metadata.xml b/x11-wm/i3-gaps/metadata.xml
deleted file mode 100644
index 5cae6b57b8d31..0000000000000
--- a/x11-wm/i3-gaps/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ajak@gentoo.org</email>
-		<name>John Helmert III</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Airblader/i3</remote-id>
-	</upstream>
-</pkgmetadata>