[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, net-proxy/lyrebird/, net-proxy/obfs4proxy/

[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, net-proxy/lyrebird/, net-proxy/obfs4proxy/

[Marek Szuba]

commit:     926cd480d5a3251a09c6cf21daa66a4538c7fed5
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 20:59:34 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 21:56:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=926cd480

net-proxy/lyrebird: rename from net-proxy/obfs4proxy

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-proxy/{obfs4proxy => lyrebird}/Manifest             |  0
 .../lyrebird-0.0.14.ebuild}                             | 17 ++++++++++-------
 net-proxy/{obfs4proxy => lyrebird}/metadata.xml         |  0
 profiles/updates/2Q-2023                                |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/lyrebird/Manifest
similarity index 100%
rename from net-proxy/obfs4proxy/Manifest
rename to net-proxy/lyrebird/Manifest

diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.14.ebuild b/net-proxy/lyrebird/lyrebird-0.0.14.ebuild
similarity index 57%
rename from net-proxy/obfs4proxy/obfs4proxy-0.0.14.ebuild
rename to net-proxy/lyrebird/lyrebird-0.0.14.ebuild
index f2282b63925d..44f0e12e63e3 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.14.ebuild
+++ b/net-proxy/lyrebird/lyrebird-0.0.14.ebuild
@@ -1,30 +1,33 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit go-module
 
+MY_PN="obfs4proxy"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
 HOMEPAGE="https://gitlab.com/yawning/obfs4"
-SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${MY_P}/obfs4-${MY_P}.tar.gz -> ${MY_P}.tar.gz
+	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${MY_P}-deps.tar.xz"
 
 # See https://gitlab.com/yawning/obfs4/-/issues/5#note_573104796 for licence clarification
 LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm ~riscv x86"
 
-S="${WORKDIR}/obfs4-${P}"
+S="${WORKDIR}/obfs4-${MY_P}"
 
 DOCS=( README.md ChangeLog LICENSE-GPL3.txt doc/obfs4-spec.txt )
 
 src_compile() {
-	go build -o ${PN}/${PN} ./${PN} || die
+	go build -o ${MY_PN}/${MY_PN} ./${MY_PN} || die
 }
 
 src_install() {
 	default
-	dobin ${PN}/${PN}
-	doman doc/${PN}.1
+	dobin ${MY_PN}/${MY_PN}
+	doman doc/${MY_PN}.1
 }

diff --git a/net-proxy/obfs4proxy/metadata.xml b/net-proxy/lyrebird/metadata.xml
similarity index 100%
rename from net-proxy/obfs4proxy/metadata.xml
rename to net-proxy/lyrebird/metadata.xml

diff --git a/profiles/updates/2Q-2023 b/profiles/updates/2Q-2023
index 9d985a954d62..ce332d5bfb43 100644
--- a/profiles/updates/2Q-2023
+++ b/profiles/updates/2Q-2023
@@ -29,3 +29,4 @@ move dev-python/python-miniupnpc dev-python/miniupnpc
 move dev-python/service_identity dev-python/service-identity
 move dev-python/readme_renderer dev-python/readme-renderer
 move dev-libs/sexp dev-libs/sexpp
+move net-proxy/obfs4proxy net-proxy/lyrebird