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

[Anna Vyalkova]

commit:     8fa48c4629a5367e9dcaf3f2f586cfa5768cd129
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Mar 19 18:41:13 2023 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun Mar 19 18:41:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8fa48c46

net-misc/ooni-probe-cli: add 3.17.1, drop 3.16.7

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-misc/ooni-probe-cli/Manifest                   |  2 +-
 .../ooni-probe-cli/ooni-probe-cli-3.16.7.ebuild    | 32 -------------
 .../ooni-probe-cli/ooni-probe-cli-3.17.1.ebuild    | 54 ++++++++++++++++++++++
 3 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/net-misc/ooni-probe-cli/Manifest b/net-misc/ooni-probe-cli/Manifest
index 02badc88d..a4b8f1e4e 100644
--- a/net-misc/ooni-probe-cli/Manifest
+++ b/net-misc/ooni-probe-cli/Manifest
@@ -1,2 +1,2 @@
-DIST ooni-probe-cli-3.16.7.tar.gz 21896439 BLAKE2B db06a87d30b97691a4f897c97282772d41c6f5a83c28df64f8f6d7084ef1c52c38d384d7b437308560f0327559faab4c07f09b878fc681897e8537a83e972c65 SHA512 a00c9622389348f588202f0db5fbc861cf3f0a13f241bf99d385eb3925a8333071337ed0cb3875a65fba50fe5478886bd40d97fec51b4b054ec440d2c9746d16
 DIST ooni-probe-cli-3.17.0.tar.gz 22660357 BLAKE2B 688b4e2ebf1b6064753180ee5d77a34e9e685955cc99a6a0ad8c05e6f9f3ae89c92e092f6c19de346aa85ffebfe8b26c70903f455489980773dd84e37c427116 SHA512 1619674382dd0ef20228f7bcecaec2a7ac3fa71ac56fdf733b307b6fe2f30d73c6ab5be99a1c18e79656f16f65790299afddbc7e6acbdaec15979cb0269995ce
+DIST ooni-probe-cli-3.17.1.tar.gz 22683293 BLAKE2B 76e6c7637ae344b83c87fc8c1c7e14adb460a94c745acda564c6fda285303051c36811935e91377507c50de2440ef15b2b43e710b87a6188842883e441db5ee0 SHA512 9952a1508227fca816a5d28bd943b99166543b1695adb7986243139d1375920132e43fd045f4e7c3813c01b3f3dd267fd6d8a79a095d8cc7b2d7f49970e8632c

diff --git a/net-misc/ooni-probe-cli/ooni-probe-cli-3.16.7.ebuild b/net-misc/ooni-probe-cli/ooni-probe-cli-3.16.7.ebuild
deleted file mode 100644
index 8717557a0..000000000
--- a/net-misc/ooni-probe-cli/ooni-probe-cli-3.16.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022 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"
-
-DOCS=( docs CODEOWNERS {CONTRIBUTING,Readme}.md )
-
-src_compile() {
-	ego build -v -ldflags="-s -w" ./cmd/ooniprobe
-}
-
-src_test() {
-	ego test -short -race -tags shaping ./...
-}
-
-src_install() {
-	dobin ooniprobe
-	einstalldocs
-}

diff --git a/net-misc/ooni-probe-cli/ooni-probe-cli-3.17.1.ebuild b/net-misc/ooni-probe-cli/ooni-probe-cli-3.17.1.ebuild
new file mode 100644
index 000000000..4611051e2
--- /dev/null
+++ b/net-misc/ooni-probe-cli/ooni-probe-cli-3.17.1.ebuild
@@ -0,0 +1,54 @@
+# 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}"
+BDEPEND="<dev-lang/go-1.20"
+
+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
+}