gentoo auto-resync : 10:05:2024 - 00:01:13

16 files changed, 762 insertions, 391 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 124ab2a73c65..1374d7d3b1b9 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 5311e507d99b..59d8777854fe 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,5 +1,7 @@
+AUX httpie-3.2.1-pytest-fixtures.patch 19140 BLAKE2B df54635098d0da8b9b8c37dd4a144caf330f6ca9ca657de90ea510f91498735700b84b6ce48d91ff1ed88eecfa0d80a0ac626d2d8384a8ac68d9a7303d048509 SHA512 b881cefb48079ffa5ee0450e591185e15bf9052ecd16ccce7a5faddc7cc4cc9cf3f73cfcdde8dca129969b182086a2c1d867669261f91196df4318aae466a7b0
 AUX httpie-urllib3-2-fixes.patch 1852 BLAKE2B 8298b18a64e0fc99f422d5c3260ca9b567de08f9cc7b0d2cb0c20ba675a717dd1e4cff03bc036beead71f58426153e2b040fea06e4383df768d004afdbd807e7 SHA512 c926450b4ef43274e0e70b51605ff020ccf82a0704d86814590cbe40db5ea1329ec357b7f630f860b09549f76a34211c3799956b67d8f2f0db51ad14c1ba53b9
 DIST httpie-3.2.1.gh.tar.gz 1276550 BLAKE2B 627aa3db762e9e407f882be2c4267f5227301b189695537e7ac69ff140d6d39292251e131f9b9e7761e904a736d112bb4c1f5c6708c1468c6309474ee8c140b6 SHA512 ffcf6050138c49d5acb01f214d9b3fee6c78502c4c6dc45a295bafc88aafd1789f97a69c922f6e093fb48a402c1f83a7fff5307849130df81c4bcb2d595a03bf
-EBUILD httpie-3.2.1-r1.ebuild 1199 BLAKE2B cc2325459fd6bfc94cccf18f4a33ef762009ddfeb2c23cde5af7ccf7785873e0cc0ef41e77ad85c8ddc30bbc1296d117b50edf2c997a6ca4e40a4fbda8dbda45 SHA512 b46af54de9bddeffb4649418342710e6324dfa4ea2ef6638caa07bc58f7aff809d8246475b57375fabaee2fb65118cf4964068d16be30d064bf20ac4a204267e
+DIST httpie-3.2.2.gh.tar.gz 1279161 BLAKE2B aa5df73acbbe635fbfd3db458a2289042091a27d7b1791e9739874c1882e436814f74eec2b695f8acd76f9b9dd210f43dd9f8b7c0feea0cf4782b30f0e53b91a SHA512 5e95eba5a5ca8017dfd76ace525c57d2931d8918d51e84e8744eb9393cda5ae8e6cd6a1455c4aa82e50fa35edc35468a8b3582169c8f94858e61b09548cfa13d
 EBUILD httpie-3.2.1-r2.ebuild 1255 BLAKE2B 760084b16fbcd95341e67b24db2919dc84d75e20063fee3793245fc659a18bf816d64348a12aefa22f843d40e216da69588cdde8736f74b4c1b724c128e19502 SHA512 b984af94d3104df7956ede9485f563f23ef8835d50d0524de632f12b02ca2429ba4c2ba587c7023d82538fad3428b0103e9fca623e5ae0bfbc9ad9a3f9bd7d70
+EBUILD httpie-3.2.2.ebuild 3086 BLAKE2B bed66cc50988b57f716ffa0e9770f6398aa305730e77542e566efebf4b500a39f00349831943c63ee5576751d5105b62f7fadc9e305078c7def12e7b46b63dd6 SHA512 17a0f0fb01c191fc5730f8e7684545a95c47b50ed106af2e3d54ca5170c21daad7407e201530acefc7111a5761930202e7c874b4b3491e0c8baaf51638b43725
 MISC metadata.xml 933 BLAKE2B a0e1a09be17802bd416493a82c30eeef966985e7e9dd75a0c00de03d36b90b52883cf274d5257f62e2881fad6c8505cfefe47394c2796b97c9973e8a82fd2598 SHA512 dcb5b425e423af7fe38f82f5f32d2cce740789e2f7cae1dbc32a0cf46b6cd1be107fbe9fffa139f9a699042681bdd37a0fa7141fcf8b991cdea8991ed89a694c
diff --git a/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch b/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch
new file mode 100644
index 000000000000..be3dc48d16b7
--- /dev/null
+++ b/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch
@@ -0,0 +1,599 @@
+https://github.com/httpie/cli/commit/3524ccf0baa9f2b3029368ab07ba5f64e62dcb1f
+https://github.com/httpie/cli/commit/db16bbee961ceb93b7831fe1ec44a72d56a33e38
+
+From 3524ccf0baa9f2b3029368ab07ba5f64e62dcb1f Mon Sep 17 00:00:00 2001
+From: Jakub Roztocil <jakub@roztocil.co>
+Date: Mon, 4 Mar 2024 16:27:52 +0100
+Subject: [PATCH] Drop dependency on the abandoned python-lazy-fixture
+
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,6 @@
+ tests_require = [
+     'pytest',
+     'pytest-httpbin>=0.0.6',
+-    'pytest-lazy-fixture>=0.0.6',
+     'responses',
+     'pytest-mock',
+     'werkzeug<2.1.0'
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -3,14 +3,14 @@
+ import pytest
+ from pytest_httpbin import certs
+ 
+-from .utils import ( # noqa
++from .utils import (  # noqa
+     HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN,
+     HTTPBIN_WITH_CHUNKED_SUPPORT,
+     REMOTE_HTTPBIN_DOMAIN,
+     IS_PYOPENSSL,
+     mock_env
+ )
+-from .utils.plugins_cli import ( # noqa
++from .utils.plugins_cli import (  # noqa
+     broken_plugin,
+     dummy_plugin,
+     dummy_plugins,
+@@ -18,7 +18,9 @@
+     httpie_plugins_success,
+     interface,
+ )
+-from .utils.http_server import http_server, localhost_http_server # noqa
++from .utils.http_server import http_server, localhost_http_server  # noqa
++# noinspection PyUnresolvedReferences
++from .fixtures import pytest_lazy_fixture
+ 
+ 
+ @pytest.fixture(scope='function', autouse=True)
+--- /dev/null
++++ b/tests/fixtures/pytest_lazy_fixture.py
+@@ -0,0 +1,99 @@
++"""
++Replacement for the abandoned `pytest.lazy_fixture` <https://github.com/TvoroG/pytest-lazy-fixture>
++
++Based on <https://github.com/TvoroG/pytest-lazy-fixture/issues/65#issuecomment-1914581161>
++
++"""
++import dataclasses
++import typing
++
++import pytest
++
++
++@dataclasses.dataclass
++class LazyFixture:
++    """Lazy fixture dataclass."""
++
++    name: str
++
++
++def lazy_fixture(name: str) -> LazyFixture:
++    """Mark a fixture as lazy."""
++    return LazyFixture(name)
++
++
++# NOTE: Mimic the original API
++pytest.lazy_fixture = lazy_fixture
++
++
++def is_lazy_fixture(value: object) -> bool:
++    """Check whether a value is a lazy fixture."""
++    return isinstance(value, LazyFixture)
++
++
++def pytest_make_parametrize_id(
++    config: pytest.Config,
++    val: object,
++    argname: str,
++) -> str | None:
++    """Inject lazy fixture parametrized id.
++
++    Reference:
++    - https://bit.ly/48Off6r
++
++    Args:
++        config (pytest.Config): pytest configuration.
++        value (object): fixture value.
++        argname (str): automatic parameter name.
++
++    Returns:
++        str: new parameter id.
++    """
++    if is_lazy_fixture(val):
++        return typing.cast(LazyFixture, val).name
++    return None
++
++
++@pytest.hookimpl(tryfirst=True)
++def pytest_fixture_setup(
++    fixturedef: pytest.FixtureDef,
++    request: pytest.FixtureRequest,
++) -> object | None:
++    """Lazy fixture setup hook.
++
++    This hook will never take over a fixture setup but just simply will
++    try to resolve recursively any lazy fixture found in request.param.
++
++    Reference:
++    - https://bit.ly/3SyvsXJ
++
++    Args:
++        fixturedef (pytest.FixtureDef): fixture definition object.
++        request (pytest.FixtureRequest): fixture request object.
++
++    Returns:
++        object | None: fixture value or None otherwise.
++    """
++    if hasattr(request, "param") and request.param:
++        request.param = _resolve_lazy_fixture(request.param, request)
++    return None
++
++
++def _resolve_lazy_fixture(__val: object, request: pytest.FixtureRequest) -> object:
++    """Lazy fixture resolver.
++
++    Args:
++        __val (object): fixture value object.
++        request (pytest.FixtureRequest): pytest fixture request object.
++
++    Returns:
++        object: resolved fixture value.
++    """
++    if isinstance(__val, list | tuple):
++        return tuple(_resolve_lazy_fixture(v, request) for v in __val)
++    if isinstance(__val, typing.Mapping):
++        return {k: _resolve_lazy_fixture(v, request) for k, v in __val.items()}
++    if not is_lazy_fixture(__val):
++        return __val
++    lazy_obj = typing.cast(LazyFixture, __val)
++    return request.getfixturevalue(lazy_obj.name)
+
+From db16bbee961ceb93b7831fe1ec44a72d56a33e38 Mon Sep 17 00:00:00 2001
+From: Jakub Roztocil <jakub@roztocil.co>
+Date: Mon, 4 Mar 2024 18:05:26 +0100
+Subject: [PATCH] Drop dependency on the abandoned python-lazy-fixture II.
+
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -2,6 +2,7 @@
+ 
+ import pytest
+ from pytest_httpbin import certs
++from pytest_httpbin.serve import Server as PyTestHttpBinServer
+ 
+ from .utils import (  # noqa
+     HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN,
+@@ -19,8 +20,10 @@
+     interface,
+ )
+ from .utils.http_server import http_server, localhost_http_server  # noqa
+-# noinspection PyUnresolvedReferences
+-from .fixtures import pytest_lazy_fixture
++
++
++# Patch to support `url = str(server)` in addition to `url = server + '/foo'`.
++PyTestHttpBinServer.__str__ = lambda self: self.url
+ 
+ 
+ @pytest.fixture(scope='function', autouse=True)
+@@ -72,8 +75,15 @@ def _remote_httpbin_available():
+ 
+ @pytest.fixture
+ def remote_httpbin(_remote_httpbin_available):
++
+     if _remote_httpbin_available:
+-        return 'http://' + REMOTE_HTTPBIN_DOMAIN
++        class Server(str):
++            """Look like `pytest_httpbin.serve.Server` but only provide URL info."""
++            @property
++            def url(self):
++                return self
++
++        return Server('http://' + REMOTE_HTTPBIN_DOMAIN)
+     pytest.skip(f'{REMOTE_HTTPBIN_DOMAIN} not resolvable')
+ 
+ 
+--- a/tests/fixtures/pytest_lazy_fixture.py
++++ /dev/null
+@@ -1,99 +0,0 @@
+-"""
+-Replacement for the abandoned `pytest.lazy_fixture` <https://github.com/TvoroG/pytest-lazy-fixture>
+-
+-Based on <https://github.com/TvoroG/pytest-lazy-fixture/issues/65#issuecomment-1914581161>
+-
+-"""
+-import dataclasses
+-import typing
+-
+-import pytest
+-
+-
+-@dataclasses.dataclass
+-class LazyFixture:
+-    """Lazy fixture dataclass."""
+-
+-    name: str
+-
+-
+-def lazy_fixture(name: str) -> LazyFixture:
+-    """Mark a fixture as lazy."""
+-    return LazyFixture(name)
+-
+-
+-# NOTE: Mimic the original API
+-pytest.lazy_fixture = lazy_fixture
+-
+-
+-def is_lazy_fixture(value: object) -> bool:
+-    """Check whether a value is a lazy fixture."""
+-    return isinstance(value, LazyFixture)
+-
+-
+-def pytest_make_parametrize_id(
+-    config: pytest.Config,
+-    val: object,
+-    argname: str,
+-) -> str | None:
+-    """Inject lazy fixture parametrized id.
+-
+-    Reference:
+-    - https://bit.ly/48Off6r
+-
+-    Args:
+-        config (pytest.Config): pytest configuration.
+-        value (object): fixture value.
+-        argname (str): automatic parameter name.
+-
+-    Returns:
+-        str: new parameter id.
+-    """
+-    if is_lazy_fixture(val):
+-        return typing.cast(LazyFixture, val).name
+-    return None
+-
+-
+-@pytest.hookimpl(tryfirst=True)
+-def pytest_fixture_setup(
+-    fixturedef: pytest.FixtureDef,
+-    request: pytest.FixtureRequest,
+-) -> object | None:
+-    """Lazy fixture setup hook.
+-
+-    This hook will never take over a fixture setup but just simply will
+-    try to resolve recursively any lazy fixture found in request.param.
+-
+-    Reference:
+-    - https://bit.ly/3SyvsXJ
+-
+-    Args:
+-        fixturedef (pytest.FixtureDef): fixture definition object.
+-        request (pytest.FixtureRequest): fixture request object.
+-
+-    Returns:
+-        object | None: fixture value or None otherwise.
+-    """
+-    if hasattr(request, "param") and request.param:
+-        request.param = _resolve_lazy_fixture(request.param, request)
+-    return None
+-
+-
+-def _resolve_lazy_fixture(__val: object, request: pytest.FixtureRequest) -> object:
+-    """Lazy fixture resolver.
+-
+-    Args:
+-        __val (object): fixture value object.
+-        request (pytest.FixtureRequest): pytest fixture request object.
+-
+-    Returns:
+-        object: resolved fixture value.
+-    """
+-    if isinstance(__val, list | tuple):
+-        return tuple(_resolve_lazy_fixture(v, request) for v in __val)
+-    if isinstance(__val, typing.Mapping):
+-        return {k: _resolve_lazy_fixture(v, request) for k, v in __val.items()}
+-    if not is_lazy_fixture(__val):
+-        return __val
+-    lazy_obj = typing.cast(LazyFixture, __val)
+-    return request.getfixturevalue(lazy_obj.name)
+--- a/tests/test_cookie_on_redirects.py
++++ b/tests/test_cookie_on_redirects.py
+@@ -2,54 +2,47 @@
+ from .utils import http
+ 
+ 
+-def _stringify(fixture):
+-    return fixture + ''
+-
+-
+-@pytest.mark.parametrize('instance', [
+-    pytest.lazy_fixture('httpbin'),
+-    pytest.lazy_fixture('remote_httpbin'),
++@pytest.mark.parametrize('target_httpbin', [
++    'httpbin',
++    'remote_httpbin',
+ ])
+-def test_explicit_user_set_cookie(httpbin, instance):
+-    # User set cookies ARE NOT persisted within redirects
+-    # when there is no session, even on the same domain.
+-
++def test_explicit_user_set_cookie(httpbin, target_httpbin, request):
++    """User set cookies ARE NOT persisted within redirects when there is no session, even on the same domain."""
++    target_httpbin = request.getfixturevalue(target_httpbin)
+     r = http(
+         '--follow',
+         httpbin + '/redirect-to',
+-        f'url=={_stringify(instance)}/cookies',
++        f'url=={target_httpbin.url}/cookies',
+         'Cookie:a=b'
+     )
+     assert r.json == {'cookies': {}}
+ 
+ 
+-@pytest.mark.parametrize('instance', [
+-    pytest.lazy_fixture('httpbin'),
+-    pytest.lazy_fixture('remote_httpbin'),
++@pytest.mark.parametrize('target_httpbin', [
++    'httpbin',
++    'remote_httpbin',
+ ])
+-def test_explicit_user_set_cookie_in_session(tmp_path, httpbin, instance):
+-    # User set cookies ARE persisted within redirects
+-    # when there is A session, even on the same domain.
+-
++def test_explicit_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request):
++    """User set cookies ARE persisted within redirects when there is A session, even on the same domain."""
++    target_httpbin = request.getfixturevalue(target_httpbin)
+     r = http(
+         '--follow',
+         '--session',
+         str(tmp_path / 'session.json'),
+         httpbin + '/redirect-to',
+-        f'url=={_stringify(instance)}/cookies',
++        f'url=={target_httpbin}/cookies',
+         'Cookie:a=b'
+     )
+     assert r.json == {'cookies': {'a': 'b'}}
+ 
+ 
+-@pytest.mark.parametrize('instance', [
+-    pytest.lazy_fixture('httpbin'),
+-    pytest.lazy_fixture('remote_httpbin'),
++@pytest.mark.parametrize('target_httpbin', [
++    'httpbin',
++    'remote_httpbin',
+ ])
+-def test_saved_user_set_cookie_in_session(tmp_path, httpbin, instance):
+-    # User set cookies ARE persisted within redirects
+-    # when there is A session, even on the same domain.
+-
++def test_saved_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request):
++    """User set cookies ARE persisted within redirects when there is A session, even on the same domain."""
++    target_httpbin = request.getfixturevalue(target_httpbin)
+     http(
+         '--follow',
+         '--session',
+@@ -62,32 +55,33 @@ def test_saved_user_set_cookie_in_session(tmp_path, httpbin, instance):
+         '--session',
+         str(tmp_path / 'session.json'),
+         httpbin + '/redirect-to',
+-        f'url=={_stringify(instance)}/cookies',
++        f'url=={target_httpbin}/cookies',
+     )
+     assert r.json == {'cookies': {'a': 'b'}}
+ 
+ 
+-@pytest.mark.parametrize('instance', [
+-    pytest.lazy_fixture('httpbin'),
+-    pytest.lazy_fixture('remote_httpbin'),
++@pytest.mark.parametrize('target_httpbin', [
++    'httpbin',
++    'remote_httpbin',
+ ])
+ @pytest.mark.parametrize('session', [True, False])
+-def test_explicit_user_set_headers(httpbin, tmp_path, instance, session):
+-    # User set headers ARE persisted within redirects
+-    # even on different domains domain with or without
+-    # an active session.
++def test_explicit_user_set_headers(httpbin, tmp_path, target_httpbin, session, request):
++    """
++    User set headers ARE persisted within redirects even on different domains domain with or without an active session.
++
++    """
++    target_httpbin = request.getfixturevalue(target_httpbin)
+     session_args = []
+     if session:
+         session_args.extend([
+             '--session',
+             str(tmp_path / 'session.json')
+         ])
+-
+     r = http(
+         '--follow',
+         *session_args,
+         httpbin + '/redirect-to',
+-        f'url=={_stringify(instance)}/get',
++        f'url=={target_httpbin}/get',
+         'X-Custom-Header:value'
+     )
+     assert 'X-Custom-Header' in r.json['headers']
+@@ -95,16 +89,13 @@ def test_explicit_user_set_headers(httpbin, tmp_path, instance, session):
+ 
+ @pytest.mark.parametrize('session', [True, False])
+ def test_server_set_cookie_on_redirect_same_domain(tmp_path, httpbin, session):
+-    # Server set cookies ARE persisted on the same domain
+-    # when they are forwarded.
+-
++    """Server set cookies ARE persisted on the same domain when they are forwarded."""
+     session_args = []
+     if session:
+         session_args.extend([
+             '--session',
+             str(tmp_path / 'session.json')
+         ])
+-
+     r = http(
+         '--follow',
+         *session_args,
+@@ -136,8 +127,7 @@ def test_server_set_cookie_on_redirect_different_domain(tmp_path, http_server, h
+ 
+ 
+ def test_saved_session_cookies_on_same_domain(tmp_path, httpbin):
+-    # Saved session cookies ARE persisted when making a new
+-    # request to the same domain.
++    """Saved session cookies ARE persisted when making a new request to the same domain."""
+     http(
+         '--session',
+         str(tmp_path / 'session.json'),
+@@ -152,8 +142,7 @@ def test_saved_session_cookies_on_same_domain(tmp_path, httpbin):
+ 
+ 
+ def test_saved_session_cookies_on_different_domain(tmp_path, httpbin, remote_httpbin):
+-    # Saved session cookies ARE persisted when making a new
+-    # request to a different domain.
++    """Saved session cookies ARE persisted when making a new request to a different domain."""
+     http(
+         '--session',
+         str(tmp_path / 'session.json'),
+@@ -167,45 +156,49 @@ def test_saved_session_cookies_on_different_domain(tmp_path, httpbin, remote_htt
+     assert r.json == {'cookies': {}}
+ 
+ 
+-@pytest.mark.parametrize('initial_domain, first_request_domain, second_request_domain, expect_cookies', [
++@pytest.mark.parametrize(['initial_domain', 'first_request_domain', 'second_request_domain', 'expect_cookies'], [
+     (
+         # Cookies are set by    Domain A
+         # Initial domain is     Domain A
+         # Redirected domain is  Domain A
+-        pytest.lazy_fixture('httpbin'),
+-        pytest.lazy_fixture('httpbin'),
+-        pytest.lazy_fixture('httpbin'),
++        'httpbin',
++        'httpbin',
++        'httpbin',
+         True,
+     ),
+     (
+         # Cookies are set by    Domain A
+         # Initial domain is     Domain B
+         # Redirected domain is  Domain B
+-        pytest.lazy_fixture('httpbin'),
+-        pytest.lazy_fixture('remote_httpbin'),
+-        pytest.lazy_fixture('remote_httpbin'),
++        'httpbin',
++        'remote_httpbin',
++        'remote_httpbin',
+         False,
+     ),
+     (
+         # Cookies are set by    Domain A
+         # Initial domain is     Domain A
+         # Redirected domain is  Domain B
+-        pytest.lazy_fixture('httpbin'),
+-        pytest.lazy_fixture('httpbin'),
+-        pytest.lazy_fixture('remote_httpbin'),
++        'httpbin',
++        'httpbin',
++        'remote_httpbin',
+         False,
+     ),
+     (
+         # Cookies are set by    Domain A
+         # Initial domain is     Domain B
+         # Redirected domain is  Domain A
+-        pytest.lazy_fixture('httpbin'),
+-        pytest.lazy_fixture('remote_httpbin'),
+-        pytest.lazy_fixture('httpbin'),
++        'httpbin',
++        'remote_httpbin',
++        'httpbin',
+         True,
+     ),
+ ])
+-def test_saved_session_cookies_on_redirect(tmp_path, initial_domain, first_request_domain, second_request_domain, expect_cookies):
++def test_saved_session_cookies_on_redirect(
++        tmp_path, initial_domain, first_request_domain, second_request_domain, expect_cookies, request):
++    initial_domain = request.getfixturevalue(initial_domain)
++    first_request_domain = request.getfixturevalue(first_request_domain)
++    second_request_domain = request.getfixturevalue(second_request_domain)
+     http(
+         '--session',
+         str(tmp_path / 'session.json'),
+@@ -216,7 +209,7 @@ def test_saved_session_cookies_on_redirect(tmp_path, initial_domain, first_reque
+         str(tmp_path / 'session.json'),
+         '--follow',
+         first_request_domain + '/redirect-to',
+-        f'url=={_stringify(second_request_domain)}/cookies'
++        f'url=={second_request_domain}/cookies'
+     )
+     if expect_cookies:
+         expected_data = {'cookies': {'a': 'b'}}
+--- a/tests/test_sessions.py
++++ b/tests/test_sessions.py
+@@ -821,16 +821,17 @@ def test_session_multiple_headers_with_same_name(basic_session, httpbin):
+     'server, expected_cookies',
+     [
+         (
+-            pytest.lazy_fixture('localhost_http_server'),
++            'localhost_http_server',
+             {'secure_cookie': 'foo', 'insecure_cookie': 'bar'}
+         ),
+         (
+-            pytest.lazy_fixture('remote_httpbin'),
++            'remote_httpbin',
+             {'insecure_cookie': 'bar'}
+         )
+     ]
+ )
+-def test_secure_cookies_on_localhost(mock_env, tmp_path, server, expected_cookies):
++def test_secure_cookies_on_localhost(mock_env, tmp_path, server, expected_cookies, request):
++    server = request.getfixturevalue(server)
+     session_path = tmp_path / 'session.json'
+     http(
+         '--session', str(session_path),
+--- a/tests/test_update_warnings.py
++++ b/tests/test_update_warnings.py
+@@ -132,10 +132,10 @@ def test_check_updates_first_invocation(
+ 
+ 
+ @pytest.mark.parametrize(
+-    'should_issue_warning, build_channel',
++    ['should_issue_warning', 'build_channel'],
+     [
+-        (False, pytest.lazy_fixture('lower_build_channel')),
+-        (True, pytest.lazy_fixture('higher_build_channel')),
++        (False, 'lower_build_channel'),
++        (True, 'higher_build_channel'),
+     ],
+ )
+ def test_check_updates_first_time_after_data_fetch(
+@@ -145,7 +145,9 @@ def test_check_updates_first_time_after_data_fetch(
+     static_fetch_data,
+     should_issue_warning,
+     build_channel,
++    request,
+ ):
++    request.getfixturevalue(build_channel)
+     http('fetch_updates', '--daemon', env=with_warnings)
+     r = http(httpbin + '/get', env=with_warnings)
+ 
+@@ -176,14 +178,15 @@ def test_cli_check_updates(
+ 
+ 
+ @pytest.mark.parametrize(
+-    "build_channel", [
+-        pytest.lazy_fixture("lower_build_channel"),
+-        pytest.lazy_fixture("unknown_build_channel")
++    'build_channel', [
++        'lower_build_channel',
++        'unknown_build_channel',
+     ]
+ )
+ def test_cli_check_updates_not_shown(
+-    static_fetch_data, build_channel
++    static_fetch_data, build_channel, request
+ ):
++    request.getfixturevalue(build_channel)
+     r = httpie('cli', 'check-updates')
+     assert r.exit_status == ExitStatus.SUCCESS
+     assert not check_update_warnings(r)
diff --git a/net-misc/httpie/httpie-3.2.1-r1.ebuild b/net-misc/httpie/httpie-3.2.1-r1.ebuild
deleted file mode 100644
index 8408d5324ea8..000000000000
--- a/net-misc/httpie/httpie-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ssl(+)"
-DISTUTILS_USE_PEP517=setuptools
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Modern command line HTTP client"
-HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/"
-SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/charset-normalizer[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/multidict[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	newbashcomp extras/httpie-completion.bash http
-	insinto /usr/share/fish/vendor_completions.d
-	newins extras/httpie-completion.fish http.fish
-	distutils-r1_python_install_all
-}
diff --git a/net-misc/httpie/httpie-3.2.2.ebuild b/net-misc/httpie/httpie-3.2.2.ebuild
new file mode 100644
index 000000000000..d6672c06715a
--- /dev/null
+++ b/net-misc/httpie/httpie-3.2.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ssl(+)"
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Modern command line HTTP client"
+HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/"
+SRC_URI="https://github.com/httpie/cli/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/cli-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/charset-normalizer[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/multidict[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-pytest-fixtures.patch"
+)
+
+EPYTEST_DESELECT=(
+	# https://github.com/httpie/cli/issues/1530
+	tests/test_compress.py::test_compress_form
+	tests/test_binary.py::TestBinaryResponseData
+
+	# Needs network
+	'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie_in_session[remote_httpbin]'
+	'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie[remote_httpbin]'
+	'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[False-remote_httpbin]'
+	'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[True-remote_httpbin]'
+	tests/test_cookie_on_redirects.py::test_saved_session_cookie_pool
+	tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_different_domain
+	'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-httpbin-remote_httpbin-False]'
+	'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-httpbin-True]'
+	'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-remote_httpbin-False]'
+	'tests/test_cookie_on_redirects.py::test_saved_user_set_cookie_in_session[remote_httpbin]'
+	'tests/test_sessions.py::test_secure_cookies_on_localhost[remote_httpbin-expected_cookies1]'
+	tests/test_tokens.py::test_verbose_chunked
+	tests/test_uploads.py::test_chunked_form
+	tests/test_uploads.py::test_chunked_json
+	tests/test_uploads.py::test_chunked_raw
+	tests/test_uploads.py::test_chunked_stdin
+	tests/test_uploads.py::test_chunked_stdin_multiple_chunks
+	tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked
+	tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked
+)
+
+EPYTEST_IGNORE=(
+	# Assumes installation in a clean venv
+	tests/test_plugins_cli.py
+)
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	newbashcomp extras/httpie-completion.bash http
+	insinto /usr/share/fish/vendor_completions.d
+	newins extras/httpie-completion.fish http.fish
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index d5ee52cad5b4..d706cb0e50a6 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -15,5 +15,5 @@ DIST kea-2.4.0.tar.gz 10462721 BLAKE2B 07a4424c01872142b85446ee881afbdc9d8b3a0bc
 DIST kea-2.4.1.tar.gz 10487415 BLAKE2B 21037d28f812ebbc65ae34f5151a209e9c74f6aa005e96ed7cbbf6e4250e6c40eecf5d257b852bf01663a0982b5401008dd6a51a16d861b30a83549f827538b6 SHA512 b8a3b6f2cae213fd9826c37568c71d3458f52eed973dbe437a1d0974dafa026635a730d828c6ff03b32e030be57d75a7914a8ca313833e91d9996b6a05b2b224
 EBUILD kea-2.4.0-r1.ebuild 3783 BLAKE2B 08cfb9157984ed86622c14944d051614204e59b16ff21601d5b1a08e0815dc9fbb1b4110210911a9f0f0730eadb712c625773105c19bfd1fa6bea40097bab7ef SHA512 484936bc34d274088f9243fcd23ecff95cf30bebd5036ab8995cf3ad81057df2dacc13e418d11557094d8e9f7aadf01ffa91eaa25913832e359e98d73f98448e
 EBUILD kea-2.4.1.ebuild 3783 BLAKE2B 08cfb9157984ed86622c14944d051614204e59b16ff21601d5b1a08e0815dc9fbb1b4110210911a9f0f0730eadb712c625773105c19bfd1fa6bea40097bab7ef SHA512 484936bc34d274088f9243fcd23ecff95cf30bebd5036ab8995cf3ad81057df2dacc13e418d11557094d8e9f7aadf01ffa91eaa25913832e359e98d73f98448e
-EBUILD kea-9999.ebuild 3649 BLAKE2B 7f2ba60798621edbb491186351f8185947e31a8b6b17d14c930f4b0873bd392aedc36970f15cca9cd58f98dbd3eda069dd274c12c154c6935f9846dccfd4d0bb SHA512 d6e3fcfa8c5f4109a7925007df6311154c8b3b1e535e90b1917609c4a2e614dadcb3727c37cea7448287a60a3558b682c75ed75fb12aa477faccf0bab8e5bbf9
+EBUILD kea-9999.ebuild 3783 BLAKE2B 08cfb9157984ed86622c14944d051614204e59b16ff21601d5b1a08e0815dc9fbb1b4110210911a9f0f0730eadb712c625773105c19bfd1fa6bea40097bab7ef SHA512 484936bc34d274088f9243fcd23ecff95cf30bebd5036ab8995cf3ad81057df2dacc13e418d11557094d8e9f7aadf01ffa91eaa25913832e359e98d73f98448e
 MISC metadata.xml 760 BLAKE2B def46b553ea484e8c8ebb887fbaa45f30b65b4607b6dbc269540e19e7edac2dd152b6b724f666a2e920b7c7e7269b0e60a08ad46f5e8131b5135950c678d2144 SHA512 308b7461e94919cc2b5ec0627bd63292b874eae91e7520465264fa5c2187085afdfe9c95fddf68265eea49ad38b5cd0e3426982234d191ccbbb4c0161c36a7c9
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 2c411fe395c2..72c97487d6f6 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -71,11 +71,15 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed'
+	if use test; then
+		cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed'
+	fi
 
 	# brand the version with Gentoo
 	sed -i \
-		-e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], [kea-dev@lists.isc.org])/g" \
+		-e 's/KEA_SRCID="tarball"/KEA_SRCID="gentoo"/g' \
+		-e 's/AC_MSG_RESULT("tarball")/AC_MSG_RESULT("gentoo")/g' \
+		-e "s/EXTENDED_VERSION=\"\${EXTENDED_VERSION} (\$KEA_SRCID)\"/EXTENDED_VERSION=\"${PVR} (\$KEA_SRCID)\"/g" \
 		configure.ac || die
 
 	sed -i \
@@ -105,7 +109,6 @@ src_configure() {
 		--with-log4cplus
 		$(use_enable debug)
 		$(use_enable doc generate-docs)
-		$(use_enable test gtest)
 		$(use_enable shell)
 		$(use_with mysql)
 		$(use_with openssl)
@@ -115,7 +118,8 @@ src_configure() {
 }
 
 src_install() {
-	default
+	emake -j1 install DESTDIR="${D}"
+
 	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
 	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
 
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 8bd047987458..5f0e4830b184 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -5,11 +5,11 @@ AUX ntpd.rc-r3 491 BLAKE2B e91eb8921b60142d9f827abf7c2a4e4e48be423b3227cbe736433
 AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e
 AUX ntpsec-1.2.2-logrotate.patch 663 BLAKE2B c5e8eca739909695b6fd6cf7e507acb8e49a8eb2eebbf2afe83733159b8240f563a22a7389ac58373c10df104ee5dd34c7aec40787200bd3d704e5f0273cfc42 SHA512 ccba1116fac3fcb8dc075c81f2d8ed24399b41b6718ae65ed042b0da8bf19c0a5259650323a9b1d6f0e5c44ae167874ccaca7cbdd50b38955b17a4a49840c863
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
-DIST ntpsec-1.2.2.tar.gz 2710329 BLAKE2B 031412d0fc7ecb5aba73501e63f8d0c416b23fe69114dd32422b03b4827e1ac9c92a4dfeb2e7d074cf6fd410d00cf86632f241dffd22987e4c03b21d21d8693a SHA512 864afb72c4bd8bc439ee06d343893cf92b3893c26c972a7bd1ff2713f0ad1f50704b6d0c6f155e6373c9747efff3ea36097a590be0d53e1a7ea7f429ba409cd1
 DIST ntpsec-1.2.2a.tar.gz 2710790 BLAKE2B b069433598697ab1e8110dbd005316a295d14c1e180fe0af2d19494bdff941d01234f0b4e9f38a150e27e450e1bd1f4dcf4535f9ff51c253670d11c5cb67382d SHA512 7a2cc04bde49800a745c74933e565a4764a22be484faffc5ea933231b74507af737a691cd0bb3aa024e81c083be0718c8d7b30dd152b0b0d386ae72fda426db9
 DIST ntpsec-1.2.2a.tar.gz.asc 833 BLAKE2B ce21b020d2a8590b731fdd4c171041fadbd699d60b9e10b2dc548675eed2efc04b9d5ae75fa8f77cc9c8e55db0f609d1eee5c5f2f7c7d804e1b087eb9ea95e1d SHA512 c1b0c1c6b534b11ef172d5ab68ada47bbd9e3f0298400c684e8745447221db16e4f4de436f06b0f6ab374e437b0506853a3a3da2bbe17c148cdf7de62c769f28
-EBUILD ntpsec-1.2.2-r1.ebuild 4216 BLAKE2B 1878542ea91ae273da114e7a5992657e676808b681f91b13a82ff745a4549d6873e205e0e26c02ddedea2ab8896c02a952033adfd8e6818203b751c028d5533d SHA512 ce908ee199ceb561a7b450e6854ef3abc674ed8bf470d357e837d0fbb7b73ab06f8b9f20593ae47d4dedb8f31bb3f5509b2cfaab75ac7777c4a5877eb4288820
-EBUILD ntpsec-1.2.2.ebuild 4170 BLAKE2B c359af305fd9c7dfaee68b73a45277789d5253b0ca6aaf34da7e16a897de2689da7de78e72c38d60ebc583333116fe1e1f5ef361d100c474048000e7656c5128 SHA512 1a2b3332e25038ba639c5b1a41fdda289d8cb52a41a5576845a4b5ea2d153f761440e2204772113dbf4a21966ab9c8d076826248413b16500e67ba0e90f4aba8
+DIST ntpsec-1.2.3.tar.gz 2725081 BLAKE2B d39a4d08790949afb28b843739a410624a8d862bfc25afd4e6c7dc55be43e41f3c89823406c60fb911496e7a3db51d6fa83c8bcda9b9686708c36154c2fe9686 SHA512 6baecf32f499fc12c2ef0b44360072b61ab9e8b52ec7ead64ff43a27b5a57431db939d4ce1fad92d38def981f6256a1d8ede0c0cdc5abb50d861be729255eee2
+DIST ntpsec-1.2.3.tar.gz.asc 833 BLAKE2B f0d6a0b163a7f9214da6d6eb1982f87387a7087efb740ec146f55362381aa101a5a8e40c27f121ca6607c0a5c429b1e06ecaf9a9ab5392d836535430cf6575fa SHA512 17280e3092e7e9de0ddae0723637a261d3a740d916ce0f016c44c6010672cfe2fc39b45f86257cfa5bd29f1f11895f8bd583c76765c6484489027cbc82dbe6b2
 EBUILD ntpsec-1.2.2a.ebuild 4400 BLAKE2B a8329fecac0ecaa5643dbcccbb77c6c3c3b944677f1c5bfb350e21a2d734b8f20862cc3b0fdc1c3135e8de4f75d11bcad523cb27b4f062af1839ba592738b387 SHA512 46b98f059d76924fda38340b6803935ec97ad9aa3dcd68d95f4913d7f733581e1253e322ee8357735ef6d9942482eeecbc3cc259e3511c94ff0ecbfbb87c2a93
-EBUILD ntpsec-9999.ebuild 4403 BLAKE2B d58b5734dd41bcf3fa3d2a5fb3a487bcacb8782c1e5ee16ab717de0cbfc4c09cf3dd4b07c5c2fe556b845c4ef390d38872bb808ab7281db7e5c0e4f7f14b73f4 SHA512 dbd1ddc69ae0c99fccadae12c9fd13f80633de9377a51e2af55ee88f553c3d27b94d3c1db48f3eedd5185d39dc296d57f918cbdfebd00c0379651765b4acd2b5
+EBUILD ntpsec-1.2.3.ebuild 4357 BLAKE2B 9ec09cbdebd9fb42cc1cb29f6bc83b5508fe672c851c96442147df5428b630f04ac6f745216cba80f7ed840304938f30815070f26aa52f51610e62b8ce972334 SHA512 793da62d08d511c1bc9c769de7d8eaa8ed7bfca9aea4cc1d285ab5c41b405627b54cbffe6c02e1dabaf7a25de6232e96dc12fff9b5ce0d8c91f41c3f2a84b9e6
+EBUILD ntpsec-9999.ebuild 4357 BLAKE2B 9ec09cbdebd9fb42cc1cb29f6bc83b5508fe672c851c96442147df5428b630f04ac6f745216cba80f7ed840304938f30815070f26aa52f51610e62b8ce972334 SHA512 793da62d08d511c1bc9c769de7d8eaa8ed7bfca9aea4cc1d285ab5c41b405627b54cbffe6c02e1dabaf7a25de6232e96dc12fff9b5ce0d8c91f41c3f2a84b9e6
 MISC metadata.xml 1777 BLAKE2B e324b32f904e5f076331594aefa32e5174e917a78fb0e1ca0361a2a0cae8f7813637e044d6c351e3f1d07d01733062def59666b89f73d134a507332585f29ae9 SHA512 db03c0268e00fea3701979e30b3bb3b1677de9f2c6692c99eb78cf5a929ca39cb8f379add7ba6786f1ddbb80e1b9263ec46bf459706996c12f3fd38bbc9452ea
diff --git a/net-misc/ntpsec/ntpsec-1.2.2.ebuild b/net-misc/ntpsec/ntpsec-1.2.2.ebuild
deleted file mode 100644
index 0b9c2a939cc3..000000000000
--- a/net-misc/ntpsec/ntpsec-1.2.2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='threads(+)'
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 flag-o-matic waf-utils systemd toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea modem local
-)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-DEPEND="${PYTHON_DEPS}
-	dev-libs/openssl:=
-	dev-python/psutil[${PYTHON_USEDEP}]
-	sys-libs/libcap
-	libbsd? ( dev-libs/libbsd:0= )
-	seccomp? ( sys-libs/libseccomp )
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	!net-misc/ntp
-	!net-misc/openntpd
-	acct-group/ntp
-	acct-user/ntp
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
-BDEPEND=">=app-text/asciidoc-8.6.8
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-alternatives/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-)
-
-WAF_BINARY="${S}/waf"
-
-src_prepare() {
-	default
-
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript || die
-	if ! use libbsd ; then
-		eapply "${FILESDIR}/${PN}-no-bsd.patch"
-	fi
-	# remove extra default pool servers
-	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	tc-is-lto && filter-flags -fuse-linker-plugin
-	filter-lto
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	myconf=(
-		--notests
-		--nopyc
-		--nopyo
-		--enable-pylib ext
-		--refclock="${CLOCKSTRING}"
-		#--build-epoch="$(date +%s)"
-		$(use doc	|| echo "--disable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	distutils-r1_src_configure
-}
-
-python_configure() {
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-python_compile() {
-	waf-utils_src_compile --notests
-}
-
-python_test() {
-	waf-utils_src_compile check
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-python_install() {
-	waf-utils_src_install --notests
-	python_fix_shebang "${ED}"
-	python_optimize
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3.ebuild
index 8dccc88c556e..ca1b744563fb 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3.ebuild
@@ -3,23 +3,34 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE='threads(+)'
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 flag-o-matic waf-utils systemd toolchain-funcs
+inherit distutils-r1 flag-o-matic waf-utils systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ntpsec.asc
+	inherit verify-sig
+	SRC_URI="
+		https://ftp.ntpsec.org/pub/releases/${P}.tar.gz
+		verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc )
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
 HOMEPAGE="https://www.ntpsec.org/"
 
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+
 NTPSEC_REFCLOCK=(
 	oncore trimble truetime gpsd jjy generic spectracom
 	shm pps hpgps zyfer arbiter nmea modem local
@@ -27,30 +38,37 @@ NTPSEC_REFCLOCK=(
 
 IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
-DEPEND="${PYTHON_DEPS}
+DEPEND="
+	${PYTHON_DEPS}
 	dev-libs/openssl:=
 	dev-python/psutil[${PYTHON_USEDEP}]
 	sys-libs/libcap
 	libbsd? ( dev-libs/libbsd:0= )
 	seccomp? ( sys-libs/libseccomp )
 	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
+	rclock_pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${DEPEND}
 	!net-misc/ntp
 	!net-misc/openntpd
 	acct-group/ntp
 	acct-user/ntp
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
-BDEPEND=">=app-text/asciidoc-8.6.8
+	ntpviz? (
+		media-fonts/liberation-fonts
+		sci-visualization/gnuplot
+	)
+"
+BDEPEND+="
+	>=app-text/asciidoc-8.6.8
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
-	app-alternatives/yacc"
+	app-alternatives/yacc
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
@@ -74,7 +92,6 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-is-lto && filter-flags -fuse-linker-plugin
 	filter-lto
 
 	local string_127=""
@@ -97,7 +114,6 @@ src_configure() {
 		#--build-epoch="$(date +%s)"
 		$(use doc	|| echo "--disable-doc")
 		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
 		$(use samba	&& echo "--enable-mssntp")
 		$(use seccomp	&& echo "--enable-seccomp")
 		$(use smear	&& echo "--enable-leap-smear")
@@ -138,7 +154,7 @@ src_install() {
 	chmod 770 "${ED}"/var/lib/ntp
 	keepdir /var/lib/ntp
 
-	# Install a log rotate script
+	# Install a logrotate script
 	mkdir -pv "${ED}"/etc/logrotate.d
 	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
 
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index cc9e877c051b..ca1b744563fb 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE='threads(+)'
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -38,7 +38,7 @@ NTPSEC_REFCLOCK=(
 
 IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -114,7 +114,6 @@ src_configure() {
 		#--build-epoch="$(date +%s)"
 		$(use doc	|| echo "--disable-doc")
 		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
 		$(use samba	&& echo "--enable-mssntp")
 		$(use seccomp	&& echo "--enable-seccomp")
 		$(use smear	&& echo "--enable-leap-smear")
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index b47a7dd586b2..98af93425991 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,4 +1,3 @@
-AUX openvswitch-2.17.6-groff-1.23.0.patch 5162 BLAKE2B 3c6a097c25f4a1f9935a540ffbdb6af58d5d0abafac3d9493adfcaf97c1f2842dd0ad3adb4cb5bb9546ee7bd543853e62c90cabcc847920ba772ea5f68b38a16 SHA512 f7e80c1f8b03fef59c868bc7a7e9a4025c868ff71224fbd7c84ae84c657b3de3966bfd60613e71392c431e3057546075bb7c6245da0c1f0320929940603622f4
 AUX openvswitch-2.17.8-gcc14-build-fix.patch 1338 BLAKE2B b7c89e2815c6ce948636dcbd4bf6a0976972bc96b4097cb657ed9006f9434a7a25a3f7b85c1c532a40925e0168b936efe7f116e3a36573a93039aa5637c84984 SHA512 da7970042a2a97defbcc4a76e5bff01285bc408ea80ebbdbbdbbcc30aa15727288bc97773fdd6d85635cdc536dee7ea31e47be697233bf341ccfad693c35e751
 AUX openvswitch.tmpfiles 36 BLAKE2B b6e77e158bfa3ec2f67d66d449e1461ff13fb067d8d51084538938cf139d65406644e910663cb9297881eec10e87b3bf7ba15cf50e20a2d1e112c8f72f1f9b78 SHA512 8e9e0b8ba6fbd0a06eec91b985fd46a338823cd46b41521539627a57a9fbd5051be3875a24cc455742c08c006f91382b5e211e7c51f60bccb7f0b9dd2c55a280
 AUX ovs-vswitchd-r1 428 BLAKE2B 202cf0694cb26e8a302b8a8e347f203ecfb0be5152841aa28a775f1e53a611296ef00f2197b3a91fc113993ef8e327991503484d852ad023e7e426b4aaa85018 SHA512 c41b31a856f66fa140781831f38635c696440bb93a816576256c4cdf71b872e573d742d29b9f494336735fd384d34722ba3304fa97d3c76fc82c2f6db869a233
diff --git a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch b/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch
deleted file mode 100644
index 3035005ae52e..000000000000
--- a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-https://bugs.gentoo.org/910196
-https://github.com/openvswitch/ovs/commit/a45b3afbf82e1c1702d25a5097a25c45923c6fae
-https://github.com/openvswitch/ovs/commit/6929485d318e08c11e8e98f7847d5cefcb36c21c
-https://github.com/openvswitch/ovs/commit/93412e00e7a1f61c5eb4771d150bdbf504ff59aa
-
-From a45b3afbf82e1c1702d25a5097a25c45923c6fae Mon Sep 17 00:00:00 2001
-From: gordonwwang <gordonwwang@tencent.com>
-Date: Thu, 17 Aug 2023 11:04:39 +0800
-Subject: [PATCH] ovs.tmac: Fix troff warning in versions above groff-1.23.
-
-When the compilation dependency is groff-1.23, the following message is
-displayed in the compilation log, and the compilation fails:
-
-  troff:vswitchd/ovs-vswitchd.8:1298: warning: cannot select font 'CW'
-  make[1]: *** [Makefile:6761: manpage-check] Error 1
-
-CW font was removed and and now groff warns about non-existent font:
- https://git.savannah.gnu.org/cgit/groff.git/commit/?id=d75ea8b2e283e37bd560e821fa4597065f36725f)
-
-Fix that by replacing CW with CR.  CW supposed to be an alias of CR
-anyway.
-
-Submitted-at: https://github.com/openvswitch/ovs/pull/416
-Co-authored-by: Xiaojie Chen <jackchanx@163.com>
-Signed-off-by: Xiaojie Chen <jackchanx@163.com>
-Signed-off-by: gordonwwang <gordonwwang@tencent.com>
-Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
----
- lib/ovs.tmac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ovs.tmac b/lib/ovs.tmac
-index 5f8f20afa4a..97b6fa3df76 100644
---- a/lib/ovs.tmac
-+++ b/lib/ovs.tmac
-@@ -175,7 +175,7 @@
- .  nr mE \\n(.f
- .  nf
- .  nh
--.  ft CW
-+.  ft CR
- ..
- .
- .
-
-From 6929485d318e08c11e8e98f7847d5cefcb36c21c Mon Sep 17 00:00:00 2001
-From: Frode Nordahl <frode.nordahl@canonical.com>
-Date: Mon, 21 Aug 2023 15:53:33 +0200
-Subject: [PATCH] docs: Add `nowarn` region option to tables.
-
-Starting with groff 1.23.0 a warning is produced if the tbl
-preprocessor is not run.  A side effect of enabling it is that
-new warnings on table formatting is printed.
-
-As requested during the review [0] of a series [1] attempting to
-address this, this patch makes use of the `nowarn` region option
-as opposed to attempting to change the formatting.
-
-0: https://patchwork.ozlabs.org/project/openvswitch/patch/ZM00Wfa80rOb2oCA@riva.ucam.org/#3164177
-1: https://patchwork.ozlabs.org/project/openvswitch/list/?series=367378&state=*
-
-Reported-by: Lucas Nussbaum <lucas@debian.org>
-Reported-at: https://bugs.debian.org/1042358
-Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com>
-Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
----
- build-aux/extract-ofp-fields | 6 +++---
- lib/meta-flow.xml            | 1 +
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
-index 8766995d9ab..7a9788be968 100755
---- a/build-aux/extract-ofp-fields
-+++ b/build-aux/extract-ofp-fields
-@@ -578,7 +578,7 @@ def field_to_xml(field_node, f, body, summary):
-     body += [""".PP
- \\fB%s Field\\fR
- .TS
--tab(;);
-+tab(;),nowarn;
- l lx.
- """ % title]
- 
-@@ -655,7 +655,7 @@ def group_xml_to_nroff(group_node, fields):
-         '.SH \"%s\"\n' % build.nroff.text_to_nroff(title.upper() + " FIELDS"),
-         '.SS "Summary:"\n',
-         '.TS\n',
--        'tab(;);\n',
-+        'tab(;),nowarn;\n',
-         'l l l l l l l.\n',
-         'Name;Bytes;Mask;RW?;Prereqs;NXM/OXM Support\n',
-         '\_;\_;\_;\_;\_;\_\n']
-@@ -665,7 +665,7 @@ def group_xml_to_nroff(group_node, fields):
-     return ''.join(content)
- 
- def make_oxm_classes_xml(document):
--    s = '''tab(;);
-+    s = '''tab(;),nowarn;
- l l l.
- Prefix;Vendor;Class
- \_;\_;\_
-diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml
-index ff81fddc5e7..fe80ee930d0 100644
---- a/lib/meta-flow.xml
-+++ b/lib/meta-flow.xml
-@@ -3517,6 +3517,7 @@ actions=clone(load:0->NXM_OF_IN_PORT[],output:123)
-     </p>
- 
-     <tbl>
-+nowarn;
- r r r r r.
- Criteria        OpenFlow 1.0    OpenFlow 1.1    OpenFlow 1.2+   NXM
- \_      \_      \_      \_      \_
-From 93412e00e7a1f61c5eb4771d150bdbf504ff59aa Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@ubuntu.com>
-Date: Mon, 21 Aug 2023 15:53:34 +0200
-Subject: [PATCH] docs: Run tbl preprocessor in manpage-check rule.
-
-If we omit this, groff 1.23.0 warns:
-
-  tbl preprocessor failed, or it or soelim was not run; table(s) likely
-  not rendered (TE macro called with TW register undefined)
-
-Reported-by: Lucas Nussbaum <lucas@debian.org>
-Reported-at: https://bugs.debian.org/1042358
-Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
-Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cb8076433e8..2a41e63ad90 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -368,7 +368,7 @@ ALL_LOCAL += manpage-check
- manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
- 	@error=false; \
- 	for manpage in $?; do \
--	  LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \
-+	  LANG=en_US.UTF-8 groff -t -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \
- 	  if grep warning: $@.tmp; then error=:; fi; \
- 	  rm -f $@.tmp; \
- 	done; \
-
diff --git a/net-misc/vmnet/Manifest b/net-misc/vmnet/Manifest
index a09261fe886e..5a502b56413e 100644
--- a/net-misc/vmnet/Manifest
+++ b/net-misc/vmnet/Manifest
@@ -1,5 +1,6 @@
 AUX vmnet-0.4-Fix-build-with-Clang-16.patch 745 BLAKE2B 65c71509f65c583d0b816b97599f1c0a913b7d97df6fc2ea9a8b31db588e281590493c0ea3e819af721549346b1cb9dbf0b632f2b8db84e894a71a3eb2e3e411 SHA512 e7966fb5d2650884606f156be84c77df08dc732fefde99567ba5c4cdb5f30311b5e6e6b8089abe9d3a6d8c3a022dd843a9d8b600dd848fb7d45a7371d358424d
+AUX vmnet-0.4-replace-missing-musl-function.patch 454 BLAKE2B 934c9b35feb6231fb040944fb7c53be9688597e66c88adacc276e5235b269f731ad115abdbeb12c779e8a99a7a2a25120c573ac016b33d6bab359580c9ba0ca0 SHA512 e51f35d8596659d7250573506e0aea664255ef9bdf7dc8f918ef6ba6a7ca433d58e7ef50bff8a3fed68a29f244fef176c668551202ef6f52fc2836be63a0988c
 DIST vmnet-0.4.tar.gz 11362 BLAKE2B 5fdf7e44719752cf47d45d254f25b70343d479a1da0b28cd7fd56735aa67830335599d29664d785b4b21a219a58c48cf2c07f1eb635b126142dda226b6c21ce2 SHA512 b5872caf2d0eadd24323901aff527deb6c57b9286d03362c252b87cd84b7dd8db149b86636fbd4b499810caff41aa948fa7b1f2163159d4b665c2feae279375d
 DIST vmnet_0.4-1.diff.gz 5084 BLAKE2B 1388b8b8334b8d8d16ba920f201f7d7f59bf7202418817cd251689370cc97ce6c2c089a397dabcd96f65193358a4ec606fbfdc9061e876f7232303d0601be070 SHA512 d9518917d0c9ebb75ffe82f002c0c5375b3a932fdd31d2cb4818a9956d586fb0e1bfedc166cdad3ab7a5ead8109afdee2893c68fe69b426c57965648188de4af
-EBUILD vmnet-0.4-r1.ebuild 1061 BLAKE2B 460911986f7729956e2b9417015f416166c2b62b399deb8c7061801083d5be687bbcf3495114da06ca6d95075113628f3427b0d61380509c6b6f0285b04c3e9d SHA512 e3da273a5f179dda9985e82f14268d3194b89057a06d42f37529bededf0131f4e4e064e1bd7136f1526bd14400ef84cabd307900227f4c90b6f07fa7912d190d
+EBUILD vmnet-0.4-r2.ebuild 1150 BLAKE2B 0ed6f11fc0f9915ceddf0dd948e825239652becb3b27a95775d533469ec71c22e7af14ec879da7f95bcf18e5f810286381d8dedf189d8f5d0a95d1552ffbd474 SHA512 c15750ce4f599867b095ed0c017740b745a20d447f34ef77c9669444bb0342a0e09087bc9181d5ac9403cc55de5ca5a0d8cc7e131a18202cb0fa9442aa7efb4f
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch
new file mode 100644
index 000000000000..5c4fbb152e9e
--- /dev/null
+++ b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch
@@ -0,0 +1,20 @@
+diff -ru vmnet-0.4.orig/vmnet.c vmnet-0.4/vmnet.c
+--- vmnet-0.4.orig/vmnet.c	2024-04-02 08:35:41.521216356 +0000
++++ vmnet-0.4/vmnet.c	2024-04-02 08:37:34.760604906 +0000
+@@ -50,6 +50,7 @@
+  */
+ 
+ #define _GNU_SOURCE
++#define _XOPEN_SOURCE 700
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <pwd.h>
+@@ -197,7 +198,7 @@
+ 	int master, slave;
+ 	char name[1024];
+ 
+-	master = getpt();
++	master = posix_openpt(O_RDWR);
+ 	if (master < 0) {
+ 		return 0;
+ 	}
diff --git a/net-misc/vmnet/vmnet-0.4-r1.ebuild b/net-misc/vmnet/vmnet-0.4-r2.ebuild
index 1fadcfdf151c..573adbc16276 100644
--- a/net-misc/vmnet/vmnet-0.4-r1.ebuild
+++ b/net-misc/vmnet/vmnet-0.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A simple virtual networking program - SLIP over stdin/out"
 HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/"
@@ -11,13 +11,14 @@ HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/"
 # So this might be better but it's a different filename
 # http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz
 # We use the debian patch anyway
-SRC_URI="ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz"
+SRC_URI="
+	ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz
+"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
 
 RDEPEND="sys-apps/net-tools"
 DEPEND="${RDEPEND}"
@@ -25,11 +26,12 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${WORKDIR}"/${P/-/_}-1.diff
 	"${FILESDIR}"/${PN}-0.4-Fix-build-with-Clang-16.patch
+	"${FILESDIR}"/${PN}-0.4-replace-missing-musl-function.patch
 )
 
 src_compile() {
 	append-ldflags -Wl,-z,now
-	emake
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {