gentoo auto-resync : 24:12:2022 - 14:02:21

3 files changed, 7 insertions, 42 deletions

diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest
index 7f02dfb5bbdc..f319465843dd 100644
--- a/dev-util/fq/Manifest
+++ b/dev-util/fq/Manifest
@@ -1,7 +1,4 @@
-DIST fq-0.1.0-deps.tar.xz 23497408 BLAKE2B 2ea9edad64f5d077026db99b6d981a443a7c5f5501b4525311512100fb68674bfd9f884908af845a007579d45b5e199bbaf8139a5ed0cee764167459bc62072f SHA512 0b028de7c909077253309d6f16d7bb036b67fb9db6716327d6fe403e7e491f1a56547f91159302e19a8bb578ffdcd74bcb1eab80f1ed65be9f11b4c35fbaf0d9
-DIST fq-0.1.0.tar.gz 8549022 BLAKE2B e4a7d8240f6f9adadab95d66b79747417290d24b53dc1b07c9f2cd526ef86f93f932ba15072cef050d9e3da2f1212ee76da5265345d665796c109bb4b104f0f7 SHA512 3cc81962c9a31343109743f9de7b73939df9165d4d5dd4beff3790e85e435c0344fa44f59a66153d9235ed156e9bee0f93e63b36c492d337547c6cf1712132ed
 DIST fq-0.2.0-deps.tar.xz 23494148 BLAKE2B 59400200a814d08fac88d9bcedc5db0ea2ae5192a5a67b389fa62cbb6e82d8f4210e9153a14aa2e259143c68f67863865359e7636966419f47b00f9fb44394ca SHA512 fa8d3464976569c5bca810dcbce6492bce85173907366aeda3a290a467d027891a8edc889283a9185c5d7139d51f77a2fb9f08b5a452ebc9cd96994f7db8127e
 DIST fq-0.2.0.tar.gz 12762736 BLAKE2B 7f1496b1da231b804b7e3af40f252381e83c62ca5e4779af65a502e9dc6a15a0a5267af68b83569c996f726870234c03952711e8262f360b2061bf34df5b2e4e SHA512 faf88faf0121a837c32dfbfe4c9e05261f28c2eec50d981f7840937ad121e45b0fa6809f428c45c0b41c99d1ae12a667a81911943e0601f2d81922ac670e03fe
-EBUILD fq-0.1.0.ebuild 777 BLAKE2B 3e3550bd3c7dff2c99d7de5648679ca4b670eeee7cdbbfcbcd1ffb9ac4f023e13f4ab3c889901379ce971674210be8d72fde6461c7e2ce42c43524c3e5e407c6 SHA512 37362498b2b39e3193ce71773d899a79caa7002fdfa4391c266428f358a0825048b40853ac94ba6e59d212e63bf14e14abee9eccec7a0f02a16bd9ee7568d496
-EBUILD fq-0.2.0.ebuild 777 BLAKE2B 3e3550bd3c7dff2c99d7de5648679ca4b670eeee7cdbbfcbcd1ffb9ac4f023e13f4ab3c889901379ce971674210be8d72fde6461c7e2ce42c43524c3e5e407c6 SHA512 37362498b2b39e3193ce71773d899a79caa7002fdfa4391c266428f358a0825048b40853ac94ba6e59d212e63bf14e14abee9eccec7a0f02a16bd9ee7568d496
+EBUILD fq-0.2.0-r1.ebuild 931 BLAKE2B 98fe6d7652ffd4fb0be5ecebbc06d0e662fec9122025df3c81afa4b82e5f41d8847c0640284dadac6235cce49e85997e8dc323216eae9b8711c082f32897a1c3 SHA512 838cb2a918f28c7ec129771cfa1fb6f3d3dbd3ac950d881a5cbfc366d05c5081e422af3882a7028f51a37b8a26182d228d77bc15cc485fad7210839ed8f7c92c
 MISC metadata.xml 313 BLAKE2B 49888cd21e49fca7d7913fbd265cbffd73dcfaa5080e09ccd1f5b9c62804e5b9fb1de1e21df96609079c18c481b2847897b4fe1a9fc499d0e6dc2559e677a27f SHA512 1d125e77b24aeffe27b0d54b8b9f247e1e2b62037bdb127f232d3089d63e1b92c2062e37446067850defc382d7e49785152e9af86cd46f44827e2e037dd291a7
diff --git a/dev-util/fq/fq-0.1.0.ebuild b/dev-util/fq/fq-0.2.0-r1.ebuild
index ae862b026637..c4bb233a488d 100644
--- a/dev-util/fq/fq-0.1.0.ebuild
+++ b/dev-util/fq/fq-0.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit go-module
 
-DESCRIPTION="Tool for working with binary data (jq for binary formats)"
+DESCRIPTION="Tool for working with binary data (app-misc/jq for binary formats)"
 HOMEPAGE="https://github.com/wader/fq"
 SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
@@ -23,6 +23,9 @@ src_prepare() {
 
 	# https://github.com/wader/fq/issues/494
 	sed -i -e '/test_repl.exp/d' Makefile || die
+	# Don't unconditionally (and therefore twice) build tests
+	# TODO: upstream
+	sed -i -e 's/all: test fq/all: fq/' Makefile || die
 }
 
 src_compile() {
@@ -33,5 +36,7 @@ src_compile() {
 }
 
 src_install() {
+	einstalldocs
+
 	dobin fq
 }
diff --git a/dev-util/fq/fq-0.2.0.ebuild b/dev-util/fq/fq-0.2.0.ebuild
deleted file mode 100644
index ae862b026637..000000000000
--- a/dev-util/fq/fq-0.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Tool for working with binary data (jq for binary formats)"
-HOMEPAGE="https://github.com/wader/fq"
-SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-tcltk/expect )"
-
-src_prepare() {
-	default
-
-	# https://github.com/wader/fq/issues/494
-	sed -i -e '/test_repl.exp/d' Makefile || die
-}
-
-src_compile() {
-	# Avoid -s being set in Makefile (stripping)
-	export GO_BUILD_LDFLAGS="-w"
-
-	default
-}
-
-src_install() {
-	dobin fq
-}