[gentoo-commits] repo/gentoo:master commit in: app-containers/cri-tools/
commit: daf65d92fa0382189822b3def322ee68adbd6771
Author: Zac Medico gentoo org>
AuthorDate: Sun Sep 8 21:55:30 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Sep 8 22:03:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf65d92
app-containers/cri-tools: add 1.31.1
Signed-off-by: Zac Medico gentoo.org>
app-containers/cri-tools/Manifest| 1 +
app-containers/cri-tools/cri-tools-1.31.1.ebuild | 33
2 files changed, 34 insertions(+)
diff --git a/app-containers/cri-tools/Manifest
b/app-containers/cri-tools/Manifest
index a67abf87f207..f6b768507883 100644
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@@ -1,2 +1,3 @@
DIST cri-tools-1.25.0.tar.gz 7905707 BLAKE2B
79595f31fc22aff608406bad4319a60dddcabda5f4dab8706305f11500b3db43f1d7021a340a096227d4580212953f32a95b05bbf81c1236f8fa8cf635017abb
SHA512
dc04359320d59d6b3789e4e81fb613f3795b7e82dbad681393eaeff2c876e5b0393dd9384d7857d24ada5de34d03e151f7cf121367cc20e71d0b78607372b3a1
DIST cri-tools-1.27.0.tar.gz 8465050 BLAKE2B
d6c0429271ebc4085e75b54d7f3b9f75ab796e63bc9ae7562105296b13bbad8b512293a7d25abf1ab946f4bf54e672016fdb72696c12c730d21ac74724da465c
SHA512
b94122e6401eb0c33b9c3d112274b7ab20cbbad05e76a54933e79d2e42ded2d684771cb9ed703a6c1afa381844142b6f1b4dc77d17e915f9a42c236fd8426b9b
+DIST cri-tools-1.31.1.tar.gz 7830559 BLAKE2B
5ec935be8d453a2d024fb8b07c8c7a21a15c23c7aba03b9030806c5ed47698f41a5167b02c3d38e792fec035725fccdff92867e68c5b2c8a06ff040e4c37cc9e
SHA512
a72946944207d20f27236da12f7c2d532a1c9ebc881c3af4709494f7abc6f7b2d421934006a535a0b4a35926f09f58315ff0aaf4da870fd5a65281f547ef86a1
diff --git a/app-containers/cri-tools/cri-tools-1.31.1.ebuild
b/app-containers/cri-tools/cri-tools-1.31.1.ebuild
new file mode 100644
index ..21381a7af4bb
--- /dev/null
+++ b/app-containers/cri-tools/cri-tools-1.31.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
+HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools";
+SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="test"
+
+DOCS=( docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md )
+
+src_compile() {
+ emake VERSION="${PV}"
+ find build/ -name crictl -exec cp {} build/bin/ \; || die
+ ./build/bin/crictl completion bash > "crictl.bash" || die
+ ./build/bin/crictl completion zsh > "crictl.zsh" || die
+}
+
+src_install() {
+ einstalldocs
+
+ dobin ./build/bin/crictl
+ newbashcomp crictl.bash crictl
+ insinto /usr/share/zsh/site-functions
+ newins crictl.zsh _crictl
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
commit: 754f240e6662ee4ac5d93fd52adca345d037f6c2 Author: Zac Medico gentoo org> AuthorDate: Thu Sep 5 05:32:20 2024 + Commit: Zac Medico gentoo org> CommitDate: Thu Sep 5 05:36:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754f240e dev-util/android-tools: Depend on dev-cpp/abseil-cpp:= Bug: https://bugs.gentoo.org/939089 Signed-off-by: Zac Medico gentoo.org> dev-util/android-tools/android-tools-33.0.3-r1.ebuild | 3 ++- dev-util/android-tools/android-tools-34.0.5.ebuild| 1 + dev-util/android-tools/android-tools-35.0.1.ebuild| 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild index 155cf7f10a4b..b79b27a92a04 100644 --- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild +++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,6 +28,7 @@ DEPEND=" app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= + dev-cpp/abseil-cpp:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild index 32ad5c7b7ab0..8cec6941f76e 100644 --- a/dev-util/android-tools/android-tools-34.0.5.ebuild +++ b/dev-util/android-tools/android-tools-34.0.5.ebuild @@ -28,6 +28,7 @@ DEPEND=" app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= + dev-cpp/abseil-cpp:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= diff --git a/dev-util/android-tools/android-tools-35.0.1.ebuild b/dev-util/android-tools/android-tools-35.0.1.ebuild index 9dacbecf215d..3ffcb47e9012 100644 --- a/dev-util/android-tools/android-tools-35.0.1.ebuild +++ b/dev-util/android-tools/android-tools-35.0.1.ebuild @@ -28,6 +28,7 @@ DEPEND=" app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= + dev-cpp/abseil-cpp:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:=
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: df9764779da1097f2715c56bc281340702b9ebf3
Author: Sasha Finkelstein gmail com>
AuthorDate: Sun Sep 1 18:46:28 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Sep 1 18:49:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df976477
net-misc/passt: Actually build 2024.08.21 instead of 2024.06.07
Closes: https://bugs.gentoo.org/938882
Signed-off-by: Sasha Finkelstein gmail.com>
Fixes: 10ee7afe94f4 ("net-misc/passt: add 2024.08.21")
Closes: https://github.com/gentoo/gentoo/pull/38366
Signed-off-by: Zac Medico gentoo.org>
net-misc/passt/Manifest | 2 +-
.../{passt-2024.08.21.ebuild => passt-2024.08.21-r1.ebuild} | 9 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index 6822119362e6..3be7239020e1 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -3,4 +3,4 @@ DIST passt-2024.04.05.tar.xz 195772 BLAKE2B
4c237aeda56455f948d4309624d171612d59
DIST passt-2024.04.26.tar.xz 196148 BLAKE2B
f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68
SHA512
f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98
DIST passt-2024.05.10.tar.xz 195992 BLAKE2B
9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae
SHA512
04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3
DIST passt-2024.06.07.tar.xz 198360 BLAKE2B
378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488
SHA512
103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0
-DIST passt-2024.08.21.tar.xz 198360 BLAKE2B
378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488
SHA512
103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0
+DIST passt-2024.08.21-r1.tar.xz 209692 BLAKE2B
1b6b540f64528e375e6f0cfd90cec788b2b2281f7ab6dbe0f6df933757dcc4f37e154b2cd8e9e00adbc2b647a044fca05f2c48f49d05c0443c396831a2e13754
SHA512
ec09210b471377cc9f3d0044c97924834fadcfed7523aaab2f6c0fddb2d3d098c0730d1573e7c44963334d33dba5fbf660b0b222d4c71fab27cebf8edb52abf1
diff --git a/net-misc/passt/passt-2024.08.21.ebuild
b/net-misc/passt/passt-2024.08.21-r1.ebuild
similarity index 77%
rename from net-misc/passt/passt-2024.08.21.ebuild
rename to net-misc/passt/passt-2024.08.21-r1.ebuild
index 056444e46eba..c5749fff3812 100644
--- a/net-misc/passt/passt-2024.08.21.ebuild
+++ b/net-misc/passt/passt-2024.08.21-r1.ebuild
@@ -8,14 +8,15 @@ inherit toolchain-funcs
DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
HOMEPAGE="https://passt.top/";
-RELEASE_COMMIT="8a83b53"
+RELEASE_COMMIT="1d6142f"
+MY_PV="${PV//./_}.${RELEASE_COMMIT}"
if [[ ${PV} == * ]]; then
inherit git-r3
EGIT_REPO_URI="https://passt.top/passt";
else
-
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
- S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+ SRC_URI="https://passt.top/passt/snapshot/passt-${MY_PV}.tar.xz ->
${PF}.tar.xz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
fi
@@ -30,7 +31,7 @@ src_prepare() {
src_compile() {
[[ ${PV} != * ]] && export VERSION="${PV}"
- export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}"
+ export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${PF}"
emake $(usev static)
}
[gentoo-commits] proj/portage:master commit in: lib/portage/util/futures/_asyncio/
commit: b30ddb1913e8aa2947d20e43f455d2060aa6257f
Author: Zac Medico gentoo org>
AuthorDate: Sat Aug 31 20:08:35 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Sep 1 06:59:44 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b30ddb19
asyncio: Avoid _wrap_loop prior to create_subprocess_exec
Bug: https://bugs.gentoo.org/761538
Signed-off-by: Zac Medico gentoo.org>
lib/portage/util/futures/_asyncio/__init__.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/portage/util/futures/_asyncio/__init__.py
b/lib/portage/util/futures/_asyncio/__init__.py
index 48d9b68104..4cf337998c 100644
--- a/lib/portage/util/futures/_asyncio/__init__.py
+++ b/lib/portage/util/futures/_asyncio/__init__.py
@@ -119,7 +119,7 @@ def run(coro):
run.__doc__ = _real_asyncio.run.__doc__
-def create_subprocess_exec(*args, **kwargs):
+def create_subprocess_exec(*args, loop=None, **kwargs):
"""
Create a subprocess.
@@ -140,7 +140,6 @@ def create_subprocess_exec(*args, **kwargs):
@rtype: asyncio.subprocess.Process (or compatible)
@return: asyncio.subprocess.Process interface
"""
-loop = _wrap_loop(kwargs.pop("loop", None))
# Python 3.4 and later implement PEP 446, which makes newly
# created file descriptors non-inheritable by default.
kwargs.setdefault("close_fds", False)
[gentoo-commits] proj/portage:master commit in: lib/portage/util/futures/_asyncio/
commit: 7f6b2b04878209130d44fc06105f521bae2b2173 Author: Zac Medico gentoo org> AuthorDate: Sat Aug 31 05:35:32 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun Sep 1 06:58:56 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7f6b2b04 asyncio: Use default sleep implementation when possible When a loop argument is not given, use the default asyncio sleep implementation and avoid unnecessary _wrap_loop usage. Bug: https://bugs.gentoo.org/761538 Signed-off-by: Zac Medico gentoo.org> lib/portage/util/futures/_asyncio/__init__.py | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/portage/util/futures/_asyncio/__init__.py b/lib/portage/util/futures/_asyncio/__init__.py index 23c664e763..a235d87246 100644 --- a/lib/portage/util/futures/_asyncio/__init__.py +++ b/lib/portage/util/futures/_asyncio/__init__.py @@ -210,9 +210,12 @@ def sleep(delay, result=None, loop=None): @param result: result of the future @type loop: asyncio.AbstractEventLoop (or compatible) @param loop: event loop -@rtype: asyncio.Future (or compatible) -@return: an instance of Future +@rtype: collections.abc.Coroutine or asyncio.Future +@return: an instance of Coroutine or Future """ +if loop is None: +return _real_asyncio.sleep(delay, result=result) + loop = _wrap_loop(loop) future = loop.create_future() handle = loop.call_later(delay, future.set_result, result)
[gentoo-commits] proj/portage:master commit in: lib/portage/util/futures/_asyncio/
commit: e5457915f7929db3781ded384bdb089b0760221f Author: Zac Medico gentoo org> AuthorDate: Sat Aug 31 17:32:12 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun Sep 1 06:59:34 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e5457915 asyncio: Use default ensure_future implementation when possible When a loop argument is not given, use the default asyncio ensure_future implementation and avoid unnecessary _wrap_loop usage. Bug: https://bugs.gentoo.org/761538 Signed-off-by: Zac Medico gentoo.org> lib/portage/util/futures/_asyncio/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/portage/util/futures/_asyncio/__init__.py b/lib/portage/util/futures/_asyncio/__init__.py index a235d87246..48d9b68104 100644 --- a/lib/portage/util/futures/_asyncio/__init__.py +++ b/lib/portage/util/futures/_asyncio/__init__.py @@ -186,6 +186,9 @@ def ensure_future(coro_or_future, loop=None): @rtype: asyncio.Future (or compatible) @return: an instance of Future """ +if loop is None: +return _real_asyncio.ensure_future(coro_or_future) + loop = _wrap_loop(loop) if isinstance(loop._asyncio_wrapper, _AsyncioEventLoop): # Use the real asyncio loop and ensure_future.
[gentoo-commits] proj/portage:master commit in: lib/portage/util/futures/_asyncio/
commit: ee17cbd807ba976491e4c657be8aa9b9a29fe059
Author: Zac Medico gentoo org>
AuthorDate: Sat Aug 31 19:06:25 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Aug 31 19:06:25 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ee17cbd8
_safe_loop: Discard wrapped asyncio.run loop that was closed
Since commit cb0c09d8cecb, _get_running_loop can wrap loops from
asyncio.run, so these loops need to be discarded if they've been
closed.
Fixes: cb0c09d8cecb ("Support coroutine exitfuncs for non-main loops")
Bug: https://bugs.gentoo.org/938761
Bug: https://bugs.gentoo.org/761538
Signed-off-by: Zac Medico gentoo.org>
lib/portage/util/futures/_asyncio/__init__.py | 7 +++
1 file changed, 7 insertions(+)
diff --git a/lib/portage/util/futures/_asyncio/__init__.py
b/lib/portage/util/futures/_asyncio/__init__.py
index bdacda59ce..23c664e763 100644
--- a/lib/portage/util/futures/_asyncio/__init__.py
+++ b/lib/portage/util/futures/_asyncio/__init__.py
@@ -311,6 +311,13 @@ def _safe_loop(create: Optional[bool] = True) ->
Optional[_AsyncioEventLoop]:
_thread_weakrefs.loops = weakref.WeakValueDictionary()
try:
loop = _thread_weakrefs.loops[thread_key]
+if loop.is_closed():
+# Discard wrapped asyncio.run loop that was closed.
+del _thread_weakrefs.loops[thread_key]
+if loop is _thread_weakrefs.mainloop:
+_thread_weakrefs.mainloop = None
+loop = None
+raise KeyError(thread_key)
except KeyError:
if not create:
return None
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: 10ee7afe94f44465509290da003e94391e89bd2b
Author: Michal Privoznik gmail com>
AuthorDate: Fri Aug 30 07:47:16 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Aug 31 17:53:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10ee7afe
net-misc/passt: add 2024.08.21
Signed-off-by: Michal Privoznik gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38342
Signed-off-by: Zac Medico gentoo.org>
net-misc/passt/Manifest| 1 +
net-misc/passt/passt-2024.08.21.ebuild | 36 ++
2 files changed, 37 insertions(+)
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index d1b7a339a1a1..6822119362e6 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -3,3 +3,4 @@ DIST passt-2024.04.05.tar.xz 195772 BLAKE2B
4c237aeda56455f948d4309624d171612d59
DIST passt-2024.04.26.tar.xz 196148 BLAKE2B
f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68
SHA512
f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98
DIST passt-2024.05.10.tar.xz 195992 BLAKE2B
9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae
SHA512
04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3
DIST passt-2024.06.07.tar.xz 198360 BLAKE2B
378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488
SHA512
103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0
+DIST passt-2024.08.21.tar.xz 198360 BLAKE2B
378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488
SHA512
103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0
diff --git a/net-misc/passt/passt-2024.08.21.ebuild
b/net-misc/passt/passt-2024.08.21.ebuild
new file mode 100644
index ..056444e46eba
--- /dev/null
+++ b/net-misc/passt/passt-2024.08.21.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
+HOMEPAGE="https://passt.top/";
+
+RELEASE_COMMIT="8a83b53"
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://passt.top/passt";
+else
+
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
+ S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+ KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+fi
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+IUSE="static"
+
+src_prepare() {
+ default
+ tc-export CC
+}
+
+src_compile() {
+ [[ ${PV} != * ]] && export VERSION="${PV}"
+ export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}"
+
+ emake $(usev static)
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: dd01dfed9af62b7f5c729bf3978108fae9c541d7
Author: Michal Privoznik gmail com>
AuthorDate: Fri Aug 30 07:43:40 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Aug 31 17:53:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd01dfed
net-misc/passt: Don't apply Makefile-2024.03.20.patch on live ebuild
The passt's Makefile was changed so that it no longed enables
_FORTIFY_SOURCE explicitly [1]. This means, the patch that's
applied on top can be dropped.
1: https://passt.top/passt/commit/?id=38363964fc96008761195984c989b036227e0e5c
Signed-off-by: Michal Privoznik gmail.com>
From: https://github.com/gentoo/gentoo/pull/38342
Signed-off-by: Zac Medico gentoo.org>
net-misc/passt/passt-.ebuild | 4
1 file changed, 4 deletions(-)
diff --git a/net-misc/passt/passt-.ebuild b/net-misc/passt/passt-.ebuild
index 37ba4d13c25f..056444e46eba 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-.ebuild
@@ -23,10 +23,6 @@ LICENSE="BSD GPL-2+"
SLOT="0"
IUSE="static"
-PATCHES=(
- "${FILESDIR}"/Makefile-2024.03.20.patch
-)
-
src_prepare() {
default
tc-export CC
[gentoo-commits] repo/gentoo:master commit in: net-vpn/frp/
commit: da1c40b1eeaa97c850d38c17ffc176514e1eecbe
Author: Puqns67 puqns67 icu>
AuthorDate: Sun Aug 25 15:05:10 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Aug 26 01:06:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1c40b1
net-vpn/frp: add 0.60.0
Signed-off-by: Puqns67 puqns67.icu>
Closes: https://github.com/gentoo/gentoo/pull/38286
Signed-off-by: Zac Medico gentoo.org>
net-vpn/frp/Manifest | 2 ++
net-vpn/frp/frp-0.60.0.ebuild | 65 +++
2 files changed, 67 insertions(+)
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index fc780a5df065..4a66e7bda912 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -2,3 +2,5 @@ DIST frp-0.56.0-deps.tar.xz 2890568 BLAKE2B
cabeeba66d4fa94ff95637020178310c984b
DIST frp-0.56.0.tar.gz 1080201 BLAKE2B
493e8b21aab6d5fae2d762eafba7d94de59394e9c4cb3c3dfce2bd8b5a0d0fcca6ef471917e8257022e079bececf34e910fe3b6bc845753862da59a1d00ca20c
SHA512
883dce220aa78296f2b7eb9d64b3d1598bc2df436c52a48bc813d725a6f8fa43028359b0507bf4a586a29f4739310474047abfefd46249c0c9942990ceac0e2d
DIST frp-0.58.1-deps.tar.xz 2916740 BLAKE2B
49256c40ca359a5b76a92e2999e3a5a3ca4899f71e4804544296ee71fa6c079f563b1892195243e9e8792c72c445f779fb5a32b1cc5c4ebca9265d88808072e3
SHA512
3295e0e6b5a7ace8c5af1dd9e15ffb893930c0f03755e8de46dfbca2272747b95d8e58f4034f4fa2c44896c5036654b3c805a6d3dd0d3926335330d28d07
DIST frp-0.58.1.tar.gz 1081317 BLAKE2B
e5d897a9d866df1075c9fb397f1cbcf23efb738fd89e58bce4fba5abce23d9cb6c826b50d4cda52b3fa40a6194003a51c6209f2d4aef43d9dc62f08b51a776a7
SHA512
809e86e9cd2cb67ae338b2584c0c8f5d4f01104cc7725826743f48eb5c893bce9cd678bcd90e04953bb6bfc6523fcf400c6bc1bdf03ff335666b05af5e0c4b55
+DIST frp-0.60.0-vendor.tar.xz 2816520 BLAKE2B
3f58f108c1dc563d73d119293d9cbcb181059c24bb58731f5d6d870a320982c976c8a0938ff0442bd21ffd0bb86218aaa20f1b382fb7a045422aaea411ad3557
SHA512
9825d39cd4bce25ad796b3ac817e690ca41daf9f028ac4e88aa43b4e295d20f9ede57a1be8933efca00a512ff238f8e34a85f24a4b56f9c52cf40aa1f26118f9
+DIST frp-0.60.0.tar.gz 1073862 BLAKE2B
c6169818bbca656d44bc945c70b73474a4f427bd123fa7a546285fb63d3a156dc90d7fa1d46f2ba4ae971281e546fb43a217ad2527b7bd20a402810cb356d7ac
SHA512
4c86b91a28b58ce5b681e5f8c886efd57a41fb6ac92606facce0b6f6f6cbd6cf6f789209252455bc6bc6a3ad043f2470040ac84b893926653cc036b40907e60c
diff --git a/net-vpn/frp/frp-0.60.0.ebuild b/net-vpn/frp/frp-0.60.0.ebuild
new file mode 100644
index ..994a8b5d4b28
--- /dev/null
+++ b/net-vpn/frp/frp-0.60.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd shell-completion
+
+DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to
the internet"
+HOMEPAGE="https://github.com/fatedier/frp";
+SRC_URI="https://github.com/fatedier/frp/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+="
https://github.com/Puqns67/gentoo-deps/releases/download/${P}/${P}-vendor.tar.xz";
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv"
+IUSE="+client +server"
+REQUIRED_USE="|| ( client server )"
+BDEPEND=">=dev-lang/go-1.22"
+
+src_compile() {
+ mkdir -pv comp || die
+
+ if use client; then
+ ego build -trimpath -ldflags "-s -w" -tags frpc -o frpc
./cmd/frpc
+ ./frpc completion bash > comp/frpc || die
+ ./frpc completion fish > comp/frpc.fish || die
+ ./frpc completion zsh > comp/_frpc || die
+ fi
+
+ if use server; then
+ ego build -trimpath -ldflags "-s -w" -tags frps -o frps
./cmd/frps
+ ./frps completion bash > comp/frps || die
+ ./frps completion fish > comp/frps.fish || die
+ ./frps completion zsh > comp/_frps || die
+ fi
+}
+
+src_install() {
+ _install() {
+ # Install binary file
+ dobin "${1}"
+
+ # Install completion files
+ dobashcomp "${S}/comp/${1}"
+ dofishcomp "${S}/comp/${1}.fish"
+ dozshcomp "${S}/comp/_${1}"
+
+ # Install systemd services
+ systemd_dounit "${FILESDIR}/${1}.service"
+ systemd_newunit "${FILESDIR}/${1}_at_.service" "${1}@.service"
+
+ # Install config files
+ insinto "/etc/${PN}"
+ newins "${S}/conf/${1}.toml" "${1}.toml.example"
+ newins "${S}/conf/${1}_full_example.toml"
"${1}_full.toml.example"
+ }
+
+ if use client; then
+ _install frpc
+ fi
+
+ if use server; then
+ _install frps
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/calibre/files/
commit: ac1592bc68a4c95d66398cf5318fdfc845b196e8
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Aug 22 05:37:38 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Aug 24 22:22:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1592bc
app-text/calibre: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
From: https://github.com/gentoo/gentoo/pull/38243
Signed-off-by: Zac Medico gentoo.org>
.../files/calibre-2.9.0-no_updates_dialog.patch| 27 --
1 file changed, 27 deletions(-)
diff --git a/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch
b/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch
deleted file mode 100644
index 4d37c3b642f5..
--- a/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py
calibre-2.9.0/src/calibre/gui2/main.py
calibre-2.9.0.orig/src/calibre/gui2/main.py2014-11-09
20:09:54.081231882 +0800
-+++ calibre-2.9.0/src/calibre/gui2/main.py 2014-11-09 20:15:48.193033844
+0800
-@@ -37,8 +37,9 @@
- help=_('Start minimized to system tray.'))
- parser.add_option('-v', '--verbose', default=0, action='count',
- help=_('Ignored, do not use. Present only for legacy
reasons'))
--parser.add_option('--no-update-check', default=False, action='store_true',
--help=_('Do not check for updates'))
-+parser.add_option('--update-check', dest='no_update_check', default=True,
-+action='store_false',
-+help=_('Check for updates'))
- parser.add_option('--ignore-plugins', default=False, action='store_true',
- help=_('Ignore custom plugins, useful if you installed a plugin'
- ' that is preventing calibre from starting'))
-diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py
calibre-2.9.0/src/calibre/gui2/update.py
calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09
20:09:54.082231864 +0800
-+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115
+0800
-@@ -154,6 +154,8 @@
- self.update_checker.signal.update_found.connect(self.update_found,
- type=Qt.QueuedConnection)
- self.update_checker.start()
-+else:
-+self.update_checker = None
-
- def recalc_update_label(self, number_of_plugin_updates):
- self.update_found(self.last_newest_calibre_version,
number_of_plugin_updates)
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: 652f17bcfc5b13438990110166cc20f569375999
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Aug 24 08:29:53 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Aug 24 15:27:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652f17bc
net-misc/passt: use https:// instead of git:// for cloning
git:// is unencrypted and could be used by an attacker (mitm) to insert
malicious code, see also [1].
git:// runs on port 9418 which is also less likely open behind a firewall.
[1] git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols
Signed-off-by: Michael Mair-Keimberger levelnine.at>
From: https://github.com/gentoo/gentoo/pull/38276
Signed-off-by: Zac Medico gentoo.org>
net-misc/passt/passt-2024.03.26.ebuild | 2 +-
net-misc/passt/passt-2024.04.05.ebuild | 2 +-
net-misc/passt/passt-2024.04.26.ebuild | 2 +-
net-misc/passt/passt-2024.05.10.ebuild | 2 +-
net-misc/passt/passt-2024.06.07.ebuild | 2 +-
net-misc/passt/passt-.ebuild | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-misc/passt/passt-2024.03.26.ebuild
b/net-misc/passt/passt-2024.03.26.ebuild
index 90df839f93d9..91d818f5b4a1 100644
--- a/net-misc/passt/passt-2024.03.26.ebuild
+++ b/net-misc/passt/passt-2024.03.26.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="4988e2b"
if [[ ${PV} == * ]]; then
inherit git-r3
- EGIT_REPO_URI="git://passt.top/passt"
+ EGIT_REPO_URI="https://passt.top/passt";
else
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
diff --git a/net-misc/passt/passt-2024.04.05.ebuild
b/net-misc/passt/passt-2024.04.05.ebuild
index e4201215e520..be03e08a6fab 100644
--- a/net-misc/passt/passt-2024.04.05.ebuild
+++ b/net-misc/passt/passt-2024.04.05.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="954589b"
if [[ ${PV} == * ]]; then
inherit git-r3
- EGIT_REPO_URI="git://passt.top/passt"
+ EGIT_REPO_URI="https://passt.top/passt";
else
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
diff --git a/net-misc/passt/passt-2024.04.26.ebuild
b/net-misc/passt/passt-2024.04.26.ebuild
index c73a0f7c146b..cf83c50f72ed 100644
--- a/net-misc/passt/passt-2024.04.26.ebuild
+++ b/net-misc/passt/passt-2024.04.26.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="d03c4e2"
if [[ ${PV} == * ]]; then
inherit git-r3
- EGIT_REPO_URI="git://passt.top/passt"
+ EGIT_REPO_URI="https://passt.top/passt";
else
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
diff --git a/net-misc/passt/passt-2024.05.10.ebuild
b/net-misc/passt/passt-2024.05.10.ebuild
index ce44d6abe4eb..022bbfc62aa7 100644
--- a/net-misc/passt/passt-2024.05.10.ebuild
+++ b/net-misc/passt/passt-2024.05.10.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="7288448"
if [[ ${PV} == * ]]; then
inherit git-r3
- EGIT_REPO_URI="git://passt.top/passt"
+ EGIT_REPO_URI="https://passt.top/passt";
else
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
diff --git a/net-misc/passt/passt-2024.06.07.ebuild
b/net-misc/passt/passt-2024.06.07.ebuild
index 9ffe1a0980df..37ba4d13c25f 100644
--- a/net-misc/passt/passt-2024.06.07.ebuild
+++ b/net-misc/passt/passt-2024.06.07.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="8a83b53"
if [[ ${PV} == * ]]; then
inherit git-r3
- EGIT_REPO_URI="git://passt.top/passt"
+ EGIT_REPO_URI="https://passt.top/passt";
else
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
diff --git a/net-misc/passt/passt-.ebuild b/net-misc/passt/passt-.ebuild
index 9ffe1a0980df..37ba4d13c25f 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="8a83b53"
if [[ ${PV} == * ]]; then
inherit git-r3
- EGIT_REPO_URI="git://passt.top/passt"
+ EGIT_REPO_URI="https://passt.top/passt";
else
SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz ->
${P}.tar.xz"
S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
[gentoo-commits] proj/portage:master commit in: man/
commit: 747b2d2079281adc60206c52b8bbf475fd982969 Author: Allen-Kristjan Päll fst ee> AuthorDate: Tue Aug 20 06:09:52 2024 + Commit: Zac Medico gentoo org> CommitDate: Tue Aug 20 16:29:16 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=747b2d20 man/emerge.1: Fixed a typo Signed-off-by: Allen-Kristjan Päll fst.ee> Closes: https://github.com/gentoo/portage/pull/1373 Signed-off-by: Zac Medico gentoo.org> man/emerge.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/emerge.1 b/man/emerge.1 index e30f5f813e..c629c68262 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -30,7 +30,7 @@ distribution. .SH "EBUILDS, TBZ2S, SETS AND ATOMS" \fBemerge\fR primarily installs packages. You can specify packages to install in five possible ways: an \fIatom\fR, -a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR, a +a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR, a \fItbz2\fR file, or a \fIgpkg\fR file. .LP .TP
[gentoo-commits] proj/portage:master commit in: lib/portage/util/futures/_asyncio/
commit: a62faf99dbd0078cd58a76e6419e0a2d0d14d636
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 18 15:00:07 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 18 15:47:01 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a62faf99
Remove unused and unimplemented asyncio.Task class
This class originated from commit 142d08c0636b and it is unused
since _PortageEventLoop was removed in commit 20204fd8c29.
Fixes: 20204fd8c29 ("Remove unused _PortageEventLoop and _PortageChildWatcher")
Signed-off-by: Zac Medico gentoo.org>
lib/portage/util/futures/_asyncio/__init__.py | 11 ---
1 file changed, 11 deletions(-)
diff --git a/lib/portage/util/futures/_asyncio/__init__.py
b/lib/portage/util/futures/_asyncio/__init__.py
index c960d03630..bdacda59ce 100644
--- a/lib/portage/util/futures/_asyncio/__init__.py
+++ b/lib/portage/util/futures/_asyncio/__init__.py
@@ -19,7 +19,6 @@ __all__ = (
"run",
"shield",
"sleep",
-"Task",
"wait",
"wait_for",
)
@@ -174,16 +173,6 @@ class Lock(_Lock):
super().__init__(**kwargs)
-class Task(Future):
-"""
-Schedule the execution of a coroutine: wrap it in a future. A task
-is a subclass of Future.
-"""
-
-def __init__(self, coro, loop=None):
-raise NotImplementedError
-
-
def ensure_future(coro_or_future, loop=None):
"""
Wrap a coroutine or an awaitable in a future.
[gentoo-commits] proj/portage:master commit in: lib/portage/util/futures/_asyncio/
commit: e97acd3c62ff02eb41ff643e75eb5e07c27717f8
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 18 14:59:46 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 18 15:46:45 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e97acd3c
_wrap_loop: Prevent redundant AsyncioEventLoop instances
Ultimately the loop arguments that necessitate the _wrap_loop
function can be removed, because our aim since bug 761538 should
be to eliminate them. Meanwhile, we don't want _wrap_loop to return
redundant AsyncioEventLoop instances if we can easily prevent it.
Therefore, use _safe_loop(create=False) to look up the AsyncioEventLoop
instance associated with the current thread, and avoid creating
redundant instances. This serves to guard against garbage collection
of AsyncioEventLoop instances which may have _coroutine_exithandlers
added by the atexit_register function since commit cb0c09d8cecb from
bug 937740.
If _safe_loop(create=False) fails to associate a loop with the current
thread, raise an AssertionError for portage internal API consumers.
It's not known whether external API consumers will trigger this case,
so if it happens then emit a UserWarning and return a temporary
AsyncioEventLoop instance.
Fixes: cb0c09d8cecb ("Support coroutine exitfuncs for non-main loops")
Bug: https://bugs.gentoo.org/938127
Bug: https://bugs.gentoo.org/937740
Bug: https://bugs.gentoo.org/761538
Signed-off-by: Zac Medico gentoo.org>
lib/portage/util/futures/_asyncio/__init__.py | 43 +++
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/lib/portage/util/futures/_asyncio/__init__.py
b/lib/portage/util/futures/_asyncio/__init__.py
index 8805e35756..c960d03630 100644
--- a/lib/portage/util/futures/_asyncio/__init__.py
+++ b/lib/portage/util/futures/_asyncio/__init__.py
@@ -26,6 +26,7 @@ __all__ = (
import sys
import types
+import warnings
import weakref
import asyncio as _real_asyncio
@@ -46,6 +47,7 @@ from asyncio import (
)
import threading
+from typing import Optional
import portage
@@ -251,11 +253,35 @@ def _wrap_loop(loop=None):
# The default loop returned by _wrap_loop should be consistent
# with global_event_loop, in order to avoid accidental registration
# of callbacks with a loop that is not intended to run.
-loop = loop or _safe_loop()
-return loop if hasattr(loop, "_asyncio_wrapper") else
_AsyncioEventLoop(loop=loop)
+if hasattr(loop, "_asyncio_wrapper"):
+return loop
+
+# This returns a running loop if it exists, and otherwise returns
+# a loop associated with the current thread.
+safe_loop = _safe_loop(create=loop is None)
+if safe_loop is not None and (loop is None or safe_loop._loop is loop):
+return safe_loop
+
+if safe_loop is None:
+msg = f"_wrap_loop argument '{loop}' not associated with thread
'{threading.get_ident()}'"
+else:
+msg = f"_wrap_loop argument '{loop}' different frome loop
'{safe_loop._loop}' already associated with thread '{threading.get_ident()}'"
+
+if portage._internal_caller:
+raise AssertionError(msg)
+# It's not known whether external API consumers will trigger this case,
+# so if it happens then emit a UserWarning before returning a temporary
+# AsyncioEventLoop instance.
+warnings.warn(msg, UserWarning, stacklevel=2)
-def _safe_loop():
+# We could possibly add a weak reference in _thread_weakrefs.loops when
+# safe_loop is None, but if safe_loop is not None, then there is a
+# collision in _thread_weakrefs.loops that would need to be resolved.
+return _AsyncioEventLoop(loop=loop)
+
+
+def _safe_loop(create: Optional[bool] = True) -> Optional[_AsyncioEventLoop]:
"""
Return an event loop that's safe to use within the current context.
For portage internal callers or external API consumers calling from
@@ -276,8 +302,13 @@ def _safe_loop():
are added to a WeakValueDictionary, and closed via an atexit hook
if they still exist during exit for the current pid.
-@rtype: asyncio.AbstractEventLoop (or compatible)
-@return: event loop instance
+@type create: bool
+@param create: Create a loop by default if a loop is not already associated
+with the current thread. If create is False, then return None if a loop
+is not already associated with the current thread.
+@rtype: AsyncioEventLoop or None
+@return: event loop instance, or None if the create parameter is False and
+a loop is not already associated with the current thread.
"""
loop = _get_running_loop()
if loop is not None:
@@ -292,6 +323,8 @@ def _safe_loop():
try:
loop = _thread_weakrefs.loops[thread_key]
except KeyError:
+if not create:
+return None
try:
try:
_loop = _real_asyncio.get_running_loop()
[gentoo-commits] repo/gentoo:master commit in: app-containers/k3d/
commit: 7cbcd50c9c409581992d7c7ee2f3c2b82e2f6c6f
Author: Zac Medico gentoo org>
AuthorDate: Mon Aug 19 03:23:58 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Aug 19 03:29:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbcd50c
app-containers/k3d: add 5.7.3 (bump K3S_TAG to v1.30.3-k3s1)
Signed-off-by: Zac Medico gentoo.org>
app-containers/k3d/Manifest | 1 +
app-containers/k3d/k3d-5.7.3.ebuild | 43 +
2 files changed, 44 insertions(+)
diff --git a/app-containers/k3d/Manifest b/app-containers/k3d/Manifest
index 536b64890a4f..b3995d3253af 100644
--- a/app-containers/k3d/Manifest
+++ b/app-containers/k3d/Manifest
@@ -1,2 +1,3 @@
DIST k3d-5.4.9.tar.gz 7740293 BLAKE2B
b7a657720524abac2c36cccef8cf6e9c5588fcc191ecc2a3f7ed138762cc23abdc2b6413c67d426635e50777b8b87fccf93dc7cd88b0dd5c67becbc3f9056472
SHA512
caa6566f79837deb31db991df5475369b4921a5a110b723ad6c76f8ce2349399d0843d3e5de071a4ec50b318157d8fb47cc36018a0af9bb487793269c27027bf
DIST k3d-5.6.0.tar.gz 8022281 BLAKE2B
93f32f65e6c42650608b94d58d2149c3fec96251500be0d95d5673f07ae8c366d80954afa4d80eec149b7a9e8af7389323c21498910a3010bb80b975f64064d0
SHA512
c13df93499ffde6567e4bf7dcf260cb65ca01c390bf39361122fa61553591f418213049cf29d8dde63896f026a28d96f4e2ab522a143ac66cfa9f3786f8ba9b9
+DIST k3d-5.7.3.tar.gz 9566684 BLAKE2B
9dff7ab447b3fd790a036d61bc3a4bb61238c74eec60aa12a4ff10150ff2f4999a3b1e635aaae6211f4e05ed9c589dc08e08ba511eb7690f857c0dad954b6ce7
SHA512
d6e2f6fb3013429745e1663214c7dd66dd2727b592a32e81f5837bbcc997aee18418366a0e21463ba48a2d72b9a86067f492f1f44c4689a129166dcf018e5642
diff --git a/app-containers/k3d/k3d-5.7.3.ebuild
b/app-containers/k3d/k3d-5.7.3.ebuild
new file mode 100644
index ..1a19ed584ac4
--- /dev/null
+++ b/app-containers/k3d/k3d-5.7.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="k3d creates k3s clusters in docker"
+HOMEPAGE="https://github.com/rancher/k3d";
+
+K3D_K3S_TAG=v1.30.3-k3s1
+SRC_URI="https://github.com/rancher/k3d/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0 ISC"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="doc"
+
+src_prepare() {
+ default
+ rm Makefile || die
+}
+
+src_compile() {
+ local extra_ldflags=(
+ -X "github.com/k3d-io/k3d/v5/version.Version=v${PV}"
+ -X "github.com/k3d-io/k3d/v5/version.K3sVersion=${K3D_K3S_TAG}"
+ )
+ env -u GOWORK \
+ CGO_ENABLED=0 \
+ go build \
+ -mod=vendor \
+ -ldflags "-w -s ${extra_ldflags[*]}" \
+ -o bin/k3d || die
+}
+
+src_install() {
+ dobin bin/${PN}
+ DOCS=(*.md)
+ if use doc; then
+ DOCS+=(docs)
+ fi
+ default_src_install
+}
[gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/
commit: f52b5bc93c2fe7f5ce1f20dea1c57410aad17a27
Author: Zac Medico gentoo org>
AuthorDate: Mon Aug 19 00:05:13 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Aug 19 00:06:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52b5bc9
dev-go/go-tools: Compile go packages selectively
This eliminates the need to use nonfatal and check for
expected binaries afterwards.
Signed-off-by: Zac Medico gentoo.org>
dev-go/go-tools/go-tools-0.24.0.ebuild | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dev-go/go-tools/go-tools-0.24.0.ebuild
b/dev-go/go-tools/go-tools-0.24.0.ebuild
index 312e41f08ccd..442e64290744 100644
--- a/dev-go/go-tools/go-tools-0.24.0.ebuild
+++ b/dev-go/go-tools/go-tools-0.24.0.ebuild
@@ -29,12 +29,8 @@ GO_TOOLS_BINS=(
src_compile() {
local bin packages
- readarray -t packages < <(ego list ./...)
- GOBIN="${S}/bin" nonfatal ego install -work "${packages[@]}" || true
- for bin in "${GO_TOOLS_BINS[@]}"; do
- [[ -x ${S}/bin/${bin} ]] || \
- die "File not found, check build log: ${S}/bin/${bin}"
- done
+ readarray -t packages < <(ego list ./... | grep -E "/($(echo
"${GO_TOOLS_BINS[@]}" | tr ' ' '|'))$")
+ GOBIN="${S}/bin" ego install -work "${packages[@]}"
}
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/
commit: 613cdf31149d1fbf54750b5fe3b8d11ddc8d0d95
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 18 23:45:19 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 18 23:46:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=613cdf31
dev-go/go-tools: update HOMEPAGE
Signed-off-by: Zac Medico gentoo.org>
dev-go/go-tools/go-tools-0.1.10.ebuild | 2 +-
dev-go/go-tools/go-tools-0.20.0.ebuild | 2 +-
dev-go/go-tools/go-tools-0.24.0.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-go/go-tools/go-tools-0.1.10.ebuild
b/dev-go/go-tools/go-tools-0.1.10.ebuild
index 7c66827e5473..87ff0acf7a3c 100644
--- a/dev-go/go-tools/go-tools-0.1.10.ebuild
+++ b/dev-go/go-tools/go-tools-0.1.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit go-module
DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
-HOMEPAGE="https://godoc.org/golang.org/x/tools";
+HOMEPAGE="https://pkg.go.dev/golang.org/x/tools";
SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz";
S=${WORKDIR}/${P#go-}
diff --git a/dev-go/go-tools/go-tools-0.20.0.ebuild
b/dev-go/go-tools/go-tools-0.20.0.ebuild
index fe369f14fa0a..4f8e29b6be14 100644
--- a/dev-go/go-tools/go-tools-0.20.0.ebuild
+++ b/dev-go/go-tools/go-tools-0.20.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit go-module
DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
-HOMEPAGE="https://godoc.org/golang.org/x/tools";
+HOMEPAGE="https://pkg.go.dev/golang.org/x/tools";
SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
S=${WORKDIR}/${P#go-}
diff --git a/dev-go/go-tools/go-tools-0.24.0.ebuild
b/dev-go/go-tools/go-tools-0.24.0.ebuild
index fedb0f72416a..312e41f08ccd 100644
--- a/dev-go/go-tools/go-tools-0.24.0.ebuild
+++ b/dev-go/go-tools/go-tools-0.24.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit go-module
DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
-HOMEPAGE="https://godoc.org/golang.org/x/tools";
+HOMEPAGE="https://pkg.go.dev/golang.org/x/tools";
SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
S=${WORKDIR}/${P#go-}
[gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/
commit: 6b1059633c5956e575d7468a65ad57564190f91e
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 18 19:28:01 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 18 19:33:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b105963
dev-go/go-tools: add 0.24.0
Tested with go-1.23.0 and it successfully built all of the
expected binaries.
Closes: https://bugs.gentoo.org/937934
Signed-off-by: Zac Medico gentoo.org>
dev-go/go-tools/Manifest | 2 ++
dev-go/go-tools/go-tools-0.24.0.ebuild | 52 ++
2 files changed, 54 insertions(+)
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 69c562a90597..e98c5f7e0f5b 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -2,3 +2,5 @@ DIST go-tools-0.1.10-deps.tar.xz 16247548 BLAKE2B
7dc27e377eec3c7fa49d37614d2b7b
DIST go-tools-0.1.10.tar.gz 3014465 BLAKE2B
f3b6129ad00385539eab3426bc542a120bd41d3984174d5d8b91bee6435d7a179c0058f2a50de3235a07e5b67f6d9657288bd578591d61187447441bb6408e76
SHA512
9c817c98739a1788b7fb459728528b5c647226e64df495661c1b3027bfa571e884d6c28d8796558b65e2ba54774976897bddcd052568f33d4e30ce8ee5d883e1
DIST go-tools-0.20.0-deps.tar.xz 383336 BLAKE2B
0bddd81087bae28c2d874a2ea647a5293b32895fded73351813c1542066d7ee1a0d3d8a0aaa5c13cea3e117c692b46690282f992293d83c8fbd2901adc71911f
SHA512
eeaa8a85ec81eed757156f99d6bc99f69c89debf52eb862e870c7effb7a0b800736e04f507efa19be122a5246aed2519d4c33bd850bc790947f065ab8a87a323
DIST go-tools-0.20.0.tar.gz 3779878 BLAKE2B
42175d921dfb5acb25c9eee224138675619860aefaca09db8e354481c146faa52b2fcc64d99953d8508a79ce8375ebcc42a1e7d20f4721e55b8c843989565fbc
SHA512
c67706593d0a48f941955e40cadc1e39961b07ba51c9342b302ba99f93a1e55b9feec21d6171ee370f96293253be27b480274d48a16eff1055373f81b73f2dd9
+DIST go-tools-0.24.0-deps.tar.xz 423048 BLAKE2B
0df1a18476c207e26c5397aa81d475e96ac00cbf9460899c3e66804963b5661befcd648f0bc51bf67775b533c370dcf634939bd6c5efad5ee289f73233c09b66
SHA512
f4eb6bfc918b947b6903e260edc99f71ebea4b8c39a118526608b9c86712e97029ab4473fd617dc8377a7021a8b606d267abf686c4a36a37556f828afd53fb4c
+DIST go-tools-0.24.0.tar.gz 6977100 BLAKE2B
ca0a9c5d3e41ca9accbacfc4074827bb3750c7bab8b20a80c76998dc4078d889eeaaf0f7fc6cd3864b5613c8474175d626165a5e20ada12876afa0279d325887
SHA512
bb41b620d4e3fe2c028a618656b47e28e9ecf2ecc49bb70dcd919948d0c6a4eeeded04ef2fa7604307029686605d5d809ff671dc1b0d3143af7100e4e480a444
diff --git a/dev-go/go-tools/go-tools-0.24.0.ebuild
b/dev-go/go-tools/go-tools-0.24.0.ebuild
new file mode 100644
index ..fedb0f72416a
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0.24.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
+HOMEPAGE="https://godoc.org/golang.org/x/tools";
+SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+S=${WORKDIR}/${P#go-}
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Many test failures.
+RESTRICT="test"
+
+GO_TOOLS_BINS=(
+ authtest benchcmp bisect bundle callgraph compilebench cookieauth
+ deadcode defers digraph eg fieldalignment file2fuzz findcall fiximports
+ fuzz-driver fuzz-runner gitauth go-contrib-init godex godoc goimports
+ gomvpkg gonew gopackages gorename gostacks gotype goyacc html2article
+ httpmux ifaceassert lostcancel netrcauth nilness nodecount play present
+ present2md shadow splitdwarf ssadump stress stringer stringintconv
+ toolstash unmarshal unusedresult
+)
+
+src_compile() {
+ local bin packages
+ readarray -t packages < <(ego list ./...)
+ GOBIN="${S}/bin" nonfatal ego install -work "${packages[@]}" || true
+ for bin in "${GO_TOOLS_BINS[@]}"; do
+ [[ -x ${S}/bin/${bin} ]] || \
+ die "File not found, check build log: ${S}/bin/${bin}"
+ done
+}
+
+src_test() {
+ ego test -work ./...
+}
+
+src_install() {
+ # bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+ local goroot=$(go env GOROOT)
+ goroot=${goroot#${EPREFIX}}
+ exeinto "${goroot}/bin"
+ doexe bin/*
+ dodir /usr/bin
+ ln "${ED}/${goroot}/bin/godoc" "${ED}/usr/bin/godoc" || die
+}
[gentoo-commits] repo/gentoo:master commit in: app-containers/cri-o/
commit: f9c13604be244bb8d585593a31774dd9a79ee968
Author: Zac Medico gentoo org>
AuthorDate: Thu Aug 15 03:23:04 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Aug 15 03:29:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c13604
app-containers/cri-o: drop 1.29.0
Signed-off-by: Zac Medico gentoo.org>
app-containers/cri-o/Manifest| 1 -
app-containers/cri-o/cri-o-1.29.0.ebuild | 102 ---
2 files changed, 103 deletions(-)
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index 11f94eddc2da..f49f03ba1405 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1,2 +1 @@
-DIST cri-o-1.29.0.tar.gz 21371695 BLAKE2B
f670605f07446a78ce04f497207e0205aee23138be448bdc2d2fb172691e5bb309234daa1c5c0adbb37dcb24e9177f24f62e01e183ac6443f48054b9e65b6dfe
SHA512
bb83c906964e61ae68219e1374a3e0810fc982fd0389549e6fe3128156af8d5c6effce4217de4d33d3e29e986db630525694093ca3a99b6065385e1e37927fef
DIST cri-o-1.29.2.tar.gz 21203342 BLAKE2B
deec88f8a505bdc1f184a3512da7f6d4b78499c4a66cacf0651a9fe56b62d33d62eaaf2ce68e5d8e856e13988b26e076ab69c24b30a62b42d88656441d948fcb
SHA512
dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c
diff --git a/app-containers/cri-o/cri-o-1.29.0.ebuild
b/app-containers/cri-o/cri-o-1.29.0.ebuild
deleted file mode 100644
index 9d8b95307d64..
--- a/app-containers/cri-o/cri-o-1.29.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT=d59bbdc252837107c9f5d235b8fb2650ff2b9d93=
-
-inherit go-module
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime
Interface"
-HOMEPAGE="https://cri-o.io/";
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs +device-mapper selinux systemd"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- app-containers/conmon
- app-containers/runc
- dev-libs/glib:=
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- net-firewall/conntrack-tools
- net-firewall/iptables
- app-containers/cni-plugins
- net-misc/socat
- sys-apps/iproute2
- sys-libs/libseccomp:=
- btrfs? ( sys-fs/btrfs-progs )
- device-mapper? ( sys-fs/lvm2:= )
- selinux? ( sys-libs/libselinux:= )
- systemd? ( sys-apps/systemd:= )"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- !> Makefile || die
-
- sed -e 's:/usr/local/bin:/usr/bin:' \
- -i contrib/systemd/* || die
-}
-
-src_compile() {
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die; }
-
- [[ -f hack/libdm_installed.sh ]] || die
- use device-mapper || { echo -e "#!/bin/sh\necho
exclude_graphdriver_devicemapper" > \
- hack/libdm_installed.sh || die; }
-
- [[ -f hack/selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- hack/selinux_tag.sh || die; }
-
- mkdir -p bin || die
- emake all \
- GOBIN="${S}/bin" \
- GO_BUILD="go build ${GOFLAGS}" \
- GO_MD2MAN="$(which go-md2man)"
-}
-
-src_install() {
- emake install install.config install.systemd \
- DESTDIR="${D}" \
- GO_MD2MAN="$(which go-md2man)" \
- PREFIX="${D}${EPREFIX}/usr"
- keepdir /etc/crio
- mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
- newinitd "${FILESDIR}/crio.initd" crio
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
- # Suppress crio log error messages triggered if these don't exist.
- keepdir /etc/containers/oci/hooks.d
- keepdir /usr/share/containers/oci/hooks.d
-
- # Suppress crio "Missing CNI default network" log message.
- keepdir /etc/cni/net.d
- insinto /etc/cni/net.d
- doins contrib/cni/99-loopback.conflist
-}
[gentoo-commits] repo/gentoo:master commit in: app-containers/cri-o/
commit: db954097dcea162dfdd7e65039a5a7539246a16d
Author: Zac Medico gentoo org>
AuthorDate: Thu Aug 15 03:27:38 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Aug 15 03:29:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db954097
app-containers/cri-o: add 1.30.4
Signed-off-by: Zac Medico gentoo.org>
app-containers/cri-o/Manifest| 1 +
app-containers/cri-o/cri-o-1.30.4.ebuild | 102 +++
2 files changed, 103 insertions(+)
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index f49f03ba1405..5c4967d78dee 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1 +1,2 @@
DIST cri-o-1.29.2.tar.gz 21203342 BLAKE2B
deec88f8a505bdc1f184a3512da7f6d4b78499c4a66cacf0651a9fe56b62d33d62eaaf2ce68e5d8e856e13988b26e076ab69c24b30a62b42d88656441d948fcb
SHA512
dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c
+DIST cri-o-1.30.4.tar.gz 19645954 BLAKE2B
bb55eb674e7703ca313ed03cf6fa9952390121440a37c3413aac0c739b2cd7f03d36993139d41ae210faabb0530cab939074a78b8aa4319e0994063132a2e344
SHA512
fe0d69107e186943482909dac5e332226d7dfd5a1702722edc5c4f5df3ad9c6bff63e43dc7831c057ecc3ca387ee77815d43f531ad1e7b921d645d59797aa95d
diff --git a/app-containers/cri-o/cri-o-1.30.4.ebuild
b/app-containers/cri-o/cri-o-1.30.4.ebuild
new file mode 100644
index ..74f118a739af
--- /dev/null
+++ b/app-containers/cri-o/cri-o-1.30.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT=dbc00ffd41a487c847158032193b6dca9b49e821
+
+inherit go-module
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime
Interface"
+HOMEPAGE="https://cri-o.io/";
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+ app-crypt/gpgme:=
+ app-containers/conmon
+ app-containers/runc
+ dev-libs/glib:=
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ net-firewall/conntrack-tools
+ net-firewall/iptables
+ app-containers/cni-plugins
+ net-misc/socat
+ sys-apps/iproute2
+ sys-libs/libseccomp:=
+ btrfs? ( sys-fs/btrfs-progs )
+ device-mapper? ( sys-fs/lvm2:= )
+ selinux? ( sys-libs/libselinux:= )
+ systemd? ( sys-apps/systemd:= )"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+ !> Makefile || die
+
+ sed -e 's:/usr/local/bin:/usr/bin:' \
+ -i contrib/systemd/* || die
+}
+
+src_compile() {
+ [[ -f hack/btrfs_installed_tag.sh ]] || die
+ use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+ hack/btrfs_installed_tag.sh || die; }
+
+ [[ -f hack/libdm_installed.sh ]] || die
+ use device-mapper || { echo -e "#!/bin/sh\necho
exclude_graphdriver_devicemapper" > \
+ hack/libdm_installed.sh || die; }
+
+ [[ -f hack/selinux_tag.sh ]] || die
+ use selinux || { echo -e "#!/bin/sh\ntrue" > \
+ hack/selinux_tag.sh || die; }
+
+ mkdir -p bin || die
+ emake all \
+ GOBIN="${S}/bin" \
+ GO_BUILD="go build ${GOFLAGS}" \
+ GO_MD2MAN="$(which go-md2man)"
+}
+
+src_install() {
+ emake install install.config install.systemd \
+ DESTDIR="${D}" \
+ GO_MD2MAN="$(which go-md2man)" \
+ PREFIX="${D}${EPREFIX}/usr"
+ keepdir /etc/crio
+ mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+ newinitd "${FILESDIR}/crio.initd" crio
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+ # Suppress crio log error messages triggered if these don't exist.
+ keepdir /etc/containers/oci/hooks.d
+ keepdir /usr/share/containers/oci/hooks.d
+
+ # Suppress crio "Missing CNI default network" log message.
+ keepdir /etc/cni/net.d
+ insinto /etc/cni/net.d
+ doins contrib/cni/99-loopback.conflist
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/vault/
commit: d45f658630c5c25659a87052f68f134cea513247
Author: Zac Medico gentoo org>
AuthorDate: Thu Aug 15 03:00:34 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Aug 15 03:00:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45f6586
app-admin/vault: add 1.17.3
Signed-off-by: Zac Medico gentoo.org>
app-admin/vault/Manifest| 3 ++
app-admin/vault/vault-1.17.3.ebuild | 86 +
2 files changed, 89 insertions(+)
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 13e072233ff7..001207c4e4e2 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -11,3 +11,6 @@ DIST vault-1.16.1.tar.gz 32997180 BLAKE2B
e8c6ccf19ce2c48eee1b4b7544c6d164bd98be
DIST vault-1.16.3-deps.tar.xz 21492052 BLAKE2B
5800105ab4f005c9569b4fd9eee567c706d2c0e1d0fbb937af6e3348f06f2a6e8ea7c159a738d04c266d577a5b1e7419735ffae410a106aac4b65740f55c7979
SHA512
9e4d515dad7862f56fef8822852b6989b52b494a786a38b74ce85af60b3f562738f3af5bf1497e5af0c07b42aaff407c1d39c3bd3f18d1f646998b7ac0b100a2
DIST vault-1.16.3-webui.tar.xz 2180172 BLAKE2B
b1d8d59c462f7cd60ec5ef5878320591290c1655d1b1727508541faf45e5fe3c6085ff8fb66b3b82d95ca74cc1ee800fed09f0db7eb98580f7cc135a3eebfe6e
SHA512
61ead17ceed96f7dda7439e292d0c0497d65c8938491f70927064ed647276ae41ffa35777e2a119dee116233baca9575b82e3e53cbeb9b622eb34f1563f4e164
DIST vault-1.16.3.tar.gz 33353350 BLAKE2B
b185b9ad6b1e30da4ca2c2e9425a606e19fbda0b4ac529fb8410d2bff5a215eafe62d12c5c9988423ba7185a0456b7a5e364a466abe00ba9e45b57d59fd115d8
SHA512
b68189b978155168c42bac3e867abc44fcd4b6e9f680bd6951b99208536f1225013e8d336711ea17b9700b0ec75758dd2678e583811918e278849f306ddc9c2e
+DIST vault-1.17.3-deps.tar.xz 21557340 BLAKE2B
ba26c3921999c76e51d1548472a6e49d9be316f099ca2213879aa384ac6b70a2716d12b8950be56263f78343e8b09708905a03421eceb67e400544241a185a55
SHA512
6aa16d78459ffab1d5356291f196a40c9efc646baa1b10d191ab5d40d712d296e0c89b396afa16719716d178557b970278949967ba0bcacaf77d0b3bfb837e10
+DIST vault-1.17.3-webui.tar.xz 2196772 BLAKE2B
c66ce1dcae83b18afb1bc4a76a1c69191d8bec6b7c1f392f58a66df423120a9d38a3b3c5222ae8ad0a960c6100e5dc3acaa11e4bfc04e2a43bf4df68fc036f47
SHA512
b9983126e403c5d4fcfdb25f02deaafe461c490ba67d5295cfdd35c69112e02677fe56e9b50cebe51afc6e896febdb5f6fac7431944f41d3bad38bad4a7670d1
+DIST vault-1.17.3.tar.gz 33565884 BLAKE2B
cc39312ada9d889feda72d7659dfab56c53d4351882fcba1d52beed4cb41d387cec3b160413b63b3d031e0b23fe21d95b6d8cce438c274a5f39e4386a8d0b3c8
SHA512
e5d2f25b77e4d50f5f51cd5e2a6060745e147be328e68a9c51c142a40d83b446a6ccc27fe1414ba10f0abf8a37818b369b4d3245d44b0afb0ddf84a0e51c0995
diff --git a/app-admin/vault/vault-1.17.3.ebuild
b/app-admin/vault/vault-1.17.3.ebuild
new file mode 100644
index ..c201204925f2
--- /dev/null
+++ b/app-admin/vault/vault-1.17.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/";
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+=" webui? (
https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="+webui"
+
+BDEPEND="
+ app-arch/zip
+ dev-go/enumer
+ dev-go/gox
+ >=dev-lang/go-1.21"
+COMMON_DEPEND="acct-group/vault
+ acct-user/vault"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT="test"
+
+src_unpack() {
+ default
+}
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
+ -i scripts/build.sh || die
+ sed -e "/hooks/d" \
+ -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+ -e "s/gofumpt/gofmt/g" \
+ -i Makefile || die
+ if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+ rm -rf "${S}/http/web_ui" || die
+ mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+ die "mv failed"
+ else
+ mkdir -p "${S}/http/we
[gentoo-commits] proj/portage:master commit in: lib/_emerge/
commit: e4f0fa4a316aba2cf2b1a47c9d2974710a1d8bd3
Author: Zac Medico gentoo org>
AuthorDate: Wed Aug 14 16:03:52 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Wed Aug 14 16:04:34 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e4f0fa4a
_EbuildFetcherProcess: Suppress asyncio.CancelledError
Fixes: 74e29110d86a ("_EbuildFetcherProcess: Suppress CancelledError")
Bug: https://bugs.gentoo.org/937888
Signed-off-by: Zac Medico gentoo.org>
lib/_emerge/EbuildFetcher.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/_emerge/EbuildFetcher.py b/lib/_emerge/EbuildFetcher.py
index 422d7c0a06..554cd95973 100644
--- a/lib/_emerge/EbuildFetcher.py
+++ b/lib/_emerge/EbuildFetcher.py
@@ -373,7 +373,7 @@ class _EbuildFetcherProcess(ForkProcess):
def cache_result(result):
try:
self._uri_map = result.result()
-except (CancelledError, Exception):
+except (asyncio.CancelledError, Exception):
# The caller handles this when it retrieves the result.
pass
[gentoo-commits] proj/portage:master commit in: lib/portage/
commit: cfd767cd35f5affd3b61b665b0f8814fe2de24c4 Author: Zac Medico gentoo org> AuthorDate: Wed Aug 14 05:30:42 2024 + Commit: Zac Medico gentoo org> CommitDate: Wed Aug 14 15:22:05 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cfd767cd run_exitfuncs: Drop hooks inherited via fork Drop hooks inherited via fork because they can trigger redundant actions as shown in bug 937891. Note that atexit hooks only work after fork since issue 83856 was fixed in Python 3.13. Bug: https://bugs.gentoo.org/937891 Signed-off-by: Zac Medico gentoo.org> lib/portage/process.py | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/portage/process.py b/lib/portage/process.py index 38adebda66..e6f6feb357 100644 --- a/lib/portage/process.py +++ b/lib/portage/process.py @@ -208,7 +208,7 @@ def atexit_register(func, *args, **kargs): # which is associated with the current thread. global_event_loop()._coroutine_exithandlers.append((func, args, kargs)) else: -_exithandlers.append((func, args, kargs)) +_exithandlers.append((func, args, kargs, portage.getpid())) def run_exitfuncs(): @@ -222,7 +222,12 @@ def run_exitfuncs(): # original function is in the output to stderr. exc_info = None while _exithandlers: -func, targs, kargs = _exithandlers.pop() +func, targs, kargs, pid = _exithandlers.pop() +if pid != portage.getpid(): +# Drop hooks inherited via fork because they can trigger redundant +# actions as shown in bug 937891. Note that atexit hooks only work +# after fork since issue 83856 was fixed in Python 3.13. +continue try: func(*targs, **kargs) except SystemExit:
[gentoo-commits] proj/portage:master commit in: lib/_emerge/
commit: 74e29110d86a55ac74fdde3e1b79506b3fb695c2 Author: Zac Medico gentoo org> AuthorDate: Wed Aug 14 05:49:30 2024 + Commit: Zac Medico gentoo org> CommitDate: Wed Aug 14 15:08:12 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=74e29110 _EbuildFetcherProcess: Suppress CancelledError Suppress CancelledError when attempting to cache the result in the _async_uri_map method. The cancelled result is returned for the caller to handle. Bug: https://bugs.gentoo.org/937888 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/EbuildFetcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_emerge/EbuildFetcher.py b/lib/_emerge/EbuildFetcher.py index 994271236c..422d7c0a06 100644 --- a/lib/_emerge/EbuildFetcher.py +++ b/lib/_emerge/EbuildFetcher.py @@ -373,7 +373,7 @@ class _EbuildFetcherProcess(ForkProcess): def cache_result(result): try: self._uri_map = result.result() -except Exception: +except (CancelledError, Exception): # The caller handles this when it retrieves the result. pass
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/util/, lib/portage/util/_eventloop/, ...
commit: cb0c09d8cecbcc086786e3e2c7cdd8ffc023a48a
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 11 07:50:49 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 07:50:49 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cb0c09d8
Support coroutine exitfuncs for non-main loops
Since an API consumer can cause loops to be instantiated
for non-main threads, support coroutine exitfuncs for each
loop. The included Socks5ServerAtExitThreadedTestCase calls
get_socks5_proxy from a non-main thread, and demonstrates
that coroutine exitfuncs for the resulting non-main loop
will reliably stop the socks5 proxy via atexit hook.
The _thread_weakrefs_atexit function will now make a
temporary adjustment to _thread_weakrefs.loops so that a
loop is associated with the current thread when it is
closing. Also, the _get_running_loop function will now
store weak references to all _AsyncioEventLoop instances
it creates, since each has a _coroutine_exithandlers
attribute that can be modified by atexit_register calls.
Bug: https://bugs.gentoo.org/937740
Signed-off-by: Zac Medico gentoo.org>
lib/portage/process.py| 11 --
lib/portage/tests/util/test_socks5.py | 38 +++--
lib/portage/util/_eventloop/asyncio_event_loop.py | 15 ++---
lib/portage/util/futures/_asyncio/__init__.py | 41 ---
4 files changed, 76 insertions(+), 29 deletions(-)
diff --git a/lib/portage/process.py b/lib/portage/process.py
index 23e2507b53..38adebda66 100644
--- a/lib/portage/process.py
+++ b/lib/portage/process.py
@@ -194,7 +194,6 @@ def spawn_fakeroot(mycommand, fakeroot_state=None,
opt_name=None, **keywords):
_exithandlers = []
-_coroutine_exithandlers = []
def atexit_register(func, *args, **kargs):
@@ -205,7 +204,9 @@ def atexit_register(func, *args, **kargs):
# The internal asyncio wrapper module would trigger a circular import
# if used here.
if _asyncio.iscoroutinefunction(func):
-_coroutine_exithandlers.append((func, args, kargs))
+# Add this coroutine function to the exit handlers for the loop
+# which is associated with the current thread.
+global_event_loop()._coroutine_exithandlers.append((func, args, kargs))
else:
_exithandlers.append((func, args, kargs))
@@ -238,13 +239,17 @@ async def run_coroutine_exitfuncs():
"""
This is the same as run_exitfuncs but it uses asyncio.iscoroutinefunction
to check which functions to run. It is called by the AsyncioEventLoop
-_close_main method just before the loop is closed.
+_close method just before the loop is closed.
If the loop is explicitly closed before exit, then that will cause
run_coroutine_exitfuncs to run before run_exitfuncs. Otherwise, a
run_exitfuncs hook will close it, causing run_coroutine_exitfuncs to be
called via run_exitfuncs.
"""
+# The _thread_weakrefs_atexit function makes an adjustment to ensure
+# that global_event_loop() returns the correct loop when it is closing,
+# regardless of which thread the loop was initially associated with.
+_coroutine_exithandlers = global_event_loop()._coroutine_exithandlers
tasks = []
while _coroutine_exithandlers:
func, targs, kargs = _coroutine_exithandlers.pop()
diff --git a/lib/portage/tests/util/test_socks5.py
b/lib/portage/tests/util/test_socks5.py
index 35f919d970..078e3b1a23 100644
--- a/lib/portage/tests/util/test_socks5.py
+++ b/lib/portage/tests/util/test_socks5.py
@@ -194,17 +194,17 @@ class Socks5ServerTestCase(TestCase):
asyncio.run(self._test_socks5_proxy())
async def _test_socks5_proxy(self):
-loop = asyncio.get_running_loop()
+loop = global_event_loop()
host = "127.0.0.1"
content = b"Hello World!"
path = "/index.html"
proxy = None
tempdir = tempfile.mkdtemp()
-previous_exithandlers = portage.process._coroutine_exithandlers
+previous_exithandlers = loop._coroutine_exithandlers
try:
-portage.process._coroutine_exithandlers = []
+loop._coroutine_exithandlers = []
with AsyncHTTPServer(host, {path: content}, loop) as server:
settings = {
"PORTAGE_TMPDIR": tempdir,
@@ -227,11 +227,11 @@ class Socks5ServerTestCase(TestCase):
finally:
try:
# Also run_coroutine_exitfuncs to test atexit hook cleanup.
-self.assertNotEqual(portage.process._coroutine_exithandlers,
[])
+self.assertNotEqual(loop._coroutine_exithandlers, [])
await portage.process.run_coroutine_exitfuncs()
-self.assertEqual(portage.process._coroutine_exithandlers, [])
+self.assertEqual(loop._cor
[gentoo-commits] repo/gentoo:master commit in: app-admin/vault/
commit: 4f05c6ec011f43a26eedc7b3721fc768e1b5d79f
Author: Zac Medico gentoo org>
AuthorDate: Tue Aug 13 05:51:39 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Aug 13 05:52:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f05c6ec
app-admin/vault: add 1.16.3
Added dev-go/enumer to BDEPEND.
Signed-off-by: Zac Medico gentoo.org>
app-admin/vault/Manifest| 3 ++
app-admin/vault/vault-1.16.3.ebuild | 87 +
2 files changed, 90 insertions(+)
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 8eb33f53ee11..13e072233ff7 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -8,3 +8,6 @@ DIST vault-1.15.6.tar.gz 31923253 BLAKE2B
8a4e7b9d8d6753b6f717c6699b2d4822cecff2
DIST vault-1.16.1-deps.tar.xz 21476528 BLAKE2B
2ba0bd2165ce41bfae6fb56a0ff97fe4ed30ac5e16f30ceba14d618e30851b9bb31a964cf5035cd4089baf87c2cda5acd17558bb363acbbcc371ddf47b453c73
SHA512
a0262f421eacfc729a0bc98c137a580d3ca7b384b5b7a8e3bb81cc27b0791b81fdb9005ff9721159cccaf49f2ec6e86dafe7f4e2dde4b5c8d806a8bf1c68de2c
DIST vault-1.16.1-webui.tar.xz 2213524 BLAKE2B
40c0811c84c849beba934f110afa21fe1ebe60f9a01750fcb4c6442f6a8ef28babd4c32157e6bb3eaf7545b683a81122f445a1a0d717cf7442a678e87206f67a
SHA512
ca25ffaa85445070310fad9d5a05d6ff477729d64707a4da8bc433781d7f2283e18e680a9a06d6aa37496a21b148ac3bdc5eb3f475246ee3fe3cf4a8db096ffb
DIST vault-1.16.1.tar.gz 32997180 BLAKE2B
e8c6ccf19ce2c48eee1b4b7544c6d164bd98be3d06a08397b06049bbb6aed9304df592bcb5103e943a629aca4c2e83f661b16469e3353c022e3ca552fa1afedb
SHA512
e970004343abb2792aeea4db55a002d1c18701d309caab4a49e3f387028083b70dfa67b7ff34b60c5d4d34ffa8ac3bef308b7218a0344dffde3b000b0e5d43a9
+DIST vault-1.16.3-deps.tar.xz 21492052 BLAKE2B
5800105ab4f005c9569b4fd9eee567c706d2c0e1d0fbb937af6e3348f06f2a6e8ea7c159a738d04c266d577a5b1e7419735ffae410a106aac4b65740f55c7979
SHA512
9e4d515dad7862f56fef8822852b6989b52b494a786a38b74ce85af60b3f562738f3af5bf1497e5af0c07b42aaff407c1d39c3bd3f18d1f646998b7ac0b100a2
+DIST vault-1.16.3-webui.tar.xz 2180172 BLAKE2B
b1d8d59c462f7cd60ec5ef5878320591290c1655d1b1727508541faf45e5fe3c6085ff8fb66b3b82d95ca74cc1ee800fed09f0db7eb98580f7cc135a3eebfe6e
SHA512
61ead17ceed96f7dda7439e292d0c0497d65c8938491f70927064ed647276ae41ffa35777e2a119dee116233baca9575b82e3e53cbeb9b622eb34f1563f4e164
+DIST vault-1.16.3.tar.gz 33353350 BLAKE2B
b185b9ad6b1e30da4ca2c2e9425a606e19fbda0b4ac529fb8410d2bff5a215eafe62d12c5c9988423ba7185a0456b7a5e364a466abe00ba9e45b57d59fd115d8
SHA512
b68189b978155168c42bac3e867abc44fcd4b6e9f680bd6951b99208536f1225013e8d336711ea17b9700b0ec75758dd2678e583811918e278849f306ddc9c2e
diff --git a/app-admin/vault/vault-1.16.3.ebuild
b/app-admin/vault/vault-1.16.3.ebuild
new file mode 100644
index ..2ad80d89998d
--- /dev/null
+++ b/app-admin/vault/vault-1.16.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/";
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+=" webui? (
https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="+webui"
+
+BDEPEND="
+ app-arch/zip
+ dev-go/enumer
+ dev-go/gox
+ >=dev-lang/go-1.21"
+COMMON_DEPEND="acct-group/vault
+ acct-user/vault"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT="test"
+PATCHES=("${FILESDIR}/${PN}-1.15.6-stubmaker-outside-git-repo-24678.patch")
+
+src_unpack() {
+ default
+}
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
+ -i scripts/build.sh || die
+ sed -e "/hooks/d" \
+ -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+ -e "s/gofumpt/gofmt/g" \
+ -i Makefile || die
+ if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+ rm -rf "${S}/http/web_ui" || die
+ mv "${WORKDIR}/http/web_ui" "${S}/http/
[gentoo-commits] repo/gentoo:master commit in: dev-go/enumer/
commit: f3dc3eeb1190f54e697620ff59aaaee511c146ff
Author: Zac Medico gentoo org>
AuthorDate: Tue Aug 13 05:35:14 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Aug 13 05:52:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3dc3eeb
dev-go/enumer: new package, add 1.5.10
Signed-off-by: Zac Medico gentoo.org>
dev-go/enumer/Manifest | 2 ++
dev-go/enumer/enumer-1.5.10.ebuild | 41 ++
dev-go/enumer/metadata.xml | 10 ++
3 files changed, 53 insertions(+)
diff --git a/dev-go/enumer/Manifest b/dev-go/enumer/Manifest
new file mode 100644
index ..c9dcd1d7d814
--- /dev/null
+++ b/dev-go/enumer/Manifest
@@ -0,0 +1,2 @@
+DIST enumer-1.5.10-deps.tar.xz 109604 BLAKE2B
b5aefbc35510f660f98e5d56562a30769b3dab607c2dce0abc0b8dca780e8ee59e98d70baf4f3f8d7d2d493da16f3f4d3f68108658ce08acf6a48e3012f0ddc2
SHA512
5306a482128fca80e525d87167e472552aec7af38f5d5788bf978015a7688a6c83f5df2d9d7241b821e5c5669f657bc2643013ee70a910d7408ed9ce9f917c03
+DIST enumer-1.5.10.tar.gz 28195 BLAKE2B
ea3100f3d9100808ef902a22692a43009ba9139f753d3d8a9eaaf1c4b3b5b0fe727f7e1be881dcd8c1e3e5ffedece5f39813e17318aa444187c14dcce8743983
SHA512
3d62ec6f89ed6f1087b0c147ac502131fdb9b3d29f07e117437a9cfbbf75544f5c5b1026db30a8e9241019bb14f77fe431593846611e9304215d39ac98cfcb05
diff --git a/dev-go/enumer/enumer-1.5.10.ebuild
b/dev-go/enumer/enumer-1.5.10.ebuild
new file mode 100644
index ..8609714f08d7
--- /dev/null
+++ b/dev-go/enumer/enumer-1.5.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A Go tool to auto generate methods for your enums"
+HOMEPAGE="https://github.com/dmarkham/enumer";
+SRC_URI="https://github.com/dmarkham/enumer/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="BSD-2"
+LICENSE+=" BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+DOCS=(README.md)
+
+src_prepare() {
+ default
+ local sed_args=()
+ # -buildmode=pie not supported when -race is enabled
+ [[ ${GOFLAGS} == *buildmode=pie* ]] && sed_args+=(
+ -e 's/ -race / /'
+ )
+ if [[ ${#sed_args[@]} -gt 0 ]]; then
+ sed "${sed_args[@]}" -i Makefile || die
+ fi
+}
+
+src_compile() {
+ CGO_ENABLED=0 ego build -a -o ./enumer .
+}
+
+src_install() {
+ einstalldocs
+ dobin "${PN}"
+}
+
+src_test() {
+ emake test
+}
diff --git a/dev-go/enumer/metadata.xml b/dev-go/enumer/metadata.xml
new file mode 100644
index ..9df7731b17ca
--- /dev/null
+++ b/dev-go/enumer/metadata.xml
@@ -0,0 +1,10 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ zmed...@gentoo.org
+
+
+ dmarkham/enumer
+
+
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
commit: b6203a5f1944718de4080aa36005ed25e5df5138
Author: Zac Medico gentoo org>
AuthorDate: Tue Aug 13 03:04:29 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Aug 13 03:04:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6203a5f
app-admin/consul: add 1.19.1
Signed-off-by: Zac Medico gentoo.org>
app-admin/consul/Manifest | 2 ++
app-admin/consul/consul-1.19.1.ebuild | 61 +++
2 files changed, 63 insertions(+)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 942b43b65f61..203b4aaa6297 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,3 +5,5 @@ DIST consul-1.18.1-deps.tar.xz 10161908 BLAKE2B
da7e3e63470f082bf0f1e92252a2d30c
DIST consul-1.18.1.tar.gz 34424463 BLAKE2B
1c205471fa5d2500e4421eae37159dc3a3f8ebb46ab50266440302ca814834d39fddf0c27f4da5e78a103a2d7411eebf74bd256153b3954c6bc3c384de660a2f
SHA512
023ee6f2dff82343f9c3382b531c8fa7f032e1820e09d18f67201c8ae839dfc89b145a8197be2f9c241709541a915a073dd117f5523e17ba0cdaa665bffc2f4c
DIST consul-1.18.2-deps.tar.xz 10054328 BLAKE2B
ed8dd4188f692b9ea0104eccc9d32668a7d14b85937be1fb4c1fbae584dc7336c1247134e43918a028994a82d003e12e69072a002693194e39b83bac8b51323d
SHA512
1f80c5c3af228d939366306b7b9f4cada03d9ca430f3bdf52a2af71cbee65f4baa68f8c6b11cb474a10b335255320c600bf3663ab2a7167b43dc9d25407a
DIST consul-1.18.2.tar.gz 34440848 BLAKE2B
c1b383c088db069a5acc4b09929f0e129be6eb35b2ab1177bd78638687d1274ded75111adc0c4a1511fa10d95e0a6218d2a7ae0b8c4692afabba21392a4d2a5e
SHA512
e02296199bc8e53549ef4b7e63b8392c2ddb3d78a1ec5ceee2ea08acb1b7a78b25c383172a6abf8be07717b3c8462297bdf594327784854788f902e938509931
+DIST consul-1.19.1-deps.tar.xz 10102748 BLAKE2B
9d121764915ff191e660450007adaab4a2b2f6ee3dbd7993a32a9d0f105584aff1940f4ebdde1811dcaedcd253df77f2227e6ddb36b165657532f1d9693b716e
SHA512
3981ce7dfeaf0b8bf83342edfe6cb3f01112af60b7ec155ee6df355e9f7e7a6d928a34d5be299a31dafb8bc87d369882d1ef80acce72dd53a071dc80ba37b243
+DIST consul-1.19.1.tar.gz 35683711 BLAKE2B
47504c91413388ef3439adc848af19af2e344944845e0a275fb9b5e5df81b13d86002f4df421a467a82b194b738422e90691b281c37ff7807093905eba95ff10
SHA512
d5912b5340e49f38823f265c0a90f09a20d6b7d8920d6d1bcce96ee556e7edf2fca0441afe4b2f65cc50b3c228479ef6babc917c5c0f17fa521c136a5147c899
diff --git a/app-admin/consul/consul-1.19.1.ebuild
b/app-admin/consul/consul-1.19.1.ebuild
new file mode 100644
index ..b635af45d4a7
--- /dev/null
+++ b/app-admin/consul/consul-1.19.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io";
+GIT_COMMIT="9f62fb4113d286a5642dff9da0138aa3bbef05da"
+GIT_DATE="2024-07-11T14:47:27Z" # source build-support/functions/10-util.sh;
git_date
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+ acct-group/consul
+ acct-user/consul"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+ default
+ sed -e "s|^GIT_DATE=.*|GIT_DATE=${GIT_DATE}|" -i Makefile || die
+}
+
+src_compile() {
+ if use x86; then
+ #924629 pie breaks build on x86
+ GOFLAGS=${GOFLAGS//-buildmode=pie}
+ fi
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake dev-build
+}
+
+src_install() {
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/consul
+ fowners consul:consul /var/log/consul
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
commit: 102dd7f8744f2a18a93b9beb0bc1a74689527706
Author: Zac Medico gentoo org>
AuthorDate: Tue Aug 13 02:47:17 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Aug 13 02:48:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=102dd7f8
app-admin/consul: add 1.18.2
Signed-off-by: Zac Medico gentoo.org>
app-admin/consul/Manifest | 2 ++
app-admin/consul/consul-1.18.2.ebuild | 61 +++
2 files changed, 63 insertions(+)
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 9532d6fa5036..942b43b65f61 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -3,3 +3,5 @@ DIST consul-1.15.11.tar.gz 28951114 BLAKE2B
02378088d1bbc4313ec62d644b583c328bc9
DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B
7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64
SHA512
b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256
DIST consul-1.18.1-deps.tar.xz 10161908 BLAKE2B
da7e3e63470f082bf0f1e92252a2d30cce90c4268e5ad3d180ab4bfed6601e92e26e0a108fe7477a1d596cf44114e97551712bce4c2b3d13c06c3fae0fa948e5
SHA512
f0d3961de4c38052209d79817ba6570fc43f3b9c472c959d591cc8fd23029f32070a98c59c70c02f56b80c214ae60d4a2711ca2ec31472758209538ba00ef786
DIST consul-1.18.1.tar.gz 34424463 BLAKE2B
1c205471fa5d2500e4421eae37159dc3a3f8ebb46ab50266440302ca814834d39fddf0c27f4da5e78a103a2d7411eebf74bd256153b3954c6bc3c384de660a2f
SHA512
023ee6f2dff82343f9c3382b531c8fa7f032e1820e09d18f67201c8ae839dfc89b145a8197be2f9c241709541a915a073dd117f5523e17ba0cdaa665bffc2f4c
+DIST consul-1.18.2-deps.tar.xz 10054328 BLAKE2B
ed8dd4188f692b9ea0104eccc9d32668a7d14b85937be1fb4c1fbae584dc7336c1247134e43918a028994a82d003e12e69072a002693194e39b83bac8b51323d
SHA512
1f80c5c3af228d939366306b7b9f4cada03d9ca430f3bdf52a2af71cbee65f4baa68f8c6b11cb474a10b335255320c600bf3663ab2a7167b43dc9d25407a
+DIST consul-1.18.2.tar.gz 34440848 BLAKE2B
c1b383c088db069a5acc4b09929f0e129be6eb35b2ab1177bd78638687d1274ded75111adc0c4a1511fa10d95e0a6218d2a7ae0b8c4692afabba21392a4d2a5e
SHA512
e02296199bc8e53549ef4b7e63b8392c2ddb3d78a1ec5ceee2ea08acb1b7a78b25c383172a6abf8be07717b3c8462297bdf594327784854788f902e938509931
diff --git a/app-admin/consul/consul-1.18.2.ebuild
b/app-admin/consul/consul-1.18.2.ebuild
new file mode 100644
index ..bdcf55a69a5d
--- /dev/null
+++ b/app-admin/consul/consul-1.18.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io";
+GIT_COMMIT="9fc827caf808b6ef1dc8c0748c3c4dce95d5b33a"
+GIT_DATE="2024-05-16T19:10:00Z"
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+ acct-group/consul
+ acct-user/consul"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+ default
+ sed -e "s|^GIT_DATE=.*|GIT_DATE=${GIT_DATE}|" -i Makefile || die
+}
+
+src_compile() {
+ if use x86; then
+ #924629 pie breaks build on x86
+ GOFLAGS=${GOFLAGS//-buildmode=pie}
+ fi
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake dev-build
+}
+
+src_install() {
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/consul
+ fowners consul:consul /var/log/consul
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-db/etcd/
commit: 2375152baf241ddf66fa9fb667524aaad864d245
Author: Zac Medico gentoo org>
AuthorDate: Mon Aug 12 05:26:23 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Aug 12 05:29:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2375152b
dev-db/etcd: add 3.5.15
Signed-off-by: Zac Medico gentoo.org>
dev-db/etcd/Manifest | 2 ++
dev-db/etcd/etcd-3.5.15.ebuild | 80 ++
2 files changed, 82 insertions(+)
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index a66e5e34c31e..7026f6c82c27 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -6,3 +6,5 @@ DIST etcd-3.5.12-deps.tar.xz 3935756 BLAKE2B
c043cc55f59549734f38b1a734106bd25a1
DIST etcd-3.5.12.tar.gz 4083299 BLAKE2B
85615cf9095a440ef73aa59f5582293de543f7e473c8049712ff13646276c9441039c96c4e42aaedfddcfb3baede8d37f0ef68bb5ddabdb3f4833c8591ee1c8c
SHA512
6fc8bd64ad63cff71c7645253273418fb3fa262c2da1742dc345576caa733af7cd75acad2f57610c5883e6bf16cffd36bc5a0c89cbbb0793c00c2a4db1c6d14b
DIST etcd-3.5.13-deps.tar.xz 5004004 BLAKE2B
effc3c3fb8e6fff789f96030e485fb887b0f973e5943e66f744ce2d41c65c0756a81850be8f8cca96f50214a59e0eeac694c4669d809ddcee0771acc1703d9ff
SHA512
ed80d70a14cf049e3af22757ad5cc4abd1ce563e00e0d422d38c82d66fe4381822ef1344de3ef803dedc2bfc038dabb520ad58fd489b8916529d24357628f002
DIST etcd-3.5.13.tar.gz 4089792 BLAKE2B
be7a46af3978108b7e25adabe736ac111a01ab7fcb8e142b75c0c87aa33905d42d10b721ebc982e834110388669d028e6a612c9745e2f5c93210dd05ffccba7d
SHA512
dc85d80079b61e96eb06eb573d41d8972060392e49140a2414c283ea9edfef7b01d5554e50c7ab37c6ad079b373ae12a1b84dbcc533addc1d4d30a2a5abf7b7b
+DIST etcd-3.5.15-deps.tar.xz 5885840 BLAKE2B
378d8136da0ca3486433ee2d55f2d65e569de3807bd41ea9dbb69e2a220a75ad3b2b1efd971738de84a21ac7a2fa1cb9703982ba571d4f115a88feddf9a1
SHA512
65810da4852df376b29b6023594af8da01fbdd63b3c25c4b95e2e643f327b15274750ed8db2f71da2d8a3223d00c603db5ed84ba13dce72303758e043ac62f19
+DIST etcd-3.5.15.tar.gz 4113649 BLAKE2B
b65ae93875cefffc09ff0c61eda485abd3a32691b0b8bb2d957c109c2e43cb36d26a51c4d81b7dadb9e96452dfdbfb626dfc5a151678154339d7e08324c15efb
SHA512
1b22376fcda4c182ea0388b97f3b5a6a2fd62f753c2f4c13d06c3b53e9b7fb8efb2b20177f1724a5775f5ecc13bfcaabe6b308d4ee205dea86f7311fbe3a2900
diff --git a/dev-db/etcd/etcd-3.5.15.ebuild b/dev-db/etcd/etcd-3.5.15.ebuild
new file mode 100644
index ..696855a8f929
--- /dev/null
+++ b/dev-db/etcd/etcd-3.5.15.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+GIT_COMMIT=9a5533382
+
+DESCRIPTION="Highly-available key value store for shared configuration and
service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd";
+SRC_URI="https://github.com/etcd-io/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv"
+IUSE="doc +server"
+
+COMMON_DEPEND="server? (
+ acct-group/etcd
+ acct-user/etcd
+ )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# Unit tests attempt to download go modules.
+RESTRICT="test"
+
+src_prepare() {
+ export FORCE_HOST_GO=1 GO_BUILD_FLAGS="-v -x"
+ default
+ sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|" \
+ -i "${S}"/build.sh || die
+ sed -e 's:\(for p in \)shellcheck :\1 :' \
+ -e 's:^ goword \\$:\\:' \
+ -e 's:^ gofmt \\$:\\:' \
+ -e 's:^ govet \\$:\\:' \
+ -e 's:^ revive \\$:\\:' \
+ -e 's:^ mod_tidy \\$:\\:' \
+ -e
"s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
+ -e "s|go test |go test ${GO_BUILD_FLAGS} |" \
+ -e 's|PASSES=${PASSES:-"fmt bom dep build
unit"}|PASSES=${PASSES:-"fmt dep unit"}|' \
+ -i ./test.sh || die
+}
+
+src_compile() {
+ ./build.sh || die
+}
+
+src_test() {
+ ./test || die
+}
+
+src_install() {
+ dobin bin/etcdctl
+ use doc && dodoc -r Documentation
+ if use server; then
+ insinto /etc/${PN}
+ sed -e 's|^data-dir:|\0 /var/lib/etcd|' -i etcd.conf.yml.sample
|| die
+ newins etcd.conf.yml.sample etcd.conf.yml
+ dobin bin/etcd
+ dodoc README.md
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+ newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d
[gentoo-commits] repo/gentoo:master commit in: sys-apps/rootlesskit/
commit: ece5ad612557cfd32c73a43657d7bdecc9403d63
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 11 22:47:53 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 22:47:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece5ad61
sys-apps/rootlesskit: drop 2.0.1
Signed-off-by: Zac Medico gentoo.org>
sys-apps/rootlesskit/Manifest | 2 --
sys-apps/rootlesskit/rootlesskit-2.0.1.ebuild | 23 ---
2 files changed, 25 deletions(-)
diff --git a/sys-apps/rootlesskit/Manifest b/sys-apps/rootlesskit/Manifest
index d6e49e7f5793..1b30848b96f3 100644
--- a/sys-apps/rootlesskit/Manifest
+++ b/sys-apps/rootlesskit/Manifest
@@ -1,4 +1,2 @@
-DIST rootlesskit-2.0.1-deps.tar.xz 66744312 BLAKE2B
8369d7ff25212dc5bcc19dfd159d5c1592723173f0e64868d8a3aba4f9654a5457089e0ae3997efbbe12709ebe3e97d299529083b42caee60fd49ecc7e6aa156
SHA512
54f207035dc37e1fc1fbb2667f542696034cee4435d80db2cd889de0028c6caa3c542f5b09cbfdc9193fe8c42f48f2433a459e01df6570edd853a6315282b2d1
-DIST rootlesskit-2.0.1.tar.gz 74527 BLAKE2B
04ae4980275c7271ce4d6a9d26917f083f89c5fe57ac3d7f43e2a0eeb5fa13e39de1f05be24940b79353bf6c2408e451f7d2ea10497bee4223757a0526f9d109
SHA512
1fe3eb19e1e0c97acfaae2c8aa435d3450ea9e666b00dcfe73a4835e9e8f6e2554c1f6f7491d9bc95a33cdab7c0c0d238aed7ce4bed237399660e9c16cb33324
DIST rootlesskit-2.0.2-deps.tar.xz 769588 BLAKE2B
fa226a8d851cd63f114e69f56a1092d4afdaaa598ceae9ca6c0167f3597e40513ba7fb2bd3240f1b906b5f8a5f5efa4eb621059aa5c2d7ca4d1911a10513f274
SHA512
ab4eccf71c9915b0fb3b39c0149154fa750d33ca04a5df84b12d50ed860dbf81d07464d36e98df0684279b814577f8b95bbc115b7337b8d1f525a6d7e431809b
DIST rootlesskit-2.0.2.tar.gz 75119 BLAKE2B
a5baa5a030986be394f4fe0941a249eb6faf55a11221f89e5710ba61d0b59150f6ddb4bc9c050182c41782921d20ce8f96d8fd211a2f57b6141eb28bd8506f41
SHA512
4f03f0cd1c650b2f1d3dd866b25ca2cca9cc6028f10a6f43e5bca7d736da605847262f2a2103e252e513caa9c0bf0ebb05fbfb1c10ba21e67fb434cfaa8123e3
diff --git a/sys-apps/rootlesskit/rootlesskit-2.0.1.ebuild
b/sys-apps/rootlesskit/rootlesskit-2.0.1.ebuild
deleted file mode 100644
index 26ccf3bc7a2b..
--- a/sys-apps/rootlesskit/rootlesskit-2.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Linux-native \"fake root\" for implementing rootless containers"
-HOMEPAGE="https://github.com/rootless-containers/rootlesskit";
-SRC_URI="https://github.com/rootless-containers/rootlesskit/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
-LICENSE="Apache-2.0"
-LICENSE+=" BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-rootlesskit )"
-
-src_install() {
- local -x BINDIR=${EPREFIX}/usr/bin
- default
-}
[gentoo-commits] repo/gentoo:master commit in: app-metrics/redis_exporter/
commit: da8a86bc58f4217370705181aa9c91cf89ae9282
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 11 22:44:36 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 22:45:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8a86bc
app-metrics/redis_exporter: drop 1.44.0
Signed-off-by: Zac Medico gentoo.org>
app-metrics/redis_exporter/Manifest| 2 -
.../redis_exporter/redis_exporter-1.44.0.ebuild| 55 --
2 files changed, 57 deletions(-)
diff --git a/app-metrics/redis_exporter/Manifest
b/app-metrics/redis_exporter/Manifest
index 5cab7bd026db..3b154bbebc05 100644
--- a/app-metrics/redis_exporter/Manifest
+++ b/app-metrics/redis_exporter/Manifest
@@ -1,4 +1,2 @@
-DIST redis_exporter-1.44.0-deps.tar.xz 103514884 BLAKE2B
14531f87fa3c19ab791b77b39687534b66da199012337b72817f2624a7a679424f1a279a3b888eacb34c0cd7a5d0d51cc8fe3c63c92036cbc320b7e9d9d70c7c
SHA512
ee8ceb663c15e18991903dab3b4a5dbf2981e040694e02bcd0ff81e5690a8fbdefb775e4ccc2bfcbb7bf757f5023f3ed5ae0c918779682c55ef4d9e11181da55
-DIST redis_exporter-1.44.0.tar.gz 190542 BLAKE2B
29228825e796def0bfe54ece2e09277fbdb614171e90f02b11b904a14a114aafe6f6810fafad19b2d56749f2edcab13bf03a0ed376310c39a5855715bfef2d53
SHA512
29dd210c23258c896e227d373b2c380a61b6a031f919b3da40ba2fb926f3fa534a2b1478e064b19496675935772bdad8ff490485625c1de4d470f377293efafb
DIST redis_exporter-1.61.0-deps.tar.xz 815816 BLAKE2B
b57f1d3094e3e03f990a5b26b75d95621d55cdd519882689c640e90b76750b4f7de7d48ebc7dd8456af33e14be14a07644211921667d2ba6b16a5f2567fc8430
SHA512
176442e32ec79f8621f57712a2658398f9481f0ddb1c104881305f6cfa36b74833b53078355d7fdd5e4a3d13f546fdfb844d5faf7dc5e38763f7f17228de4d68
DIST redis_exporter-1.61.0.tar.gz 82438 BLAKE2B
fe62e6c56206718eaf908de913dcb80dd9e27825dfc74b2f9bef3d4c914b75cfe0223924b852e8b99421ccbd0a3618bc9f9a0aea8c9a7733bcb95221731f7f97
SHA512
2528be4680b5cb2b1a1077a3a28ddac8f5a8a4a2b936504553cb218e8c53f8a9d9e52a9266c247f85bda03ae76eec90dbc9ab9bcc8df828d5850538e818d8188
diff --git a/app-metrics/redis_exporter/redis_exporter-1.44.0.ebuild
b/app-metrics/redis_exporter/redis_exporter-1.44.0.ebuild
deleted file mode 100644
index 8713b5d1d586..
--- a/app-metrics/redis_exporter/redis_exporter-1.44.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-EGIT_COMMIT=19f7b036bb46869858eec74d8d3fc2186d641399
-
-DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x
and 4.x"
-HOMEPAGE="https://github.com/oliver006/redis_exporter";
-SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
-
-LICENSE="MIT Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="
- acct-user/redis_exporter
- acct-group/redis_exporter"
-DEPEND="${RDEPEND}"
-RESTRICT+=" test"
-
-src_prepare() {
- default
- sed -e
"s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
- -e
"s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date
-u)\"|" \
- -e
"s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|"
\
- -i main.go || die
-}
-
-src_compile() {
- export GOBIN="${S}/bin"
- go install \
- -ldflags="-X main.BuildVersion=${PV} -X
main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
- ./... || die
-}
-
-src_test() {
- go test -work ./... || die
-}
-
-src_install() {
- dobin "${GOBIN}/redis_exporter"
- dodoc README.md
- local dir
- for dir in /var/{lib,log}/${PN}; do
- keepdir "${dir}"
- fowners ${PN}:${PN} "${dir}"
- done
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/yamlfmt/
commit: 5fc4d5785ddacffa4f419131ac446533d95b5e0c
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 11 21:02:26 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 21:05:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc4d578
app-text/yamlfmt: add 0.13.0
Signed-off-by: Zac Medico gentoo.org>
app-text/yamlfmt/Manifest | 2 ++
app-text/yamlfmt/yamlfmt-0.13.0.ebuild | 30 ++
2 files changed, 32 insertions(+)
diff --git a/app-text/yamlfmt/Manifest b/app-text/yamlfmt/Manifest
index da258b9b1422..6d078924a540 100644
--- a/app-text/yamlfmt/Manifest
+++ b/app-text/yamlfmt/Manifest
@@ -1,2 +1,4 @@
DIST yamlfmt-0.12.1-deps.tar.xz 128404 BLAKE2B
aa976bf73fb0a8094afc0ae480881aaff58c6263a57587ea6ceb22ce67776c424a7ed5d5fae6c38293f1ec5f3821de99e4bfd74f7951b826b2bb211914944c94
SHA512
11c9c45535ace449c3784a55707699923dcc2809db4f86a8fdb72b8b99443a92498b1c329cca40771d63414a6571bd4c590df4a304d798bb4c3709fd0edf0ef4
DIST yamlfmt-0.12.1.tar.gz 40958 BLAKE2B
3a1187c2a21716a16e6c86ab145eed424bb3eb65ab8b0525c1ad221c27d8be3221f668f0393dcdc117bd4d34c9283bcc30e72ccddf99f61e44050c61e88b3026
SHA512
ac39234977d11751802a3a8c2e2140c16e408f987d29aa4ac8e7dd329067c1cef686b0950fa4e4478aeeb214506e7d3fe498734e584abcbc4f3aa48f9f1c7504
+DIST yamlfmt-0.13.0-deps.tar.xz 128464 BLAKE2B
c51a77b6fa84e88239fe5185761bac4ab74b48f3200a822ef98884bc34670ec07c6b87bc999de77da5da0ea33b501ef911854910f74798a7532575f7c6a36881
SHA512
2187441405e028dd0dfb1d302f2a047b47af175d965c7605e5464b6403b4379425f13c5a506cad5bdce6dd424247ced12126722817c02e2afeb23d33be644a1b
+DIST yamlfmt-0.13.0.tar.gz 43334 BLAKE2B
da1828f6f8ab24236173fd5621781468e123ed4c9521ab2233b6185ab61a2e6744593f280dd786bbe3e0f38fd692b307dcde0cdce4944c9b6468425b9f7898d3
SHA512
28cf1d04690ce72a1330c0d93b148516e80b33306067f4dbe1b5056e243202d93ed09293b6fe5c958a341dd590edd61e6c1fdb278b28c88b421fb7364cff10b8
diff --git a/app-text/yamlfmt/yamlfmt-0.13.0.ebuild
b/app-text/yamlfmt/yamlfmt-0.13.0.ebuild
new file mode 100644
index ..2072a436f857
--- /dev/null
+++ b/app-text/yamlfmt/yamlfmt-0.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+EGIT_COMMIT=dd8547d
+DESCRIPTION="An extensible command line tool or library to format yaml files"
+HOMEPAGE="https://github.com/google/yamlfmt";
+SRC_URI="https://github.com/google/yamlfmt/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+ CGO_ENABLED=0 ego build -ldflags "-X main.version=${PV} -X
main.commit=${EGIT_COMMIT} -s -w" \
+ -o yamlfmt ./cmd/yamlfmt
+}
+
+src_install() {
+ dodoc -r README.md docs
+ dobin yamlfmt
+}
+
+src_test() {
+ emake test
+}
[gentoo-commits] repo/gentoo:master commit in: app-misc/yq-go/
commit: e7c4cd2f6ab002841a7e120664aa27f55c3725df
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 11 20:21:13 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 20:24:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c4cd2f
app-misc/yq-go: drop 4.44.1
Signed-off-by: Zac Medico gentoo.org>
app-misc/yq-go/Manifest| 2 --
app-misc/yq-go/yq-go-4.44.1.ebuild | 35 ---
2 files changed, 37 deletions(-)
diff --git a/app-misc/yq-go/Manifest b/app-misc/yq-go/Manifest
index 2bc06ac70f66..8052e047881a 100644
--- a/app-misc/yq-go/Manifest
+++ b/app-misc/yq-go/Manifest
@@ -1,4 +1,2 @@
-DIST yq-4.44.1-deps.tar.xz 1359068 BLAKE2B
5db0af65b75dab0148e6167d9264e7601e3f07f26d16d63387820c96d9ac28d91a57c81b300d4dd225f0a4941ce43dde4c5e27391ea9603f6862a9cf8c6564f5
SHA512
1670aa675e1776d2ed761c482e29920e1d200bd612e68dd22b62c6d93c8c188ef88ca35262d1f21423924d1337260991e815e332f6af312ea474c5f61226bbff
-DIST yq-4.44.1.tar.gz 296499 BLAKE2B
6cbcc69acead2ae471e91baccc3fcc3853bba0ade0e707307c9fb724bafc1c51905a9cefb86d7d09b056b01b2c404bc30692f47e293df0894ad3b32ad67c22dd
SHA512
afcec4e6f99f38a342a91aff34823823e32df0498c8e617314945a00d2161d28bfcc603dcaac2eb95d510bc57fe63ca2aebf1966b7420536be42f8102564314f
DIST yq-4.44.2-deps.tar.xz 1376032 BLAKE2B
ddb988d0eea1aa444ad952ee0aa57d54a6276c7f4a1c5113aa85f1793789efcdb818d0d06a4def1d66e013f1351dfb430a3013770032abd453737cc7e7455540
SHA512
459e45068e8048a0ca14a024d3114260437f20426b30351c80e9ee4877dd7ef175c52e54a63dc9e131aaad6a3eac8b361b23f0f06e7257f8b45f20c5dda0
DIST yq-4.44.2.tar.gz 297469 BLAKE2B
912436af43b94cd5dc12ac5a9ff04071f35123632b950da1c5324e9ccc4b931815da92f75067055041f9dbe02a3948f716655e7dfe3feb9cab2969ee52f69fc2
SHA512
8b81c617dde83487445b8a85f34bb28a363238f58b6b06d7e4b5c3becdafde8f62702acd71ed33eb85601f66e2abec80edbbf1490df90eb67ece55948254c263
diff --git a/app-misc/yq-go/yq-go-4.44.1.ebuild
b/app-misc/yq-go/yq-go-4.44.1.ebuild
deleted file mode 100644
index e5ffdf984aaa..
--- a/app-misc/yq-go/yq-go-4.44.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="yq is a lightweight and portable command-line YAML, JSON and XML
processor"
-HOMEPAGE="https://github.com/mikefarah/yq";
-SRC_URI="https://github.com/mikefarah/yq/archive/refs/tags/v${PV}.tar.gz ->
${P/-go/}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P/-go/}-deps.tar.xz";
-
-S=${WORKDIR}/${P/-go/}
-LICENSE="MIT"
-LICENSE+=" Apache-2.0 BSD BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+yq-symlink"
-DOCS=(README.md)
-RDEPEND="yq-symlink? ( !app-misc/yq[yq-symlink(+)] )"
-
-src_compile() {
- CGO_ENABLED=0 ego build -ldflags "-X main.GitDescribe=v${PV} -s -w"
-}
-
-src_install() {
- einstalldocs
- newbin yq yq-go
- if use yq-symlink; then
- dosym yq-go /usr/bin/yq
- fi
-}
-
-src_test() {
- ./scripts/test.sh || die
-}
[gentoo-commits] repo/gentoo:master commit in: app-misc/yq-go/
commit: fc83101dc52cada9570908e7f5850cd60af26aaa
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 11 20:22:58 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 20:24:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc83101d
app-misc/yq-go: add 4.44.3
Signed-off-by: Zac Medico gentoo.org>
app-misc/yq-go/Manifest| 2 ++
app-misc/yq-go/yq-go-4.44.3.ebuild | 35 +++
2 files changed, 37 insertions(+)
diff --git a/app-misc/yq-go/Manifest b/app-misc/yq-go/Manifest
index 8052e047881a..f35953d5052c 100644
--- a/app-misc/yq-go/Manifest
+++ b/app-misc/yq-go/Manifest
@@ -1,2 +1,4 @@
DIST yq-4.44.2-deps.tar.xz 1376032 BLAKE2B
ddb988d0eea1aa444ad952ee0aa57d54a6276c7f4a1c5113aa85f1793789efcdb818d0d06a4def1d66e013f1351dfb430a3013770032abd453737cc7e7455540
SHA512
459e45068e8048a0ca14a024d3114260437f20426b30351c80e9ee4877dd7ef175c52e54a63dc9e131aaad6a3eac8b361b23f0f06e7257f8b45f20c5dda0
DIST yq-4.44.2.tar.gz 297469 BLAKE2B
912436af43b94cd5dc12ac5a9ff04071f35123632b950da1c5324e9ccc4b931815da92f75067055041f9dbe02a3948f716655e7dfe3feb9cab2969ee52f69fc2
SHA512
8b81c617dde83487445b8a85f34bb28a363238f58b6b06d7e4b5c3becdafde8f62702acd71ed33eb85601f66e2abec80edbbf1490df90eb67ece55948254c263
+DIST yq-4.44.3-deps.tar.xz 1376444 BLAKE2B
dbccf16fa939991f01762efec5f14f86394a9ff43c46dbe504040a36bf60df4402734a7883c7281617fa43f7f4c8e208b65885f6279648b8ad417cdc8ac9f4de
SHA512
0460ba42cc318193b09ab88961dc49e26934a74986f6a9c196e3bceb4d7842401604727be0bd63ba18fa93a237e9b401250b580cc628dd7c61fded86560a0bc9
+DIST yq-4.44.3.tar.gz 297938 BLAKE2B
9a4e382e2fb5862302aafca2268d8551232b0636adae560151acca1060d8e09c46dc36eee8597d7763d50fc53f36fdc8c1ff3df81f88f637f6b4ad5714c6e116
SHA512
ad4971d7a2f3a4355a696027a178d05b7388b26241a097fc8d222f81fb8ed18b908d0e2cefe0210f70bf4e5ee2becef61206def40e908be20e60d5a074c38bb5
diff --git a/app-misc/yq-go/yq-go-4.44.3.ebuild
b/app-misc/yq-go/yq-go-4.44.3.ebuild
new file mode 100644
index ..277186a7f1e3
--- /dev/null
+++ b/app-misc/yq-go/yq-go-4.44.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="yq is a lightweight and portable command-line YAML, JSON and XML
processor"
+HOMEPAGE="https://github.com/mikefarah/yq";
+SRC_URI="https://github.com/mikefarah/yq/archive/refs/tags/v${PV}.tar.gz ->
${P/-go/}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P/-go/}-deps.tar.xz";
+
+S=${WORKDIR}/${P/-go/}
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~loong"
+IUSE="+yq-symlink"
+DOCS=(README.md)
+RDEPEND="yq-symlink? ( !app-misc/yq[yq-symlink(+)] )"
+
+src_compile() {
+ CGO_ENABLED=0 ego build -ldflags "-X main.GitDescribe=v${PV} -s -w"
+}
+
+src_install() {
+ einstalldocs
+ newbin yq yq-go
+ if use yq-symlink; then
+ dosym yq-go /usr/bin/yq
+ fi
+}
+
+src_test() {
+ ./scripts/test.sh || die
+}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/kubeletctl/
commit: ddcfaf2b0c9838edec93f5b17274d5af978fb464
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 11 19:42:10 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 19:43:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcfaf2b
sys-cluster/kubeletctl: add 1.12
Closes: https://bugs.gentoo.org/937727
Signed-off-by: Zac Medico gentoo.org>
sys-cluster/kubeletctl/Manifest | 2 ++
sys-cluster/kubeletctl/kubeletctl-1.12.ebuild | 25 +
2 files changed, 27 insertions(+)
diff --git a/sys-cluster/kubeletctl/Manifest b/sys-cluster/kubeletctl/Manifest
index d8954572c253..97b51dbb88ac 100644
--- a/sys-cluster/kubeletctl/Manifest
+++ b/sys-cluster/kubeletctl/Manifest
@@ -1,2 +1,4 @@
+DIST kubeletctl-1.12-deps.tar.xz 1586588 BLAKE2B
e39f271cfa2a5b0e9283139181d0d988c54643985416c1ca5fa09fd266ddcc5621d7b537b1edb2bbfdc386601bd65591417a483752ec6fbfc883e0d0ad3277bd
SHA512
b68bfcc0757e7e0d16648bfa35effe27a1040e189e86417c2967047ee956656eca2ed425a7bae609a076b5a5b408ad1ccb36bc4a0b063fb42df5e0b12e61d850
+DIST kubeletctl-1.12.tar.gz 47285 BLAKE2B
f8d7784b9fd64bd91679ebb7f2306fd1613cfdf95c94f816a0823f7e0fd6892a4f5611c6263aee6363186fac2b984dadf4b5484505bf5eea87efdd3556968b5c
SHA512
a18d37cc383d196cf620aa48f37d0c6e95b468d29ddc8f55c8b58bfbd0a781bbfbffaa6e57d18c8ec79998a1fe28c44460321e78c05a0d4620cfe74e045138c7
DIST kubeletctl-1.6-deps.tar.xz 36450320 BLAKE2B
266c6ba630543684f5d20b2c0ca4d0703997fc169bb5abe09302d69981ef65e169682cb9f871b39f0ddd0d76932354983709013ece800f94a28e1f9ce9186f73
SHA512
82f18a1e4b9dbdd8223fea77735616071893241048a82aa7615977d873aebe10a43c8f11c56dcdc3b5c392c1a150606e478d1b04fe67c5340b5f1ccae3316a3f
DIST kubeletctl-1.6.tar.gz 47987 BLAKE2B
f69bf6e1e53a62f0a2f2edfd3a4ee2ec040349136f08077837050bed03de9b6cfc6019cac844227125b979b94976b5336eac5ce42f385c3f60be6b2265e57361
SHA512
2701d66980284cf153fe8305cb812a6bb2af550e7c7ee6aa37187a3b9d5d6ae78e4a9c7a46ae3db05b1e4d863f87f48a60091d18c35e46ce71354e894bc6922a
diff --git a/sys-cluster/kubeletctl/kubeletctl-1.12.ebuild
b/sys-cluster/kubeletctl/kubeletctl-1.12.ebuild
new file mode 100644
index ..da824f7f6ebb
--- /dev/null
+++ b/sys-cluster/kubeletctl/kubeletctl-1.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A client for kubelet"
+HOMEPAGE="https://github.com/cyberark/kubeletctl";
+SRC_URI="https://github.com/cyberark/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT+=" test"
+
+src_compile() {
+ go build -ldflags "-s -w" || die
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc README.md
+}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/zookeepercli/
commit: be4cc6321e96ce9a6441f177d0d3cf422eec009c
Author: Zac Medico gentoo org>
AuthorDate: Sun Aug 11 17:52:04 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 17:53:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4cc632
sys-cluster/zookeepercli: Bump to version 1.0.11 from kt315 upstream
Change upstream to github.com/kt315/zookeepercli who added
a go module build and sent it to openark here:
https://github.com/openark/zookeepercli/pull/2
Closes: https://bugs.gentoo.org/937726
Signed-off-by: Zac Medico gentoo.org>
sys-cluster/zookeepercli/Manifest | 4 +--
sys-cluster/zookeepercli/metadata.xml | 2 +-
.../zookeepercli/zookeepercli-1.0.11.ebuild| 22 +
.../zookeepercli/zookeepercli-1.0.12.ebuild| 37 --
4 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/sys-cluster/zookeepercli/Manifest
b/sys-cluster/zookeepercli/Manifest
index b5d863ef49be..98e7003495a5 100644
--- a/sys-cluster/zookeepercli/Manifest
+++ b/sys-cluster/zookeepercli/Manifest
@@ -1,3 +1 @@
-DIST github.com-outbrain-golib-ab954725f502c2be1491afadbbc66da2f99a45ae.tar.gz
5892 BLAKE2B
8ac98704758e0ddf121ae088b15873234f14eba14ab86379f3212638787345e618f104608364f21e9d00106242e4942293e4706dbc1bb7e5ddbf19b2f71bd511
SHA512
dfb5758f5c26320ca5cdf502c1e3847ed35adb85d09db7df2a0784a3ec0662dc316bab6d88e6aa9e085585fe0157aa9f83a53e30d0ac38b5cc96704e12fa8194
-DIST
github.com-samuel-go-zookeeper-c4fab1ac1bec58281ad0667dc3f0907a9476ac47.tar.gz
37110 BLAKE2B
4c32afe54c27ed1532a50d386217bec3b477ceba3744bb415f906c5b0301db172289455a6631659e98b4600175ad391d09f7c60532bdc5754761a177482be37f
SHA512
3dab581a699336979b7be6b9792a877eee9e9fe39157b0774e38831735e1148b522617d246c7c1d146cb8c6dd3faba20cb72b94e9bd85e532f11d20f97e755d9
-DIST zookeepercli-1.0.12.tar.gz 51077 BLAKE2B
5b5c07305407882845fe339bbc75fd7a521020f588db30303855733c6263409a6c3ad08d5c0bb287cd2c4c03aeb7ff7ee3b544c0b3480fab17952f67d6cca339
SHA512
fb18d1a725fe21e98039cdd19f158a344cae008eff319abeabf349921ef9f4b92b0e251ec5e6414102fe66394d287d1aa3c675bd7454665c1a47d0e9cb4fb352
+DIST zookeepercli-1.0.11.tar.gz 39371 BLAKE2B
b024ce14e893bf9bfe4e2ffe2d5da81bf980907d37f348ac7a7063878ce05fd5f521f2c9cc32d28fb541895c2f635e5b7f0c80006a942384927bdf3a73997367
SHA512
91d53e8cbd3075db5f72aeb055b2d22f31948d5c8ad2ea5d3772358866ee728db53736a2cd871242ecd2929fe45ec853329ec089bdf0a88de8e48ff4e6114764
diff --git a/sys-cluster/zookeepercli/metadata.xml
b/sys-cluster/zookeepercli/metadata.xml
index d58ea8e28fe1..4747695a9df1 100644
--- a/sys-cluster/zookeepercli/metadata.xml
+++ b/sys-cluster/zookeepercli/metadata.xml
@@ -6,6 +6,6 @@
Zac Medico
- openark/zookeepercli
+ kt315/zookeepercli
diff --git a/sys-cluster/zookeepercli/zookeepercli-1.0.11.ebuild
b/sys-cluster/zookeepercli/zookeepercli-1.0.11.ebuild
new file mode 100644
index ..9a656b44daab
--- /dev/null
+++ b/sys-cluster/zookeepercli/zookeepercli-1.0.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Simple, lightweight, dependable CLI for ZooKeeper"
+HOMEPAGE="https://github.com/kt315/zookeepercli";
+SRC_URI="https://github.com/kt315/zookeepercli/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+LICENSE+=" BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+ ego build -ldflags "-X main.Version=${PV}" -o ./bin/${PN}
+}
+
+src_install() {
+ dobin bin/${PN}
+ dodoc README.md
+}
diff --git a/sys-cluster/zookeepercli/zookeepercli-1.0.12.ebuild
b/sys-cluster/zookeepercli/zookeepercli-1.0.12.ebuild
deleted file mode 100644
index c33552c11fc4..
--- a/sys-cluster/zookeepercli/zookeepercli-1.0.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/outbrain/zookeepercli"
-EGO_VENDOR=(
- "github.com/outbrain/golib ab954725f502c2be1491afadbbc66da2f99a45ae"
- "github.com/samuel/go-zookeeper
c4fab1ac1bec58281ad0667dc3f0907a9476ac47"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-DESCRIPTION="Simple, lightweight, dependable CLI for ZooKeeper"
-HOMEPAGE="https://github.com/openark/zookeepercli";
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.9:="
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME #6789
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/gmqtt/
commit: 783c7311879bbb6a309a07a9cd2c353726f9b61d
Author: Filip Kobierski pm me>
AuthorDate: Tue Jul 30 12:12:56 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 04:30:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783c7311
sys-cluster/gmqtt: remove empty IUSE
Signed-off-by: Filip Kobierski pm.me>
From: https://github.com/gentoo/gentoo/pull/37810
Signed-off-by: Zac Medico gentoo.org>
sys-cluster/gmqtt/gmqtt-0.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/gmqtt/gmqtt-0.5.0.ebuild
b/sys-cluster/gmqtt/gmqtt-0.5.0.ebuild
index b43ae3df0986..35a980655fed 100644
--- a/sys-cluster/gmqtt/gmqtt-0.5.0.ebuild
+++ b/sys-cluster/gmqtt/gmqtt-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+="
https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
LICENSE="MIT Apache-2.0 BSD BSD-2 ISC MPL-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
+
RESTRICT="test"
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/gmqtt/
commit: e3ac183b07024746bde47282bde8dfbc38a0f434
Author: Filip Kobierski pm me>
AuthorDate: Tue Jul 30 12:13:17 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Aug 11 04:30:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ac183b
sys-cluster/gmqtt: drop 0.4.1
Signed-off-by: Filip Kobierski pm.me>
Closes: https://github.com/gentoo/gentoo/pull/37810
Signed-off-by: Zac Medico gentoo.org>
sys-cluster/gmqtt/Manifest | 2 --
sys-cluster/gmqtt/gmqtt-0.4.1.ebuild | 42
2 files changed, 44 deletions(-)
diff --git a/sys-cluster/gmqtt/Manifest b/sys-cluster/gmqtt/Manifest
index 63dc1b4dff8c..881b112d7619 100644
--- a/sys-cluster/gmqtt/Manifest
+++ b/sys-cluster/gmqtt/Manifest
@@ -1,4 +1,2 @@
-DIST gmqtt-0.4.1-deps.tar.xz 50641100 BLAKE2B
e2df0588178f3cee0f96a15c867352d9718deb9ed1b8acb0b0a26bf512308c40797275deee04be3f35d8725018b522aa807638ed17f300c337a062012fddc16d
SHA512
6c77dcb5bc6c029296ac8715a5796f20091273e5b322fedbe952086cb81e5abf5d5fbe5b0005f22d674565dff1d3b9dbaf84812ec22203ef1b6ccd629405115d
-DIST gmqtt-0.4.1.tar.gz 338368 BLAKE2B
4114816d4e60f6421fcea2cb33006f416143040bc85eb97630fcbd588c9fb2e11cd0d1f9e6e56f8ad8461653a5d7772971e4978a3dfca357335309b7c9e138ed
SHA512
cad45a7d3d9033d9d345c72bd0568c4e6115964d980ed02451da3fb6fe7fb92785ccc39bf1632c81242b269f5e61caba18255315e12f49d5debcfc1c105a
DIST gmqtt-0.5.0-deps.tar.xz 2274132 BLAKE2B
c4eef28fbcf743128e9fee3f62106405343d8a6daeb018f168a16ee67f0028669a04d457ac6127e7528248c69ff38a5f469bbd242f3ce39178f8a44994706649
SHA512
d3f6036652d7185306f629db5660245bdb0d4e0f2bfa64ccf4e306bc725cfb2d3757097c32f495595b21ea8750ab7f0907b93b38c8512811e037f65fc38af852
DIST gmqtt-0.5.0.tar.gz 256487 BLAKE2B
ce1d032cf13806381c2c0d42aec5592c74b86e938d284252fd01bd23f7eb8b0c0e9b59558be5284b780edd778035c9755a0d6c6da30ccd851c8b3a06f6c49289
SHA512
8c696a54386282b51ce6a835fba787f465f862afd5f553fc0039b8e01a6a03660a4103deed346c683e4b0fe98fd3ac4105a3602f28f416f5c544dc6ee960645a
diff --git a/sys-cluster/gmqtt/gmqtt-0.4.1.ebuild
b/sys-cluster/gmqtt/gmqtt-0.4.1.ebuild
deleted file mode 100644
index f55a01b13d5f..
--- a/sys-cluster/gmqtt/gmqtt-0.4.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="MQTT broker library with cluster support that implements MQTT
V5.0 and V3.1.1"
-HOMEPAGE="https://github.com/DrmagicE/gmqtt";
-SRC_URI="https://github.com/DrmagicE/gmqtt/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT+=" test"
-
-src_compile() {
- GOBIN=${S}/bin CGO_ENABLED=0 go install ./... || die
-}
-
-src_install() {
- dobin bin/{gmqctl,gmqttd}
- keepdir /etc/${PN}
- systemd_dounit "${FILESDIR}/${PN}d.service"
- newinitd "${FILESDIR}/initd" "${PN}d"
- newconfd "${FILESDIR}/confd" "${PN}d"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/logrotated" "${PN}"
- docompress -x /usr/share/doc/${PF}/default_config.yml
- dodoc CONTRIBUTING.md README*.md cmd/gmqttd/default_config.yml
- docinto federation
- dodoc -r plugin/federation/{examples,README.md}
-}
-
-pkg_postinst() {
- local config=/etc/gmqtt/gmqttd.yml dest=${ROOT}/
- if [[ ! ${REPLACING_VERSIONS} && ! -e ${ROOT}${config} ]]; then
- einfo "Copying default config to ${config} for first install"
- cp "${ROOT}/usr/share/doc/${PF}/default_config.yml"
"${ROOT}${config}"
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/files/, dev-util/android-tools/
commit: e987962a39893738df90b693c49508a18cd13cea
Author: Zac Medico gentoo org>
AuthorDate: Sat Aug 10 19:34:38 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Aug 10 19:34:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e987962a
dev-util/android-tools: drop 34.0.0, 34.0.1
Signed-off-by: Zac Medico gentoo.org>
dev-util/android-tools/Manifest| 2 -
dev-util/android-tools/android-tools-34.0.0.ebuild | 94
dev-util/android-tools/android-tools-34.0.1.ebuild | 99 --
.../files/android-tools-34.0.0-protobuf.patch | 41 -
.../android-tools-34.0.1-include-algorithm.patch | 45 --
5 files changed, 281 deletions(-)
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index d4dcccbb0515..7e060f5bdad4 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,6 +1,4 @@
DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B
da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe
SHA512
a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B
4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78
SHA512
78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71
-DIST android-tools-34.0.0.tar.xz 37882448 BLAKE2B
19698c08dd650abba61e5cad9f7474ee3993f5b1fd2f173221560e5ccfc1677093758c325833993a68058c1427e132986b009f9e69a1eae9c4447053920b6feb
SHA512
2d24cd95df7da1efa902fab3c848e2ebf09d3335fac61e667b19e1892e95c30a850413d354ceda72a402014623bbda4154cc33fb93a62c31fece8857efbbd596
-DIST android-tools-34.0.1.tar.xz 37904276 BLAKE2B
6b4d31dadbc646d52c8abd65602264dc16127eb36286d23be447539b0d9b46154592a04af37b3e7617933e62529e953b958db8cb77622e72cfe5ab176f822437
SHA512
413ddcca9a461d1c0a12d7fd19b9d8955619b281e1153318ed961bec17ad92bec103671abc8d63525bc83669376f37c11c887cc4cada85719120dff6c3951274
DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B
a86ad9d22c356d2b3d0d85dd17e5540b5d105a286dd07946659dac4ab6d1e8285eecbbf0377c542ac6ca78e0af8df320a97e24ea2b735bbec66a2d2b23d2099c
SHA512
2edea0c7a4c2f63531a8b5f518ed4dc9c315d08d8b23d3fac3b7024e2297860465f6df9fad43c9925fb80b5a50f5f3f4744886b552818bf3e961ba0372212496
DIST android-tools-35.0.1.tar.xz 21460424 BLAKE2B
e87a4ad13e5b8030069c87cbbe47f369e797e319aa3a054a668ad55f4cdd7445e5ef7825f2d185f6891958fd52f815ee0cb3909649ee3ea703061d72d0ab
SHA512
2dc3831f29a2c5ffc57978e4a6fa6d1469bcb0740750779b3e4f8239eaec87864f3474254a2d649ab630062be091d8b44a4e45c7e7b7e033f3b4481f81d76296
diff --git a/dev-util/android-tools/android-tools-34.0.0.ebuild
b/dev-util/android-tools/android-tools-34.0.0.ebuild
deleted file mode 100644
index d8ca6ca82456..
--- a/dev-util/android-tools/android-tools-34.0.0.ebuild
+++ /dev/null
@@ -1,94 +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} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/
https://developer.android.com/";
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
- https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="python udev"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
- app-arch/brotli:=
- app-arch/lz4:=
- app-arch/zstd:=
- dev-libs/libpcre2:=
- >=dev-libs/protobuf-3.0.0:=
- sys-libs/zlib:=
- virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
- udev? ( dev-util/android-udev-rules )
- python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
- dev-lang/go
- dev-lang/perl
-"
-
-DOCS=()
-
-src_prepare() {
- eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
-
- cd "${S}/vendor/core" || die
- eapply
"${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-
- cd "${S}/vendor/libziparchive" || die
- eapply
"${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-
- cd "${S}" || die
- rm -r patches || die
- cmake_src_prepare
-
[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
commit: 7dd40271d9f5637cab1e93cd7df57a6da7bed9bd
Author: Paul Zander gmail com>
AuthorDate: Wed Jun 12 23:13:06 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Aug 10 19:22:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd40271
dev-util/android-tools: add 35.0.1
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38069
Signed-off-by: Zac Medico gentoo.org>
dev-util/android-tools/Manifest| 1 +
dev-util/android-tools/android-tools-35.0.1.ebuild | 99 ++
2 files changed, 100 insertions(+)
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index a0025f84e65a..d4dcccbb0515 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -3,3 +3,4 @@ DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B
4254f0ab8657966cf56e2a7c3e9a3d
DIST android-tools-34.0.0.tar.xz 37882448 BLAKE2B
19698c08dd650abba61e5cad9f7474ee3993f5b1fd2f173221560e5ccfc1677093758c325833993a68058c1427e132986b009f9e69a1eae9c4447053920b6feb
SHA512
2d24cd95df7da1efa902fab3c848e2ebf09d3335fac61e667b19e1892e95c30a850413d354ceda72a402014623bbda4154cc33fb93a62c31fece8857efbbd596
DIST android-tools-34.0.1.tar.xz 37904276 BLAKE2B
6b4d31dadbc646d52c8abd65602264dc16127eb36286d23be447539b0d9b46154592a04af37b3e7617933e62529e953b958db8cb77622e72cfe5ab176f822437
SHA512
413ddcca9a461d1c0a12d7fd19b9d8955619b281e1153318ed961bec17ad92bec103671abc8d63525bc83669376f37c11c887cc4cada85719120dff6c3951274
DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B
a86ad9d22c356d2b3d0d85dd17e5540b5d105a286dd07946659dac4ab6d1e8285eecbbf0377c542ac6ca78e0af8df320a97e24ea2b735bbec66a2d2b23d2099c
SHA512
2edea0c7a4c2f63531a8b5f518ed4dc9c315d08d8b23d3fac3b7024e2297860465f6df9fad43c9925fb80b5a50f5f3f4744886b552818bf3e961ba0372212496
+DIST android-tools-35.0.1.tar.xz 21460424 BLAKE2B
e87a4ad13e5b8030069c87cbbe47f369e797e319aa3a054a668ad55f4cdd7445e5ef7825f2d185f6891958fd52f815ee0cb3909649ee3ea703061d72d0ab
SHA512
2dc3831f29a2c5ffc57978e4a6fa6d1469bcb0740750779b3e4f8239eaec87864f3474254a2d649ab630062be091d8b44a4e45c7e7b7e033f3b4481f81d76296
diff --git a/dev-util/android-tools/android-tools-35.0.1.ebuild
b/dev-util/android-tools/android-tools-35.0.1.ebuild
new file mode 100644
index ..0ff6f3bbb94f
--- /dev/null
+++ b/dev-util/android-tools/android-tools-35.0.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/
https://developer.android.com/";
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+ https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="python udev"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+ app-arch/brotli:=
+ app-arch/lz4:=
+ app-arch/zstd:=
+ dev-libs/libpcre2:=
+ >=dev-libs/protobuf-3.0.0:=
+ sys-libs/zlib:=
+ virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+ udev? ( dev-util/android-udev-rules )
+ python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+ dev-lang/go
+ dev-lang/perl
+"
+
+DOCS=()
+
+src_prepare() {
+ eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+
+ cd "${S}/vendor/core" || die
+ eapply
"${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+
+ cd "${S}/vendor/libziparchive" || die
+ eapply
"${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+
+ cd "${S}" || die
+ rm -r patches || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # Statically link the bundled boringssl
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
+ -Dprotobuf_MODULE_COMPATIBLE=ON
+ -DBUILD_SHARED_LIBS=OFF
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ export GOCACHE="${T}/go-build"
+ export GOFLAGS="-mod=vendor"
+ cmake_src_compile
+}
+
+src_install() {
+ cmake_src_install
+ rm "${ED}/usr/bin/mkbootimg" |
[gentoo-commits] proj/portage:master commit in: lib/portage/, lib/portage/util/_async/, lib/portage/tests/, ...
commit: d6710ee0cdab2a212ff70503f9699f1be4660bb4
Author: Zac Medico gentoo org>
AuthorDate: Thu Aug 8 14:58:31 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Aug 8 14:58:31 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d6710ee0
run_exitfuncs: Support loop close via hook
Handle the case where the loop has not been explicitly closed before
exit. In this case, run_exitfuncs previously tried to call coroutine
functions as though they were normal functions, which obvously would
not behave correctly.
Solve this problem by storing the coroutine functions in a separate
_coroutine_exithandlers list that belongs exclusively to the
run_coroutine_exitfuncs function, so that it is safe to close the
loop and call run_coroutine_exitfuncs from inside a run_exitfuncs
hook. A _thread_weakrefs_atexit hook already exists that will close
weakly referenced loops. The _thread_weakrefs_atexit hook is now
fixed to release its lock when it closes a loop, since the same
lock may need to be re-acquired when run_coroutine_exitfuncs runs.
The included test case demonstrates that run_exitfuncs will run
via an atexit hook and correctly terminate the socks5 proxy in a
standalone program using the portage API (like eclean).
Due to a deadlock that will occur if an _exit_function atexit hook
from the multiprocessing module executes before run_exitfuncs, a
portage.process._atexit_register_run_exitfuncs() function needs to
be called in order to re-order the hooks after the first process
has been started via the multiprocessing module. The natural place
to call this is in the ForkProcess class, using a global variable
to trigger the call just once.
Fixes: c3ebdbb42e72 ("elog/mod_custom: Spawn processes in background")
Bug: https://bugs.gentoo.org/937384
Signed-off-by: Zac Medico gentoo.org>
lib/portage/process.py| 37 ---
lib/portage/tests/__init__.py | 19
lib/portage/tests/util/test_socks5.py | 66 ---
lib/portage/util/_async/ForkProcess.py| 8
lib/portage/util/futures/_asyncio/__init__.py | 24 ++
5 files changed, 133 insertions(+), 21 deletions(-)
diff --git a/lib/portage/process.py b/lib/portage/process.py
index 6e4e0d7162..23e2507b53 100644
--- a/lib/portage/process.py
+++ b/lib/portage/process.py
@@ -3,6 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
+import asyncio as _asyncio
import atexit
import errno
import fcntl
@@ -193,6 +194,7 @@ def spawn_fakeroot(mycommand, fakeroot_state=None,
opt_name=None, **keywords):
_exithandlers = []
+_coroutine_exithandlers = []
def atexit_register(func, *args, **kargs):
@@ -200,7 +202,12 @@ def atexit_register(func, *args, **kargs):
what is registered. For example, when portage restarts itself via
os.execv, the atexit module does not work so we have to do it
manually by calling the run_exitfuncs() function in this module."""
-_exithandlers.append((func, args, kargs))
+# The internal asyncio wrapper module would trigger a circular import
+# if used here.
+if _asyncio.iscoroutinefunction(func):
+_coroutine_exithandlers.append((func, args, kargs))
+else:
+_exithandlers.append((func, args, kargs))
def run_exitfuncs():
@@ -232,12 +239,16 @@ async def run_coroutine_exitfuncs():
This is the same as run_exitfuncs but it uses asyncio.iscoroutinefunction
to check which functions to run. It is called by the AsyncioEventLoop
_close_main method just before the loop is closed.
+
+If the loop is explicitly closed before exit, then that will cause
+run_coroutine_exitfuncs to run before run_exitfuncs. Otherwise, a
+run_exitfuncs hook will close it, causing run_coroutine_exitfuncs to be
+called via run_exitfuncs.
"""
tasks = []
-for index, (func, targs, kargs) in
reversed(list(enumerate(_exithandlers))):
-if asyncio.iscoroutinefunction(func):
-del _exithandlers[index]
-tasks.append(asyncio.ensure_future(func(*targs, **kargs)))
+while _coroutine_exithandlers:
+func, targs, kargs = _coroutine_exithandlers.pop()
+tasks.append(asyncio.ensure_future(func(*targs, **kargs)))
tracebacks = []
exc_info = None
for task in tasks:
@@ -255,7 +266,21 @@ async def run_coroutine_exitfuncs():
raise exc_info[1].with_traceback(exc_info[2])
-atexit.register(run_exitfuncs)
+def _atexit_register_run_exitfuncs():
+"""
+Register the run_exitfuncs atexit hook. If this hook is not called
+before the multiprocessing module's _exit_function, then there will
+be a deadlock. In order to prevent the deadlock, this function must
+be called in order to re-order the hooks after the first process has
+been started via the multiprocessing module. The n
[gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/
commit: 9e6451c88e3da11e0eb7b0bd6b1497c5ca4fb67f
Author: Zac Medico gentoo org>
AuthorDate: Tue Aug 6 04:48:26 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Wed Aug 7 14:39:25 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9e6451c8
doebuild.spawn: Skip socks5 proxy for "depend" phase
Skip the socks5 proxy for the "depend" phase. It should not be needed
because we only allow bash builtin commands during this phase.
Since the socks5 proxy requires portage's event loop to be explictly
closed before exit, skipping it will allow programs like eclean-dist
to avoid the need to explicitly close portage's event loop before exit.
Bug: https://bugs.gentoo.org/937384
Signed-off-by: Zac Medico gentoo.org>
lib/portage/package/ebuild/doebuild.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/portage/package/ebuild/doebuild.py
b/lib/portage/package/ebuild/doebuild.py
index 403836b80b..b5fb46df70 100644
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -2009,7 +2009,7 @@ def spawn(
if (
not networked
-and mysettings.get("EBUILD_PHASE") != "nofetch"
+and mysettings.get("EBUILD_PHASE") not in ("depend", "nofetch")
and ("network-sandbox-proxy" in features or "distcc" in features)
):
# Provide a SOCKS5-over-UNIX-socket proxy to escape sandbox
[gentoo-commits] repo/gentoo:master commit in: app-shells/nushell/
commit: cd6db84801d87062f18fa447fbc09359468b1093 Author: Jonas Frei pm me> AuthorDate: Tue Aug 6 05:47:53 2024 + Commit: Zac Medico gentoo org> CommitDate: Wed Aug 7 02:26:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6db848 app-shells/nushell: add 0.96.1 Signed-off-by: Jonas Frei pm.me> From: https://github.com/gentoo/gentoo/pull/37989 Signed-off-by: Zac Medico gentoo.org> app-shells/nushell/Manifest | 53 +++ app-shells/nushell/nushell-0.96.1.ebuild | 772 +++ 2 files changed, 825 insertions(+) diff --git a/app-shells/nushell/Manifest b/app-shells/nushell/Manifest index 40fe25366e48..129f8d2858e6 100644 --- a/app-shells/nushell/Manifest +++ b/app-shells/nushell/Manifest @@ -244,18 +244,23 @@ DIST csv-core-0.1.11.crate 25852 BLAKE2B 9f56cea786b5b35f6fd5c4f41fc3cc06d777f6d DIST ctrlc-3.4.0.crate 14098 BLAKE2B 709de25815437bc91d18bc66ce139fe4c051d201b01a8dc90c97d275137e048452fa63d73b6fbe881370727153c9bee7d3ec6a97efb9710982639388ab683294 SHA512 94e2f5580ab178c50d56a6b40490e3a61d121c9de681f54f56c1e50596709835eee0b26df0436d1313af77cec1c4422051f1959221ea82536b8a709ef84c18fd DIST ctrlc-3.4.2.crate 14171 BLAKE2B 65bcbaff2a58a78370888e988e52bdf7b8c1dec5963854374a87fa31b4db633f41b7a7e9965027411c14b089680eaaf32db1ab26ceeebaecbe09c0c3b5e1fce9 SHA512 99fc52445a51438bbbefefedf6409efc6b9c8db8f8932bde8eebeda3bfa952d116923b6ea9762e3bd28521ddee17ca1c8fb9b24cf8fe287063ec2ffc696ec408 DIST ctrlc-3.4.4.crate 14660 BLAKE2B fe7c2ca8352dbe40e60ad2c63654beafd9ad3f62483b23b3c614a22dacc8ce0edd2b94e9ec3a2472c581f6a1b8befe0952df092b4c7d34ad92414190e285e51b SHA512 c09c5bb87e4116e4f2604023d9a94afb9985678a4d02aac17baf5b5d13d0ac7321e07dd7b20ed620af9670926acdb6b78be37a56c8be171c21975d34ebf0196c +DIST curl-0.4.46.crate 94864 BLAKE2B bcfc97c19ce299abd3e8a9769a30c0ec5dc6692b5c1d81423f47aeea39066d1840ca7ec1d4713132519f3bea94d43aebd8d733a19028280e2e6c2a8e91eb1948 SHA512 c08f857b385582ba635a76744c940017b74c3f241d28cc7c8c6eeff958c76c01a1a51df41b3a7a6a9a38a31f8cf5b9b3b639eaa163c441fdec29d0b3f14c8336 +DIST curl-sys-0.4.73+curl-8.8.0.crate 1759967 BLAKE2B 85a2304632b81cfffa9deb9d90078d6e05587599218d343cba7ec39a0cc4e246815dfec1f747708429146b2c9847db943f49c8ab4a80f2056a0acd074c7f4785 SHA512 7c669747ede48191e6a75f118084bc473fac3ec2fe78882bd13527df3d98a0c26c00b30055230298685afc741aa99e369b8bc2bb6d89712aaa3e5208c7ee9fc0 DIST dashmap-5.5.0.crate 24067 BLAKE2B 48f48215e459e4a3973d90b10b15fe346f6f02340b876016b2d6ea82ac3cc8a69be82127ddcb4ecca7c7d86b55440d78c89bfa95a081abe761601bc9fb8d6ef6 SHA512 191448f8366c9462b268c93f975196522d3094ace757617e0dd895b3361884b11d4be68cee49c090d2aa6d8d7c6ce1a76194791fdc11a6605782933b721b4744 DIST dashmap-5.5.3.crate 24061 BLAKE2B 2bdd62f674e90007a81b76419dd5df1b58c3d9b80bed4324d9e0298355cd66706794c7187c74bd9a6ce119d81ba9400c47aa2729ec923979b0bc081329051e71 SHA512 15079a921d768224defebdf8d5339257c9e94a46d115b37ddfca8eb83718b2448555a8982bcf0381a915d292aff9d271a89d3398d2ae2f396dd581cc6883963a DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 DIST derive-new-0.5.9.crate 7733 BLAKE2B 3f0a19b794c10e529da5b3618cfeaa4e575ee31597d2ff1f95618eb5163568c6c8836c5a634323dda65f448bf3fba2bbf066df5f815feb07f59ff99d1f46da26 SHA512 9ce0991fe63d8339a88d9552fcd8cc744d8bbc2c6525f60959faf519e1ffa84256c773291df2101912483c0d9accd4fe5f7dbb199dbd36d299ceae8f607e0b30 DIST derive-new-0.6.0.crate 7694 BLAKE2B 8c7f33653f01961eb8df131e9f61422a54b3fed986a4116b7174693649e8762ec60e5251e9a34713a8e0126e4e2fb2fefe1d6e8c5591d806b1dcd480512cb153 SHA512 2f603df3765657e1dc857012610d849705002c8f710136ddf4717cde5d7f827d7d886074a08ec75d4678601c17b8cac83961db25bd10e49840777a4e89c4f7cd DIST derive_more-0.99.17.crate 55771 BLAKE2B b290bfbf06119018206be0f8ad4c92508be4cbc443f1a937c38961e207fc3f433d8a87b2b5a17e72aa1735520799540557d9dd9e49e26b8eb7cc80289afd44bd SHA512 0bb5a94e56d35a17ff4deed61c437ba75c9063694032ba98b58be1b072d33f2fb170d51bd262a17ff1beed2110b334528de75d5315ac627202ccb13d8c490baf +DIST deunicode-1.6.0.crate 170864 BLAKE2B db0a3d0459a43c224fc0bbe84bed044ff81b9f05063e364fa38c44bc51a12106805f93569d07469b6544745b684097cf3f03d6cebefc93dfa0deb232fc73f7f9 SHA512 39e5de0d1ed93bf3fcd37e87a04ac3b23d3a50d28b37b0962b30f9461753b3c1e3639c9760101bbaf1d4269c7eaa8568764b481d3cac6faa6b9580f51d11144c DIST dialoguer-0.10.4.crate 29928 BLAKE2B 98442debedfc4661f3179aad4b756c91b392632259da0347c6eb3c9706c95c687331891c7dcb961171e4de2e807c6fa46489ac281191aa3b1a9b57c79cb66d26 SHA512 0ad01a3cf177b2877c4d6a12f8368e6543f514d9d7993e38826c52f22b1181039b4140c618965f3c1ec20a175f477a759ac6948ca3b6c39c5508b87d64fe8002 DIST dialoguer-0.11.0.crate 3
[gentoo-commits] repo/gentoo:master commit in: sys-fabric/mstflint/
commit: 5ed91a25cb4038e0ca0a1da891a9f9af3cd5
Author: Filip Kobierski pm me>
AuthorDate: Mon Aug 5 14:21:20 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Aug 6 00:28:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed91a25
sys-fabric/mstflint: fix pkgcheck issues
Signed-off-by: Filip Kobierski pm.me>
Closes: https://github.com/gentoo/gentoo/pull/37978
Signed-off-by: Zac Medico gentoo.org>
sys-fabric/mstflint/mstflint-4.23.0_p1.ebuild | 25 +++--
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/sys-fabric/mstflint/mstflint-4.23.0_p1.ebuild
b/sys-fabric/mstflint/mstflint-4.23.0_p1.ebuild
index 44fd3ec31adb..625933e4b2ff 100644
--- a/sys-fabric/mstflint/mstflint-4.23.0_p1.ebuild
+++ b/sys-fabric/mstflint/mstflint-4.23.0_p1.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools
+MY_PV="${PV/_p/-}"
+EGIT_COMMIT="acfaf553f2f571b1f9256b6cd558eafa767d9172"
+
DESCRIPTION="Mstflint - an open source version of MFT (Mellanox Firmware
Tools)"
HOMEPAGE="https://github.com/Mellanox/mstflint";
+SRC_URI="https://github.com/Mellanox/mstflint/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
LICENSE="|| ( GPL-2 BSD-2 )"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
-EGIT_COMMIT="acfaf553f2f571b1f9256b6cd558eafa767d9172"
-MY_PV=${PV/_p/-}
-MY_P=""
-SRC_URI="https://github.com/Mellanox/mstflint/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
IUSE="adb-generic-tools inband ssl"
-SLOT="0"
-RDEPEND="dev-db/sqlite:3=
+
+RDEPEND="
+ dev-db/sqlite:3=
sys-libs/zlib:=
inband? ( sys-cluster/rdma-core )
adb-generic-tools? (
@@ -24,8 +28,8 @@ RDEPEND="dev-db/sqlite:3=
)
ssl? ( dev-libs/openssl:= )"
DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-PATCHES=("${FILESDIR}"/mstflint-4.23.0_p1-C99-compat.patch)
+
+PATCHES=( "${FILESDIR}"/mstflint-4.23.0_p1-C99-compat.patch )
src_prepare() {
default
@@ -36,7 +40,8 @@ src_prepare() {
src_configure() {
eautoreconf
- econf $(use_enable inband) $(use_enable ssl openssl) $(use
adb-generic-tools && printf -- '--enable-adb-generic-tools')
+ econf $(use_enable inband) $(use_enable ssl openssl) \
+ $(use adb-generic-tools && printf --
'--enable-adb-generic-tools')
}
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: sys-fabric/mstflint/
commit: 7ad787bc9776039dae95d54ce01a2630eaceea8e
Author: Zac Medico gentoo org>
AuthorDate: Tue Aug 6 00:26:41 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Aug 6 00:26:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad787bc
sys-fabric/mstflint: drop 4.18.0_p1-r1, 4.20.0_p1
Signed-off-by: Zac Medico gentoo.org>
sys-fabric/mstflint/Manifest | 2 --
sys-fabric/mstflint/mstflint-4.18.0_p1-r1.ebuild | 46
sys-fabric/mstflint/mstflint-4.20.0_p1.ebuild| 46
3 files changed, 94 deletions(-)
diff --git a/sys-fabric/mstflint/Manifest b/sys-fabric/mstflint/Manifest
index cfcd1e932dcd..0ab9136d928a 100644
--- a/sys-fabric/mstflint/Manifest
+++ b/sys-fabric/mstflint/Manifest
@@ -1,3 +1 @@
-DIST mstflint-4.18.0_p1.tar.gz 4877851 BLAKE2B
7fb995561155ccc73b0c36d2994c0398483a92788c5ce045f0263a3e5b0ff7230ca8bb0f5b821e957d5879e0629f11716b179e3bc581849335cc95715631c1d6
SHA512
aed2302dc88b9b95892eb6dd929a922ac6257ddae808db656c7fd01c393f9f0a0d3aa4e13da6c07fe0118cd48a43795f39cc16e619408b05e6bed7d085dbf0d4
-DIST mstflint-4.20.0_p1.tar.gz 5176386 BLAKE2B
065fbf1884de70b57b602bb2a46e34c903b7419050622f2e6d55589f066555a43e781e35cfa4751f4d3af4394f3bbcff3c61e5618acb6696d0c22790ccaf50b8
SHA512
7298c425831f6e8f80145fb0f79af9d63ed013eeac6a99a5d9fe804a6e5c044ecffaf0ce62cd3edd07d185732bdb6ae3a99ecbb31b94047831d710b0b7fe1738
DIST mstflint-4.23.0_p1.tar.gz 6269497 BLAKE2B
95c8fda6a1532baa50de7bcfffc128d24f30c41e670ee9fb19193025dee75fecf3b3e5bebec30bfd7ce9cc138c8eb61ba66a24d14ccec304cc75cae95d62995f
SHA512
e0f98587272334d30910b7e8ea4c61ee0404924c85bfedd298ef0ae9321b177d56c8469588a2f59bc1584da79cd2908a222f3608b240d3b5498fb0cd87c06146
diff --git a/sys-fabric/mstflint/mstflint-4.18.0_p1-r1.ebuild
b/sys-fabric/mstflint/mstflint-4.18.0_p1-r1.ebuild
deleted file mode 100644
index 810536121d18..
--- a/sys-fabric/mstflint/mstflint-4.18.0_p1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Mstflint - an open source version of MFT (Mellanox Firmware
Tools)"
-HOMEPAGE="https://github.com/Mellanox/mstflint";
-LICENSE="|| ( GPL-2 BSD-2 )"
-KEYWORDS="~amd64 ~x86"
-EGIT_COMMIT="ab6f72086a2aa3a07629536fa091141f40a6f0c0"
-MY_PV=${PV/_p/-}
-MY_P=""
-SRC_URI="https://github.com/Mellanox/mstflint/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
-IUSE="adb-generic-tools inband ssl"
-SLOT="0"
-RDEPEND="dev-db/sqlite:3=
- sys-libs/zlib:=
- inband? ( sys-cluster/rdma-core )
- adb-generic-tools? (
- dev-libs/boost:=
- dev-libs/expat:=
- )
- ssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- default
- echo '#define TOOLS_GIT_SHA "'${EGIT_COMMIT}'"' > ./common/gitversion.h
|| die
-}
-
-src_configure() {
- eautoreconf
- econf $(use_enable inband) $(use_enable ssl openssl) $(use
adb-generic-tools && printf -- '--enable-adb-generic-tools')
-}
-
-src_compile() {
- if use adb-generic-tools; then
- pushd ext_libs/json >/dev/null || die
- emake
- popd >/dev/null || die
- fi
- default
-}
diff --git a/sys-fabric/mstflint/mstflint-4.20.0_p1.ebuild
b/sys-fabric/mstflint/mstflint-4.20.0_p1.ebuild
deleted file mode 100644
index d323798bc98f..
--- a/sys-fabric/mstflint/mstflint-4.20.0_p1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Mstflint - an open source version of MFT (Mellanox Firmware
Tools)"
-HOMEPAGE="https://github.com/Mellanox/mstflint";
-LICENSE="|| ( GPL-2 BSD-2 )"
-KEYWORDS="~amd64 ~x86"
-EGIT_COMMIT="d23c7b44193a6697a49211d2232dfe094a0e6530"
-MY_PV=${PV/_p/-}
-MY_P=""
-SRC_URI="https://github.com/Mellanox/mstflint/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz"
-IUSE="adb-generic-tools inband ssl"
-SLOT="0"
-RDEPEND="dev-db/sqlite:3=
- sys-libs/zlib:=
- inband? ( sys-cluster/rdma-core )
- adb-generic-tools? (
- dev-libs/boost:=
- dev-libs/expat:=
- )
- ssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- default
- echo '#define TOOLS_GIT_SHA "'${EGIT_COMMIT}'"' > ./common/gitversion.h
|| die
-}
-
-src_configure() {
- eautoreconf
- econf $(use_enable inband) $(use_enable ssl openssl) $(use
adb-generic-tools && printf -- '--enable-adb-generic-tools')
-}
-
-src_compile() {
- if use adb-generic-tools; then
- pushd ext_libs/json >/dev/null || die
- emake
- popd >/dev/null || die
- fi
- default
-}
[gentoo-commits] proj/portage:master commit in: /
commit: 5f0bc595e6cd49b36fc5462ae494276d3bfbbd29 Author: Zac Medico gentoo org> AuthorDate: Sun Aug 4 05:07:59 2024 + Commit: Zac Medico gentoo org> CommitDate: Sun Aug 4 05:09:33 2024 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5f0bc595 NEWS: Fix FETCHCOMMAND spelling Signed-off-by: Zac Medico gentoo.org> NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 3b71349508..58dd83bf17 100644 --- a/NEWS +++ b/NEWS @@ -28,7 +28,7 @@ Bug fixes: * repository: config: Allow a repository to be configured using one of its aliases rather than its primary name (bug #935830). -* emerge: Fix parallel-fetch to properly terminate FETCOMMAND processes when +* emerge: Fix parallel-fetch to properly terminate FETCHCOMMAND processes when needed, using a SIGTERM handler (bug #936273). portage-3.0.65 (2024-06-04)
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/util/, lib/portage/tests/ebuild/, /, ...
commit: 8b5b5186965c47605ba004d317e8fd58e70e97cd
Author: Zac Medico gentoo org>
AuthorDate: Sat Aug 3 21:33:41 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Aug 3 21:33:41 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8b5b5186
_EbuildFetcherProcess: Handle SIGTERM
Fix _EbuildFetcherProcess to handle SIGTERM, so that FETCHCOMMAND
processes will not be left running in the background:
* Convert the fetch function to an async_fetch coroutine function
so that it can use asyncio.CancelledError handlers to terminate
running processes.
* Use multiprocessing.active_children() to detect and terminate
any processes that asyncio.CancelledError handlers did not have
an opportunity to terminate because the exception arrived too
soon after fork/spawn.
* Add unit test to verify that a child process is correctly
killed when EbuildFetcher is cancelled, with short timeout in
case it takes some time for the process to disappear.
Bug: https://bugs.gentoo.org/936273
Signed-off-by: Zac Medico gentoo.org>
NEWS | 3 +
lib/_emerge/EbuildFetcher.py | 68 ++
lib/portage/package/ebuild/fetch.py| 102 -
lib/portage/tests/ebuild/test_fetch.py | 100 +++-
lib/portage/tests/util/test_socks5.py | 16 --
5 files changed, 257 insertions(+), 32 deletions(-)
diff --git a/NEWS b/NEWS
index 04ce6069db..3b71349508 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,9 @@ Bug fixes:
* repository: config: Allow a repository to be configured using one of its
aliases rather than its primary name (bug #935830).
+* emerge: Fix parallel-fetch to properly terminate FETCOMMAND processes when
+ needed, using a SIGTERM handler (bug #936273).
+
portage-3.0.65 (2024-06-04)
--
diff --git a/lib/_emerge/EbuildFetcher.py b/lib/_emerge/EbuildFetcher.py
index 81d4b1054b..994271236c 100644
--- a/lib/_emerge/EbuildFetcher.py
+++ b/lib/_emerge/EbuildFetcher.py
@@ -4,6 +4,8 @@
import copy
import functools
import io
+import multiprocessing
+import signal
import sys
import portage
@@ -17,11 +19,12 @@ from portage.package.ebuild.fetch import (
_check_distfile,
_drop_privs_userfetch,
_want_userfetch,
-fetch,
+async_fetch,
)
from portage.util._async.AsyncTaskFuture import AsyncTaskFuture
from portage.util._async.ForkProcess import ForkProcess
from portage.util._pty import _create_pty_or_pipe
+from portage.util.futures import asyncio
from _emerge.CompositeTask import CompositeTask
@@ -34,6 +37,7 @@ class EbuildFetcher(CompositeTask):
"logfile",
"pkg",
"prefetch",
+"pre_exec",
"_fetcher_proc",
)
@@ -253,6 +257,7 @@ class _EbuildFetcherProcess(ForkProcess):
self._get_manifest(),
self._uri_map,
self.fetchonly,
+self.pre_exec,
)
ForkProcess._start(self)
@@ -263,7 +268,10 @@ class _EbuildFetcherProcess(ForkProcess):
self._settings = None
@staticmethod
-def _target(settings, manifest, uri_map, fetchonly):
+def _target(settings, manifest, uri_map, fetchonly, pre_exec):
+if pre_exec is not None:
+pre_exec()
+
# Force consistent color output, in case we are capturing fetch
# output through a normal pipe due to unavailability of ptys.
portage.output.havecolor = settings.get("NOCOLOR") not in ("yes",
"true")
@@ -273,17 +281,53 @@ class _EbuildFetcherProcess(ForkProcess):
if _want_userfetch(settings):
_drop_privs_userfetch(settings)
-rval = 1
allow_missing = manifest.allow_missing or "digest" in settings.features
-if fetch(
-uri_map,
-settings,
-fetchonly=fetchonly,
-digests=copy.deepcopy(manifest.getTypeDigests("DIST")),
-allow_missing_digests=allow_missing,
-):
-rval = os.EX_OK
-return rval
+
+async def main():
+loop = asyncio.get_event_loop()
+task = asyncio.ensure_future(
+async_fetch(
+uri_map,
+settings,
+fetchonly=fetchonly,
+digests=copy.deepcopy(manifest.getTypeDigests("DIST")),
+allow_missing_digests=allow_missing,
+)
+)
+
+def sigterm_handler(signum, _frame):
+loop.call_soon_threadsafe(task.cancel)
+signal.signal(signal.SIGTERM, signal.SIG_IGN)
+
+signal.signal(signal.SIGTERM, sigterm_handler)
+try:
+await task
+except asyncio.CancelledError:
+# If asyncio.CancelledError arrives too
[gentoo-commits] repo/gentoo:master commit in: net-vpn/fp-multiuser/
commit: 924130e2955b05fd2ca3f3dbd14ccefe2cb7b02b
Author: Filip Kobierski pm me>
AuthorDate: Wed Jul 31 11:07:25 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Wed Jul 31 21:49:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=924130e2
net-vpn/fp: fix drop empty IUSE
Signed-off-by: Filip Kobierski pm.me>
From: https://github.com/gentoo/gentoo/pull/37849
Signed-off-by: Zac Medico gentoo.org>
net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
b/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
index bc98553b747e..358f00f4c30e 100644
--- a/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
+++ b/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/gofrp/fp-multiuser/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
+
RDEPEND="
acct-user/fp-multiuser
acct-group/fp-multiuser"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/yarn/
commit: 347cfef6bae84210b9828345ff2300d6789d33aa
Author: Filip Kobierski pm me>
AuthorDate: Tue Jul 30 12:59:52 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Wed Jul 31 03:06:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347cfef6
sys-apps/yarn: drop old
Signed-off-by: Filip Kobierski pm.me>
Closes: https://github.com/gentoo/gentoo/pull/37815
Signed-off-by: Zac Medico gentoo.org>
sys-apps/yarn/Manifest| 3 ---
sys-apps/yarn/yarn-1.22.17.ebuild | 40 ---
sys-apps/yarn/yarn-1.22.19.ebuild | 40 ---
sys-apps/yarn/yarn-1.22.21.ebuild | 40 ---
4 files changed, 123 deletions(-)
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index b3e157667ab3..77b9534a1b56 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,4 +1 @@
-DIST yarn-v1.22.17.tar.gz 1246198 BLAKE2B
ae0b86cdb248a0f81d1a4a23d15ef9aab185fcda7ef7f8873959c3e54dfc305219afb2416264911098c4e3a6a65a33d248ff97c8e0ca043b118de64e003c3d9b
SHA512
1f4a76e35057687d1437d21e1fffd14fcdad9793df36b695a52a44a16f844fb966a29342eb5799f80f880ef53c14ce86a39bf1d7ad929dc0cbf09d598d106b89
-DIST yarn-v1.22.19.tar.gz 1244259 BLAKE2B
f103d148bafa76bddcdf9e26356fbebba87f7c7c707f823a54404302571e1d09e25569406fc721d74f53cfdac8706dec6bd40da39b7d44000381b1f36d0d8de0
SHA512
ff4579ab459bb25aa7c0ff75b62acebe576f6084b36aa842971cf250a5d8c6cd3bc9420b22ce63c7f93a0857bc6ef29291db39c3e7a23aab5adfd5a4dd6c5d71
-DIST yarn-v1.22.21.tar.gz 1243124 BLAKE2B
99a53db799f07c6aed1bb8d5d2997b6caef6d518118ef8bea4974fdaf3cc0b6a7a7fa17fb9244c8fb2915bffed77d5ed8dd701eecdcf4491d26b68f92750d8c7
SHA512
75fc33d00ee14733272c04090b3a646fb4021fce85103b2451f01f60f47be7dc9811c76b26465fe6a3735996ac55fd9e80f918cc45422af0888047f4c9ba8f9d
DIST yarn-v1.22.22.tar.gz 1247457 BLAKE2B
a81ec778e774f85da6d5802d4abbc579f1c9194f6e2681ef239cc336e4ec2b502b412f303fa4a8c61dda08a00444e120487e04aa19e89113f844c0db4fd54098
SHA512
c8b361ca353e3ca15e32eadf7f1617449f485fe488860e49774ea35dac1544f39ab1104f82bf24528de6e553eef53c4604a560e522dfab8433425ee13ccfd6f9
diff --git a/sys-apps/yarn/yarn-1.22.17.ebuild
b/sys-apps/yarn/yarn-1.22.17.ebuild
deleted file mode 100644
index bb8df23d1c0e..
--- a/sys-apps/yarn/yarn-1.22.17.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com";
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz";
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
- net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- sed -i 's/"installationMethod": "tar"/"installationMethod":
"portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
- local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
- insinto "${install_dir}"
- doins -r .
- dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
- dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg"
"/usr/bin/yarnpkg"
-
- while read -r -d '' path; do
- read -r shebang < "${ED}${path}" || die
- [[ "${shebang}" == \#\!* ]] || continue
- fperms +x "${path}"
- done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/yarn/yarn-1.22.19.ebuild
b/sys-apps/yarn/yarn-1.22.19.ebuild
deleted file mode 100644
index a1a20e84d28e..
--- a/sys-apps/yarn/yarn-1.22.19.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com";
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz";
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
- net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- sed -i 's/"installationMethod": "tar"/"installationMethod":
"portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
- local install_dir
[gentoo-commits] repo/gentoo:master commit in: sys-fs/linux-apfs-rw/
commit: f37aa8023fa8e23a31a867c43d02d9799e89257a
Author: Zac Medico gentoo org>
AuthorDate: Sun Jul 28 23:43:51 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jul 28 23:45:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37aa802
sys-fs/linux-apfs-rw: add 0.3.10
Includes this set_blocksize pointer type fix for kernel 6.10:
https://github.com/linux-apfs/linux-apfs-rw/commit/071cdacc32e15c6121b925c130ff6b509dfc5693
Closes: https://bugs.gentoo.org/936845
Signed-off-by: Zac Medico gentoo.org>
sys-fs/linux-apfs-rw/Manifest | 2 +-
.../{linux-apfs-rw-0.3.9.ebuild => linux-apfs-rw-0.3.10.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/linux-apfs-rw/Manifest b/sys-fs/linux-apfs-rw/Manifest
index 09edd1b8f6dc..f1dfb52b34db 100644
--- a/sys-fs/linux-apfs-rw/Manifest
+++ b/sys-fs/linux-apfs-rw/Manifest
@@ -1 +1 @@
-DIST linux-apfs-rw-0.3.9.tar.gz 209682 BLAKE2B
663007f1b7c7af6cf4198066b6ba141c3bb625685508fe06f72bb3654438bac03ecc50204227fd724d16a4bb757f0df9ed7d19fb08fece8b98f08da9cfb3c8f5
SHA512
b241044c6faa175c1523f0ba391f9bb9ba336b3c39fd3528f43e0df5e9c6090691ab226091948f9f32f33748e8c435a0881ccc00fed4badca97d195c1982f9a7
+DIST linux-apfs-rw-0.3.10.tar.gz 210033 BLAKE2B
a7714ed7e0f2334fe8b534cf88cca5c5dba62592046e8c4957171350de17d808fb64cc809facd2b385ef27b7f8c3f6001e675e34437c609daf5b6b2cd9afd1f0
SHA512
cebdbbda67f282edaf00e6b1da9ed4905a068205c2af6a1b723da4007c39c3ea02c2a2935e2e07395b51dda58b6f1ad00beb9547fed81690f77455b96fb9e672
diff --git a/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild
b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.10.ebuild
similarity index 100%
rename from sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild
rename to sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.10.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-portage/kuroo/
commit: 89a007fc844e8dac80373dd424b497173da32679
Author: A Schenck users sourceforge net>
AuthorDate: Sat Jul 20 21:57:25 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jul 20 22:00:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89a007fc
app-portage/kuroo: add 1.2.3
Closes: https://bugs.gentoo.org/936066
Signed-off-by: Zac Medico gentoo.org>
app-portage/kuroo/Manifest | 1 +
app-portage/kuroo/kuroo-1.2.3.ebuild | 48
2 files changed, 49 insertions(+)
diff --git a/app-portage/kuroo/Manifest b/app-portage/kuroo/Manifest
index c0b12acacf38..58a4dceb1903 100644
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@@ -1 +1,2 @@
DIST kuroo-1.2.2.tar.xz 250284 BLAKE2B
57bb80fde83e4506b0e8e9230a9e619ec887327779e1d9700e51bd534fa3d14ab51d3d80aad1def1a67cc14fd446f84f1ea551919578bf7f92cbb5dc4368e172
SHA512
6120508d77fe2b6787aa62994327882bd7abd0a08bfce0905920ab17b7837aabfa271c572377fe16131dd9770e5fd45c82409c6aeae5f27f8c0eb33d4e0cdb4c
+DIST kuroo-1.2.3.tar.xz 253408 BLAKE2B
621e4e6a54d9beadb33ff550f505405cfdb3a052bb82522e5890e9884c0d3b8e79a589a1d5a464d4ff9e0464b7931e661c83e98ff55ed85c0d83f1ccb0d0cea9
SHA512
f441054bcb97f9ff21a9df2f9a9615ec7445bcbe2ce1d11ba413ce94a265cc1de37fdac901ffb6dae8c3e58dcb128b7d24ca686fa74ef6bd428f6b6056d481a6
diff --git a/app-portage/kuroo/kuroo-1.2.3.ebuild
b/app-portage/kuroo/kuroo-1.2.3.ebuild
new file mode 100644
index ..75678dec77e9
--- /dev/null
+++ b/app-portage/kuroo/kuroo-1.2.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.96.0
+inherit ecm
+
+DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
+HOMEPAGE="https://sourceforge.net/projects/kuroo/";
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-db/sqlite:3
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+ app-portage/gentoolkit
+ kde-apps/kompare:5
+"
+
+pkg_postinst() {
+ if ! has_version app-admin/logrotate ; then
+ elog "Installing app-admin/logrotate is recommended to keep"
+ elog "portage's summary.log size reasonable to view in the
history page."
+ fi
+
+ ecm_pkg_postinst
+}
[gentoo-commits] repo/gentoo:master commit in: app-shells/nushell/files/, app-shells/nushell/
commit: 3bdf21c1019f87a61b1c10c373f9b3327255edb2 Author: Jonas Frei pm me> AuthorDate: Sun Jun 30 16:46:06 2024 + Commit: Zac Medico gentoo org> CommitDate: Sat Jul 20 03:52:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bdf21c1 app-shells/nushell: Add 0.95.0, renamed patch Signed-off-by: Jonas Frei pm.me> Closes: https://github.com/gentoo/gentoo/pull/37379 Closes: https://bugs.gentoo.org/936307 Signed-off-by: Zac Medico gentoo.org> app-shells/nushell/Manifest| 31 +++ ...gins.patch => nushell-dont-build-plugins.patch} | 0 app-shells/nushell/nushell-0.94.2.ebuild | 2 +- ...nushell-0.94.2.ebuild => nushell-0.95.0.ebuild} | 63 +++--- 4 files changed, 63 insertions(+), 33 deletions(-) diff --git a/app-shells/nushell/Manifest b/app-shells/nushell/Manifest index 37648ffd4127..40fe25366e48 100644 --- a/app-shells/nushell/Manifest +++ b/app-shells/nushell/Manifest @@ -206,6 +206,7 @@ DIST const_format-0.2.31.crate 77893 BLAKE2B 61d75cbff309a23f7bdcf5b02880e662b6b DIST const_format-0.2.32.crate 77317 BLAKE2B 69b87c1d9dd81f5f92fe7cbc09dea126d386adb2cfb359ed9a906af554fe9b4083d49b87558e019777aff4d93e52babbf39e5d9934ce7163435168656ddb11a1 SHA512 05f883696902f13bb78278e0c202c092fe232cfab7a33c078a16b5f67825a85dede0b6bbb2969dad685977f67098c468916c7fb1d9c5c65bf7fee0a5f8329091 DIST const_format_proc_macros-0.2.31.crate 24402 BLAKE2B 9ab560ca7119fafbaa5c0275fb79e7c5be415ba54c3829a36d2e71cabb18407786ebf6f9a0754547ba673ca69b7d8522ae0279b8a5817026af7fd78c51fd48ce SHA512 4e00b71994a57b8ccc8343d06fce01a346688780b2f3f939e44ec35515dead9de65012bebdfa1fbe3a32de17e9e8361d9322279bf63800d0aad9fce7967bb97a DIST const_format_proc_macros-0.2.32.crate 24389 BLAKE2B fdb8dad234c45a2fb179c41573765dc0495ffd7268e325403ee9e56b80e68999bd886e22c414c6591ff6be798ae1c172b671d167a7e3ceb853185613f1e4c1c1 SHA512 01b4fb82eb8e3c59a80bb4a819db9218c25d57e947eee6e8a7e4bcc9339c423a2f028fac0959f3781da5e20d7012d2264f05751661b0df7f7011701da124ad0e +DIST convert_case-0.6.0.crate 18675 BLAKE2B 5e5ab159a61e68b801f1c95dc5336f3af7ffe6fee212c8ffb9905af1121f0b272b234b4e70a30f29f5ed24f4825ccfb59722057b69549fec0fc3472857ee1ce9 SHA512 3b17449195a9a36e3965db89eeb967979c192ad7743217ea08e8c8b91ecae1ac1674362d05dc6f32f1f361fface3f783398285bb78060403f65a777a9d29adf2 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072 DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33 DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e8456933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 @@ -262,6 +263,7 @@ DIST dlib-0.5.2.crate 5806 BLAKE2B 2a8be2d76c44c95d5b1b9a5439a99a75daa703a341980 DIST dlv-list-0.5.0.crate 22112 BLAKE2B ed6ba7f0621dea6bad42a96423c147e55d6b120bedf7b1f8eee9f1101e38bc44f5e030c67df29d281829a9951233c0a8138906dd59c454caa44aeca443f08758 SHA512 4acfd27f975f314edb8e520fdd36c45f9dce60db7d0f1a8b483689ce01e099663fb5608a0463b0c4c3453d493787ba4167b21fab50eadceb90bbe202396ef2a6 DIST dlv-list-0.5.2.crate 22373 BLAKE2B 9edcbd42af8665750bf633dfea9543db4e5f37208523ee05300a599d7107a57e35e9eee2c60ab9cc1c5dc5d7408187dbf846fb0019a1e7ea7de905e08f018453 SHA512 f2fe69a3a5d319ea963c53e6a410f3a5553d6f6b5708e6318b450ae3b5319a19f9d492bcddd233d7a5a65355ca378bc41232c335deb9c4987dd9350a37afbca3 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba +DIST doctest-file-1.0.0.crate 5703 BLAKE2B eafa2ab1455e07bf20006d8a254c1dc15ee6ecd94e2d0f78c2500490419d18a4ec8abb0615b8b444797efd1c1be6c9a8cfab2e8849425868b447a253a265939a SHA512 a02e3071c51a7cf9de9551c84054c3e7ded8823bfeef8ca5a9c7fa0c7e0c49a7221908039ab19541728e0591c5b8261227cde10ccaacde6857c00097f203f3ef DIST downcast-rs-1.2.0.crate 11670 BLAKE2B 7d44d708c1ac068a02ea5d72dd3caa8a7f6d18b7ee653d520600acc9c52365824f5b8d3c68143d1d13aa438a18b16ff9975e15131cac7ec48b2d995184673d37 SHA512 b80b72f30b42c5e6b2bd33287f2dd22be5673b2fa5c1a8c75c5de224fc7eca46a55f2fce63c02d225dfbc94ac3462b4b2fec53d63331c70da6307ebcdcc6cb14
[gentoo-commits] proj/portage:master commit in: man/, lib/portage/dbapi/, lib/portage/binrepo/, lib/portage/, lib/_emerge/
commit: 20cd76664c11991e59b7d72b782fea96259ff9af
Author: Zac Medico gentoo org>
AuthorDate: Wed Jul 17 02:14:34 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Wed Jul 17 02:14:34 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=20cd7666
binrepos.conf: Support custom download location
Download packages to a custom location if it is configured
in binrepos.conf, instead of PKGDIR. If a custom download
location is not configured then inject downloaded packages
into PKGDIR as usual.
The binarytree download_required method should now be used
instead of the isremote method to check if download is
required, since a remote package may or may not be cached
in the custom location. The get_local_repo_location method
should be used to check if there is a custom download
location, and if there is then downloaded packages must
not be injected into PKGDIR.
If any packages from a repo with a custom download location
were injected into PKGDIR in the past, their identity will
be recognized and will not be re-downloaded to the custom
location.
Bug: https://bugs.gentoo.org/934784
Signed-off-by: Zac Medico gentoo.org>
lib/_emerge/Binpkg.py | 7 +++--
lib/_emerge/BinpkgFetcher.py| 8 -
lib/_emerge/BinpkgPrefetcher.py | 7 +
lib/_emerge/Scheduler.py| 8 +++--
lib/_emerge/actions.py | 2 +-
lib/portage/binrepo/config.py | 3 ++
lib/portage/dbapi/bintree.py| 70 +++--
lib/portage/versions.py | 6 +++-
man/portage.5 | 7 -
9 files changed, 106 insertions(+), 12 deletions(-)
diff --git a/lib/_emerge/Binpkg.py b/lib/_emerge/Binpkg.py
index 299ae7fbc9..437111fa10 100644
--- a/lib/_emerge/Binpkg.py
+++ b/lib/_emerge/Binpkg.py
@@ -170,7 +170,7 @@ class Binpkg(CompositeTask):
pkg_count = self.pkg_count
fetcher = None
-if self.opts.getbinpkg and self._bintree.isremote(pkg.cpv):
+if self.opts.getbinpkg and self._bintree.download_required(pkg.cpv):
fetcher = BinpkgFetcher(
background=self.background,
logfile=self.settings.get("PORTAGE_LOG_FILE"),
@@ -245,7 +245,10 @@ class Binpkg(CompositeTask):
pkg = self.pkg
pkg_count = self.pkg_count
-if self._fetched_pkg:
+if self._fetched_pkg and
self._bintree.get_local_repo_location(pkg.cpv):
+os.rename(self._fetched_pkg, self._pkg_allocated_path)
+pkg_path = self._pkg_allocated_path
+elif self._fetched_pkg:
stdout_orig = sys.stdout
stderr_orig = sys.stderr
out = io.StringIO()
diff --git a/lib/_emerge/BinpkgFetcher.py b/lib/_emerge/BinpkgFetcher.py
index 19d08359f0..a357bac82d 100644
--- a/lib/_emerge/BinpkgFetcher.py
+++ b/lib/_emerge/BinpkgFetcher.py
@@ -34,8 +34,14 @@ class BinpkgFetcher(CompositeTask):
)
binpkg_format = get_binpkg_format(binpkg_path)
+getname_kwargs = {}
+if not bintree.get_local_repo_location(pkg.cpv):
+getname_kwargs.update(
+dict(allocate_new=True, remote_binpkg_format=binpkg_format)
+)
+
self.pkg_allocated_path = pkg.root_config.trees["bintree"].getname(
-pkg.cpv, allocate_new=True, remote_binpkg_format=binpkg_format
+pkg.cpv, **getname_kwargs
)
self.pkg_path = self.pkg_allocated_path + ".partial"
diff --git a/lib/_emerge/BinpkgPrefetcher.py b/lib/_emerge/BinpkgPrefetcher.py
index a8af30ca80..f7204bcc17 100644
--- a/lib/_emerge/BinpkgPrefetcher.py
+++ b/lib/_emerge/BinpkgPrefetcher.py
@@ -51,6 +51,13 @@ class BinpkgPrefetcher(CompositeTask):
self.wait()
return
+if self._bintree.get_local_repo_location(self.pkg.cpv):
+os.rename(self.pkg_path, self.pkg_allocated_path)
+self._current_task = None
+self.returncode = os.EX_OK
+self.wait()
+return
+
injected_pkg = None
stdout_orig = sys.stdout
stderr_orig = sys.stderr
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py
index 614df9e783..e23ebeb7ac 100644
--- a/lib/_emerge/Scheduler.py
+++ b/lib/_emerge/Scheduler.py
@@ -830,7 +830,7 @@ class Scheduler(PollScheduler):
elif (
pkg.type_name == "binary"
and "--getbinpkg" in self.myopts
-and pkg.root_config.trees["bintree"].isremote(pkg.cpv)
+and pkg.root_config.trees["bintree"].download_required(pkg.cpv)
):
prefetcher = BinpkgPrefetcher(
background=True, pkg=pkg, scheduler=self._sched_iface
@@ -939,7 +939,7 @@ class Scheduler(PollScheduler):
# Display fetch on stdout, so that it's always clear what
# is consuming
[gentoo-commits] repo/gentoo:master commit in: www-servers/caddy/
commit: c71311afdc753b26e63fc74e732103521effa04a
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Thu Jun 13 14:03:54 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 29 03:15:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c71311af
www-servers/caddy: update to 2.8.4
* code cleanup related to beta versions because I don't want to maintain
those anymore
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37141
Signed-off-by: Zac Medico gentoo.org>
www-servers/caddy/Manifest | 3 +++
www-servers/caddy/{caddy-.ebuild => caddy-2.8.4.ebuild} | 8 +++-
www-servers/caddy/caddy-.ebuild | 8 +++-
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index bfd4a8eabc22..2038371954be 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -4,3 +4,6 @@ DIST caddy-2.7.6.tar.gz 606077 BLAKE2B
1237edc164ec6095c9dff27c332925c4ce9d91a60
DIST caddy-2.8.0_beta2-deps.tar.xz 9983432 BLAKE2B
5ce369219b03688a18f01d7e0f14158a4831bdb02f90c9d4cd2554c8a516f8575155473134197c58c6b65b8752b2fc6a2cdf56b4eaacde20a01233c3f5b1dd38
SHA512
e4fd9432adb4cc98b1f765d5b7f3920030fc433e838a5b7f388f8ba220fe0f23e0c0ce5da01507e3241d03f3e7f010a49dde6ba49402f363fb005bb879c2c1a6
DIST caddy-2.8.0_beta2-docs.tar.gz 24678 BLAKE2B
5e03bada381b63a4549715c25f651e51eed81fc97d9e89cadb1128db55ba8344335590b10ac57a70395f7b57aa8ece93c5a8c2b6f4dd8e199f703bbed2147631
SHA512
d185e77d8020e7afd05a8dd7798fc29a9688268088129be8f813768f2fdd19abbd9e14440d80445c16844976f0740f5aa377ffc8084263c337d313c03adf7556
DIST caddy-2.8.0_beta2.tar.gz 656863 BLAKE2B
6d1364798629949611c8cc5094e0f91928c9a50fc7de2a084b85402cce07e553d9da2652f1fa55daac8c94c877beb08de7226b7f3befd57367b901e593be1d2c
SHA512
64c3f6fb4e32947ff55307f71b416aeb8610d8fd3273514c59c6ebcf323a3552ceea0e3f6281ba4a879d24f1fa02d232e6f634e53fa9edebbce76f78c174032d
+DIST caddy-2.8.4-deps.tar.xz 9995236 BLAKE2B
c19901a458eae2d395fddb9ef8b02225f56e1cf5032a85493de58a9f797369997cb8be8fe52d6ec85333d26d879316f48af73fbd429ae2a4a3c6d2a5e57caea0
SHA512
2ff16025abb9b9a26abd2e2261b487ac34c31c09227ab573cdacad3a5206603a74a5585fa08041c2372469651d8a2a3410f2c562041aef3038c7ecc4fc8baec8
+DIST caddy-2.8.4-docs.tar.gz 24660 BLAKE2B
39628524c155b97f20ba00dec592d33e363086278ef96bd216807347d7b61a1a10d7bb50be84f84f3c4a6a972ff5034840700bf2bcd763cbcec75414a667b964
SHA512
c40a3e2b911ac106706e54022563685a0c920e35fe4716d878b79a3ebd8f422aa3bec847b3a0767a53453e40d8b21a3af1804a3c7bf62ddf61fc290c4129de0b
+DIST caddy-2.8.4.tar.gz 662064 BLAKE2B
77aa671c22e55dff6bab3d251fa9f0a082e41176bf82f5cc9be5b9bee4a234e568c73b8865da116d0db26efbccdd58eeadac80f9160a06946426277640cec11c
SHA512
5c354d0ceb3e927b918594c8c7de51f658aba798ac23d41b751c55b728f9fc5c46fa1f8c2e86c838e58d7b3514bc11937a765b36fd87971ea1757c92a70e9665
diff --git a/www-servers/caddy/caddy-.ebuild
b/www-servers/caddy/caddy-2.8.4.ebuild
similarity index 91%
copy from www-servers/caddy/caddy-.ebuild
copy to www-servers/caddy/caddy-2.8.4.ebuild
index c66b0a78cfe2..da0106f31184 100644
--- a/www-servers/caddy/caddy-.ebuild
+++ b/www-servers/caddy/caddy-2.8.4.ebuild
@@ -13,15 +13,13 @@ if [[ "${PV}" == * ]]; then
EGIT_REPO_URI="https://github.com/caddyserver/caddy.git";
else
SRC_URI="
-
https://github.com/caddyserver/caddy/archive/v${PV/_beta/-beta.}.tar.gz ->
${P}.tar.gz
+ https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz ->
${P}.tar.gz
https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz
-> ${P}-deps.tar.xz
-
https://github.com/caddyserver/dist/archive/refs/tags/v${PV/_beta/-beta.}.tar.gz
-> ${P}-docs.tar.gz
+
https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz ->
${P}-docs.tar.gz
"
- [[ ${PV} != *beta* ]] && \
- KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+ KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
fi
-S="${WORKDIR}/${PN}-${PV/_beta/-beta.}"
# MAIN
LICENSE="Apache-2.0"
# deps
diff --git a/www-servers/caddy/caddy-.ebuild
b/www-servers/caddy/caddy-.ebuild
index c66b0a78cfe2..da0106f31184 100644
--- a/www-servers/caddy/caddy-.ebuild
+++ b/www-servers/caddy/caddy-.ebuild
@@ -13,15 +13,13 @@ if [[ "${PV}" == * ]]; then
EGIT_REPO_URI="https://github.com/caddyserver/caddy.git";
else
SRC_URI="
-
https://github.com/caddyserver/caddy/archive/v${PV/_beta/-beta.}.tar.gz ->
${P}.tar.gz
+ https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz ->
${P}.tar.gz
https://github.com/rahilarious/gentoo-distfiles/releases/download
[gentoo-commits] repo/gentoo:master commit in: www-servers/caddy/
commit: a26f03a437e54ada3411b7803a52069dd533ce34
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 29 03:10:55 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 29 03:15:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a26f03a4
www-servers/caddy: Copy deps tarball to dev space
Signed-off-by: Zac Medico gentoo.org>
www-servers/caddy/caddy-2.8.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/caddy/caddy-2.8.4.ebuild
b/www-servers/caddy/caddy-2.8.4.ebuild
index da0106f31184..6857e8e83659 100644
--- a/www-servers/caddy/caddy-2.8.4.ebuild
+++ b/www-servers/caddy/caddy-2.8.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == * ]]; then
else
SRC_URI="
https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz ->
${P}.tar.gz
-
https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz
-> ${P}-deps.tar.xz
+ https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz
https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz ->
${P}-docs.tar.gz
"
KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
[gentoo-commits] repo/gentoo:master commit in: www-servers/caddy/
commit: 57b07ef09499f3b181a8849dcc8bf7c9a51e4358
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Thu Jun 13 14:06:16 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 29 03:15:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b07ef0
www-servers/caddy: cleanup old versions
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/37141
Signed-off-by: Zac Medico gentoo.org>
www-servers/caddy/Manifest | 3 -
www-servers/caddy/caddy-2.8.0_beta2.ebuild | 133 -
2 files changed, 136 deletions(-)
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 2038371954be..093a34e468d7 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,9 +1,6 @@
DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B
d3dbbb701d86cbfaf538f10911fdd3613b8c3c0f49ef9e229487d2a4fcef9eff79b56e9852d5c1ccd5a8d1d1898861fc8183c343c129901562b03a9092af9e61
SHA512
62e534d41e714b47265fd8089ad9e03a1a89903460976d8af27fa5f71173e076bab8574282213595e495be701b769e1a70ff9e7ec9576fbf8e821e672207faa5
DIST caddy-2.7.6-r2-deps.tar.xz 8511804 BLAKE2B
ad3c78ee483474754ad83284fabf249c376423217c2929740cd171446d0e755f121e380130c80f291422d39ca69ea7e6ac52f5ce5cdec740616099b665cef5af
SHA512
c48d299d9a0b27ebe467f64dc433625de26293674d8153122ad6798a6b95ed4fe55f764a18d3e9211a8e2f966724d20996f1789e2e84dbb0181cfcf5340303fb
DIST caddy-2.7.6.tar.gz 606077 BLAKE2B
1237edc164ec6095c9dff27c332925c4ce9d91a60e629770463bbffb1503b8b11e36033e852df3eb5bb69ffa448833b6ee2891dc0ba6dc9b43b6cce27d492179
SHA512
ef0cb6fd7f6f2a296290b4bb520300e043ad31cc612e734632ffa25cdaa23fd7d601ac4ceaa1c76285d54a07ee773360f795103ef3c2ec79516a4f18a5e844b5
-DIST caddy-2.8.0_beta2-deps.tar.xz 9983432 BLAKE2B
5ce369219b03688a18f01d7e0f14158a4831bdb02f90c9d4cd2554c8a516f8575155473134197c58c6b65b8752b2fc6a2cdf56b4eaacde20a01233c3f5b1dd38
SHA512
e4fd9432adb4cc98b1f765d5b7f3920030fc433e838a5b7f388f8ba220fe0f23e0c0ce5da01507e3241d03f3e7f010a49dde6ba49402f363fb005bb879c2c1a6
-DIST caddy-2.8.0_beta2-docs.tar.gz 24678 BLAKE2B
5e03bada381b63a4549715c25f651e51eed81fc97d9e89cadb1128db55ba8344335590b10ac57a70395f7b57aa8ece93c5a8c2b6f4dd8e199f703bbed2147631
SHA512
d185e77d8020e7afd05a8dd7798fc29a9688268088129be8f813768f2fdd19abbd9e14440d80445c16844976f0740f5aa377ffc8084263c337d313c03adf7556
-DIST caddy-2.8.0_beta2.tar.gz 656863 BLAKE2B
6d1364798629949611c8cc5094e0f91928c9a50fc7de2a084b85402cce07e553d9da2652f1fa55daac8c94c877beb08de7226b7f3befd57367b901e593be1d2c
SHA512
64c3f6fb4e32947ff55307f71b416aeb8610d8fd3273514c59c6ebcf323a3552ceea0e3f6281ba4a879d24f1fa02d232e6f634e53fa9edebbce76f78c174032d
DIST caddy-2.8.4-deps.tar.xz 9995236 BLAKE2B
c19901a458eae2d395fddb9ef8b02225f56e1cf5032a85493de58a9f797369997cb8be8fe52d6ec85333d26d879316f48af73fbd429ae2a4a3c6d2a5e57caea0
SHA512
2ff16025abb9b9a26abd2e2261b487ac34c31c09227ab573cdacad3a5206603a74a5585fa08041c2372469651d8a2a3410f2c562041aef3038c7ecc4fc8baec8
DIST caddy-2.8.4-docs.tar.gz 24660 BLAKE2B
39628524c155b97f20ba00dec592d33e363086278ef96bd216807347d7b61a1a10d7bb50be84f84f3c4a6a972ff5034840700bf2bcd763cbcec75414a667b964
SHA512
c40a3e2b911ac106706e54022563685a0c920e35fe4716d878b79a3ebd8f422aa3bec847b3a0767a53453e40d8b21a3af1804a3c7bf62ddf61fc290c4129de0b
DIST caddy-2.8.4.tar.gz 662064 BLAKE2B
77aa671c22e55dff6bab3d251fa9f0a082e41176bf82f5cc9be5b9bee4a234e568c73b8865da116d0db26efbccdd58eeadac80f9160a06946426277640cec11c
SHA512
5c354d0ceb3e927b918594c8c7de51f658aba798ac23d41b751c55b728f9fc5c46fa1f8c2e86c838e58d7b3514bc11937a765b36fd87971ea1757c92a70e9665
diff --git a/www-servers/caddy/caddy-2.8.0_beta2.ebuild
b/www-servers/caddy/caddy-2.8.0_beta2.ebuild
deleted file mode 100644
index d28390c3b0f9..
--- a/www-servers/caddy/caddy-2.8.0_beta2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd shell-completion
-
-DESCRIPTION="Fast and extensible multi-platform HTTP/1-2-3 web server with
automatic HTTPS"
-HOMEPAGE="https://caddyserver.com";
-
-if [[ "${PV}" == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/caddyserver/caddy.git";
-else
- SRC_URI="
-
https://github.com/caddyserver/caddy/archive/v${PV/_beta/-beta.}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz
- https://dev.gentoo.org/~zmedico/dist/${P}-docs.tar.gz
-"
- [[ ${PV} != *beta* ]] && \
- KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-fi
-
-S="${WORKDIR}/${PN}-${PV/_beta/-beta.}"
-# MAIN
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD ECL-2.0 MIT CC0-1.0"
-SLOT="0"
-
-IUSE='events-handlers-exec security&
[gentoo-commits] proj/portage:master commit in: src/
commit: 918f4a4aa82f47291deac496d13c2761f306e01f
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 16 19:44:37 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Fri Jun 28 18:15:38 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=918f4a4a
Allow GIL to be disabled in whirlpool C extension
In 3.13 python extensions need to declare support for GIL features, for
example if they don't declare Py_MOD_GIL_NOT_USED then it will cause the
GIL to be enabled even when python was launched in free-threaded mode.
This requires "multi-phase initialization" because Py_mod_create is
incompatible with m_slots. There's a PyUnstable_Module_SetGIL() function
that can be used with single-phase init, but it's an unstable API, so
it's better to use multi-phase init. There's no need to use
PyModule_GetState() because the whirlpool module has no mutable state.
Bug: https://bugs.gentoo.org/934220
Signed-off-by: Zac Medico gentoo.org>
src/portage_util__whirlpool.c | 46 +++
1 file changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/portage_util__whirlpool.c b/src/portage_util__whirlpool.c
index 6c9421e56b..4af9307c71 100644
--- a/src/portage_util__whirlpool.c
+++ b/src/portage_util__whirlpool.c
@@ -1112,30 +1112,42 @@ static PyTypeObject WhirlpoolType = {
.tp_methods = Whirlpool_methods,
};
+static int
+whirlpool_exec(PyObject *mod)
+{
+if (PyType_Ready(&WhirlpoolType) < 0)
+return -1;
+
+Py_INCREF(&WhirlpoolType);
+if (PyModule_AddObject(mod, "Whirlpool", (PyObject *) &WhirlpoolType) < 0)
{
+Py_DECREF(&WhirlpoolType);
+return -1;
+}
+
+return 0;
+}
+
+static PyModuleDef_Slot _whirlpoolmodule_slots[] = {
+{Py_mod_exec, whirlpool_exec},
+#ifdef Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
+{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
+#endif
+#ifdef Py_MOD_GIL_NOT_USED
+{Py_mod_gil, Py_MOD_GIL_NOT_USED},
+#endif
+{0, NULL},
+};
+
static PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
.m_name = "_whirlpool",
.m_doc = "Reference Whirlpool implementation",
-.m_size = -1,
+.m_size = 0,
+.m_slots = _whirlpoolmodule_slots,
};
PyMODINIT_FUNC
PyInit__whirlpool(void)
{
-PyObject *m;
-if (PyType_Ready(&WhirlpoolType) < 0)
-return NULL;
-
-m = PyModule_Create(&moduledef);
-if (m == NULL)
-return NULL;
-
-Py_INCREF(&WhirlpoolType);
-if (PyModule_AddObject(m, "Whirlpool", (PyObject *) &WhirlpoolType) < 0) {
-Py_DECREF(&WhirlpoolType);
-Py_DECREF(m);
-return NULL;
-}
-
-return m;
+return PyModuleDef_Init(&moduledef);
}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/gmqtt/
commit: ce8435af992af70f2646b21686184d199ff22fcd
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 17 04:03:56 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 17 04:05:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8435af
sys-cluster/gmqtt: add 0.5.0
Signed-off-by: Zac Medico gentoo.org>
sys-cluster/gmqtt/Manifest | 2 ++
sys-cluster/gmqtt/gmqtt-0.5.0.ebuild | 42
2 files changed, 44 insertions(+)
diff --git a/sys-cluster/gmqtt/Manifest b/sys-cluster/gmqtt/Manifest
index fec262288052..63dc1b4dff8c 100644
--- a/sys-cluster/gmqtt/Manifest
+++ b/sys-cluster/gmqtt/Manifest
@@ -1,2 +1,4 @@
DIST gmqtt-0.4.1-deps.tar.xz 50641100 BLAKE2B
e2df0588178f3cee0f96a15c867352d9718deb9ed1b8acb0b0a26bf512308c40797275deee04be3f35d8725018b522aa807638ed17f300c337a062012fddc16d
SHA512
6c77dcb5bc6c029296ac8715a5796f20091273e5b322fedbe952086cb81e5abf5d5fbe5b0005f22d674565dff1d3b9dbaf84812ec22203ef1b6ccd629405115d
DIST gmqtt-0.4.1.tar.gz 338368 BLAKE2B
4114816d4e60f6421fcea2cb33006f416143040bc85eb97630fcbd588c9fb2e11cd0d1f9e6e56f8ad8461653a5d7772971e4978a3dfca357335309b7c9e138ed
SHA512
cad45a7d3d9033d9d345c72bd0568c4e6115964d980ed02451da3fb6fe7fb92785ccc39bf1632c81242b269f5e61caba18255315e12f49d5debcfc1c105a
+DIST gmqtt-0.5.0-deps.tar.xz 2274132 BLAKE2B
c4eef28fbcf743128e9fee3f62106405343d8a6daeb018f168a16ee67f0028669a04d457ac6127e7528248c69ff38a5f469bbd242f3ce39178f8a44994706649
SHA512
d3f6036652d7185306f629db5660245bdb0d4e0f2bfa64ccf4e306bc725cfb2d3757097c32f495595b21ea8750ab7f0907b93b38c8512811e037f65fc38af852
+DIST gmqtt-0.5.0.tar.gz 256487 BLAKE2B
ce1d032cf13806381c2c0d42aec5592c74b86e938d284252fd01bd23f7eb8b0c0e9b59558be5284b780edd778035c9755a0d6c6da30ccd851c8b3a06f6c49289
SHA512
8c696a54386282b51ce6a835fba787f465f862afd5f553fc0039b8e01a6a03660a4103deed346c683e4b0fe98fd3ac4105a3602f28f416f5c544dc6ee960645a
diff --git a/sys-cluster/gmqtt/gmqtt-0.5.0.ebuild
b/sys-cluster/gmqtt/gmqtt-0.5.0.ebuild
new file mode 100644
index ..b43ae3df0986
--- /dev/null
+++ b/sys-cluster/gmqtt/gmqtt-0.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="MQTT broker library with cluster support that implements MQTT
V5.0 and V3.1.1"
+HOMEPAGE="https://github.com/DrmagicE/gmqtt";
+SRC_URI="https://github.com/DrmagicE/gmqtt/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+src_compile() {
+ GOBIN=${S}/bin CGO_ENABLED=0 go install ./... || die
+}
+
+src_install() {
+ dobin bin/{gmqctl,gmqttd}
+ keepdir /etc/${PN}
+ systemd_dounit "${FILESDIR}/${PN}d.service"
+ newinitd "${FILESDIR}/initd" "${PN}d"
+ newconfd "${FILESDIR}/confd" "${PN}d"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/logrotated" "${PN}"
+ docompress -x /usr/share/doc/${PF}/default_config.yml
+ dodoc CONTRIBUTING.md README*.md cmd/gmqttd/default_config.yml
+ docinto federation
+ dodoc -r plugin/federation/{examples,README.md}
+}
+
+pkg_postinst() {
+ local config=/etc/gmqtt/gmqttd.yml dest=${ROOT}/
+ if [[ ! ${REPLACING_VERSIONS} && ! -e ${ROOT}${config} ]]; then
+ einfo "Copying default config to ${config} for first install"
+ cp "${ROOT}/usr/share/doc/${PF}/default_config.yml"
"${ROOT}${config}"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: app-misc/dasel/
commit: ccf200b2c34ab38d5d284c03a59ba6c8af6705d9
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 17 03:52:51 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 17 03:52:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf200b2
app-misc/dasel: drop 1.27.3
Signed-off-by: Zac Medico gentoo.org>
app-misc/dasel/Manifest| 2 --
app-misc/dasel/dasel-1.27.3.ebuild | 24
2 files changed, 26 deletions(-)
diff --git a/app-misc/dasel/Manifest b/app-misc/dasel/Manifest
index 200d99bd1ed8..a9f077ed0e7c 100644
--- a/app-misc/dasel/Manifest
+++ b/app-misc/dasel/Manifest
@@ -1,4 +1,2 @@
-DIST dasel-1.24.3-deps.tar.xz 20531068 BLAKE2B
6cd947a88c54e46300432c2f87c0ef757a53739e0755af48f4596a87ba46faf12c967145a0f263e13abb8f01ffe10c51b45f641de348fc02e7af39417b709d1d
SHA512
27696cd5a5c93b3e29ba12fd2730c04047dc752ef17a32db73e7cbc8e5d38d914705720da9ff0ffb0c8d3fb383b5070eb552b24a4e72e72ebad70c2e1085cab3
-DIST dasel-1.27.3.tar.gz 3056021 BLAKE2B
2145f501f837cd16aaa7cc16074e446e07cbb8b6b7ce043c644badbe758d255c9e42f408ca818e6241feb91f22eaa1e8e7fbf74b84275b7eba576687e877b1aa
SHA512
51e5f770f75e34f72692adf0987bcb965dd2100ac3e251c035cf62479462e22f982640bab6adac3c12bebac6987f7852f53cceb2c0c4d6dd009befe843cc1aec
DIST dasel-2.7.0-deps.tar.xz 1219584 BLAKE2B
91cfc1225588ba397d9dc5b62297876164644c08260288d09fb843cf7c8619909c11126f54e5c1be1a225a55e3f60184bbdad6ed5e86dafe27c2892eb646066f
SHA512
d2f6545ddb3f62acaa0b98894321f53e01e8fefbc0c8e4327e051dd513fa3a47bbc822ffb7b856a3897915962cfac01d080adc7778d9349ff3282d1cce1debeb
DIST dasel-2.7.0.tar.gz 2793422 BLAKE2B
27fdc70f998c389453c7b6c6ec59491f3482ff7df1a043499e985179c5a51f6b58328272d733eddb28009ada0dd206b0e4fed37ec6bc43229314a0c1906e215e
SHA512
37753bc124511bc2105186ad62090bda25e8574b5c1ec2cc2583f91e9f8ab41de261f870600ea1a501f41c5ad3b13999c64ca995eee50ee120359f819f6f334a
diff --git a/app-misc/dasel/dasel-1.27.3.ebuild
b/app-misc/dasel/dasel-1.27.3.ebuild
deleted file mode 100644
index 261c64912713..
--- a/app-misc/dasel/dasel-1.27.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Query, update and convert data structures from the command line"
-HOMEPAGE="https://github.com/TomWright/dasel";
-SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz";
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-src_compile() {
- CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X
'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
-}
-
-src_install() {
- dobin bin/dasel
- dodoc CHANGELOG.md README.md
-}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/frp/
commit: 3f870471609056385087e232637784123ede118d
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 17 03:38:36 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 17 03:49:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f870471
net-vpn/frp: drop 0.53.2-r1
Signed-off-by: Zac Medico gentoo.org>
net-vpn/frp/Manifest | 2 --
net-vpn/frp/frp-0.53.2-r1.ebuild | 64
2 files changed, 66 deletions(-)
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index 88d4b6b6b30a..4594afdcab34 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -1,4 +1,2 @@
-DIST frp-0.53.2-deps.tar.xz 55621188 BLAKE2B
35e14b82bbc3a3386f2901a274969e7650cf6ce529ae17dd7ab0a7f759f355da7b7d64d0945e22d3a741d75ff3e21bd17ccf708d2184605c9303b35dc63f1b88
SHA512
c173d1d1918afc5549d99ac575eadd2b408220625c773ec5f5cce4e00a648c19d9a3cfbfce51a86e0e8425edb7a1a72a9d798a37f4bf37b38c0d4d031bc27dae
-DIST frp-0.53.2.tar.gz 1023383 BLAKE2B
bad6aee65d5386ba14a0c4679514e17e1643b703292a4bb0811ff1f9a76b95833358993fdfb13b1e4224d7cf8c0035c2aabfdcd74a14003dff90c3e569fa5d12
SHA512
c1f0acff002dbdef001d04c3dcd5ca138c33a36b8e5ad119a555f0dd05f4e6200c915e1481eab58c02e650a058f0b3f75310b9a50ad4756087f69f9fe74377b4
DIST frp-0.56.0-deps.tar.xz 2890568 BLAKE2B
cabeeba66d4fa94ff95637020178310c984b7e3254c756e75f0facc5bee0803c6ba485fa83e7c0f7c92474ce9d60621cd6a1608c3b631f2a9c27f6b6c9638ebe
SHA512
0687db5001542780ac6e5c57d0da356f4c36bd31c96c2657a9e15988950436abedcd490d85cc272ff80f4868989d173a71dcf2cf28ed26f93b877d1650f04206
DIST frp-0.56.0.tar.gz 1080201 BLAKE2B
493e8b21aab6d5fae2d762eafba7d94de59394e9c4cb3c3dfce2bd8b5a0d0fcca6ef471917e8257022e079bececf34e910fe3b6bc845753862da59a1d00ca20c
SHA512
883dce220aa78296f2b7eb9d64b3d1598bc2df436c52a48bc813d725a6f8fa43028359b0507bf4a586a29f4739310474047abfefd46249c0c9942990ceac0e2d
diff --git a/net-vpn/frp/frp-0.53.2-r1.ebuild b/net-vpn/frp/frp-0.53.2-r1.ebuild
deleted file mode 100644
index d8e7afbf47de..
--- a/net-vpn/frp/frp-0.53.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd shell-completion
-
-DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to
the internet"
-HOMEPAGE="https://github.com/fatedier/frp";
-SRC_URI="https://github.com/fatedier/frp/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv"
-IUSE="+client +server"
-REQUIRED_USE="|| ( client server )"
-
-src_compile() {
- mkdir -pv comp || die
-
- if use client; then
- ego build -trimpath -ldflags "-s -w" -tags frpc -o frpc
./cmd/frpc
- ./frpc completion bash > comp/frpc || die
- ./frpc completion fish > comp/frpc.fish || die
- ./frpc completion zsh > comp/_frpc || die
- fi
-
- if use server; then
- ego build -trimpath -ldflags "-s -w" -tags frps -o frps
./cmd/frps
- ./frps completion bash > comp/frps || die
- ./frps completion fish > comp/frps.fish || die
- ./frps completion zsh > comp/_frps || die
- fi
-}
-
-src_install() {
- _install() {
- # Install binary file
- dobin "${1}"
-
- # Install completion files
- dobashcomp "${S}/comp/${1}"
- dofishcomp "${S}/comp/${1}.fish"
- dozshcomp "${S}/comp/_${1}"
-
- # Install systemd services
- systemd_dounit "${FILESDIR}/${1}.service"
- systemd_newunit "${FILESDIR}/${1}_at_.service" "${1}@.service"
-
- # Install config files
- insinto "/etc/${PN}"
- newins "${S}/conf/${1}.toml" "${1}.toml.example"
- newins "${S}/conf/${1}_full_example.toml"
"${1}_full.toml.example"
- }
-
- if use client; then
- _install frpc
- fi
-
- if use server; then
- _install frps
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/frp/
commit: d8936a4603c74516dea90948b22ff71e0144baef
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 17 03:44:50 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 17 03:49:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8936a46
net-vpn/frp: add 0.58.1
Signed-off-by: Zac Medico gentoo.org>
net-vpn/frp/Manifest | 2 ++
net-vpn/frp/frp-0.58.1.ebuild | 65 +++
2 files changed, 67 insertions(+)
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index 4594afdcab34..fc780a5df065 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -1,2 +1,4 @@
DIST frp-0.56.0-deps.tar.xz 2890568 BLAKE2B
cabeeba66d4fa94ff95637020178310c984b7e3254c756e75f0facc5bee0803c6ba485fa83e7c0f7c92474ce9d60621cd6a1608c3b631f2a9c27f6b6c9638ebe
SHA512
0687db5001542780ac6e5c57d0da356f4c36bd31c96c2657a9e15988950436abedcd490d85cc272ff80f4868989d173a71dcf2cf28ed26f93b877d1650f04206
DIST frp-0.56.0.tar.gz 1080201 BLAKE2B
493e8b21aab6d5fae2d762eafba7d94de59394e9c4cb3c3dfce2bd8b5a0d0fcca6ef471917e8257022e079bececf34e910fe3b6bc845753862da59a1d00ca20c
SHA512
883dce220aa78296f2b7eb9d64b3d1598bc2df436c52a48bc813d725a6f8fa43028359b0507bf4a586a29f4739310474047abfefd46249c0c9942990ceac0e2d
+DIST frp-0.58.1-deps.tar.xz 2916740 BLAKE2B
49256c40ca359a5b76a92e2999e3a5a3ca4899f71e4804544296ee71fa6c079f563b1892195243e9e8792c72c445f779fb5a32b1cc5c4ebca9265d88808072e3
SHA512
3295e0e6b5a7ace8c5af1dd9e15ffb893930c0f03755e8de46dfbca2272747b95d8e58f4034f4fa2c44896c5036654b3c805a6d3dd0d3926335330d28d07
+DIST frp-0.58.1.tar.gz 1081317 BLAKE2B
e5d897a9d866df1075c9fb397f1cbcf23efb738fd89e58bce4fba5abce23d9cb6c826b50d4cda52b3fa40a6194003a51c6209f2d4aef43d9dc62f08b51a776a7
SHA512
809e86e9cd2cb67ae338b2584c0c8f5d4f01104cc7725826743f48eb5c893bce9cd678bcd90e04953bb6bfc6523fcf400c6bc1bdf03ff335666b05af5e0c4b55
diff --git a/net-vpn/frp/frp-0.58.1.ebuild b/net-vpn/frp/frp-0.58.1.ebuild
new file mode 100644
index ..df51f8a4c33b
--- /dev/null
+++ b/net-vpn/frp/frp-0.58.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd shell-completion
+
+DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to
the internet"
+HOMEPAGE="https://github.com/fatedier/frp";
+SRC_URI="https://github.com/fatedier/frp/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv"
+IUSE="+client +server"
+REQUIRED_USE="|| ( client server )"
+BDEPEND=">=dev-lang/go-1.22"
+
+src_compile() {
+ mkdir -pv comp || die
+
+ if use client; then
+ ego build -trimpath -ldflags "-s -w" -tags frpc -o frpc
./cmd/frpc
+ ./frpc completion bash > comp/frpc || die
+ ./frpc completion fish > comp/frpc.fish || die
+ ./frpc completion zsh > comp/_frpc || die
+ fi
+
+ if use server; then
+ ego build -trimpath -ldflags "-s -w" -tags frps -o frps
./cmd/frps
+ ./frps completion bash > comp/frps || die
+ ./frps completion fish > comp/frps.fish || die
+ ./frps completion zsh > comp/_frps || die
+ fi
+}
+
+src_install() {
+ _install() {
+ # Install binary file
+ dobin "${1}"
+
+ # Install completion files
+ dobashcomp "${S}/comp/${1}"
+ dofishcomp "${S}/comp/${1}.fish"
+ dozshcomp "${S}/comp/_${1}"
+
+ # Install systemd services
+ systemd_dounit "${FILESDIR}/${1}.service"
+ systemd_newunit "${FILESDIR}/${1}_at_.service" "${1}@.service"
+
+ # Install config files
+ insinto "/etc/${PN}"
+ newins "${S}/conf/${1}.toml" "${1}.toml.example"
+ newins "${S}/conf/${1}_full_example.toml"
"${1}_full.toml.example"
+ }
+
+ if use client; then
+ _install frpc
+ fi
+
+ if use server; then
+ _install frps
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: app-metrics/redis_exporter/
commit: 8c24602b80cc074c1aa02ca3c7f0aea50f0f7b91
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 16 23:19:55 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 16 23:21:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c24602b
app-metrics/redis_exporter: add 1.61.0
Signed-off-by: Zac Medico gentoo.org>
app-metrics/redis_exporter/Manifest| 2 +
.../redis_exporter/redis_exporter-1.61.0.ebuild| 54 ++
2 files changed, 56 insertions(+)
diff --git a/app-metrics/redis_exporter/Manifest
b/app-metrics/redis_exporter/Manifest
index 84d2e4b3d96b..5cab7bd026db 100644
--- a/app-metrics/redis_exporter/Manifest
+++ b/app-metrics/redis_exporter/Manifest
@@ -1,2 +1,4 @@
DIST redis_exporter-1.44.0-deps.tar.xz 103514884 BLAKE2B
14531f87fa3c19ab791b77b39687534b66da199012337b72817f2624a7a679424f1a279a3b888eacb34c0cd7a5d0d51cc8fe3c63c92036cbc320b7e9d9d70c7c
SHA512
ee8ceb663c15e18991903dab3b4a5dbf2981e040694e02bcd0ff81e5690a8fbdefb775e4ccc2bfcbb7bf757f5023f3ed5ae0c918779682c55ef4d9e11181da55
DIST redis_exporter-1.44.0.tar.gz 190542 BLAKE2B
29228825e796def0bfe54ece2e09277fbdb614171e90f02b11b904a14a114aafe6f6810fafad19b2d56749f2edcab13bf03a0ed376310c39a5855715bfef2d53
SHA512
29dd210c23258c896e227d373b2c380a61b6a031f919b3da40ba2fb926f3fa534a2b1478e064b19496675935772bdad8ff490485625c1de4d470f377293efafb
+DIST redis_exporter-1.61.0-deps.tar.xz 815816 BLAKE2B
b57f1d3094e3e03f990a5b26b75d95621d55cdd519882689c640e90b76750b4f7de7d48ebc7dd8456af33e14be14a07644211921667d2ba6b16a5f2567fc8430
SHA512
176442e32ec79f8621f57712a2658398f9481f0ddb1c104881305f6cfa36b74833b53078355d7fdd5e4a3d13f546fdfb844d5faf7dc5e38763f7f17228de4d68
+DIST redis_exporter-1.61.0.tar.gz 82438 BLAKE2B
fe62e6c56206718eaf908de913dcb80dd9e27825dfc74b2f9bef3d4c914b75cfe0223924b852e8b99421ccbd0a3618bc9f9a0aea8c9a7733bcb95221731f7f97
SHA512
2528be4680b5cb2b1a1077a3a28ddac8f5a8a4a2b936504553cb218e8c53f8a9d9e52a9266c247f85bda03ae76eec90dbc9ab9bcc8df828d5850538e818d8188
diff --git a/app-metrics/redis_exporter/redis_exporter-1.61.0.ebuild
b/app-metrics/redis_exporter/redis_exporter-1.61.0.ebuild
new file mode 100644
index ..f7d466947383
--- /dev/null
+++ b/app-metrics/redis_exporter/redis_exporter-1.61.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+EGIT_COMMIT=e9871c1465679cd3543953f57bd4d015bc73c990
+
+DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x
and 4.x"
+HOMEPAGE="https://github.com/oliver006/redis_exporter";
+SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RDEPEND="
+ acct-user/redis_exporter
+ acct-group/redis_exporter"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -e
"s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
+ -e
"s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date
-u)\"|" \
+ -e
"s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|"
\
+ -i main.go || die
+}
+
+src_compile() {
+ export GOBIN="${S}/bin"
+ go install \
+ -ldflags="-X main.BuildVersion=${PV} -X
main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
+ ./... || die
+}
+
+src_test() {
+ go test -work ./... || die
+}
+
+src_install() {
+ dobin "${GOBIN}/redis_exporter"
+ dodoc README.md
+ local dir
+ for dir in /var/{lib,log}/${PN}; do
+ keepdir "${dir}"
+ fowners ${PN}:${PN} "${dir}"
+ done
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
[gentoo-commits] repo/gentoo:master commit in: app-metrics/redis_exporter/
commit: 5ce5efe7de180082e89de5dc1fb2625e4ce103e6
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 16 23:11:05 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 16 23:11:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce5efe7
app-metrics/redis_exporter: drop 1.40.0, 1.43.0
Signed-off-by: Zac Medico gentoo.org>
app-metrics/redis_exporter/Manifest| 3 --
.../redis_exporter/redis_exporter-1.40.0.ebuild| 55 --
.../redis_exporter/redis_exporter-1.43.0.ebuild| 55 --
3 files changed, 113 deletions(-)
diff --git a/app-metrics/redis_exporter/Manifest
b/app-metrics/redis_exporter/Manifest
index bc38176397ac..84d2e4b3d96b 100644
--- a/app-metrics/redis_exporter/Manifest
+++ b/app-metrics/redis_exporter/Manifest
@@ -1,5 +1,2 @@
-DIST redis_exporter-1.38.0-deps.tar.xz 103185452 BLAKE2B
a144d70cd20887dca660fc4f4d2d2ce16dc8463ef0906499c730acb11d717d5c5cf8ab9985ffafd4f9c0cf93c677b2e98895a3b48e9f2e1a2813de96e536d89d
SHA512
31927c0dfc4c960ad3a91be387fa6b7b2603a6b9c9927b9d50ae9986beae866eb1c04cbcb2699265fecf201bda83e16746e4c8991b8f4560248c19d17c2744e4
-DIST redis_exporter-1.40.0.tar.gz 188796 BLAKE2B
f2bb4d05129f4644d58fae005c13737f76222d32c08b9938a4b4fbb8c5000a6a00529204d839b96ae53f489183caf01ecb113535648cd80b0e9d3872ad35a8b1
SHA512
0909f71b32434bd2b47db505cd48cd5d34c4c7cfa04b513ff53c265bbd6b91c15f4e7bcf18e4b4e1c52940dafe53eed43ab9ae4db33071cd827a6d798878736b
-DIST redis_exporter-1.43.0.tar.gz 189579 BLAKE2B
9340ed4710c8d3277bdd562555269b18fd2691b669f507c2306534848815edda8730e0aa718c6b159ba83b91fc89f99dc4480380e950c5f8e662931621a413d3
SHA512
3d2b6d5b58347ddf826de06d60571ef8962078c8ab03647b8f1a91fcdbe2b7e9be015335d09109b21471ee06a59d5e1ad947d9e1bbc681e430c270dc01ae48f2
DIST redis_exporter-1.44.0-deps.tar.xz 103514884 BLAKE2B
14531f87fa3c19ab791b77b39687534b66da199012337b72817f2624a7a679424f1a279a3b888eacb34c0cd7a5d0d51cc8fe3c63c92036cbc320b7e9d9d70c7c
SHA512
ee8ceb663c15e18991903dab3b4a5dbf2981e040694e02bcd0ff81e5690a8fbdefb775e4ccc2bfcbb7bf757f5023f3ed5ae0c918779682c55ef4d9e11181da55
DIST redis_exporter-1.44.0.tar.gz 190542 BLAKE2B
29228825e796def0bfe54ece2e09277fbdb614171e90f02b11b904a14a114aafe6f6810fafad19b2d56749f2edcab13bf03a0ed376310c39a5855715bfef2d53
SHA512
29dd210c23258c896e227d373b2c380a61b6a031f919b3da40ba2fb926f3fa534a2b1478e064b19496675935772bdad8ff490485625c1de4d470f377293efafb
diff --git a/app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild
b/app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild
deleted file mode 100644
index 2c43a3723319..
--- a/app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-EGIT_COMMIT=3a743038c6c5a80d10ce45a3fbd49412262c300b
-
-DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x
and 4.x"
-HOMEPAGE="https://github.com/oliver006/redis_exporter";
-SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/redis_exporter-1.38.0-deps.tar.xz";
-
-LICENSE="MIT Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="
- acct-user/redis_exporter
- acct-group/redis_exporter"
-DEPEND="${RDEPEND}"
-RESTRICT+=" test"
-
-src_prepare() {
- default
- sed -e
"s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
- -e
"s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date
-u)\"|" \
- -e
"s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|"
\
- -i main.go || die
-}
-
-src_compile() {
- export GOBIN="${S}/bin"
- go install \
- -ldflags="-X main.BuildVersion=${PV} -X
main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
- ./... || die
-}
-
-src_test() {
- go test -work ./... || die
-}
-
-src_install() {
- dobin "${GOBIN}/redis_exporter"
- dodoc README.md
- local dir
- for dir in /var/{lib,log}/${PN}; do
- keepdir "${dir}"
- fowners ${PN}:${PN} "${dir}"
- done
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/app-metrics/redis_exporter/redis_exporter-1.43.0.ebuild
b/app-metrics/redis_exporter/redis_exporter-1.43.0.ebuild
delete
[gentoo-commits] repo/gentoo:master commit in: www-servers/caddy/
commit: d5dd5c2ca9fdc5b2bd4ab310d99ef251b6a62322
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 16 23:05:47 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 16 23:07:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5dd5c2c
www-servers/caddy: drop 2.7.6-r1
Signed-off-by: Zac Medico gentoo.org>
www-servers/caddy/Manifest | 1 -
www-servers/caddy/caddy-2.7.6-r1.ebuild | 129
2 files changed, 130 deletions(-)
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 631af198827c..bfd4a8eabc22 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,5 +1,4 @@
DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B
d3dbbb701d86cbfaf538f10911fdd3613b8c3c0f49ef9e229487d2a4fcef9eff79b56e9852d5c1ccd5a8d1d1898861fc8183c343c129901562b03a9092af9e61
SHA512
62e534d41e714b47265fd8089ad9e03a1a89903460976d8af27fa5f71173e076bab8574282213595e495be701b769e1a70ff9e7ec9576fbf8e821e672207faa5
-DIST caddy-2.7.6-r1-deps.tar.xz 129331604 BLAKE2B
50b83c012c70637936c83ec765758cdcd80014ca224d76a746de8640a6b36ae15ce11ec57d9fdb20a5f7b3add946209c6dde7bb4e4bd4a47ffe3ffc8971725db
SHA512
a4bc56de4f7ec8e9967dde3d7ca4cbb74cba9ce0b8906ffe16f8dae3f52fff1164827942df8154eadbae80cce3ee603535b9135cf8a5126d84a9017e8aece078
DIST caddy-2.7.6-r2-deps.tar.xz 8511804 BLAKE2B
ad3c78ee483474754ad83284fabf249c376423217c2929740cd171446d0e755f121e380130c80f291422d39ca69ea7e6ac52f5ce5cdec740616099b665cef5af
SHA512
c48d299d9a0b27ebe467f64dc433625de26293674d8153122ad6798a6b95ed4fe55f764a18d3e9211a8e2f966724d20996f1789e2e84dbb0181cfcf5340303fb
DIST caddy-2.7.6.tar.gz 606077 BLAKE2B
1237edc164ec6095c9dff27c332925c4ce9d91a60e629770463bbffb1503b8b11e36033e852df3eb5bb69ffa448833b6ee2891dc0ba6dc9b43b6cce27d492179
SHA512
ef0cb6fd7f6f2a296290b4bb520300e043ad31cc612e734632ffa25cdaa23fd7d601ac4ceaa1c76285d54a07ee773360f795103ef3c2ec79516a4f18a5e844b5
DIST caddy-2.8.0_beta2-deps.tar.xz 9983432 BLAKE2B
5ce369219b03688a18f01d7e0f14158a4831bdb02f90c9d4cd2554c8a516f8575155473134197c58c6b65b8752b2fc6a2cdf56b4eaacde20a01233c3f5b1dd38
SHA512
e4fd9432adb4cc98b1f765d5b7f3920030fc433e838a5b7f388f8ba220fe0f23e0c0ce5da01507e3241d03f3e7f010a49dde6ba49402f363fb005bb879c2c1a6
diff --git a/www-servers/caddy/caddy-2.7.6-r1.ebuild
b/www-servers/caddy/caddy-2.7.6-r1.ebuild
deleted file mode 100644
index 5397520fab65..
--- a/www-servers/caddy/caddy-2.7.6-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd shell-completion
-
-DESCRIPTION="Fast and extensible multi-platform HTTP/1-2-3 web server with
automatic HTTPS"
-HOMEPAGE="https://caddyserver.com";
-
-if [[ "${PV}" == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/caddyserver/caddy.git";
-else
- SRC_URI="
- https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz
-
https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz ->
${P}-docs.tar.gz
-"
- KEYWORDS="amd64 arm64 ~loong ~riscv"
-fi
-
-# MAIN
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD ECL-2.0 MIT CC0-1.0"
-SLOT="0"
-
-IUSE='events-handlers-exec'
-RESTRICT="test"
-
-RDEPEND="
- acct-user/http
- acct-group/http"
-DEPEND="${RDEPEND}"
-
-FILECAPS=(
- -m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}"
-)
-
-PATCHES=(
- "${FILESDIR}"/remove-binary-altering-commands-2.7.5.patch
-)
-
-# takes a module as an only arg
-add_custom_module() {
- local LINE_NO=$(grep -n 'plug in Caddy modules here' cmd/caddy/main.go
| awk -F: '{print $1;}')
- sed -i -e "${LINE_NO:?}a \_ \"$1\"" cmd/caddy/main.go || die
-}
-
-src_unpack() {
- if [[ "${PV}" == * ]]; then
- # clone main git repo
- git-r3_src_unpack
-
- # get extra modules
- if use events-handlers-exec; then
- pushd "${P}"
- add_custom_module 'github.com/mholt/caddy-events-exec'
|| die
- ego get github.com/mholt/caddy-events-exec
- popd
- fi
-
- # clone dist repo (docs and misc)
- EGIT_REPO_URI="https://github.com/caddyserver/dist.git";
- EGIT_CHECKOUT_DIR="${WORKDIR}/dist-${PV}"
- git-r3_src_unpack
-
- go-module_live_vendor
- else
- go-module_src_unpack
- fi
-}
-
-src_prepare() {
- d
[gentoo-commits] repo/gentoo:master commit in: app-misc/yq-go/
commit: 725020d24d722a81315f7fa262a53e400ad12fef
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 16 23:04:31 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 16 23:07:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=725020d2
app-misc/yq-go: add 4.44.2
Signed-off-by: Zac Medico gentoo.org>
app-misc/yq-go/Manifest| 2 ++
app-misc/yq-go/yq-go-4.44.2.ebuild | 35 +++
2 files changed, 37 insertions(+)
diff --git a/app-misc/yq-go/Manifest b/app-misc/yq-go/Manifest
index 7fbb473a96de..2bc06ac70f66 100644
--- a/app-misc/yq-go/Manifest
+++ b/app-misc/yq-go/Manifest
@@ -1,2 +1,4 @@
DIST yq-4.44.1-deps.tar.xz 1359068 BLAKE2B
5db0af65b75dab0148e6167d9264e7601e3f07f26d16d63387820c96d9ac28d91a57c81b300d4dd225f0a4941ce43dde4c5e27391ea9603f6862a9cf8c6564f5
SHA512
1670aa675e1776d2ed761c482e29920e1d200bd612e68dd22b62c6d93c8c188ef88ca35262d1f21423924d1337260991e815e332f6af312ea474c5f61226bbff
DIST yq-4.44.1.tar.gz 296499 BLAKE2B
6cbcc69acead2ae471e91baccc3fcc3853bba0ade0e707307c9fb724bafc1c51905a9cefb86d7d09b056b01b2c404bc30692f47e293df0894ad3b32ad67c22dd
SHA512
afcec4e6f99f38a342a91aff34823823e32df0498c8e617314945a00d2161d28bfcc603dcaac2eb95d510bc57fe63ca2aebf1966b7420536be42f8102564314f
+DIST yq-4.44.2-deps.tar.xz 1376032 BLAKE2B
ddb988d0eea1aa444ad952ee0aa57d54a6276c7f4a1c5113aa85f1793789efcdb818d0d06a4def1d66e013f1351dfb430a3013770032abd453737cc7e7455540
SHA512
459e45068e8048a0ca14a024d3114260437f20426b30351c80e9ee4877dd7ef175c52e54a63dc9e131aaad6a3eac8b361b23f0f06e7257f8b45f20c5dda0
+DIST yq-4.44.2.tar.gz 297469 BLAKE2B
912436af43b94cd5dc12ac5a9ff04071f35123632b950da1c5324e9ccc4b931815da92f75067055041f9dbe02a3948f716655e7dfe3feb9cab2969ee52f69fc2
SHA512
8b81c617dde83487445b8a85f34bb28a363238f58b6b06d7e4b5c3becdafde8f62702acd71ed33eb85601f66e2abec80edbbf1490df90eb67ece55948254c263
diff --git a/app-misc/yq-go/yq-go-4.44.2.ebuild
b/app-misc/yq-go/yq-go-4.44.2.ebuild
new file mode 100644
index ..e5ffdf984aaa
--- /dev/null
+++ b/app-misc/yq-go/yq-go-4.44.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="yq is a lightweight and portable command-line YAML, JSON and XML
processor"
+HOMEPAGE="https://github.com/mikefarah/yq";
+SRC_URI="https://github.com/mikefarah/yq/archive/refs/tags/v${PV}.tar.gz ->
${P/-go/}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P/-go/}-deps.tar.xz";
+
+S=${WORKDIR}/${P/-go/}
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+yq-symlink"
+DOCS=(README.md)
+RDEPEND="yq-symlink? ( !app-misc/yq[yq-symlink(+)] )"
+
+src_compile() {
+ CGO_ENABLED=0 ego build -ldflags "-X main.GitDescribe=v${PV} -s -w"
+}
+
+src_install() {
+ einstalldocs
+ newbin yq yq-go
+ if use yq-symlink; then
+ dosym yq-go /usr/bin/yq
+ fi
+}
+
+src_test() {
+ ./scripts/test.sh || die
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/passt/
commit: 0e2b07ac3f950ecaed7e551bd8b3941288fce5bf
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 12:20:06 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2b07ac
net-misc/passt: update to 2024.06.07
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
net-misc/passt/Manifest | 1 +
net-misc/passt/{passt-.ebuild => passt-2024.06.07.ebuild} | 2 +-
net-misc/passt/passt-.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index 58e08ceca1b8..d1b7a339a1a1 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -2,3 +2,4 @@ DIST passt-2024.03.26.tar.xz 195348 BLAKE2B
d91e6ac1d50aae04ceb53a34341b545ff644
DIST passt-2024.04.05.tar.xz 195772 BLAKE2B
4c237aeda56455f948d4309624d171612d59fa7ec653e7f89c1aeb05c677ccbdeeaaf6e14c09cda1d5bc88a97fca57dbbe480095e9711045fbd381bd30fb644a
SHA512
bf14689cb1c4780d4249562965ff9a5a0515756cbf5af4b531c17982a066f33001a65210959ff8da691ddaa75560ab5691c685a4c1a4b73e742a883d12d2a24b
DIST passt-2024.04.26.tar.xz 196148 BLAKE2B
f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68
SHA512
f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98
DIST passt-2024.05.10.tar.xz 195992 BLAKE2B
9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae
SHA512
04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3
+DIST passt-2024.06.07.tar.xz 198360 BLAKE2B
378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488
SHA512
103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0
diff --git a/net-misc/passt/passt-.ebuild
b/net-misc/passt/passt-2024.06.07.ebuild
similarity index 97%
copy from net-misc/passt/passt-.ebuild
copy to net-misc/passt/passt-2024.06.07.ebuild
index 9e4992ffaab0..65a98bc9f51b 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-2024.06.07.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
HOMEPAGE="https://passt.top/";
-RELEASE_COMMIT="7288448"
+RELEASE_COMMIT="8a83b53"
if [[ ${PV} == * ]]; then
inherit git-r3
diff --git a/net-misc/passt/passt-.ebuild b/net-misc/passt/passt-.ebuild
index 9e4992ffaab0..65a98bc9f51b 100644
--- a/net-misc/passt/passt-.ebuild
+++ b/net-misc/passt/passt-.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement
for Slirp"
HOMEPAGE="https://passt.top/";
-RELEASE_COMMIT="7288448"
+RELEASE_COMMIT="8a83b53"
if [[ ${PV} == * ]]; then
inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus-podman-exporter/
commit: 48522338a8c024e9e539df132fb16688529bd413
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 16:53:50 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48522338
app-metrics/prometheus-podman-exporter: cleanup 1.{7,8}.0
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-metrics/prometheus-podman-exporter/Manifest| 2 -
.../prometheus-podman-exporter-1.7.0.ebuild| 45 --
.../prometheus-podman-exporter-1.8.0.ebuild| 42
3 files changed, 89 deletions(-)
diff --git a/app-metrics/prometheus-podman-exporter/Manifest
b/app-metrics/prometheus-podman-exporter/Manifest
index 65fec0333893..051cfe2f48a4 100644
--- a/app-metrics/prometheus-podman-exporter/Manifest
+++ b/app-metrics/prometheus-podman-exporter/Manifest
@@ -1,5 +1,3 @@
DIST prometheus-podman-exporter-1.10.1.tar.gz 13578778 BLAKE2B
e854a61ac1ac7237f0ab4bb7d6d2f39f3ebcf9c32f45e4b44c551aa45a8a97902084f0f24180a1253d0c664907fa1dcb5dc6ac587d31387c708c83388c2c9ed9
SHA512
f8da5b88e6d88d02bc48c2fcd627aca0e88d8264aa3c971b2e251fd7641b329fbe66686d12e2dfca8fe40cc1488359caa1a345844f32e45c79a28bc172bbd501
DIST prometheus-podman-exporter-1.11.0.tar.gz 13883834 BLAKE2B
c8c7334d08c4fa86deb1c8d07cbea1468dbc815d0812fc7dd563a52a29573af8c4ae003e8d5aad80e997770187abf7c5f50ed841a1bbec327f220c676dd829a6
SHA512
f976d77940c08202e629c27ba91810f1d9b03ee6b3ebbbcd1568491aec70eba2fae70e6e5ec261105bcd503e5508a95f75eb5a0e5e7916bcbb17205d8a17f7da
DIST prometheus-podman-exporter-1.12.0.tar.gz 13735898 BLAKE2B
77f1595a2ac6df2d6875b3a3717e0493a5e917872dc8353f3b1290a03088e9f580dc7c138e20109a02c00819963779bee93e8d7abaac70528ea9a9570422b77d
SHA512
85505ac8cc54606e2c2a7a0dd82a53bde4135b75f94ddde8d0487d7d5d1f3b20751f27d990f52b288d5969747ed3033e15dfdf1d3b51c8ef67a3b125bcaaa079
-DIST prometheus-podman-exporter-1.7.0.tar.gz 12251956 BLAKE2B
91a6a217db3fd2b408344f738a7acad5c161adad6da53ef3d3750b73d9135022b0a4c18d85d0f79fc331344462e600574c8cd94477b57261adb29e5ffccdcc83
SHA512
3f9184681f1466ca4bbd32830c8fd233bb7e95af4df0b97cff606e39987d6c608b8847924d3b1c5fe98d058b32324dea86a142065bae7afdb0f99e4cfe0d9b52
-DIST prometheus-podman-exporter-1.8.0.tar.gz 12253412 BLAKE2B
673986f2acce525ab6c9d0858ca6c193bc292bc5e6c8ad50f81921a8f66673c29f724ad562efefb6fe63d556e491432b593b7581af3a01faf44279013a2ec209
SHA512
eb647d8d5c7d30a6676fe192ac2f8c3be5ee67525206c67ac9d0dc06f2fd5fb7dbad838f53fa75f550f5dcfa5c188bd2eb0e7c46b13fe2795b38187ac2fdb81a
diff --git
a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.7.0.ebuild
b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.7.0.ebuild
deleted file mode 100644
index 5d9cfead06de..
---
a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Exporter for podman giving containers, pods, images, volumes &
networks metrics"
-HOMEPAGE="https://github.com/containers/prometheus-podman-exporter";
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
-
EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git";
-else
-
SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-# Main package
-LICENSE="Apache-2.0"
-# Dependencies
-LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
-
-SLOT="0"
-IUSE="btrfs"
-
-# there are no test files so prevent tests
-RESTRICT="test"
-RDEPEND="
- app-containers/podman[btrfs?]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- export BUILDFLAGS=" -tags exclude_graphdriver_devicemapper"
- use !btrfs && BUILDFLAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
- default
-}
-
-src_install() {
- emake DESTDIR="${ED}/usr/bin" install
- systemd_dounit "contrib/systemd/prometheus-podman-exporter.service"
- systemd_douserunit "contrib/systemd/prometheus-podman-exporter.service"
- einstalldocs
-}
diff --git
a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.8.0.ebuild
b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.8.0.ebuild
deleted file mode 100644
index 1547a7a4946d..
---
a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: 73c4de08800950341a83df38134b1405278fbf21
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 17:11:48 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c4de08
app-containers/containers-common: cleanup
Signed-off-by: Rahil Bhimjiani rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-containers/containers-common/Manifest | 1 -
.../containers-common-0.57.0.ebuild| 68 --
.../containers-common-0.57.3.ebuild| 59 ---
.../containers-common-0.58.0.ebuild| 60 ---
4 files changed, 188 deletions(-)
diff --git a/app-containers/containers-common/Manifest
b/app-containers/containers-common/Manifest
index 1ef18a9a70a8..09300934cd25 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -1,4 +1,3 @@
DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B
8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297
SHA512
b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3
-DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B
7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737
SHA512
f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928
DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B
17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c
SHA512
6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8
DIST containers-common-0.59.1.tar.gz 13131960 BLAKE2B
5b3b947789f889955716816fa15a84eb2f398d6cfb59c85bd969442fb8f55715f2c17c78d963ae913d96e6a109f69da745cfc7db8d23e2ed6516f992b982dda0
SHA512
452c9b84f7631afdf39b7b1fcaf2f721bede312d8fb55b89a953f16ca3546c0df11bb23c99588a592b6375275516d1364570261fbc15301ca3ad486ee66eae32
diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild
b/app-containers/containers-common/containers-common-0.57.0.ebuild
deleted file mode 100644
index 2d56b46669f2..
--- a/app-containers/containers-common/containers-common-0.57.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Common config files and docs for Containers stack"
-HOMEPAGE="https://github.com/containers/common";
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/containers/common.git";
-else
- SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${P#containers-}"
- KEYWORDS="amd64 ~arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
- =app-containers/netavark-1.6.0
>=app-containers/aardvark-dns-1.6.0 )
- >=app-containers/cni-plugins-0.9.1
- )
-"
-
-BDEPEND="
- >=dev-go/go-md2man-2.0.2
-"
-
-src_prepare() {
- default
-
- [[ -f docs/Makefile && -f Makefile ]] || die
- sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
-
- # add comments to mounts.conf
- eapply "${FILESDIR}/examplify-mounts-conf.patch"
-}
-
-src_compile() {
- emake docs
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
-
- insinto /etc/containers
- # https://github.com/containers/skopeo/raw/main/default-policy.json
- doins pkg/config/containers.conf "${FILESDIR}/policy.json"
-
- insinto /etc/containers/registries.d
- # https://github.com/containers/skopeo/raw/main/default.yaml
- doins "${FILESDIR}/default.yaml"
-
- insinto /usr/share/containers
- doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
-
- keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d
/etc/containers/systemd /var/lib/containers/sigstore
-}
diff --git a/app-containers/containers-common/containers-common-0.57.3.ebuild
b/app-containers/containers-common/containers-common-0.57.3.ebuild
deleted file mode 100644
index 5a0aa2f26d0b..
--- a/app-containers/containers-common/containers-common-0.57.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRI
[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus-podman-exporter/
commit: 6c2579d93fb755aaf49cd25031067cfcd9a189d0
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 16:52:51 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c2579d9
app-metrics/prometheus-podman-exporter: update to 1.12.0
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-metrics/prometheus-podman-exporter/Manifest| 1 +
.../prometheus-podman-exporter-1.12.0.ebuild | 86 ++
2 files changed, 87 insertions(+)
diff --git a/app-metrics/prometheus-podman-exporter/Manifest
b/app-metrics/prometheus-podman-exporter/Manifest
index 75f6786cc292..65fec0333893 100644
--- a/app-metrics/prometheus-podman-exporter/Manifest
+++ b/app-metrics/prometheus-podman-exporter/Manifest
@@ -1,4 +1,5 @@
DIST prometheus-podman-exporter-1.10.1.tar.gz 13578778 BLAKE2B
e854a61ac1ac7237f0ab4bb7d6d2f39f3ebcf9c32f45e4b44c551aa45a8a97902084f0f24180a1253d0c664907fa1dcb5dc6ac587d31387c708c83388c2c9ed9
SHA512
f8da5b88e6d88d02bc48c2fcd627aca0e88d8264aa3c971b2e251fd7641b329fbe66686d12e2dfca8fe40cc1488359caa1a345844f32e45c79a28bc172bbd501
DIST prometheus-podman-exporter-1.11.0.tar.gz 13883834 BLAKE2B
c8c7334d08c4fa86deb1c8d07cbea1468dbc815d0812fc7dd563a52a29573af8c4ae003e8d5aad80e997770187abf7c5f50ed841a1bbec327f220c676dd829a6
SHA512
f976d77940c08202e629c27ba91810f1d9b03ee6b3ebbbcd1568491aec70eba2fae70e6e5ec261105bcd503e5508a95f75eb5a0e5e7916bcbb17205d8a17f7da
+DIST prometheus-podman-exporter-1.12.0.tar.gz 13735898 BLAKE2B
77f1595a2ac6df2d6875b3a3717e0493a5e917872dc8353f3b1290a03088e9f580dc7c138e20109a02c00819963779bee93e8d7abaac70528ea9a9570422b77d
SHA512
85505ac8cc54606e2c2a7a0dd82a53bde4135b75f94ddde8d0487d7d5d1f3b20751f27d990f52b288d5969747ed3033e15dfdf1d3b51c8ef67a3b125bcaaa079
DIST prometheus-podman-exporter-1.7.0.tar.gz 12251956 BLAKE2B
91a6a217db3fd2b408344f738a7acad5c161adad6da53ef3d3750b73d9135022b0a4c18d85d0f79fc331344462e600574c8cd94477b57261adb29e5ffccdcc83
SHA512
3f9184681f1466ca4bbd32830c8fd233bb7e95af4df0b97cff606e39987d6c608b8847924d3b1c5fe98d058b32324dea86a142065bae7afdb0f99e4cfe0d9b52
DIST prometheus-podman-exporter-1.8.0.tar.gz 12253412 BLAKE2B
673986f2acce525ab6c9d0858ca6c193bc292bc5e6c8ad50f81921a8f66673c29f724ad562efefb6fe63d556e491432b593b7581af3a01faf44279013a2ec209
SHA512
eb647d8d5c7d30a6676fe192ac2f8c3be5ee67525206c67ac9d0dc06f2fd5fb7dbad838f53fa75f550f5dcfa5c188bd2eb0e7c46b13fe2795b38187ac2fdb81a
diff --git
a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.12.0.ebuild
b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.12.0.ebuild
new file mode 100644
index ..4452311819fe
--- /dev/null
+++
b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.12.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Exporter for podman giving containers, pods, images, volumes &
networks metrics"
+HOMEPAGE="https://github.com/containers/prometheus-podman-exporter";
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+
EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git";
+else
+
SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Main package
+LICENSE="Apache-2.0"
+# Dependencies
+LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="btrfs systemd"
+
+# there are no test files so prevent tests
+RESTRICT="test"
+
+PATCHES=(
+ "${T}/gentoo-specific-systemd-service.patch"
+)
+
+src_prepare() {
+ cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch"
+ --- a/contrib/systemd/system/prometheus-podman-exporter.service
+ +++ b/contrib/systemd/system/prometheus-podman-exporter.service
+ @@ -2,7 +2,7 @@
+Description=Prometheus exporter for podman (v4) machine
+[Service]
+Restart=on-failure
+ -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+ +EnvironmentFile=-/etc/default/prometheus-podman-exporter
+ExecStart=/usr/bin/prometheus-podman-exporter
$PODMAN_EXPORTER_OPTS
+ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=20s
+ --- a/contrib/systemd/user/prometheus-podman-exporter.service
+ +++ b/contrib/systemd/user/prometheus-podman-exporter.service
+ @@ -2,7 +2,7 @@
+Description=Prometheus exporter for podman (v4) machine
+
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-image/
commit: 4e921990bd654009619549b60d3b6eb4ccf26800
Author: Zac Medico gentoo org>
AuthorDate: Thu Jun 13 19:08:43 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e921990
app-containers/containers-image: drop 5.29.0
Signed-off-by: Zac Medico gentoo.org>
app-containers/containers-image/Manifest | 1 -
.../containers-image-5.29.0.ebuild | 37 --
2 files changed, 38 deletions(-)
diff --git a/app-containers/containers-image/Manifest
b/app-containers/containers-image/Manifest
index 0a452993112f..1382b8858816 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,3 +1,2 @@
-DIST containers-image-5.29.0.tar.gz 706774 BLAKE2B
0af5c7c43e8b75df591cbd291d0865ac19322bf62ad98b4f36cfb51b006ced088f91f0b3f582ce29ae80582e72087467cfe589683216eeb50ad3762152853dc0
SHA512
5e670f85fe0b43769667f1a3e710434ab65c4ec2d8c60b0cad4b0ed41c35f84677528f9dfecb0b946de556ebbdd56f4949760432ec49b1b3c691120a323af869
DIST containers-image-5.29.2.tar.gz 707618 BLAKE2B
f1556cbb26ceedd74a338355caf8b557c43286726f4be63544cebc9a8f4b92be78d7a0cddbedaba7352d13e9fc399f62ee114caba6c8b1ecc334dab1379e523b
SHA512
f3f6e09670dc393067992a78303f01e2584dabe79ba156973a50d7a460c011e5a27d0ccdf0ff6b399099a9a3a4c57f3badf24fb5d0704efd645ab7196a544d8f
DIST containers-image-5.30.0.tar.gz 719070 BLAKE2B
5952ab703b6df793f326dd4fc82f50c5f672e2b9d142e0bc706014092420e3563599d9f1c1f65f743e1a8144b91f92b2326d7bf4c3024b5efb466d777a8ad613
SHA512
89cd0d482bb5d70037ff51413b7abca01d36bc7f39e9dc130c78462e501dae32193137a367d81532afd216a7432e127728147e6e839d5d99eeb6b6680f31d4dc
diff --git a/app-containers/containers-image/containers-image-5.29.0.ebuild
b/app-containers/containers-image/containers-image-5.29.0.ebuild
deleted file mode 100644
index eb50b44f8f73..
--- a/app-containers/containers-image/containers-image-5.29.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Default config and docs related to Containers' images"
-HOMEPAGE="https://github.com/containers/image";
-
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/containers/image.git";
-else
- SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${P#containers-}"
- KEYWORDS="amd64 ~arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-go/go-md2man-2.0.2"
-
-src_prepare() {
- default
- eapply "${FILESDIR}/fix-warnings.patch"
-}
-
-src_compile() {
- emake docs
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
-
- insinto /etc/containers
- doins registries.conf
-}
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman-tui/
commit: 30cd97c30ac71bbcd15630dcb86f1f7d407dd830
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 16:47:02 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30cd97c3
app-containers/podman-tui: update to 1.1.0
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman-tui/Manifest| 1 +
app-containers/podman-tui/podman-tui-1.1.0.ebuild | 34 +++
2 files changed, 35 insertions(+)
diff --git a/app-containers/podman-tui/Manifest
b/app-containers/podman-tui/Manifest
index 238979100079..12a50f103e77 100644
--- a/app-containers/podman-tui/Manifest
+++ b/app-containers/podman-tui/Manifest
@@ -1,3 +1,4 @@
DIST podman-tui-0.18.0.tar.gz 15928626 BLAKE2B
80fd4f826a407b4eeeb664c065f836f12dd85cacab35003ad8fbcabf3eb69b3838bf02fb76269124d18c110370e42556cff8e348caabb100aa88a1994f99d4cc
SHA512
77107a9e64b12fd5065698b7065909d5aa45ca49d749056cfb0f76aa2fd0f269708d3d75ecb4cab7939c30571510cdacebcdaac67549979873e3656e1af4db9f
DIST podman-tui-1.0.0.tar.gz 16208356 BLAKE2B
c5ae4274cdc6c4d5abb9f9a18c82949a40a9f2894a9127d8bdf89b8a9445716cc985d8400833c890dec4524fd617babd5791e3062e9e7654ea93d66c34dfe181
SHA512
918b3efb823a543a439ae0f56c59ee2689961ac6e39a40054a7971ddf02056ca50c7c681ca03c45590e9fdfce1822f406bbf90f9b25563a0ef9ae75b88235a8c
DIST podman-tui-1.0.1.tar.gz 16252864 BLAKE2B
14b28a87aca99d90d9412d7bdd052604bdd8c05b262564eaa6821fd10f1f357bcb5f65d486da53a1abf98cfd45fadaf847f14942a27525136e70f83603ef6d85
SHA512
3c5ff5a77e885a0518a16e8d7fd0581a80b16650b546d2c736c50503c250797be1b8cb1a2da68ee1eed5a7a1dcdbcfa8344f37d0c6724c341470d05446a0591e
+DIST podman-tui-1.1.0.tar.gz 16091487 BLAKE2B
e1d697a94da515c5ed896527bbf25f742a7ee315a5d83565377664c61fc65736beaef43d351dbbd64a0f6e254bed407278532a9a26eda7ec69637348ce60c5ce
SHA512
d8e4710f489ac124ad11930c5051d9fc279166316bb85d952847e6a924f70b5cc64487f8c161878a21e8f88784c47c2f9f36b5b332c0736f48f3dd0ada92584a
diff --git a/app-containers/podman-tui/podman-tui-1.1.0.ebuild
b/app-containers/podman-tui/podman-tui-1.1.0.ebuild
new file mode 100644
index ..beefef11ab58
--- /dev/null
+++ b/app-containers/podman-tui/podman-tui-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+DESCRIPTION="Terminal UI frontend for Podman"
+HOMEPAGE="https://github.com/containers/podman-tui";
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/podman-tui.git";
+else
+ SRC_URI="https://github.com/containers/podman-tui/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD-2 BSD MIT MPL-2.0"
+SLOT="0"
+RESTRICT="test"
+
+src_compile() {
+ # parse tags from Makefile & make them comma-seperated as
space-seperated list is deprecated
+ local BUILDTAGS=$(grep 'BUILDTAGS :=' Makefile | awk -F\" '{ print $2;
}' | sed -e 's| |,|g;')
+ ego build -tags "${BUILDTAGS}"
+}
+
+src_install() {
+ dobin "${PN}"
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/
commit: 5ddabd203cf889fcaab95c31016b70f2f88625af
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 16:58:51 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ddabd20
app-containers/buildah: update to 1.36.0
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-containers/buildah/Manifest | 1 +
app-containers/buildah/{buildah-.ebuild => buildah-1.36.0.ebuild} | 4
app-containers/buildah/buildah-.ebuild| 4
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index e5c0f32b7762..f135ecc06b6e 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -2,3 +2,4 @@ DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B
d2788096d8d6fd6cc528e8f33edc58a2
DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B
c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3
SHA512
26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
DIST buildah-1.35.3.tar.gz 19372597 BLAKE2B
014bea80b3a8c4482bbe098a0c5293892cf9f4f0d4d74ecaba8f155e49fab326689b95b690b413d64f6b576c7269bdb9d0f446244b832afe311e909b3f96856d
SHA512
ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3
DIST buildah-1.35.4.tar.gz 19370823 BLAKE2B
6dc8ad2a21c3ce41d4b8a2908d90bcbb32f5598c11fcde49a706334407370998731fedac7d8ee8e080a6a168c10b4a0404bf1120cab8b561e916a9df2bd2d115
SHA512
679f2328f675a39f9965128d51a6e8a3f82d64a6d3c3cdcb862cfcb7691eba272d869b6718147da1590aa573534081329ef05e879875024a11aa9ad52b2f292f
+DIST buildah-1.36.0.tar.gz 19328201 BLAKE2B
d3602b62a587d75904741b086bea6d789ac30fb6079b574214368552269e48310921340f42050c5c648173452fab7b478690fbfbd80bbebda4a5ec9a102aa4e6
SHA512
feb55b0dfb3cba4e9c6776b0f4730ebb4b9ea416f507e342f3b1cbf23b2bb79d96a58622faac7a980727e6739df7e0ceddf1a9d5ae483a3c7e781f7af75d115f
diff --git a/app-containers/buildah/buildah-.ebuild
b/app-containers/buildah/buildah-1.36.0.ebuild
similarity index 97%
copy from app-containers/buildah/buildah-.ebuild
copy to app-containers/buildah/buildah-1.36.0.ebuild
index 987715de5560..1d1b2acc5e46 100644
--- a/app-containers/buildah/buildah-.ebuild
+++ b/app-containers/buildah/buildah-1.36.0.ebuild
@@ -44,10 +44,6 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="dev-go/go-md2man"
-PATCHES=(
- "${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
-)
-
pkg_pretend() {
local CONFIG_CHECK=""
use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
diff --git a/app-containers/buildah/buildah-.ebuild
b/app-containers/buildah/buildah-.ebuild
index 987715de5560..1d1b2acc5e46 100644
--- a/app-containers/buildah/buildah-.ebuild
+++ b/app-containers/buildah/buildah-.ebuild
@@ -44,10 +44,6 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="dev-go/go-md2man"
-PATCHES=(
- "${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
-)
-
pkg_pretend() {
local CONFIG_CHECK=""
use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
[gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
commit: bcce5c501435ae84101c63093467f02a32bd274b
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 17:10:33 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcce5c50
app-containers/containers-common: update to 0.59.1
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-containers/containers-common/Manifest | 1 +
.../containers-common-0.59.1.ebuild| 75 ++
2 files changed, 76 insertions(+)
diff --git a/app-containers/containers-common/Manifest
b/app-containers/containers-common/Manifest
index d683aa50a470..1ef18a9a70a8 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -1,3 +1,4 @@
DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B
8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297
SHA512
b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3
DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B
7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737
SHA512
f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928
DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B
17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c
SHA512
6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8
+DIST containers-common-0.59.1.tar.gz 13131960 BLAKE2B
5b3b947789f889955716816fa15a84eb2f398d6cfb59c85bd969442fb8f55715f2c17c78d963ae913d96e6a109f69da745cfc7db8d23e2ed6516f992b982dda0
SHA512
452c9b84f7631afdf39b7b1fcaf2f721bede312d8fb55b89a953f16ca3546c0df11bb23c99588a592b6375275516d1364570261fbc15301ca3ad486ee66eae32
diff --git a/app-containers/containers-common/containers-common-0.59.1.ebuild
b/app-containers/containers-common/containers-common-0.59.1.ebuild
new file mode 100644
index ..4a0427e20df7
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.59.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="Common config files and docs for Containers stack"
+HOMEPAGE="https://github.com/containers/common";
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/common.git";
+else
+ SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${P#containers-}"
+ KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RESTRICT="test"
+RDEPEND="
+ >=app-containers/aardvark-dns-1.10.0
+ >=app-containers/crun-1.14.3
+ >=app-containers/containers-image-5.30.0
+ >=app-containers/containers-storage-1.53.0
+ app-containers/containers-shortnames
+ >=app-containers/netavark-1.10.3
+ net-firewall/nftables
+ net-firewall/iptables[nftables]
+ >=net-misc/passt-2024.03.20
+ >=sys-fs/fuse-overlayfs-1.13
+"
+
+BDEPEND="
+ >=dev-go/go-md2man-2.0.3
+"
+
+PATCHES=(
+ "${FILESDIR}/examplify-mounts-conf.patch"
+)
+
+DOC_CONTENTS="\n
+For rootless operations, one needs to configure subuid(5) and subgid(5)\n
+See /etc/sub{uid,gid} to check whether rootless user is already configured\n
+If not, quickly configure it with:\n
+usermod --add-subuids 1065536-1131071 \n
+usermod --add-subgids 1065536-1131071 \n
+"
+
+src_prepare() {
+ default
+
+ [[ -f docs/Makefile && -f Makefile ]] || die
+ sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
+}
+
+src_compile() {
+ emake docs
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install
+ readme.gentoo_create_doc
+
+ insinto /usr/share/containers
+ doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
+
+ keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d
/etc/containers/systemd /var/lib/containers/sigstore
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/
commit: 61ea6c638cf6da9a378a2d38851b678752162197
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 11:14:47 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61ea6c63
app-containers/podman: update to 5.1.1
* add compatibility to python 3.13
* Use new upstream variable in Makefile to toggle seccomp USE
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-containers/podman/Manifest | 1 +
.../{podman-.ebuild => podman-5.1.1.ebuild} | 20
app-containers/podman/podman-.ebuild | 20
3 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 8b245d7b6949..14d764f5eb50 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,3 +1,4 @@
DIST podman-4.9.4.tar.gz 21733620 BLAKE2B
17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993
SHA512
7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
DIST podman-5.0.2.tar.gz 23811875 BLAKE2B
e943eb36eb0b80332223afc5d971c0886f6eaffeb7133c634d28c0a38e9aae6a54266691067dbca7684882f8b6dad72c3d5de2287ec5a7e8fb4b1cfd96df0b4d
SHA512
70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104
DIST podman-5.0.3.tar.gz 23814179 BLAKE2B
46385710e4d24f8eca3a7c98c18a97b96ecd4691b3c965c5a5e7bc690d40d892a6d5fb71c1dd8ec56cc907a2167ab5ee795b4d2c2279c58cef3a5a1cece8b678
SHA512
c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d
+DIST podman-5.1.1.tar.gz 23794366 BLAKE2B
0612a148972c96f532e96a8eb1ab388d80b32fe2ca7c5626e615748ef269a853407aeb39f34686d9eb75de239882e524cf5ee7c97152caccf5f77eb6ecfd54d8
SHA512
e896ee97980da4a522eb865d2eacb6876dd8bc5be1488aed8bd81a81af95faa1383b176b5d236d4af0f76bc30ddad5230df3e11c59ffc6f86e5b4cf3876ff184
diff --git a/app-containers/podman/podman-.ebuild
b/app-containers/podman/podman-5.1.1.ebuild
similarity index 85%
copy from app-containers/podman/podman-.ebuild
copy to app-containers/podman/podman-5.1.1.ebuild
index 738613b007dc..95b806ea578e 100644
--- a/app-containers/podman/podman-.ebuild
+++ b/app-containers/podman/podman-5.1.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{11,12} )
+PYTHON_COMPAT=( python3_{11..13} )
inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
@@ -51,7 +51,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/seccomp-toggle-4.7.0.patch"
+ "${T}"/togglable-seccomp.patch
)
CONFIG_CHECK="
@@ -65,6 +65,19 @@ pkg_setup() {
}
src_prepare() {
+ cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
+--- a/Makefile
b/Makefile
+@@ -56,7 +56,6 @@ BUILDTAGS ?= \
+ $(shell hack/systemd_tag.sh) \
+ $(shell hack/libsubid_tag.sh) \
+ exclude_graphdriver_devicemapper \
+- seccomp
+ # allow downstreams to easily add build tags while keeping our defaults
+ BUILDTAGS += ${EXTRA_BUILDTAGS}
+ # N/B: This value is managed by Renovate, manual changes are
+EOF
+
default
# assure necessary files are present
@@ -101,8 +114,7 @@ src_compile() {
tc-export PKG_CONFIG
fi
- # BUILD_SECCOMP is used in the patch to toggle seccomp
- emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man"
BUILD_SECCOMP="$(usex seccomp)" \
+ emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man"
EXTRA_BUILDTAGS="$(usev seccomp)" \
all $(usev wrapper docker-docs)
}
diff --git a/app-containers/podman/podman-.ebuild
b/app-containers/podman/podman-.ebuild
index 738613b007dc..95b806ea578e 100644
--- a/app-containers/podman/podman-.ebuild
+++ b/app-containers/podman/podman-.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{11,12} )
+PYTHON_COMPAT=( python3_{11..13} )
inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
@@ -51,7 +51,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/seccomp-toggle-4.7.0.patch"
+ "${T}"/togglable-seccomp.patch
)
CONFIG_CHECK="
@@ -65,6 +65,19 @@ pkg_setup() {
}
src_prepare() {
+ cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
+--- a/Makefile
b/Makefile
+@@ -56,7 +56,6 @@ BUILDTAGS ?= \
+ $(shell hack/systemd_tag.sh) \
+ $(shell hack/libsubid_tag.sh) \
+ exclude_graphdriver_dev
[gentoo-commits] repo/gentoo:master commit in: app-containers/aardvark-dns/
commit: 13c684964196e4592e289581a3341e89850facbb
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 12:29:01 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c68496
app-containers/aardvark-dns: update to 1.11.0
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-containers/aardvark-dns/Manifest | 2 +
.../aardvark-dns/aardvark-dns-1.11.0.ebuild| 47 ++
2 files changed, 49 insertions(+)
diff --git a/app-containers/aardvark-dns/Manifest
b/app-containers/aardvark-dns/Manifest
index c205c4065d9a..131bc511f60f 100644
--- a/app-containers/aardvark-dns/Manifest
+++ b/app-containers/aardvark-dns/Manifest
@@ -1,4 +1,6 @@
DIST aardvark-dns-1.10.0.crate 51028 BLAKE2B
81cdc4eb7eaff7359a1a12657b2bc42603383cf0f80a3a599ce9ce277e15ad83e9d5b36c3de3bef15b3201a1e60d86286ad61469d1d58ba2252b4c0174506ea2
SHA512
3d67f1b3c66aeaf4878c09e5e8fc34717cea6c348e0295bc0521c0c4144433656a3306731c24bb362a0e340e652b036b7544e544cca99b61590547bd7a6ce629
+DIST aardvark-dns-1.11.0.crate 8977859 BLAKE2B
d37c2015d1a46308bea214682133d6364fb50c75e840b664c692c6f344d21a093acab5a93dbf1c7dd624a0adc7cdd38cedc35be8dfde0904a7a773b4f620e002
SHA512
0fb9f9cb20e6c548483778a1109ec315c6135dc1afa3736980754847b06a2e988f5704de7b52b2784b20297d370d47d034137d3899f519d2bb5818a5a68234d8
DIST aardvark-dns-1.9.0.crate 50846 BLAKE2B
bae46eae2ec2071b1a1a301f00dc3e3aac0b3a5f1247f1f5be4f2e4b1d9d906fc22c53e5d56967731fcf226a295e8b1d8868dcfae228b05674a5ddecb58a1455
SHA512
1f21b4c40567c0aff967d38ea224884d5c2cb4a85ddffe7bbc5badd237a1195943e4d76f3c65ceb0cab984aa0c2528d8486e78e1e53c5376792477a6a5f426e7
DIST aardvark-dns-v1.10.0-vendor.tar.gz 6283889 BLAKE2B
cb69144eabf876e418667782171273541bbc416b456193780b4d7f1d22ad03e18f06ec0d6b1e51e21eab912317bd61dd73266d717fa97a81b4314a3c7d14776a
SHA512
68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c
+DIST aardvark-dns-v1.11.0-vendor.tar.gz 6829221 BLAKE2B
42f7df29c407dd91e8e9ea1b43fc368b6795ea17169091d3900e59aea12be16174241c996b016e2f5de3e7a592ac3a1fa1c6b817f16ba282ebdda1ab65bfe61a
SHA512
e49a6bb410238b90287a75adee481b8fe899ff680be48831c9b3cf36f9985d1fec1ba5bb858a095ffd520c05888651163d65f8b038e7512e975cfa522c0bee56
DIST aardvark-dns-v1.9.0-vendor.tar.gz 8085548 BLAKE2B
487f69a9c34832d74783b66c565a7c2f67f101527e8a44c215f167e4ea80f069846b25decbb423972cd42cd9ee7717efc21c3d1b0885a7d87c0fbdb9cfb9d26f
SHA512
f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22
diff --git a/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild
b/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild
new file mode 100644
index ..cdf0cb032c10
--- /dev/null
+++ b/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == * ]] || CRATES="${PN}@${PV}"
+inherit cargo
+
+DESCRIPTION="A container-focused DNS server"
+HOMEPAGE="https://github.com/containers/aardvark-dns";
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git";
+else
+ SRC_URI="${CARGO_CRATE_URIS}"
+
SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz";
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+fi
+
+# main
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016
ZLIB"
+SLOT="0"
+QA_FLAGS_IGNORED="usr/libexec/podman/${PN}"
+QA_PRESTRIPPED="usr/libexec/podman/${PN}"
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+src_unpack() {
+ if [[ ${PV} == * ]]; then
+ git-r3_src_unpack
+ cargo_live_src_unpack
+ else
+ cargo_src_unpack
+ fi
+}
+
+src_prepare() {
+ default
+ sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;"
Makefile || die
+}
+
+src_install() {
+ export PREFIX="${EPREFIX}"/usr
+ default
+}
[gentoo-commits] repo/gentoo:master commit in: app-containers/skopeo/
commit: c7b5ac4efdde4f4cce8bf3747c22bfee187e2488
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 12:34:03 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b5ac4e
app-containers/skopeo: update to 1.15.1
Addresses https://github.com/advisories/GHSA-6wvf-f2vw-3425 which allows
unexpected authenticated registry accesses
Bug: https://bugs.gentoo.org/932453
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-containers/skopeo/Manifest | 1 +
app-containers/skopeo/skopeo-1.15.1.ebuild | 69 ++
2 files changed, 70 insertions(+)
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index 17b91a05315b..f66fa103541a 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,3 +1,4 @@
DIST skopeo-1.14.0.tar.gz 10548883 BLAKE2B
6ecf54d236405ce59bedf77acc124fa8b3bb12acefa24a679a1d2d85957ddf585b5a6ba163806b8b7b510485d936adbe1afd6eee8c92b267b948f7d78ac83d05
SHA512
59d329036a97cbeca4de20b15d9dd8adacd5201834b26ae5e5c88b05594b2a7101c22da91f22c35c07a98e41afa28f2c7103e660b3847c7f8c9691f27f4c4146
DIST skopeo-1.14.2.tar.gz 10547979 BLAKE2B
bca47d82380ad714397dc8e36e365a3e81fc628b47519b022ecb5edd2a03ce8972c066af350cd1f0b5a3d9d6c1585f0729b32a1a829cfc4eaefc1c7fc9dc2667
SHA512
ffb3c00cdde05f7a916bd3980c9cec1bb82b3f3bf90058bfff1837d3a9902087ac011828e6164baec18210d4aeee1a5258b75405411fd15ea2470a2522a6da73
DIST skopeo-1.15.0.tar.gz 10710505 BLAKE2B
b6804561ec96ce7f987ccdaf5a89aa7f5fd0ed2da1307467b4c1857386508d88e3fd28f066f49b136962e232b89594484610fc4f6b494be6a98b64908900865b
SHA512
71fb94fd2cf9937bf2dd969c8b1b74f5b66eb2ac2bd9358e8c8983c3fd6548311ca274ed2f8c3f088c3c9d6032962075da1890449dcd25dcfd49882acbfa20de
+DIST skopeo-1.15.1.tar.gz 10709125 BLAKE2B
aa688197fe0d803b6cb1f4e7c5c998a917e7d588fa41b9e6ede6d60fd1ef12f209e2f119bc29143bf92ae3349c1168e33f79cb36d6c7f5a1a22bcbf3f4e51792
SHA512
686d17da4a84d9029d688cfca08724576564ce2a05aed9380bf55059c244c90cffa3b21c2dbe84b19b746773e98d5f26e5ceaca58f7be26b656125977685c663
diff --git a/app-containers/skopeo/skopeo-1.15.1.ebuild
b/app-containers/skopeo/skopeo-1.15.1.ebuild
new file mode 100644
index ..ab892d6789a8
--- /dev/null
+++ b/app-containers/skopeo/skopeo-1.15.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info
+
+DESCRIPTION="Work with remote container images registries"
+HOMEPAGE="https://github.com/containers/skopeo";
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/skopeo.git";
+else
+ SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+# main
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+IUSE="btrfs device-mapper rootless"
+
+COMMON_DEPEND="
+ >=app-crypt/gpgme-1.5.5:=
+ >=dev-libs/libassuan-2.4.3:=
+ btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
+ device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
+ rootless? ( sys-apps/shadow:= )
+"
+
+# TODO: Is this really needed? cause upstream doesnt mention it
https://github.com/containers/skopeo/blob/main/install.md#building-from-source
+# dev-libs/libgpg-error:=
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+ ${COMMON_DEPEND}
+ app-containers/containers-common
+"
+BDEPEND="dev-go/go-md2man"
+
+RESTRICT="test"
+
+pkg_setup() {
+ use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+ use device-mapper && CONFIG_CHECK+=" ~MD"
+ linux-info_pkg_setup
+}
+
+run_make() {
+ emake \
+ BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion
exclude_graphdriver_btrfs')" \
+ CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \
+ LIBDM_BUILD_TAG="$(usex device-mapper ''
'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \
+ LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \
+ PREFIX="${EPREFIX}/usr" \
+ $@
+}
+
+src_compile() {
+ run_make all completions
+}
+
+src_install() {
+ # The install target in the Makefile tries to rebuild the binary and
+ # installs things that are already installed by containers-common.
+ dobin bin/skopeo
+ einstalldocs
+ doman docs/*.1
+ run_make "DESTDIR=${D}" install-completions
+}
[gentoo-commits] repo/gentoo:master commit in: app-containers/netavark/
commit: aa1558e2df8f152bc3e0efbf887c9fa7ac6c3c9b
Author: Rahil Bhimjiani rahil rocks>
AuthorDate: Wed Jun 12 12:24:26 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Thu Jun 13 19:10:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa1558e2
app-containers/netavark: update to 1.11.0
Signed-off-by: Rahil Bhimjiani rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/37135
Signed-off-by: Zac Medico gentoo.org>
app-containers/netavark/Manifest | 2 +
app-containers/netavark/netavark-1.11.0.ebuild | 59 ++
2 files changed, 61 insertions(+)
diff --git a/app-containers/netavark/Manifest b/app-containers/netavark/Manifest
index 5987fb7d613a..e0fe74fbb9d9 100644
--- a/app-containers/netavark/Manifest
+++ b/app-containers/netavark/Manifest
@@ -1,6 +1,8 @@
DIST netavark-1.10.2.crate 154261 BLAKE2B
2da5b12917f5db01d82c47808f403e06d6abbcbad0b777d1871de73d52d25219e3d6f8db48feb862aff8a20ed2184c728e813871aa1acc1d02e3997987a932b6
SHA512
362dd2652b3a9d9d1dec99cd85bc6e74b323d86b79ded742e68472e0b58881a5306d7217218d88e27d5e1c4094f2d67c9cb766d4b4c1ee2185c8b4fcbd299e3d
DIST netavark-1.10.3.crate 154416 BLAKE2B
a7750304484ae820eb3bb1bc4de8c2ad22d95494fe10471014e0eb999fb7578c5e9c2ab352fe357d964d701206ee7016f87134a62afe0a03cd1b574cae1264ca
SHA512
6ed9cd5a69a6eacc4ad839a82680c7b98d453564aadee41eb6ea632223fba7fbdb20f11e4146dc74b6c6d3695ac50624424b3260dbb7769a4100a918e4328dbf
+DIST netavark-1.11.0.crate 155698 BLAKE2B
df460f6a2e5ce82645dccf6ca487724da2abc6f3f2c90f56d935d691ddd9a4229b785177a4e6360f75aa13ee7cdb29a2794c0b7360ef9d40ea3f946771d3ab73
SHA512
e25b075f98cb2aa55cf0e8d8868aac3b6ff0b390f4f0632d6ee2f431cede144948ed98015576cf8a64fcc1a2c33c454415159951aacbdf0611613da867db9a13
DIST netavark-1.9.0.crate 139321 BLAKE2B
c0c40c5b109544c094bf83ba9c73f829472c7703a72e25ec3dcb9b62b926f404618b2cb143fcc944f2240db074de14e75d6f51d722125e152eea0ac0a631
SHA512
7a5fb4a856b5815c141ad63abbe0f122d762a411b86189add76cfff99adfdb066e24a7b577683950efdc39f2b7955bbdfb31f2c1c41037702fb732916e8aeebe
DIST netavark-v1.10.2-vendor.tar.gz 16135498 BLAKE2B
607cad9d80067d579adaafdea22b238f5e2f6f92a3c6aed530c8e97bce2f7f869adeabbc7b7d1c04f7c517459112c42b5588aa3ccbf04d5205d2b8212c1e7a42
SHA512
a5079b724d25af60cc094dd5c0bc9e01d503f64bee7ef1c8e616e79793726d848a5e000d951f02d2516f10feea23e30ab637b37ae09da5580f4edb1e783240c0
DIST netavark-v1.10.3-vendor.tar.gz 16135507 BLAKE2B
114519b76d932c5918fd91cea73e8bc9f5aa3a63275f9218e667e400c3e2512e5db29ce806b5e5b509b043c04a3436344a27cf170e203d4360d00247e48b5ca9
SHA512
b8a99f45ba4ebb20414fe052ff08b1e7a7a86994c7dfa2f36d0500d52bcbd2d279aeff19fb0844a65e2375e86da33af735851f038f598771d2dac96ff7e032a5
+DIST netavark-v1.11.0-vendor.tar.gz 17751524 BLAKE2B
b466b27674e6944b2de8a684ee3e14f26775b6065f0f1e82987a0c240725c01f88d2138641b768b5e03fce5b26908d0281b1983b8c1844af4999064bf24d8f15
SHA512
d858bddaaf41b284af9ede84a4d3aab5b5935ea83df5261dfa58e2b7d14962dd55983b1a95b2692e323ea40fc2dc4d9b1bdf2aed90644739e6333c794a7915cb
DIST netavark-v1.9.0-vendor.tar.gz 16032862 BLAKE2B
313bcde75f2355dab3fa4fdc82881109924c07408aa352e92b590356cf292cd60ad39d8ef31687935e3fed6f22ec8c3b8f26e6eae21fdf211c29c83b745c8a84
SHA512
a5c11dd47122490579a260b6ac3b1c8f01d1c2881e58dbcc5bece398c7d6ef01f376f8c342df4ef619b135cc92a95c48741c8098413c33ede696c87a9cdcc96c
diff --git a/app-containers/netavark/netavark-1.11.0.ebuild
b/app-containers/netavark/netavark-1.11.0.ebuild
new file mode 100644
index ..a18be8dea54d
--- /dev/null
+++ b/app-containers/netavark/netavark-1.11.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == * ]] || CRATES="${PN}@${PV}"
+
+inherit cargo systemd
+
+DESCRIPTION="A container network stack"
+HOMEPAGE="https://github.com/containers/netavark";
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/netavark.git";
+else
+ SRC_URI="${CARGO_CRATE_URIS}
https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz";
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+fi
+
+# main
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT
Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+BDEPEND="dev-go/go-md2man
+ dev-libs/protobuf"
+
+QA_FLAGS_IGNORED="
+ usr/libexec/podman/${PN}"
+QA_PRESTRIPPED="
+ usr/libexec/podman/${PN}"
+
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+src_unpack() {
+ if [[ ${PV} == * ]]; then
+ git-r3_src_unpack
+ cargo_live_src_unpack
+ else
+ cargo_src_unpack
+ fi
+}
+
+src_prepare() {
+ default
+ sed -i -e "s|m0755 bin|m0755 target
[gentoo-commits] repo/gentoo:master commit in: sys-fs/apfsprogs/
commit: fa9522bb3f2c9bfd74bf26b14cbdcf9f420a1ddf
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 10 00:35:58 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 10 00:43:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9522bb
sys-fs/apfsprogs: new package, add 0_pre20240521
Signed-off-by: Zac Medico gentoo.org>
sys-fs/apfsprogs/Manifest | 1 +
sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild | 29 +
sys-fs/apfsprogs/metadata.xml | 11 ++
3 files changed, 41 insertions(+)
diff --git a/sys-fs/apfsprogs/Manifest b/sys-fs/apfsprogs/Manifest
new file mode 100644
index ..66d268e43a81
--- /dev/null
+++ b/sys-fs/apfsprogs/Manifest
@@ -0,0 +1 @@
+DIST apfsprogs-0_pre20240521.tar.gz 202087 BLAKE2B
e0fabc489b8719522e2da3ce8ca1f3ed1f1d9bef7ea1b1935f09d250adba2e6369e9df84bed2e883846bd0eb152deed9de5ab801482817ac65538501627ca6ff
SHA512
ad49350464abbdc6c0ca899135265fc6dffe96865d378e8c6105f17ec75e1f3bca2ddfc40ab2b838cd129357607aa33e92e12e30c82a6a1361a343844773d593
diff --git a/sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild
b/sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild
new file mode 100644
index ..13019944cdb4
--- /dev/null
+++ b/sys-fs/apfsprogs/apfsprogs-0_pre20240521.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="28c0053dcb77efc267b57013702c17007c21d942"
+SRC_URI="https://github.com/linux-apfs/apfsprogs/archive/${EGIT_COMMIT}.tar.gz
-> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+KEYWORDS="~amd64"
+DESCRIPTION="Experimental APFS tools for linux"
+HOMEPAGE="https://github.com/linux-apfs/apfsprogs";
+LICENSE="GPL-2"
+SLOT="0"
+APFSPROGS=(apfs-snap apfsck mkapfs)
+
+src_compile() {
+ local prog
+ emake -C lib || die
+ for prog in "${APFSPROGS[@]}"; do
+ emake -C "${prog}" || die
+ done
+}
+
+src_install() {
+ local prog
+ for prog in "${APFSPROGS[@]}"; do
+ emake -C "${prog}" install DESTDIR="${ED}" BINDIR=/usr/bin
MANDIR=/usr/share/man/man8
+ done
+}
diff --git a/sys-fs/apfsprogs/metadata.xml b/sys-fs/apfsprogs/metadata.xml
new file mode 100644
index ..9153843468c1
--- /dev/null
+++ b/sys-fs/apfsprogs/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ linux-apfs/apfsprogs
+
+
[gentoo-commits] repo/gentoo:master commit in: sys-fs/linux-apfs-rw/
commit: 340671b3ef2d93d98fbc49ea23dd3ca76bb86d98
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 10 00:17:01 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 10 00:43:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340671b3
sys-fs/linux-apfs-rw: new package, add 0.3.9
Signed-off-by: Zac Medico gentoo.org>
sys-fs/linux-apfs-rw/Manifest | 1 +
sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild | 40 +
sys-fs/linux-apfs-rw/metadata.xml | 11 +++
3 files changed, 52 insertions(+)
diff --git a/sys-fs/linux-apfs-rw/Manifest b/sys-fs/linux-apfs-rw/Manifest
new file mode 100644
index ..09edd1b8f6dc
--- /dev/null
+++ b/sys-fs/linux-apfs-rw/Manifest
@@ -0,0 +1 @@
+DIST linux-apfs-rw-0.3.9.tar.gz 209682 BLAKE2B
663007f1b7c7af6cf4198066b6ba141c3bb625685508fe06f72bb3654438bac03ecc50204227fd724d16a4bb757f0df9ed7d19fb08fece8b98f08da9cfb3c8f5
SHA512
b241044c6faa175c1523f0ba391f9bb9ba336b3c39fd3528f43e0df5e9c6090691ab226091948f9f32f33748e8c435a0881ccc00fed4badca97d195c1982f9a7
diff --git a/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild
b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild
new file mode 100644
index ..5d6a55ecd6d9
--- /dev/null
+++ b/sys-fs/linux-apfs-rw/linux-apfs-rw-0.3.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="APFS module for linux, with experimental write support"
+HOMEPAGE="https://github.com/linux-apfs/linux-apfs-rw";
+SRC_URI="https://github.com/linux-apfs/linux-apfs-rw/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="LIBCRC32C"
+
+pkg_setup() {
+ linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ sed -e "s/GIT_COMMIT=.*/GIT_COMMIT=${PV}/" -i genver.sh || die
+}
+
+src_compile() {
+ local modlist=( apfs=extra )
+ local modargs=( KERNEL_DIR=${KV_OUT_DIR} KERNELRELEASE=${KV_FULL} )
+
+ linux-mod-r1_src_compile
+}
+
+src_install() {
+ linux-mod-r1_src_install
+}
+
+pkg_postinst() {
+ linux-mod-r1_pkg_postinst
+}
diff --git a/sys-fs/linux-apfs-rw/metadata.xml
b/sys-fs/linux-apfs-rw/metadata.xml
new file mode 100644
index ..313f7d9cb420
--- /dev/null
+++ b/sys-fs/linux-apfs-rw/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ linux-apfs/linux-apfs-rw
+
+
[gentoo-commits] repo/gentoo:master commit in: app-crypt/cryptor/
commit: 48bbac0adec5096f2e218b4d2750180203d17c03
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 9 20:28:59 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 9 20:42:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48bbac0a
app-crypt/cryptor: new package, add 1.1.0
Signed-off-by: Zac Medico gentoo.org>
app-crypt/cryptor/Manifest | 1 +
app-crypt/cryptor/cryptor-1.1.0.ebuild | 50 ++
app-crypt/cryptor/metadata.xml | 11
3 files changed, 62 insertions(+)
diff --git a/app-crypt/cryptor/Manifest b/app-crypt/cryptor/Manifest
new file mode 100644
index ..834b5af2909b
--- /dev/null
+++ b/app-crypt/cryptor/Manifest
@@ -0,0 +1 @@
+DIST cryptor-1.1.0.tar.gz 56776 BLAKE2B
14c576bda70541d09be5029f59ea026d8a0c427547539c27134d9db78c84d4248782da4400b7b763056be7595e2bffda0b907dffa9fd86174deec1f9f5d86fd5
SHA512
4823780796baaf8e70886228b3e39b2e621978c857ddc73861fc635ee22fe54f82536d9f56d44061330c38c2e54734fd4c88bbe15d03dbba88f82f28a523090d
diff --git a/app-crypt/cryptor/cryptor-1.1.0.ebuild
b/app-crypt/cryptor/cryptor-1.1.0.ebuild
new file mode 100644
index ..99fff154c14c
--- /dev/null
+++ b/app-crypt/cryptor/cryptor-1.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop meson vala xdg
+
+DESCRIPTION="Simple GUI application for gocryptfs"
+HOMEPAGE="https://github.com/moson-mo/cryptor";
+SRC_URI="https://github.com/moson-mo/cryptor/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ app-crypt/gocryptfs
+ dev-libs/glib:2
+ dev-libs/json-glib
+ dev-libs/libgee
+ x11-libs/gtk+:3
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ $(vala_depend)
+"
+
+DOCS=(README.md)
+
+src_prepare() {
+ # The TrayIcon category triggers QA Notice that the "OnlyShowIn" key
must be included.
+ sed -e 's/TrayIcon;//' -i resources/misc/cryptor.desktop || die
+ default
+ vala_setup
+}
+
+src_install() {
+ meson_src_install
+ einstalldocs
+ domenu resources/misc/cryptor.desktop
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/app-crypt/cryptor/metadata.xml b/app-crypt/cryptor/metadata.xml
new file mode 100644
index ..bdde076c07b0
--- /dev/null
+++ b/app-crypt/cryptor/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ moson-mo/cryptor
+
+
[gentoo-commits] repo/gentoo:master commit in: app-crypt/gocryptfs/
commit: 0a34c563fe50f96e4c1fc9aaa71251b9fa1e87e3
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 9 19:16:11 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 9 19:25:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a34c563
app-crypt/gocryptfs: new package, add 2.4.0
Signed-off-by: Zac Medico gentoo.org>
app-crypt/gocryptfs/Manifest | 1 +
app-crypt/gocryptfs/gocryptfs-2.4.0.ebuild | 39 ++
app-crypt/gocryptfs/metadata.xml | 11 +
3 files changed, 51 insertions(+)
diff --git a/app-crypt/gocryptfs/Manifest b/app-crypt/gocryptfs/Manifest
new file mode 100644
index ..6e4250362ab5
--- /dev/null
+++ b/app-crypt/gocryptfs/Manifest
@@ -0,0 +1 @@
+DIST gocryptfs_v2.4.0_src-deps.tar.gz 2927929 BLAKE2B
e66e91506c5a7abb5413e8797f786145c436ca760e3c7157590ccb1c8430b2ac240b8ba1fd0ed3401ee4277a2e9ef6b8f3a9b3c52c22bac8e6b27b56350d9eec
SHA512
b46d6eee21a0194022a042d6ae2a737f221a0932bb899123438f2cf929ecb50635fcfc90012d6a04928fd4b2856d6e24d19392ce5aa87eea573fb58cf5a5d4e1
diff --git a/app-crypt/gocryptfs/gocryptfs-2.4.0.ebuild
b/app-crypt/gocryptfs/gocryptfs-2.4.0.ebuild
new file mode 100644
index ..1097ebdaab4d
--- /dev/null
+++ b/app-crypt/gocryptfs/gocryptfs-2.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Encrypted overlay filesystem written in Go"
+HOMEPAGE="https://github.com/rfjakob/gocryptfs";
+SRC_URI="https://github.com/rfjakob/gocryptfs/releases/download/v${PV}/${PN}_v${PV}_src-deps.tar.gz";
+S=${WORKDIR}/${PN}_v${PV}_src-deps
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+BDEPEND="virtual/pandoc"
+PROPERTIES="test_privileged"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -e 's:ldd gocryptfs 2> /dev/null:! ldd gocryptfs | grep -q
"statically linked":' \
+ -i "${S}/build-without-openssl.bash" || die
+}
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ emake "DESTDIR=${ED}" install
+ dobin contrib/statfs/statfs
+ doman Documentation/*.1
+ dodoc -r README.md Documentation
+ rm -f
"${ED}"/usr/share/doc/${PF}/Documentation/{.gitignore,gocryptfs.1,gocryptfs-xray.1,statfs.1,MANPAGE-render.bash}
|| die
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-crypt/gocryptfs/metadata.xml b/app-crypt/gocryptfs/metadata.xml
new file mode 100644
index ..90e70502
--- /dev/null
+++ b/app-crypt/gocryptfs/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ rfjakob/gocryptfs
+
+
[gentoo-commits] proj/portage:master commit in: lib/portage/
commit: f620a0769a509966295954c2b0c76e46e8fb4289
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 2 21:53:04 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 9 17:53:31 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f620a076
tar_safe_extract: Use tarfile.fully_trusted_filter
This suppresses a DeprecationWarning triggered because the
tarfile.data_filter will become the new default in python3.14.
The fully_trusted filter should be suitable here because
tar_safe_extract already performs security validation on
tar members prior to extraction.
Bug: https://bugs.gentoo.org/933433
Signed-off-by: Zac Medico gentoo.org>
lib/portage/gpkg.py | 9 +
1 file changed, 9 insertions(+)
diff --git a/lib/portage/gpkg.py b/lib/portage/gpkg.py
index 9606f6d3c8..fdb54c69b8 100644
--- a/lib/portage/gpkg.py
+++ b/lib/portage/gpkg.py
@@ -628,6 +628,15 @@ class tar_safe_extract:
if self.closed:
raise OSError("Tar file is closed.")
temp_dir = tempfile.TemporaryDirectory(dir=dest_dir)
+# The below tar member security checks can be refactored as a filter
function
+# that raises an exception. Use tarfile.fully_trusted_filter for now,
which
+# is simply an identity function:
+# def fully_trusted_filter(member, dest_path):
+# return member
+try:
+self.tar.extraction_filter = tarfile.fully_trusted_filter
+except AttributeError:
+pass
try:
while True:
member = self.tar.next()
[gentoo-commits] repo/gentoo:master commit in: app-misc/gojq/
commit: d97dc17bf25d0a2dcd5dc4ba3cdeeda6a18f543c
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 8 18:27:25 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 8 18:29:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97dc17b
app-misc/gojq: new package, add 0.12.16
Signed-off-by: Zac Medico gentoo.org>
app-misc/gojq/Manifest| 2 ++
app-misc/gojq/gojq-0.12.16.ebuild | 43 +++
app-misc/gojq/metadata.xml| 11 ++
3 files changed, 56 insertions(+)
diff --git a/app-misc/gojq/Manifest b/app-misc/gojq/Manifest
new file mode 100644
index ..8e9820659bd0
--- /dev/null
+++ b/app-misc/gojq/Manifest
@@ -0,0 +1,2 @@
+DIST gojq-0.12.16-deps.tar.xz 537848 BLAKE2B
11e0a6a03cb88eac6345b4cb02b0a2132b08d0d3198e8d12a7e7cd4d51c0ee4bf6fc0222de9aa1bca75a1a55fef1f60567bb7aaf52a86ea4c09b83d3210fb135
SHA512
b68c7d4401880f8ef232fe2880b9439b9198fd17dd356f95680195a30f8833a80b896e1ab27a075b2aa495657a1cb91ecd48bece5b3db6c6d9d20441af36f617
+DIST gojq-0.12.16.tar.gz 131894 BLAKE2B
094b51e9200ce9cda01b67e68be362ac111418f67e2ef9d96ede1a3da0c9469bde76bd958152b15f9231d84f8d2e6200ea10d1cad9102f2f1ef51c2623af159a
SHA512
08129dac68e280b4a7c2d64ea3da4cf8a00ab0ba8431e76468cb9d4b52e052eb5f2b92d1dc8545c3a5e08e354b0d4ec60c39137a13b4df6ea9027f0278e148c5
diff --git a/app-misc/gojq/gojq-0.12.16.ebuild
b/app-misc/gojq/gojq-0.12.16.ebuild
new file mode 100644
index ..4aee21687e7a
--- /dev/null
+++ b/app-misc/gojq/gojq-0.12.16.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+EGIT_COMMIT=0607aa5
+DESCRIPTION="Pure Go implementation of jq with yaml support"
+HOMEPAGE="https://github.com/itchyny/gojq";
+SRC_URI="https://github.com/itchyny/gojq/archive/refs/tags/v${PV}.tar.gz ->
${P/-go/}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P/-go/}-deps.tar.xz";
+
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+DOCS=(README.md)
+
+src_prepare() {
+ default
+ local -a sed_args=(
+ -e "s/^VERSION := .*/VERSION := ${PV}/"
+ -e "s/^CURRENT_REVISION = .*/CURRENT_REVISION = ${EGIT_COMMIT}/"
+ )
+ # -buildmode=pie not supported when -race is enabled
+ [[ ${GOFLAGS} == *buildmode=pie* ]] && sed_args+=(
+ -e 's/ -race / /'
+ )
+ sed "${sed_args[@]}" -i Makefile || die
+}
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ einstalldocs
+ dobin "${PN}"
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-misc/gojq/metadata.xml b/app-misc/gojq/metadata.xml
new file mode 100644
index ..c333e701aa29
--- /dev/null
+++ b/app-misc/gojq/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ zmed...@gentoo.org
+ Zac Medico
+
+
+ itchyny/gojq
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-db/rqlite/
commit: 5693339ee117b177b5c1cfe54db79ac65396445c
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 8 17:27:21 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 8 17:30:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5693339e
dev-db/rqlite: add 8.25.0
Signed-off-by: Zac Medico gentoo.org>
dev-db/rqlite/Manifest | 2 ++
dev-db/rqlite/rqlite-8.25.0.ebuild | 36
2 files changed, 38 insertions(+)
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 1654d3ee4dfe..32f775612de1 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -1,2 +1,4 @@
DIST rqlite-8.23.0-deps.tar.xz 3934116 BLAKE2B
3f56e99ab7cc6e9ae6584bfc3bb10ff28a866961a90bb77ee7acc9442d16d37eaa705b5cc85abbf7de3daea77df24ec9b4b65fbff43a11033bc8e0a11bcb089e
SHA512
cace762d4f7e3a6d973dcba7ccf40ddc45d05a0cb5669d67a4c9fd4917e826828664779ab2bb293757fb46f2d5fc956d7ecae46b59f4914afe8fadc42d9d95b1
DIST rqlite-8.23.0.tar.gz 613529 BLAKE2B
0c6c790f1a211a10f14a2f03a231567c186504c05618509733f94a7cacb6b4b23abdbeb119067a4a884ddcbc5862d301ede0a83b3059e9ff55b20876c27f85dc
SHA512
6247cf72ac295a5892fe992ec90c7733de311142996d4eead2c69752d71ad55326a5f6c4f26f4c5fee229bd0b75a3379460bf69abe0c473517a8fb3ef322889f
+DIST rqlite-8.25.0-deps.tar.xz 3958656 BLAKE2B
f48b155e2f8535a4189ff8403fd33e555ad57edfd16546b80f9040852bab26c5580a0f39ebde232396df1cd21b3f08e0c4a9e83fd54837aca75a89d05d159241
SHA512
49b0b010eff36a5a5fdeb243f9b248beb0f96c3d914e62bf1c6f0638b8502b6a08daa84f23620f17411269a4efd703ef60ffa567da1cb72b04538b0fbe994e6b
+DIST rqlite-8.25.0.tar.gz 619814 BLAKE2B
489e572073ea7c19092c0345881381b39ff40c2728b3b4c443ac5c9b7df3172f45e189ef2fc0ee365a9a4274d0f58476efc23ad95bb5e462e84cc449af78ba79
SHA512
79331a6a24d9d42aded35d4e9250af84f522f6bf42ed817ad93c51e019b7cf2e7149ec78de6499aac39608a31da1fbd208fd0db5bee1b6cf92dd793b60559ac3
diff --git a/dev-db/rqlite/rqlite-8.25.0.ebuild
b/dev-db/rqlite/rqlite-8.25.0.ebuild
new file mode 100644
index ..fb2ae853ec49
--- /dev/null
+++ b/dev-db/rqlite/rqlite-8.25.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+EGIT_COMMIT=312d6b01f44630fc4f425d353bdc8dde1f34d860
+
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+HOMEPAGE="https://github.com/rqlite/rqlite
https://www.philipotoole.com/tag/rqlite/";
+SRC_URI="https://github.com/rqlite/rqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD CC0-1.0 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+ GOBIN="${S}/bin" \
+ go install \
+ -ldflags="-X main.version=v${PV}
+ -X main.branch=master
+ -X main.commit=${EGIT_COMMIT}
+ -X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
+ ./cmd/... || die
+}
+
+src_test() {
+ GOBIN="${S}/bin" \
+ go test ./... || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc -r *.md DOC
+}
[gentoo-commits] repo/gentoo:master commit in: dev-db/rqlite/
commit: 625eb321c2c5818a07c56503029d779657d395dc
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 8 17:17:39 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 8 17:30:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625eb321
dev-db/rqlite: drop 8.16.8
Signed-off-by: Zac Medico gentoo.org>
dev-db/rqlite/Manifest | 1 -
dev-db/rqlite/rqlite-8.16.8.ebuild | 37 -
2 files changed, 38 deletions(-)
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 4f54ccf8ec50..1654d3ee4dfe 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -1,3 +1,2 @@
-DIST rqlite-8.16.8-vendor.tar.gz 7715303 BLAKE2B
50660bdfb8ce9fa8238ae028916d822e9f5d8e027ee4865f543f97f8a49b92a13e549deb07a5b79e7a52c2c9e994cf6891562a15873b09398c74773f82ffc3d2
SHA512
987c9dbe91766f4847233949cd4251aa3d0a56d23b850bbb552d8f9bb255de3908c4fa440c45e730e861e6f4f60e559a41353659ab9d953b978c45ff986ee9b5
DIST rqlite-8.23.0-deps.tar.xz 3934116 BLAKE2B
3f56e99ab7cc6e9ae6584bfc3bb10ff28a866961a90bb77ee7acc9442d16d37eaa705b5cc85abbf7de3daea77df24ec9b4b65fbff43a11033bc8e0a11bcb089e
SHA512
cace762d4f7e3a6d973dcba7ccf40ddc45d05a0cb5669d67a4c9fd4917e826828664779ab2bb293757fb46f2d5fc956d7ecae46b59f4914afe8fadc42d9d95b1
DIST rqlite-8.23.0.tar.gz 613529 BLAKE2B
0c6c790f1a211a10f14a2f03a231567c186504c05618509733f94a7cacb6b4b23abdbeb119067a4a884ddcbc5862d301ede0a83b3059e9ff55b20876c27f85dc
SHA512
6247cf72ac295a5892fe992ec90c7733de311142996d4eead2c69752d71ad55326a5f6c4f26f4c5fee229bd0b75a3379460bf69abe0c473517a8fb3ef322889f
diff --git a/dev-db/rqlite/rqlite-8.16.8.ebuild
b/dev-db/rqlite/rqlite-8.16.8.ebuild
deleted file mode 100644
index fb6d652092cd..
--- a/dev-db/rqlite/rqlite-8.16.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-EGIT_COMMIT=10a5c9bd0e89e05c61e6de1a012470c432ee3591
-
-DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
-HOMEPAGE="https://github.com/rqlite/rqlite
https://www.philipotoole.com/tag/rqlite/";
-SRC_URI="https://github.com/zmedico/rqlite/archive/v${PV}-vendor.tar.gz ->
${P}-vendor.tar.gz"
-
-LICENSE="MIT"
-LICENSE+=" Apache-2.0 BSD CC0-1.0 MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${P}-vendor
-
-src_compile() {
- GOBIN="${S}/bin" \
- go install \
- -ldflags="-X main.version=v${PV}
- -X main.branch=master
- -X main.commit=${EGIT_COMMIT}
- -X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
- ./cmd/... || die
-}
-
-src_test() {
- GOBIN="${S}/bin" \
- go test ./... || die
-}
-
-src_install() {
- dobin bin/*
- dodoc -r *.md DOC
-}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/starlark-rust/
commit: 2d9f543f2ecfef9c1fd052d60955d791a239ab70 Author: Zac Medico gentoo org> AuthorDate: Sat Jun 8 17:11:12 2024 + Commit: Zac Medico gentoo org> CommitDate: Sat Jun 8 17:11:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d9f543f dev-lang/starlark-rust: update EAPI 7 -> 8 Signed-off-by: Zac Medico gentoo.org> dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild b/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild index 583c4b1b2c2d..e5adc9734c7a 100644 --- a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild +++ b/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CRATES=" Inflector-0.11.4
[gentoo-commits] repo/gentoo:master commit in: dev-python/sqlalchemy-rqlite/
commit: 7826b7a0e97afe03a1d9636c75618d8eb7a5e3d4
Author: Zac Medico gentoo org>
AuthorDate: Fri Jun 7 04:58:41 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Fri Jun 7 05:01:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7826b7a0
dev-python/sqlalchemy-rqlite: add 2.0
Signed-off-by: Zac Medico gentoo.org>
dev-python/sqlalchemy-rqlite/Manifest | 1 +
.../sqlalchemy-rqlite/sqlalchemy-rqlite-2.0.ebuild | 35 ++
2 files changed, 36 insertions(+)
diff --git a/dev-python/sqlalchemy-rqlite/Manifest
b/dev-python/sqlalchemy-rqlite/Manifest
index 2323c644c8ea..a2a3a09d3c59 100644
--- a/dev-python/sqlalchemy-rqlite/Manifest
+++ b/dev-python/sqlalchemy-rqlite/Manifest
@@ -1 +1,2 @@
DIST sqlalchemy-rqlite-1.2.gh.tar.gz 4880 BLAKE2B
ff07c0ee1c80cdbe0c743a4d25946cb260336766ed43a4496c014de4bb1cde0646250e4ede5f2bb73b8e5ecbe9816ec0b5a82e1c7c35ff66bac62b839bba72ab
SHA512
35e11b09c961e6af3bd658c583a0f3621b5798baa2bfd5f85b3d4136b4f134ad4af96e84e7cc52ab3025668ab05fc9e4f178803d8ae570ddbcd5405a43fdedf4
+DIST sqlalchemy-rqlite-2.0.gh.tar.gz 4965 BLAKE2B
b3567b9c4d6aa1b9c2098529f6c1066d5e96cd01e612593844ce87bc79229f5f4d4501fa02a281d4027a39ed0368ac3e4ff20be1daeee639f709569f0c801aed
SHA512
d2f335031add36c4efc91899a143b79c1a047fbd7fd43e61cc76f0a8e843fe3beffd5b9c6507fd8269dcdd60fd56bf18e605dc96f1f12123b5eea1bd2dd4330e
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-2.0.ebuild
b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-2.0.ebuild
new file mode 100644
index ..f7589570934b
--- /dev/null
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A SQLAlchemy dialect for rqlite"
+HOMEPAGE="
+ https://github.com/rqlite/sqlalchemy-rqlite/
+ https://pypi.org/project/sqlalchemy-rqlite/
+"
+SRC_URI="
+ https://github.com/rqlite/sqlalchemy-rqlite/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/pyrqlite[${PYTHON_USEDEP}]
+ dev-python/sqlalchemy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i
src/sqlalchemy_rqlite/constants.py || die
+ distutils-r1_src_prepare
+}
[gentoo-commits] repo/gentoo:master commit in: app-misc/dasel/
commit: bdad5d73ad0410cab8e98a25f93e5e498908a7e0
Author: Zac Medico gentoo org>
AuthorDate: Tue Jun 4 16:27:59 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Jun 4 16:46:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdad5d73
app-misc/dasel: drop 1.26.1, 1.27.1
Signed-off-by: Zac Medico gentoo.org>
app-misc/dasel/Manifest| 2 --
app-misc/dasel/dasel-1.26.1.ebuild | 24
app-misc/dasel/dasel-1.27.1.ebuild | 24
3 files changed, 50 deletions(-)
diff --git a/app-misc/dasel/Manifest b/app-misc/dasel/Manifest
index 87353f5567c3..c83719687d93 100644
--- a/app-misc/dasel/Manifest
+++ b/app-misc/dasel/Manifest
@@ -1,4 +1,2 @@
DIST dasel-1.24.3-deps.tar.xz 20531068 BLAKE2B
6cd947a88c54e46300432c2f87c0ef757a53739e0755af48f4596a87ba46faf12c967145a0f263e13abb8f01ffe10c51b45f641de348fc02e7af39417b709d1d
SHA512
27696cd5a5c93b3e29ba12fd2730c04047dc752ef17a32db73e7cbc8e5d38d914705720da9ff0ffb0c8d3fb383b5070eb552b24a4e72e72ebad70c2e1085cab3
-DIST dasel-1.26.1.tar.gz 3054446 BLAKE2B
760f03ee0feb1b6e0e0da9a92922f13bb3786b90ab01bda040d2be2cf10ed5d8a8c2db69ac146ac2ec64f6c4503eaaa87d32c73068f27ebc9ce87045052b4af3
SHA512
07efcf0bf31573decc856a8b41842af9658dc1a3b968510b8e4c642ec8cfe24e97de64b6ef2c296da7d5623ca47e92d42e3f7bb927a8a25e54f97546fac279f0
-DIST dasel-1.27.1.tar.gz 3055281 BLAKE2B
fde309780c2eef80e1efb52eafe1f5c1fc9c6824f88ed5d902564f4831f6628cf03501d52b7f2605be8ee7d5eb84898d752bac1077e3c06243ffe5b1f1eb4527
SHA512
de9a68cd158262d7d216fe54bc05b7bbaed671dbdee2f3c8055957434903364491c79c00e009e357f1650f2d3f2558ccd609b15f5320026b536eb23cb74482bd
DIST dasel-1.27.3.tar.gz 3056021 BLAKE2B
2145f501f837cd16aaa7cc16074e446e07cbb8b6b7ce043c644badbe758d255c9e42f408ca818e6241feb91f22eaa1e8e7fbf74b84275b7eba576687e877b1aa
SHA512
51e5f770f75e34f72692adf0987bcb965dd2100ac3e251c035cf62479462e22f982640bab6adac3c12bebac6987f7852f53cceb2c0c4d6dd009befe843cc1aec
diff --git a/app-misc/dasel/dasel-1.26.1.ebuild
b/app-misc/dasel/dasel-1.26.1.ebuild
deleted file mode 100644
index 261c64912713..
--- a/app-misc/dasel/dasel-1.26.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Query, update and convert data structures from the command line"
-HOMEPAGE="https://github.com/TomWright/dasel";
-SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz";
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-src_compile() {
- CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X
'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
-}
-
-src_install() {
- dobin bin/dasel
- dodoc CHANGELOG.md README.md
-}
diff --git a/app-misc/dasel/dasel-1.27.1.ebuild
b/app-misc/dasel/dasel-1.27.1.ebuild
deleted file mode 100644
index 261c64912713..
--- a/app-misc/dasel/dasel-1.27.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Query, update and convert data structures from the command line"
-HOMEPAGE="https://github.com/TomWright/dasel";
-SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz ->
${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz";
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-src_compile() {
- CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X
'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
-}
-
-src_install() {
- dobin bin/dasel
- dodoc CHANGELOG.md README.md
-}
[gentoo-commits] repo/gentoo:master commit in: app-misc/dasel/
commit: 04345b9dc20bacf88582baef954241326c82a0fd
Author: Zac Medico gentoo org>
AuthorDate: Tue Jun 4 16:44:38 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Jun 4 16:46:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04345b9d
app-misc/dasel: add 2.7.0
Signed-off-by: Zac Medico gentoo.org>
app-misc/dasel/Manifest | 2 ++
app-misc/dasel/dasel-2.7.0.ebuild | 24
2 files changed, 26 insertions(+)
diff --git a/app-misc/dasel/Manifest b/app-misc/dasel/Manifest
index c83719687d93..200d99bd1ed8 100644
--- a/app-misc/dasel/Manifest
+++ b/app-misc/dasel/Manifest
@@ -1,2 +1,4 @@
DIST dasel-1.24.3-deps.tar.xz 20531068 BLAKE2B
6cd947a88c54e46300432c2f87c0ef757a53739e0755af48f4596a87ba46faf12c967145a0f263e13abb8f01ffe10c51b45f641de348fc02e7af39417b709d1d
SHA512
27696cd5a5c93b3e29ba12fd2730c04047dc752ef17a32db73e7cbc8e5d38d914705720da9ff0ffb0c8d3fb383b5070eb552b24a4e72e72ebad70c2e1085cab3
DIST dasel-1.27.3.tar.gz 3056021 BLAKE2B
2145f501f837cd16aaa7cc16074e446e07cbb8b6b7ce043c644badbe758d255c9e42f408ca818e6241feb91f22eaa1e8e7fbf74b84275b7eba576687e877b1aa
SHA512
51e5f770f75e34f72692adf0987bcb965dd2100ac3e251c035cf62479462e22f982640bab6adac3c12bebac6987f7852f53cceb2c0c4d6dd009befe843cc1aec
+DIST dasel-2.7.0-deps.tar.xz 1219584 BLAKE2B
91cfc1225588ba397d9dc5b62297876164644c08260288d09fb843cf7c8619909c11126f54e5c1be1a225a55e3f60184bbdad6ed5e86dafe27c2892eb646066f
SHA512
d2f6545ddb3f62acaa0b98894321f53e01e8fefbc0c8e4327e051dd513fa3a47bbc822ffb7b856a3897915962cfac01d080adc7778d9349ff3282d1cce1debeb
+DIST dasel-2.7.0.tar.gz 2793422 BLAKE2B
27fdc70f998c389453c7b6c6ec59491f3482ff7df1a043499e985179c5a51f6b58328272d733eddb28009ada0dd206b0e4fed37ec6bc43229314a0c1906e215e
SHA512
37753bc124511bc2105186ad62090bda25e8574b5c1ec2cc2583f91e9f8ab41de261f870600ea1a501f41c5ad3b13999c64ca995eee50ee120359f819f6f334a
diff --git a/app-misc/dasel/dasel-2.7.0.ebuild
b/app-misc/dasel/dasel-2.7.0.ebuild
new file mode 100644
index ..ebf04bd39740
--- /dev/null
+++ b/app-misc/dasel/dasel-2.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Query, update and convert data structures from the command line"
+HOMEPAGE="https://github.com/TomWright/dasel";
+SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz ->
${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz";
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+ CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X
'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
+}
+
+src_install() {
+ dobin bin/dasel
+ dodoc CHANGELOG.md README.md
+}
[gentoo-commits] repo/gentoo:master commit in: app-shells/nushell/
commit: 43d7735a913098ece3d3afd986ca6e2cd5b6305f Author: Jonas Frei pm me> AuthorDate: Fri May 31 03:37:34 2024 + Commit: Zac Medico gentoo org> CommitDate: Tue Jun 4 16:27:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d7735a app-shells/nushell: drop 0.92.1 Signed-off-by: Jonas Frei pm.me> Closes: https://github.com/gentoo/gentoo/pull/36909 Signed-off-by: Zac Medico gentoo.org> app-shells/nushell/Manifest | 6 - app-shells/nushell/nushell-0.92.1.ebuild | 713 --- 2 files changed, 719 deletions(-) diff --git a/app-shells/nushell/Manifest b/app-shells/nushell/Manifest index ac728d78de10..37648ffd4127 100644 --- a/app-shells/nushell/Manifest +++ b/app-shells/nushell/Manifest @@ -156,7 +156,6 @@ DIST chardetng-0.1.17.crate 56362 BLAKE2B c99d2f1044fc652858e6de0f2be9a24bec6855 DIST charset-0.1.3.crate 14330 BLAKE2B 928771e37cc4f86f49cf09b671cc016cb662275799f34159dff9c22ca61a71d722f199ed36b2fadebde30b5763cc01d87bd6f27e70ff8ad357df10d6ddb652a8 SHA512 61166acd4fba3330c4c71e101e1993717baa448d91dd9773f7d58ac504fa4025322560ce82bd7de1b5935443f96ba84691658e5c982192196b325f52dc48f4b1 DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 DIST chrono-0.4.34.crate 228932 BLAKE2B a2feab8d8b079209f8661fd8c5069f2a5fc3e5b0a6233187ace16f8f2ad8b4a147253e47af306cb31aacd82bdf490a8c8a171ad702b8dc22f9b934205d080c55 SHA512 2aaccde5e5ecaec744613429f807b3c34b92632973de7fdbdafd7ca510b917a23a0abc92a6497754d0d3368d684305648aec1fa2a0a61c88a100a20fab2348f1 -DIST chrono-0.4.35.crate 234267 BLAKE2B 92552b9c8fb40160de9ee62ed8c5bea12bf8bae393caf91c1c64596d6b2efd09dce94355fb757ed46eaf4a13d27ee3ebb43af91e2d8c26df1f9a9f429869f319 SHA512 aed8bc3298c8f8dd8146c6a919610b6dda52c038a28b56c837a21590e41fda605cd466dc1b85e407f365e116d741cb82afbeff5d29f95f3f5bce4a62abf80812 DIST chrono-0.4.37.crate 234441 BLAKE2B d1c10bcdf33324f1dbe9a79cd8c5a70b8223ca289753446aef778c93bf18863714ab2ade88f1e67432d1451b0d408065325a7d8dd3578211a0e39caae733ceee SHA512 46d77f291c7c60a25d0c06ebbd89935ef3ae1b736d504b8faf39aad8210a9fc68b45b5afb024763979f666308750b1a662afdabc36c59974567cadadfc17fcbf DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9 DIST chrono-humanize-0.2.3.crate 15411 BLAKE2B d271f5f34e27edd1ffc10d655f50c47ed1871c3553dd40dc10c5de6fba8fdd2186fc65bf4d229c558314e330bdfada73c663f01e0fe1a9c73fab964f60aff919 SHA512 cb379e678b97749cb6fb5d6aaa1878ae2b106cfd6850ba5ff909b4f22dec67c70d3f738c05980ac3ab691fb959541ceb6f43068f0786c21b2ad1933e5047469b @@ -184,7 +183,6 @@ DIST clap_lex-0.5.0.crate 11792 BLAKE2B 0409c9d957ea6a566eb8b50f4212702df038d04c DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036 DIST clipboard-win-4.5.0.crate 13476 BLAKE2B bfe3e9c21d58e0001b85c69d724b03b2bc7128fe67420948dffe0b9709504924339c93b5acc2a572a7780bb1adcb51ab10ac172b972c26d325f3ceb7f7f6dde7 SHA512 2dfaf30119eb77c9f069310417f11e836e158ba43f988ff49f79647f5fe44bacf7e28dcc11ba2cd95389c685a69be0f5ef8b033ef09b94c9a3e484952e891d8e -DIST clipboard-win-5.2.0.crate 19036 BLAKE2B 395d8609cd92fcb918480ea87ecf32cf91eaf7019a9a88168962c716ed671c6d53216f20d93101f255be6c8a62406fe005f90f4129de6f300701b5ca1745b0f6 SHA512 6bd4d400075a409a29480b8a2e882d16b5e59acea35b9172140339b617f1991e9d63568fce1f50a36956905f96359401e2a981f8a10ff97ebc245b11ed2fabdf DIST clipboard-win-5.3.0.crate 19597 BLAKE2B 1f61d0c7049e6b2d9f09d6ef47196153ca4f592cb0eff7602317cb871cf06a54ecf7b49a121f45842cf49555c171f27db38e41975ba13920e5eed456283b6c10 SHA512 decd0b73e2d879c7b650f525b74e2ff20d271ac21598a64d447d863cd3d1fe344b3f4b4420514644c777d1d1793b585336e877759734c7234627ada0510daffc DIST clipboard-win-5.3.1.crate 19921 BLAKE2B b0b3b9e30bf4bd897fe6db78cb68a906e8dcaf79f0f4218428f5707f89aa60450d3aed272de10e81ef708e2ddf4737393380593cbd34fae5b1abf87a9119
[gentoo-commits] proj/portage:master commit in: lib/portage/sync/modules/zipfile/, lib/portage/sync/modules/
commit: 8bb7aecf7e5c922911192d0df63853c5c75d9f8a
Author: Alexey Gladkov kernel org>
AuthorDate: Tue Jun 4 15:31:06 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue Jun 4 15:40:25 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8bb7aecf
sync/zipfile: Install zipfile sync method
Add files that were accidentally forgotten when adding zipfile sync
method.
Fixes: 80445d9b0 ("sync: Add method to download zip archives")
Signed-off-by: Alexey Gladkov kernel.org>
Closes: https://github.com/gentoo/portage/pull/1340
Signed-off-by: Zac Medico gentoo.org>
lib/portage/sync/modules/meson.build | 1 +
lib/portage/sync/modules/zipfile/meson.build | 8
2 files changed, 9 insertions(+)
diff --git a/lib/portage/sync/modules/meson.build
b/lib/portage/sync/modules/meson.build
index fab2878e92..ba0b6f278b 100644
--- a/lib/portage/sync/modules/meson.build
+++ b/lib/portage/sync/modules/meson.build
@@ -12,3 +12,4 @@ subdir('mercurial')
subdir('rsync')
subdir('svn')
subdir('webrsync')
+subdir('zipfile')
diff --git a/lib/portage/sync/modules/zipfile/meson.build
b/lib/portage/sync/modules/zipfile/meson.build
new file mode 100644
index 00..46006aea7e
--- /dev/null
+++ b/lib/portage/sync/modules/zipfile/meson.build
@@ -0,0 +1,8 @@
+py.install_sources(
+[
+'zipfile.py',
+'__init__.py',
+],
+subdir : 'portage/sync/modules/zipfile',
+pure : not native_extensions
+)
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/util/, lib/_emerge/
commit: 3a9f2c09eb75f47cf3ae15fa4ebe671548a66870
Author: Zac Medico gentoo org>
AuthorDate: Mon Jun 3 01:18:44 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Jun 3 01:55:08 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3a9f2c09
Add binpkgs info to mtimedb resume data
In order to fix emerge --resume and --keep-going to make
appropriate binary package selections, store a list of
binpkgs in the resume data. By adding the data as a new
key which older versions of portage will ignore, the
extension is backward compatible.
Without this fix, emerge --resume and --keep-going make
poor package selection choices which do not account for
the --binpkg-respect-use option.
Bug: https://bugs.gentoo.org/933442
Signed-off-by: Zac Medico gentoo.org>
lib/_emerge/Scheduler.py | 13 +
lib/_emerge/actions.py | 7 +++
lib/_emerge/depgraph.py| 21 +
lib/portage/tests/util/test_mtimedb.py | 30 +-
4 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py
index d913cd2dc6..614df9e783 100644
--- a/lib/_emerge/Scheduler.py
+++ b/lib/_emerge/Scheduler.py
@@ -2116,6 +2116,19 @@ class Scheduler(PollScheduler):
for x in self._mergelist
if isinstance(x, Package) and x.operation == "merge"
]
+# Store binpkgs using the same keys as $PKGDIR/Packages plus EROOT.
+mtimedb["resume"]["binpkgs"] = [
+{
+"CPV": str(x.cpv),
+"BUILD_ID": x.cpv.build_id,
+"BUILD_TIME": x.cpv.build_time,
+"MTIME": x.cpv.mtime,
+"SIZE": x.cpv.file_size,
+"EROOT": x.root,
+}
+for x in self._mergelist
+if isinstance(x, Package) and x.type_name == "binary"
+]
mtimedb.commit()
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index 512e470ad6..43d936fd14 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -216,6 +216,13 @@ def action_build(
if not isinstance(favorites, list):
del mtimedb[k]
continue
+binpkgs = resume_data.get("binpkgs")
+if binpkgs and (
+not isinstance(binpkgs, list)
+or any(not isinstance(x, dict) for x in binpkgs)
+):
+del mtimedb[k]
+continue
resume = False
if "--resume" in myopts and ("resume" in mtimedb or "resume_backup" in
mtimedb):
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 3adc04bcfb..a05404d9c2 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -11066,6 +11066,13 @@ class depgraph:
else:
args = []
+binpkgs_map = {}
+binpkgs = resume_data.get("binpkgs")
+if binpkgs:
+for x in binpkgs:
+if isinstance(x, dict) and "EROOT" in x and "CPV" in x:
+binpkgs_map[(x["EROOT"], x["CPV"])] = x
+
serialized_tasks = []
masked_tasks = []
for x in mergelist:
@@ -11096,8 +11103,22 @@ class depgraph:
except InvalidAtom:
continue
+if pkg_type == "binary":
+binpkg_info = binpkgs_map.get((myroot, pkg_key))
+else:
+binpkg_info = False
+
pkg = None
for pkg in self._iter_match_pkgs(root_config, pkg_type, atom):
+if binpkg_info:
+if not (
+pkg.cpv.build_id == binpkg_info.get("BUILD_ID")
+and pkg.cpv.build_time == binpkg_info.get("BUILD_TIME")
+and pkg.cpv.mtime == binpkg_info.get("MTIME")
+and pkg.cpv.file_size == binpkg_info.get("SIZE")
+):
+continue
+
if not self._pkg_visibility_check(
pkg
) or self._frozen_config.excluded_pkgs.findAtomForPackage(
diff --git a/lib/portage/tests/util/test_mtimedb.py
b/lib/portage/tests/util/test_mtimedb.py
index d80b4f1daf..6e3c2bee76 100644
--- a/lib/portage/tests/util/test_mtimedb.py
+++ b/lib/portage/tests/util/test_mtimedb.py
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Foundation
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from unittest.mock import patch, mock_open
@@ -30,6 +30,16 @@ _ONE_RESUME_LIST_JSON = b"""{
"/usr/local/lib64": 1711784303
},
"resume": {
+
[gentoo-commits] proj/portage:master commit in: lib/portage/
commit: eb855b8cd1248f49649003dcfb9bf009b70e88cb
Author: Zac Medico gentoo org>
AuthorDate: Sun Jun 2 17:56:44 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sun Jun 2 18:05:35 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=eb855b8c
tar_stream_writer: Add missing error attribute
This attribute was previously initialized only
in an exception handler.
Fixes: b8c3f38ec5ee ("Add more error handling for binpkgs")
Bug: https://bugs.gentoo.org/933385
Signed-off-by: Zac Medico gentoo.org>
lib/portage/gpkg.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/portage/gpkg.py b/lib/portage/gpkg.py
index fc4d7b1fb6..9606f6d3c8 100644
--- a/lib/portage/gpkg.py
+++ b/lib/portage/gpkg.py
@@ -100,6 +100,7 @@ class tar_stream_writer:
self.closed = False
self.container = container
self.killed = False
+self.error = False
self.tar_format = tar_format
self.tarinfo = tarinfo
self.uid = uid
[gentoo-commits] repo/gentoo:master commit in: app-containers/snapd/
commit: e359d098225e9bf9c505c11b9ee45b1fdb14f09f
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 1 20:14:51 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 1 20:30:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e359d098
app-containers/snapd: 2.63 GNU_SOURCE patch for bug 933073
Closes: https://bugs.gentoo.org/933073
Closes: https://github.com/gentoo/gentoo/pull/36957
Signed-off-by: Zac Medico gentoo.org>
app-containers/snapd/Manifest | 1 +
app-containers/snapd/snapd-2.63.ebuild | 6 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index 89d58b906a8b..6ddc12332feb 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,3 +1,4 @@
DIST snapd-2.58.tar.xz 6980916 BLAKE2B
d3de507513db808fa4f85498b5c238de143f06660f1d677186c8c763b38643a2486e25b747977b3eb584619d79ea0a12e88dc5a909045a853c1d8f849f2c1638
SHA512
555915b8b4d9d2d91a3ba19e9e78cf6b19d9683a9f390ad225aa5876320cb8595b464d6133706c4923fc15fbe04ba2b65a47e403c9a2d8859adae827f8ec000a
DIST snapd-2.61.tar.xz 7626784 BLAKE2B
d716e91df4702fbd415bb6204a4557f37afd3dce187e3bca33b12a2ac5a1b54d1c31473d1537a784f6cbbfaf213f676d1f1b29d716e8c5f45a785229c9f3e018
SHA512
2fd432d7ef2204535576e980de7060ad15a0b3610b25e0f41b630ae34e172f97460f0a38d9d456af08dd36c619e90119219788a49e56a69afc7fbf014fc1db22
+DIST snapd-2.63-bug-933073-GNU_SOURCE.patch 870 BLAKE2B
acc2a9ec7ca16849736701b37e51f238be5700cf0cd40dac6493f126a48235ffc1f103096d546313d05a2262f8bdb6f84966cbb79c4cf3f5c1cdf4dfd5dc231e
SHA512
5e4018d1972e1849cf60c6e132f8655d8f0f4d6f8a77f9a7e5d2063b823f97a17bf26b562e6ab93ea32f081a90df6969a617e77114f37553a350f44f11fb
DIST snapd-2.63.tar.xz 7502152 BLAKE2B
8ae38699227b7f0e6b512526fc8857b3e50ed220ac95860c372ca0a4b26f5a034bd9309688217696444254e41cc70fe3a45c0bf026c84e5f950e7df8aebd47a0
SHA512
956ee142ab6cb5de522307f7844819c861b2831e22dab56f7bfca16ff7f947093f8a8727d49370cc000ed71f3af9c57cff9c4be93ebf199e8c631a152a68ec5b
diff --git a/app-containers/snapd/snapd-2.63.ebuild
b/app-containers/snapd/snapd-2.63.ebuild
index 56a00504636a..994f00213a29 100644
--- a/app-containers/snapd/snapd-2.63.ebuild
+++ b/app-containers/snapd/snapd-2.63.ebuild
@@ -9,11 +9,13 @@ DESCRIPTION="Service and tools for management of snap
packages"
HOMEPAGE="http://snapcraft.io/";
SRC_URI="https://github.com/snapcore/snapd/releases/download/${PV}/snapd_${PV}.vendor.tar.xz
-> ${P}.tar.xz"
+SRC_URI+="
https://github.com/snapcore/snapd/commit/1b035da5d873518ee4be31dacb1191c77ce0b644.patch
-> ${P}-bug-933073-GNU_SOURCE.patch"
+PATCHES=("${DISTDIR}/${P}-bug-933073-GNU_SOURCE.patch")
MY_PV=${PV}
-KEYWORDS="~amd64"
-
LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
SLOT="0"
+KEYWORDS="~amd64"
+
IUSE="apparmor +forced-devmode gtk kde systemd"
REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
commit: 26644346567067d2e3df13ef2888114fee0e0236
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 1 19:45:54 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 1 19:47:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26644346
sys-apps/portage: enable py3.13
Signed-off-by: Zac Medico gentoo.org>
sys-apps/portage/portage-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/portage/portage-.ebuild
b/sys-apps/portage/portage-.ebuild
index ea323e5a917c..56a051fcc8d0 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
PYTHON_REQ_USE='bzip2(+),threads(+)'
TMPFILES_OPTIONAL=1
[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/
commit: 1a7fc63d20ad2e1292be3697c105c2d7e1691f91
Author: Zac Medico gentoo org>
AuthorDate: Sat Jun 1 04:56:45 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jun 1 19:18:35 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1a7fc63d
MergeProcess: Pass bintree to subprocess
It's required for FEATURES=*-backup.
Fixes: b9a85ff987ea ("MergeProcess: Support QueryCommand with spawn start
method")
Bug: https://bugs.gentoo.org/933297
Signed-off-by: Zac Medico gentoo.org>
lib/portage/dbapi/_MergeProcess.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/portage/dbapi/_MergeProcess.py
b/lib/portage/dbapi/_MergeProcess.py
index d9ab2b47aa..34e39eb229 100644
--- a/lib/portage/dbapi/_MergeProcess.py
+++ b/lib/portage/dbapi/_MergeProcess.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2023 Gentoo Authors
+# Copyright 2010-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import functools
@@ -183,11 +183,12 @@ class MergeProcess(ForkProcess):
# Since the entire QueryCommand._db is not required, only pass
# in tree types that QueryCommand specifically requires.
+# NOTE: For FEATURES=*-backup bintree is needed (bug 933297).
child_db = {}
parent_db = portage.db if QueryCommand._db is None else
QueryCommand._db
for root in parent_db:
child_db[root] = {}
-for tree_type in ("vartree", "porttree"):
+for tree_type in ("bintree", "porttree", "vartree"):
child_db[root][tree_type] = parent_db[root][tree_type]
self.target = functools.partial(
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/util/, lib/portage/util/
commit: 120b2ec988eebf6cd90365d5b50a1a718eebb116
Author: Zac Medico gentoo org>
AuthorDate: Tue May 28 05:37:13 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue May 28 05:37:13 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=120b2ec9
atomic_ofstream: fix follow_symlinks fallback and default file mode
Handle OSError from mkstemp for (default) follow_symlinks mode,
not following the symlink if necessary (the target's parent may
not exist or may be readonly). This restores the fallback
behavior that existed before the introduction of mkstemp in
commit de19f3a7215d.
Handle missing _file and _tmp_name attributes during close.
Also set the default file mode respecting umask if a previous
file does not exist, which fixes the mode of CONTENTS files
since mkstemp.
Fixes: de19f3a7215d ("atomic_ofstream: Use mkstemp rather than getpid (pid
namespace safety)")
Signed-off-by: Zac Medico gentoo.org>
lib/portage/tests/util/meson.build | 1 +
lib/portage/tests/util/test_atomic_ofstream.py | 85 ++
lib/portage/util/__init__.py | 45 +-
3 files changed, 116 insertions(+), 15 deletions(-)
diff --git a/lib/portage/tests/util/meson.build
b/lib/portage/tests/util/meson.build
index 010dfa7849..7f4db871f4 100644
--- a/lib/portage/tests/util/meson.build
+++ b/lib/portage/tests/util/meson.build
@@ -1,5 +1,6 @@
py.install_sources(
[
+'test_atomic_ofstream.py',
'test_checksum.py',
'test_digraph.py',
'test_file_copier.py',
diff --git a/lib/portage/tests/util/test_atomic_ofstream.py
b/lib/portage/tests/util/test_atomic_ofstream.py
new file mode 100644
index 00..bbaf0f1b06
--- /dev/null
+++ b/lib/portage/tests/util/test_atomic_ofstream.py
@@ -0,0 +1,85 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+import errno
+import os
+import stat
+import tempfile
+
+from portage.tests import TestCase
+from portage.util import atomic_ofstream
+
+
+class AtomicOFStreamTestCase(TestCase):
+def test_enospc_rollback(self):
+file_name = "foo"
+start_dir = os.getcwd()
+with tempfile.TemporaryDirectory() as tempdir:
+try:
+os.chdir(tempdir)
+with self.assertRaises(OSError):
+with atomic_ofstream(file_name) as f:
+f.write("hello")
+raise OSError(errno.ENOSPC, "No space left on device")
+self.assertFalse(os.path.exists(file_name))
+self.assertEqual(os.listdir(tempdir), [])
+finally:
+os.chdir(start_dir)
+
+def test_open_failure(self):
+file_name = "bad/path"
+start_dir = os.getcwd()
+with tempfile.TemporaryDirectory() as tempdir:
+try:
+os.chdir(tempdir)
+with self.assertRaises(OSError):
+with atomic_ofstream(file_name):
+pass
+self.assertEqual(os.listdir(tempdir), [])
+finally:
+os.chdir(start_dir)
+
+def test_broken_symlink(self):
+content = "foo"
+broken_symlink = "symlink"
+symlink_targets = (("foo/bar/baz", False), ("baz", True))
+start_dir = os.getcwd()
+for symlink_target, can_follow in symlink_targets:
+with tempfile.TemporaryDirectory() as tempdir:
+try:
+os.chdir(tempdir)
+with open(broken_symlink, "w") as f:
+default_file_mode =
stat.S_IMODE(os.fstat(f.fileno()).st_mode)
+os.unlink(broken_symlink)
+os.symlink(symlink_target, broken_symlink)
+with atomic_ofstream(broken_symlink) as f:
+f.write(content)
+with open(broken_symlink) as f:
+self.assertEqual(f.read(), content)
+self.assertEqual(os.path.islink(broken_symlink),
can_follow)
+self.assertEqual(
+stat.S_IMODE(os.stat(broken_symlink).st_mode),
default_file_mode
+)
+finally:
+os.chdir(start_dir)
+
+def test_preserves_mode(self):
+file_name = "foo"
+file_mode = 0o604
+start_dir = os.getcwd()
+with tempfile.TemporaryDirectory() as tempdir:
+try:
+os.chdir(tempdir)
+with open(file_name, "wb"):
+pass
+self.assertNotEqual(stat.S_IMODE(os.stat(file_name).st_mode),
file_mode)
+os.chmod(file_name, file_mode)
[gentoo-commits] repo/gentoo:master commit in: sys-apps/flatpak/
commit: df54797554e209a78b7c4f279c64d9e045ebac9c
Author: Zac Medico gentoo org>
AuthorDate: Tue May 28 00:29:29 2024 +
Commit: Zac Medico gentoo org>
CommitDate: Tue May 28 00:30:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df547975
sys-apps/flatpak: drop 1.12.9, 1.14.5
Signed-off-by: Zac Medico gentoo.org>
sys-apps/flatpak/Manifest | 2 -
sys-apps/flatpak/flatpak-1.12.9.ebuild | 108 -
sys-apps/flatpak/flatpak-1.14.5.ebuild | 121 -
3 files changed, 231 deletions(-)
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 55263cd566bc..7e95fff2cd7b 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,6 +1,4 @@
DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B
6db457eba6b5c03ae4b7037e55f0537821152a80cad8746939fe93008922a9a33ff9f08635613e56a84f2d151826130c497c1e9f7f1e41a5b2dc215882f2eb14
SHA512
5a37d94e12c18a746b222c1ddbd20bddfb22079af1d3a79dc819cdb25f04774c9e4b3a51f9b5ed64f210317e7ec9fb97324ae38ec3430c6a515ba4042805fc57
-DIST flatpak-1.12.9.tar.xz 1572536 BLAKE2B
bd9b116bf0e51e60d1e0c420c4c4553a0ebc55a667bce23a0f3116da0dd566c7ffdb063c0b63f466b9b6e451b3c7791daf40cb5d13e2535d988b58cfc947341f
SHA512
9103acfed4cb25e6ff4a9d023864845cc565f688b1a4b49b0c8c2605eda9a142f33a37ad2ce670c5f7bd30a398027c141adf2a6f6d0d7549b2bfca82214d3f85
DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B
cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe
SHA512
3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0
-DIST flatpak-1.14.5.tar.xz 1637692 BLAKE2B
180dc094ef3feef1ccefceb562836f55f6e875016588a5984435ea3157498a8746305c16aa2c83044c107fd7f0e8f6c034c326b4ae29ade1c657e82cff353d47
SHA512
552deaaf3e6712a56f33698c20e6b8225c8893fe9a375af897fd99e19c487bf79b19c3e4ce3b00f3caf90020019ff67c628ca6a8f2ae1e6e01db397d2081ab2b
DIST flatpak-1.14.6.tar.xz 1644056 BLAKE2B
68bc8bdaf1d1c8a6046a06f800d41c1603e691e60a90f070c694501d50ee6fba3ad1978e222d22a9f99e2b85de9154e670149227b0f2ea6543483c2d103b5093
SHA512
d858682dbf539afe1b91087b6a0e0ebeea6658a0ef02c96d68259f3d8c58d1e6d02dd8b69db1b3c55f6d5df0f4d7e41c6165f668f09763dd3f9c3beb48f8bcf5
DIST flatpak-1.14.8.tar.xz 1698728 BLAKE2B
aecfe77371ec2479ab12f46035213d6cfb672fe9fb1882a3225ae3ee8d3bd23e96848061bc1c778265f3ff4daf369eb19e584f36f804107543b0287f774997f1
SHA512
a34d539f4ed0682459a22afa282de36da964a3545abd78138d3d86d9464d67cb57479f93bf84d1a9d811b80e72e0ea11f64293cb09a559fd5ec2c957be1729a1
diff --git a/sys-apps/flatpak/flatpak-1.12.9.ebuild
b/sys-apps/flatpak/flatpak-1.12.9.ebuild
deleted file mode 100644
index 5d1d9025a7c6..
--- a/sys-apps/flatpak/flatpak-1.12.9.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10,11} )
-
-inherit linux-info python-any-r1
-
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/";
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz";
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc introspection policykit seccomp systemd X"
-RESTRICT="test"
-
-RDEPEND="
- acct-group/flatpak
- acct-user/flatpak
- >=app-arch/libarchive-2.8:=
- app-arch/zstd:=
- >=app-crypt/gpgme-1.1.8:=
- >=dev-libs/appstream-glib-0.5.10:=
- >=dev-libs/glib-2.56:2=
- >=dev-libs/libxml2-2.4:=
- dev-libs/json-glib:=
- dev-libs/libassuan:=
- >=dev-util/ostree-2020.8:=[gpg(+)]
- || (
- dev-util/ostree[curl]
- dev-util/ostree[soup]
- )
- >=gnome-base/dconf-0.26:=
- gnome-base/gsettings-desktop-schemas
- >=net-libs/libsoup-2.4:2.4=
- >=sys-apps/bubblewrap-0.5.0
- sys-apps/dbus
- >=sys-fs/fuse-2.9.9:0=
- sys-apps/xdg-dbus-proxy
- X? (
- x11-apps/xauth
- x11-libs/libXau:=
- )
- x11-libs/gdk-pixbuf:2=
- policykit? ( >=sys-auth/polkit-0.98:= )
- seccomp? ( sys-libs/libseccomp:= )
- systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-# pyparsing version pinned for https://bugs.gentoo.org/825230
-BDEPEND="
- >=dev-build/automake-1.13.4
- >=sys-devel/gettext-0.18.2
- virtual/pkgconfig
- dev-util/gdbus-codegen
- app-alternatives/yacc
- introspection? ( >=dev-libs/gobject-introspection-1.40 )
- doc? (
- >=dev-util/gtk-doc-1.20
- dev-libs/libxslt
- )
- $(python_gen_any_dep &#x
