gentoo auto-resync : 02:12:2024 - 02:07:07

3 files changed, 105 insertions, 4 deletions

diff --git a/net-p2p/kubo/Manifest b/net-p2p/kubo/Manifest
index 7a0439214788..3cfbdaec8984 100644
--- a/net-p2p/kubo/Manifest
+++ b/net-p2p/kubo/Manifest
@@ -1,6 +1,6 @@
 AUX ipfs-at.service 340 BLAKE2B 776676603baa61cc2b76de86d8b3b1b43810ed81a703f827d5ad095824235870b73ddd4096f1e747ad6d872774fc38e2750792b5c516072cafa82fdcf275426a SHA512 90ff078ca99ef3815318e7b34be31df8531c449687e6fcc36e73ca0671b294ed8cfec922d98b8416a4410c33f587231722b483a2ab3c9e1de47e367fd37f807b
 AUX ipfs.confd 30 BLAKE2B 7ecaa40f2a4097690f9d8091da5891e0bbfb0f298bed4a59769c8d0ef978a2471865a01177950da5869b61f3b8c124f43eab97daf297c06efecdc25785a5846d SHA512 c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1
-AUX ipfs.init 464 BLAKE2B 553288784ba3df93037f640663d7ed3539f9a55e72ee9a36a9708e5b3f44e1dadff287fee989301b4ddf6fd3a88dbd1cf119386337c14523b9dadb91bdb1833d SHA512 2bc48d759b0dd4936d749aa0a442e39fdc862b5d5283269d4300cf0a5e3dc1bd0111a911d46d7a22dd7fa8023b22a148fbc371fc5bb37ce97912860b068caafc
+AUX ipfs.init 448 BLAKE2B d2c706f0a9639a77d8d6241c01c5edece73e8aa569803d468e6036ae4da0348f1f4845979e8d39e2f8cd6f1ce8271201fcd11a37cbebe01f0b140cc646735b76 SHA512 bc5f7422434b8a7f1ab57ec1137bb4ba4e5ef07e7a4177d8d35dfb7436dcb0c58c6fdf35b78138f164a74eb24ee0f7422f765cf7b72f2c6bf31e8456eaa127c4
 AUX ipfs.service 372 BLAKE2B 8989cc474ab46309dda6d167fb89476b01d10e07374d53c480a7ee345f13827e25ca19d84b0a3974e45c5d9a0c78abdfd7be262bff48f427aedaac2a9c4094a8 SHA512 35d5edda83bd296f92ffe3ee61f2608eb9ec464225e32ca52582d8e8fe699466c9b412ed224ff44e36e34d3d41a618d50082dd677feeaba53429d3a6913a869a
 DIST kubo-0.28.0.tar.gz 16070929 BLAKE2B f0febdee1e2313c83369c07b520fe285e10a73322d87f3891dd8edc97d6fa3d8dab7644d6108d060ef652fe34ed7cacf75f756e48f1e022d16b12bc30d298c0b SHA512 e6ef309084b8f09b56e5bceae37cf220c7e015003a8660f132d4e79709c7bd29ae8d8bb02736dab6a447b3acccc7dd0bd7043955df0a787a72fb3b9dfe9c42f5
 DIST kubo-0.29.0-fs-repo-15-to-16-v1.0.1-vendor.tar.xz 1643384 BLAKE2B 6c51d34ab06e662213075cdc73fce0d3dad8c9acbfd2af6cd68ee50e90c33b91f06a68bbe40f4f3de867dd2862fb3cc0a09cb377f4d1ae70750906236059de5d SHA512 f3d9fbfc93fa714491eb7b8c995b686b8af86a65c56e7f14034b0dedb36b2b9a4d489852d7988acce30dcfd53f1637e1dca42ffdaa785bc6104864fc19c45a0c
@@ -9,7 +9,11 @@ DIST kubo-0.29.0.tar.gz 16229764 BLAKE2B 91a6d322987bf7316f4acaf984ea57ea6961792
 DIST kubo-0.30.0-fs-repo-15-to-16-v1.0.1-vendor.tar.xz 1643384 BLAKE2B 6c51d34ab06e662213075cdc73fce0d3dad8c9acbfd2af6cd68ee50e90c33b91f06a68bbe40f4f3de867dd2862fb3cc0a09cb377f4d1ae70750906236059de5d SHA512 f3d9fbfc93fa714491eb7b8c995b686b8af86a65c56e7f14034b0dedb36b2b9a4d489852d7988acce30dcfd53f1637e1dca42ffdaa785bc6104864fc19c45a0c
 DIST kubo-0.30.0-fs-repo-15-to-16-v1.0.1.tar.gz 25942003 BLAKE2B 48eb3f50c8d0064561a99dd834cfc73482003bed70be93342bb30e993b509cca6aea0d44658ea981bb1063c458ce98e796293172b01109265e431f7a6ae279ae SHA512 bf631d402ecbee75e5a49e19e31c40172aeef81a13325bbf557841ba9e765caf39df42370a20d6e4039e7bd98e27dc5bd7a42f4490f30928a5614aca2214aea1
 DIST kubo-0.30.0.tar.gz 16532306 BLAKE2B 9241e8d463dfe0fd407fc6e2a30174ff67a63360a3dbef93d6f1b70fbe42ea9ce873e74109569964b8894adf95555c12b1ed66c50743b8eda591bf48b79fe8e7 SHA512 f49b53a51a07675d02d0c4457ca1a166a3db5565fc2a1659b88861c6a9ec1e94243a86115399df31069ad1f8e93b1acf14fe8b40dea63bfd3109105ad262cccc
+DIST kubo-0.31.0-fs-repo-15-to-16-v1.0.1-vendor.tar.xz 1643384 BLAKE2B 6c51d34ab06e662213075cdc73fce0d3dad8c9acbfd2af6cd68ee50e90c33b91f06a68bbe40f4f3de867dd2862fb3cc0a09cb377f4d1ae70750906236059de5d SHA512 f3d9fbfc93fa714491eb7b8c995b686b8af86a65c56e7f14034b0dedb36b2b9a4d489852d7988acce30dcfd53f1637e1dca42ffdaa785bc6104864fc19c45a0c
+DIST kubo-0.31.0-fs-repo-15-to-16-v1.0.1.tar.gz 25942003 BLAKE2B 48eb3f50c8d0064561a99dd834cfc73482003bed70be93342bb30e993b509cca6aea0d44658ea981bb1063c458ce98e796293172b01109265e431f7a6ae279ae SHA512 bf631d402ecbee75e5a49e19e31c40172aeef81a13325bbf557841ba9e765caf39df42370a20d6e4039e7bd98e27dc5bd7a42f4490f30928a5614aca2214aea1
+DIST kubo-0.31.0.tar.gz 18131293 BLAKE2B a34e9cf1849a14e42e3799437127a06434484f1ce8ef36730c1b8daf66f8ee33abe783866d22f1573de056c24855bc16efc60c67ed47ccdc1c08d7cf263e0097 SHA512 8e5782905c190eea81d25d8bb477f5027cf38721e5b66868c3b81de90c9b013b9e1205869f640d163355efda778b32c7b94739fd3ef46fff7819309c82e9066c
 EBUILD kubo-0.28.0.ebuild 1973 BLAKE2B 215b76417f7487096944d7554f81e53f55423fa2a7e5b5f92897ca9aca819582ed3b58ab9763666e26bf13598ca605f346d296c395e206e06faed80f6f4e2658 SHA512 b19393420d08b619ec1ffbf926e99116b79bd29fd747e7bcae002cf4a81c939ba98226f5ed24b152d7997b98fc631c70a5a41c071469953be8bedb11d81ee68a
 EBUILD kubo-0.29.0-r1.ebuild 2635 BLAKE2B a0aa252aac5b32b2078cabd2fe05980863ad92cedae3fe1ce169e3b970a5f051206ef65cb9bce8710e4d7832eacbdc3805f04e7623b55de8f1b8265cf9fb73d4 SHA512 941316585c64c3cfedb1f2e6adce4ba91cc27f5b71837ec04222401795141ca1ee4eda78b777a02a26998a3530449e0c6b0a4c5cb6212741e4edb7d55e881611
 EBUILD kubo-0.30.0.ebuild 2573 BLAKE2B b48ec90b2d8e93a4a98cc4bd3afb66018ed26f9216c9e0098f2166973991d62ad88b184983d46254bcfffdce6a0e66b0bc7c493eab93e96ae06de88ee75118f9 SHA512 8b5c222281776a2170ec242c5c4939774e9b675ee44a9dd18e0d74ab620e749b9e012020230dcb769d02ac405ed8822dfb6b3a46f57dce89fe004a5cb40e7751
+EBUILD kubo-0.31.0.ebuild 3047 BLAKE2B 53046ae33912b09f94feaaca27848b3811f5e9dd362caa0593cb5f622d8116bfd1533c411515e18fcceb46947816e18518f0b2bfa7b11eb7d335349709e59379 SHA512 552e19ecdd12437d188fb2a74b4f465795f51b13fdbcdbcdaa86c32b7bc8a202ca1f8cb7880a8b85c522e9f1afb8a006b52e19275f906a0e41af54a325d08eca
 MISC metadata.xml 596 BLAKE2B 68c5576e325ef2e0a6954047b8784427ca8b1d038c4b7fc7a7f2082e2682dbb8b807083251c9e5eca927d070d21b1f5ee9f96e2cb2437a9f5934bdc46f139fb6 SHA512 2d41af83abc0527e9031f8bec8d471dc7d163714bb42b9d7f65c943993e7d554207a5fb85ad96ae94c7876a74e2b3c8dba6a8f70e4f1bbb5a785bb98624233a9
diff --git a/net-p2p/kubo/files/ipfs.init b/net-p2p/kubo/files/ipfs.init
index b3798b2175a5..91dac12f4810 100644
--- a/net-p2p/kubo/files/ipfs.init
+++ b/net-p2p/kubo/files/ipfs.init
@@ -7,10 +7,11 @@ export IPFS_PATH=${IPFS_PATH:-/var/lib/ipfs/.ipfs}
 pidfile="/run/ipfs.pid"
 command="/usr/bin/ipfs"
 command_args="daemon --enable-gc --migrate"
+command_background=yes
+output_log="/var/log/ipfs/ipfs.log"
+error_log="/var/log/ipfs/ipfs.err"
 command_user="ipfs:ipfs"
-start_stop_daemon_args="--wait 1000 -b -m \
-                        -1 /var/log/ipfs/ipfs.log \
-                        -2 /var/log/ipfs/ipfs.log"
+start_stop_daemon_args="--wait 1000"
 
 depend() {
 	need net
diff --git a/net-p2p/kubo/kubo-0.31.0.ebuild b/net-p2p/kubo/kubo-0.31.0.ebuild
new file mode 100644
index 000000000000..acf8c23bc11d
--- /dev/null
+++ b/net-p2p/kubo/kubo-0.31.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module shell-completion systemd
+
+# Upstreams has a directory for each migration, for example fs-repo-15-to-16,
+# each directory is a program by itself. When an upstream tag is created,
+# they use they the name of the last migration program + version, for example
+# fs-repo-15-to-16/v1.0.1. Accordingly, we have a variable for the name and
+# another for the version. Even though the tag uses the name of the last migration,
+# the repository contains source code for all migrations, not only the tagged one.
+FS_MIG_V="1.0.1"
+FS_MIG_N="fs-repo-15-to-16"
+MY_FS_MIG="${FS_MIG_N}-v${FS_MIG_V}"
+FS_MIG_DIR="fs-repo-migrations-${MY_FS_MIG}"
+
+DESCRIPTION="Main implementation of IPFS"
+HOMEPAGE="https://ipfs.tech https://github.com/ipfs/kubo/"
+SRC_URI="https://github.com/ipfs/${PN}/releases/download/v${PV}/kubo-source.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/ipfs/fs-repo-migrations/archive/refs/tags/${FS_MIG_N}/v${FS_MIG_V}.tar.gz -> ${P}-${MY_FS_MIG}.tar.gz"
+SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${MY_FS_MIG}-vendor.tar.xz -> ${P}-${MY_FS_MIG}-vendor.tar.xz"
+
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	acct-group/ipfs
+	acct-user/ipfs
+	sys-fs/fuse:0
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md docs/ )
+
+src_prepare() {
+	default
+
+	sed -i '/fs-repo-1[0-9]-to-*/d' "${FS_MIG_DIR}/ignored-migrations" || die
+}
+
+src_compile() {
+	local mygoargs
+	mygoargs=(
+		-tags release
+	)
+
+	ego build "${mygoargs[@]}" -o ipfs ./cmd/ipfs
+	ego build "${mygoargs[@]}" -o ipfswatch ./cmd/ipfswatch
+
+	IPFS_PATH="" ./ipfs commands completion bash > ipfs-completion.bash || die
+	IPFS_PATH="" ./ipfs commands completion fish > ipfs-completion.fish || die
+	IPFS_PATH="" ./ipfs commands completion zsh > ipfs-completion.zsh || die
+
+	cd "${FS_MIG_DIR}" || die
+	emake
+}
+
+src_test() {
+	ego test ./cmd/ipfs/... ./cmd/ipfswatch/...
+}
+
+src_install() {
+	dobin ipfs
+	dobin ipfswatch
+	newbashcomp ipfs-completion.bash ipfs
+	newfishcomp ipfs-completion.fish ipfs
+	newzshcomp ipfs-completion.zsh _ipfs
+	einstalldocs
+
+	systemd_dounit "${FILESDIR}/ipfs.service"
+	systemd_newunit "${FILESDIR}/ipfs-at.service" "ipfs@.service"
+
+	newinitd "${FILESDIR}/ipfs.init" ipfs
+	newconfd "${FILESDIR}/ipfs.confd" ipfs
+
+	keepdir /var/log/ipfs
+	fowners -R ipfs:ipfs /var/log/ipfs
+
+	find "${FS_MIG_DIR}" -executable -type f -name "fs-repo-*" -exec dobin {} \; || die
+}
+
+pkg_postinst() {
+	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
+	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
+	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
+
+	# See https://bugs.gentoo.org/838238
+	ewarn 'In case kubo CPU usage is too high run the next workaround'
+	ewarn 'su -s /bin/sh -c "ipfs config profile apply lowpower" ipfs'
+	ewarn 'Be aware that this will make your node less visible to other peers'
+}