[gentoo-commits] repo/proj/guru:dev commit in: net-misc/ooni-probe-cli/

["Eli Burch" <redawl@burchbytes.com>]

commit:     605c6ba461880583ea00519fe0dceb22ebee23f0
Author:     Eli Burch <eli.burch <AT> burchbytes <DOT> com>
AuthorDate: Wed Jun 26 18:32:07 2024 +0000
Commit:     Eli Burch <redawl <AT> burchbytes <DOT> com>
CommitDate: Wed Jun 26 18:33:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=605c6ba4

net-misc/ooni-probe-cli: Bump version to 3.22.0, add myself as maintainer

Closes: https://bugs.gentoo.org/show_bug.cgi?id=922030
Signed-off-by: Eli Burch <eli.burch <AT> burchbytes.com>

 net-misc/ooni-probe-cli/Manifest                   |  3 +-
 net-misc/ooni-probe-cli/metadata.xml               |  5 +-
 .../ooni-probe-cli/ooni-probe-cli-3.18.1.ebuild    | 53 ----------------------
 ...-3.18.0.ebuild => ooni-probe-cli-3.22.0.ebuild} |  8 +---
 4 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/net-misc/ooni-probe-cli/Manifest b/net-misc/ooni-probe-cli/Manifest
index 78dd71199..5f7e46a6d 100644
--- a/net-misc/ooni-probe-cli/Manifest
+++ b/net-misc/ooni-probe-cli/Manifest
@@ -1,2 +1 @@
-DIST ooni-probe-cli-3.18.0.tar.gz 25969796 BLAKE2B e618d0441dcdb5f8df856127b6c4c2d65064dfe92e2e7c8a56d8fbb530e7a9470d4311e252b50fea0617c9a9650ca12cad52f6fc6d85b71a071809b67aa21452 SHA512 adbadb552309f09a79797d78cb91480a953d9f50af1a8200666b6c6644f32cc4e7569bf281ea6ee47e8c3b94ddf90a473770c40927fb39c122908a1b88f8d6bb
-DIST ooni-probe-cli-3.18.1.tar.gz 26317728 BLAKE2B 854c011d706a79f65e0fd32918bc7069e6e2e2800dd25e846b035c53ef14fe65787920f33eda9e48626c63a93793b5e63c8819cd0d525d2250cce05750245044 SHA512 d26cebdbf8634d1b65fe32a187a8445c713c66b6d01251d32e88d45e58b0019b0e45407185eb23db2fd65ca65d251b879fb4a95e06cf3d86486b3aff6b949b98
+DIST ooni-probe-cli-3.22.0.tar.gz 26961384 BLAKE2B 31792ad2bf792d19edc61b12894c91b85c33445808b70880d2f32f3b83665e80577d830ce255ae114c4de163e2f93bb8a73eea3b6d2a4143c6623c9a15fe5c8d SHA512 28f845a3e50eb50a9d7d9411ad0d5cbb6ae08b3238bb4cd7f85dd4fbdaa833203bcf8387287b5b45ccc51196caab4981ec85d7bb9cd199ba04f7b0d2568e20a4

diff --git a/net-misc/ooni-probe-cli/metadata.xml b/net-misc/ooni-probe-cli/metadata.xml
index 00f3af1e0..12b55589f 100644
--- a/net-misc/ooni-probe-cli/metadata.xml
+++ b/net-misc/ooni-probe-cli/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>eli.burch@burchbytes.com</email>
+		<name>Eli Burch</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ooni/probe-cli</remote-id>
 		<bugs-to>https://github.com/ooni/probe/issues/new?labels=ooni/probe-cli&amp;assignee=bassosimone</bugs-to>

diff --git a/net-misc/ooni-probe-cli/ooni-probe-cli-3.18.1.ebuild b/net-misc/ooni-probe-cli/ooni-probe-cli-3.18.1.ebuild
deleted file mode 100644
index 038127af8..000000000
--- a/net-misc/ooni-probe-cli/ooni-probe-cli-3.18.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-MY_PN=${PN#ooni-}
-DESCRIPTION="OONI Probe network measurement tool for detecting internet censorship"
-HOMEPAGE="https://ooni.org https://github.com/ooni/probe-cli"
-SRC_URI="https://github.com/ooni/${MY_PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="0BSD Apache-2.0 BSD BSD-2 CC0-1.0 GPL-3 GPL-3+ ISC LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-DEPEND="dev-db/sqlite:3[icu]"
-RDEPEND="${DEPEND}"
-
-DOCS=( docs CODEOWNERS {CODE_OF_CONDUCT,CONTRIBUTING,DESIGN,Readme}.md )
-
-src_prepare() {
-	default
-
-	# remove ooni's build tool
-	rm -r internal/cmd/buildtool || die
-}
-
-src_configure() {
-	GOFLAGS+=" -tags=shaping"
-}
-
-src_compile() {
-	ego build ./cmd/ooniprobe
-	ego build ./internal/cmd/miniooni
-	ego build ./internal/cmd/oohelperd
-}
-
-src_test() {
-	local -x GOFLAGS
-	GOFLAGS="${GOFLAGS//-v/}"
-	GOFLAGS="${GOFLAGS//-x/}"
-
-	ego test -short -race ./...
-}
-
-src_install() {
-	dobin ooniprobe miniooni oohelperd
-	einstalldocs
-}

diff --git a/net-misc/ooni-probe-cli/ooni-probe-cli-3.18.0.ebuild b/net-misc/ooni-probe-cli/ooni-probe-cli-3.22.0.ebuild
similarity index 83%
rename from net-misc/ooni-probe-cli/ooni-probe-cli-3.18.0.ebuild
rename to net-misc/ooni-probe-cli/ooni-probe-cli-3.22.0.ebuild
index 038127af8..718501272 100644
--- a/net-misc/ooni-probe-cli/ooni-probe-cli-3.18.0.ebuild
+++ b/net-misc/ooni-probe-cli/ooni-probe-cli-3.22.0.ebuild
@@ -1,22 +1,18 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit go-module
 
-MY_PN=${PN#ooni-}
 DESCRIPTION="OONI Probe network measurement tool for detecting internet censorship"
 HOMEPAGE="https://ooni.org https://github.com/ooni/probe-cli"
-SRC_URI="https://github.com/ooni/${MY_PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/ooni/probe-cli/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="0BSD Apache-2.0 BSD BSD-2 CC0-1.0 GPL-3 GPL-3+ ISC LGPL-3 MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-PROPERTIES="test_network"
-RESTRICT="test"
-
 DEPEND="dev-db/sqlite:3[icu]"
 RDEPEND="${DEPEND}"