gentoo auto-resync : 04:08:2022 - 02:04:17

11 files changed, 13 insertions, 124 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index fd81cae686f4..2af52fd9ac78 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/go-ipfs/Manifest b/net-p2p/go-ipfs/Manifest
deleted file mode 100644
index 95b4544bd157..000000000000
--- a/net-p2p/go-ipfs/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX go-ipfs-0.12.2-upgrade-quic-go.patch 2970 BLAKE2B 0277b0502011a29ca9c244e63b16450bccfa9a8c129afc174ca031369eee9603f80086bf2312057ac3412e4a096737e75fd494f481eaad21389b704657972eb1 SHA512 426728d6e440b0dcd82d46d71cba813cef03985d9eef2e601c85857e4412aa9b1b09095ab1fdae5bb5b7358d8c4ca62411e63659703216c7d6f56074cf68c3b0
-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.service 372 BLAKE2B 8989cc474ab46309dda6d167fb89476b01d10e07374d53c480a7ee345f13827e25ca19d84b0a3974e45c5d9a0c78abdfd7be262bff48f427aedaac2a9c4094a8 SHA512 35d5edda83bd296f92ffe3ee61f2608eb9ec464225e32ca52582d8e8fe699466c9b412ed224ff44e36e34d3d41a618d50082dd677feeaba53429d3a6913a869a
-DIST go-ipfs-0.12.2-deps.tar.xz 368885112 BLAKE2B a77bd1518f1c80369a2d7f4ed3c3a19e0294f662910b588c203bcfa630709ef82e42a622a9a6a8b4e218b1566a446eb80ae0fdbd98232bd2aba6c76ed8a828ec SHA512 1268e9727af7a7c856547bd8cce9a9fe5b58db1a6966c2aeb0923632dc96fee16c354261922d7132f791bcc3c2601728831e2e2ec29d9b7d2d8ea60903eafe50
-DIST go-ipfs-0.12.2.tar.gz 2112884 BLAKE2B fe6883443eaa55764beffb5b8726678615f1246d41924ca6eddaae0e67d241f85f24d9b9264eaae9a211d8f74009bc30dda2a35734ea38645736e4fe21212bc9 SHA512 a268618d66e5e82c89362e0273c0741a56d13ee95e1f545a0b55fa5a7bd719b0e678c7c6cb7dc268892f992156a1fff2f537688de589d7c05b8b48e9c90b94f1
-DIST go-ipfs-0.13.0.tar.gz 13474994 BLAKE2B 068484941ae831f9484e5c8a95614be611dfc6e3e0cd6b3f55e17b3339cbe0f4d76d4eaef2b95a7973028e1910abc92fe54acecd72d949f9a3e4a7be66a6f89c SHA512 2513076c193ec0e2a8ecaef8b6d2de5152ef9f5d1e7140735eb405f325d8b31968d2166dbbea28660b03e3458e44d25fc9f970c753ad9d0f56a3970bca7d9365
-EBUILD go-ipfs-0.12.2.ebuild 1802 BLAKE2B e5de2f9e21364c3110c7491e04acb77ce1b3943ccb385b2efaf1369ae3a762d575bb68595f19862ef648017e78e5680ccb5c52f8601bf70f940279dda8f81cf6 SHA512 0485ca99686707e69ea3b746dda0a2dd3e25ce1f23b06b9dcd4b4aacefbff42db23ff612a1cf23f7741682d57253d75ffdc02902b19f17d53f446c7d933970c0
-EBUILD go-ipfs-0.13.0.ebuild 1727 BLAKE2B 0b61cb12d8cf1861dbf445354dffe901cd78c95fdc23e41ddc22d3283dd1438e8be0ccec144df16a256330e2ebf8dcb090f716ddf397ebf800fad61c21667a73 SHA512 b039e2d78b4ae3bf4dc798da4d9d283fa9e19dda9cb02d59cafaffa14d5b43d89d2bb6bbcffa4abaeafad3ec8cedb8f20123e66762d6eb0b3c80591b7b8234bd
-MISC metadata.xml 522 BLAKE2B ac5e77995f9ba40ebd7fc6a23d7785ebb6abba433b84ea2ed99662fe8b63e197c58ff419345dcf9c2c9e466db0a2d0e92feb6d81dfffc4773efa322f2f5a957c SHA512 b1902465fb0f8c15f4d65fa8d4fd5b8deba2dba6cf9ca632e729a18921931259e135055d313468a04bb5ddc648616aa776c398df0b01431111ef46be9dbe3837
diff --git a/net-p2p/go-ipfs/files/go-ipfs-0.12.2-upgrade-quic-go.patch b/net-p2p/go-ipfs/files/go-ipfs-0.12.2-upgrade-quic-go.patch
deleted file mode 100644
index 44fea86bf31e..000000000000
--- a/net-p2p/go-ipfs/files/go-ipfs-0.12.2-upgrade-quic-go.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/ipfs/go-ipfs/issues/8819#issuecomment-1077564642
-https://bugs.gentoo.org/835491
---- a/go.mod
-+++ b/go.mod
-@@ -89,6 +89,7 @@ require (
- 	github.com/libp2p/go-socket-activation v0.1.0
- 	github.com/libp2p/go-tcp-transport v0.4.0
- 	github.com/libp2p/go-ws-transport v0.5.0
-+	github.com/lucas-clemente/quic-go v0.26.0 // indirect
- 	github.com/miekg/dns v1.1.43
- 	github.com/mitchellh/go-homedir v1.1.0
- 	github.com/multiformats/go-multiaddr v0.4.1
---- a/go.sum
-+++ b/go.sum
-@@ -1005,6 +1005,8 @@ github.com/lucas-clemente/quic-go v0.21.2/go.mod h1:vF5M1XqhBAHgbjKcJOXY3JZz3GP0
- github.com/lucas-clemente/quic-go v0.23.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
- github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g=
- github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
-+github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
-+github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
- github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
- github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
- github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-@@ -1017,9 +1019,15 @@ github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1j
- github.com/marten-seemann/qtls-go1-15 v0.1.5/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
- github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
- github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
-+github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ=
-+github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
- github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
- github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
- github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
-+github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc=
-+github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
-+github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y=
-+github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
- github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk=
- github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU=
- github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
diff --git a/net-p2p/go-ipfs/go-ipfs-0.12.2.ebuild b/net-p2p/go-ipfs/go-ipfs-0.12.2.ebuild
deleted file mode 100644
index 2c9295fc8135..000000000000
--- a/net-p2p/go-ipfs/go-ipfs-0.12.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Main implementation of IPFS"
-HOMEPAGE="https://ipfs.io/"
-SRC_URI="https://github.com/ipfs/go-ipfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# After dropped Go patch, might be able to use upstream vendor tarball
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!net-p2p/go-ipfs-bin
-	acct-group/ipfs
-	acct-user/ipfs
-	sys-fs/fuse:0
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md docs/ )
-
-PATCHES=(
-	# Should be able to drop once https://github.com/ipfs/go-ipfs/issues/8819 is fixed
-	# Needed for Go 1.18 compatibility
-	"${FILESDIR}"/${PN}-0.12.2-upgrade-quic-go.patch
-)
-
-src_compile() {
-	default
-
-	local mygoargs
-	mygoargs=(
-		-tags release
-	)
-
-	go build "${mygoargs[@]}" -o ipfs ./cmd/ipfs || die
-	go build "${mygoargs[@]}" -o ipfswatch ./cmd/ipfswatch || die
-
-	IPFS_PATH="" ./ipfs commands completion bash > ipfs-completion.bash || die
-}
-
-src_test() {
-	go test ./cmd/ipfs/... ./cmd/ipfswatch/... || die
-}
-
-src_install() {
-	dobin ipfs
-	dobin ipfswatch
-	newbashcomp ipfs-completion.bash 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
-}
-
-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.'
-}
diff --git a/net-p2p/kubo/Manifest b/net-p2p/kubo/Manifest
new file mode 100644
index 000000000000..043b813da032
--- /dev/null
+++ b/net-p2p/kubo/Manifest
@@ -0,0 +1,7 @@
+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.service 372 BLAKE2B 8989cc474ab46309dda6d167fb89476b01d10e07374d53c480a7ee345f13827e25ca19d84b0a3974e45c5d9a0c78abdfd7be262bff48f427aedaac2a9c4094a8 SHA512 35d5edda83bd296f92ffe3ee61f2608eb9ec464225e32ca52582d8e8fe699466c9b412ed224ff44e36e34d3d41a618d50082dd677feeaba53429d3a6913a869a
+DIST kubo-0.13.1.tar.gz 13474891 BLAKE2B 2e6e056e27a8783c9d04ea5d8c41d86e45250f5ba95c57737aaf52d36d453be31baab21767008596710d7eb84f471460c32de70faf1764740ea551a5aa4bd38e SHA512 3257d49df61bb31d4054934506ea543df2d9ed1f57b9b6aeef001bb77fe9fdce646fec96ded72b7f9f99e3bc687da77997b1295ebb5a40e20e4df0413e15bfd7
+EBUILD kubo-0.13.1.ebuild 1731 BLAKE2B 050bbb1bd4dbc78b85b2fbd5b1fcf6d8d195aa28993d10f0cc923a33a77e232aa6c3ba16e2a1e3367e7d08300e36f7b7ceb93234e6d894f9357069a4b5dc0b71 SHA512 954dc87554ab7dd1221840cc36caf41497fafb9b2c3066eb1ce6b8f358c4d8c69c29e4c28ed6f44ccc9bde2cfed036d665df767226c166a0da12e38d6bba2b76
+MISC metadata.xml 596 BLAKE2B 68c5576e325ef2e0a6954047b8784427ca8b1d038c4b7fc7a7f2082e2682dbb8b807083251c9e5eca927d070d21b1f5ee9f96e2cb2437a9f5934bdc46f139fb6 SHA512 2d41af83abc0527e9031f8bec8d471dc7d163714bb42b9d7f65c943993e7d554207a5fb85ad96ae94c7876a74e2b3c8dba6a8f70e4f1bbb5a785bb98624233a9
diff --git a/net-p2p/go-ipfs/files/ipfs-at.service b/net-p2p/kubo/files/ipfs-at.service
index c9ce91294177..c9ce91294177 100644
--- a/net-p2p/go-ipfs/files/ipfs-at.service
+++ b/net-p2p/kubo/files/ipfs-at.service
diff --git a/net-p2p/go-ipfs/files/ipfs.confd b/net-p2p/kubo/files/ipfs.confd
index f1e8eb77adf5..f1e8eb77adf5 100644
--- a/net-p2p/go-ipfs/files/ipfs.confd
+++ b/net-p2p/kubo/files/ipfs.confd
diff --git a/net-p2p/go-ipfs/files/ipfs.init b/net-p2p/kubo/files/ipfs.init
index b3798b2175a5..b3798b2175a5 100644
--- a/net-p2p/go-ipfs/files/ipfs.init
+++ b/net-p2p/kubo/files/ipfs.init
diff --git a/net-p2p/go-ipfs/files/ipfs.service b/net-p2p/kubo/files/ipfs.service
index 12e9d19fd965..12e9d19fd965 100644
--- a/net-p2p/go-ipfs/files/ipfs.service
+++ b/net-p2p/kubo/files/ipfs.service
diff --git a/net-p2p/go-ipfs/go-ipfs-0.13.0.ebuild b/net-p2p/kubo/kubo-0.13.1.ebuild
index 3418b0d7a9b5..82573032a2ae 100644
--- a/net-p2p/go-ipfs/go-ipfs-0.13.0.ebuild
+++ b/net-p2p/kubo/kubo-0.13.1.ebuild
@@ -7,7 +7,7 @@ inherit bash-completion-r1 go-module systemd
 
 DESCRIPTION="Main implementation of IPFS"
 HOMEPAGE="https://ipfs.io/"
-SRC_URI="https://github.com/ipfs/${PN}/releases/download/v${PV}/${PN}-source.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ipfs/${PN}/releases/download/v${PV}/go-ipfs-source.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0"
 SLOT="0"
@@ -63,7 +63,7 @@ pkg_postinst() {
 	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
 
 	# See https://bugs.gentoo.org/838238
-	ewarn 'In case go-ipfs CPU usage is too high run the next workaround'
-	ewarn 'su -s /bin/sh -c "ipfs config profile apply lowpower"'
+	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'
 }
diff --git a/net-p2p/go-ipfs/metadata.xml b/net-p2p/kubo/metadata.xml
index 9e33ed00d6e0..0b0389228dea 100644
--- a/net-p2p/go-ipfs/metadata.xml
+++ b/net-p2p/kubo/metadata.xml
@@ -13,4 +13,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ipfs/kubo</remote-id>
+	</upstream>
 </pkgmetadata>