net-misc/dnsname-cni-plugin: move dnsname v1.3.0, v1.3.1, and v9999 to dnsname-cni-plugin v1.3.0, v1.3.1, and v9999

This commits renames the ebuilds for dnsname to dnsname-cni-plugin; and adds some tidy and a fix for v1.3.0 not compiling.

Signed-off-by: Randall T. Vasquez <ran.dall@icloud.com>

6 files changed, 21 insertions, 14 deletions

diff --git a/net-misc/dnsname-cni-plugin/Manifest b/net-misc/dnsname-cni-plugin/Manifest
new file mode 100644
index 000000000..b3ea30966
--- /dev/null
+++ b/net-misc/dnsname-cni-plugin/Manifest
@@ -0,0 +1,4 @@
+DIST dnsname-cni-plugin-1.3.0-deps.tar.xz 21020340 BLAKE2B 59f1bf713d464193dea3ff0e02cf6b82d1d9edf882186fbdf53959c3f70b2fb5a6a73bfbdf4c910613f6253c9f7f1c1c19e87f8586ee59a3e501c96931171936 SHA512 53322b89eccd639e1bde14496542f335ff10bbea711ea395ab36807d2d204f811cb051a07120f54679e3d61da2e3271983a36724fa91db5d5e52c7d3cc736b59
+DIST dnsname-cni-plugin-1.3.0.tar.gz 2526598 BLAKE2B 0a17998c61c72e858d8f7a13d31c54e2b6e3495c61a2cbaaeadbade863361a468aaaf1c291fd073e77df3ff83f231d168208551143009400ad60a25f921f9bf2 SHA512 df48c4715582f098c41d45533163632ac1953621ce91fc78e88cc84e61d8a0a537e6da5aabab2be18cbddccd8e4c867670ae1fbc5ff7b6473bf7f4b464cb6ee2
+DIST dnsname-cni-plugin-1.3.1-deps.tar.xz 21051388 BLAKE2B 39393408677061355f04995d12df11bb53260f5cee5309f44d99719fa61d1ab29032a7cee931e4277098b5bb98d051587ac585c69b4a19633a79085106744d25 SHA512 4ea0249b7ba747cbe10162725abc56282ee3453213d9f590a53d2d8475c071c0ffabfa50b919bb119fff37a85d3d40d544e94d008fe9969100cac9c3d60039fe
+DIST dnsname-cni-plugin-1.3.1.tar.gz 2526593 BLAKE2B 1fd7ced187ee25a6b31746ed7c73eba412f74c809adcf531aa9a03ed53e5c1b14f065dcc81eac28eff56d1c213583e931c861d31743abe164290867e84b1b95a SHA512 ebebbe62394b981e86cd21fa8b92639a6d67e007a18c576ffdbac8067084a4cffdc9d077213bf7c9ee1e2731c7d69e4d4c02465f2340556c8723b6e302238aad
diff --git a/net-misc/dnsname/dnsname-1.3.0.ebuild b/net-misc/dnsname-cni-plugin/dnsname-cni-plugin-1.3.0.ebuild
index 254705eda..d581038f1 100644
--- a/net-misc/dnsname/dnsname-1.3.0.ebuild
+++ b/net-misc/dnsname-cni-plugin/dnsname-cni-plugin-1.3.0.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=8
 EGIT_COMMIT="dc59f285546a0b0d8b8f20033e1637ea82587840"
+MY_PN=${PN//-cni-plugin}
+MY_P=${MY_PN}-${PV}
 
-inherit go-module unpacker
+inherit flag-o-matic go-module
 
 DESCRIPTION="name resolution for containers"
 HOMEPAGE="https://github.com/containers/dnsname"
@@ -15,10 +17,10 @@ if [[ ${PV} == *9999 ]]; then
 	RESTRICT="fetch mirror test"
 else
 	SRC_URI="https://github.com/containers/dnsname/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://github.com/ran-dall/portage-deps/blob/master/${P}-deps.tar.xz"
+	SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz"
 	KEYWORDS="~amd64 ~arm64"
 	RESTRICT="mirror test"
-	S="${WORKDIR}"/${P}
+	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="Apache-2.0"
@@ -44,6 +46,8 @@ src_unpack() {
 
 src_compile() {
 	local git_commit=${EGIT_COMMIT}
+	# Disable LDFLAGS to avoid complation error; fixed in v1.3.1.
+	filter-ldflags ${LDFLAGS}
 	export -n GOCACHE GOPATH XDG_CACHE_HOME
 	GOBIN="${S}/bin" \
 	emake all \
diff --git a/net-misc/dnsname/dnsname-1.3.1.ebuild b/net-misc/dnsname-cni-plugin/dnsname-cni-plugin-1.3.1.ebuild
index 20ca30116..bf527b3dd 100644
--- a/net-misc/dnsname/dnsname-1.3.1.ebuild
+++ b/net-misc/dnsname-cni-plugin/dnsname-cni-plugin-1.3.1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=8
 EGIT_COMMIT="18822f9a4fb35d1349eb256f4cd2bfd372474d84"
+MY_PN=${PN//-cni-plugin}
+MY_P=${MY_PN}-${PV}
 
-inherit go-module unpacker
+inherit go-module
 
 DESCRIPTION="name resolution for containers"
 HOMEPAGE="https://github.com/containers/dnsname"
@@ -15,10 +17,10 @@ if [[ ${PV} == *9999 ]]; then
 	RESTRICT="fetch mirror test"
 else
 	SRC_URI="https://github.com/containers/dnsname/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://github.com/ran-dall/portage-deps/blob/master/${P}-deps.tar.xz"
+	SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz"
 	KEYWORDS="~amd64 ~arm64"
 	RESTRICT="mirror test"
-	S="${WORKDIR}"/${P}
+	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="Apache-2.0"
@@ -36,7 +38,7 @@ src_unpack() {
 	if [[ ${PV} == *9999 ]]; then
 		git-r3_fetch
 		git-r3_checkout
-		pushd ${P}/plugins/meta/dnsname || die "location change for module building failed"
+		pushd ${MY_P}/plugins/meta/dnsname || die "location change for module building failed"
 		ego get
 		popd || die "location reset from module building failed"
 	fi
diff --git a/net-misc/dnsname/dnsname-9999.ebuild b/net-misc/dnsname-cni-plugin/dnsname-cni-plugin-9999.ebuild
index f92c2a67e..63588802f 100644
--- a/net-misc/dnsname/dnsname-9999.ebuild
+++ b/net-misc/dnsname-cni-plugin/dnsname-cni-plugin-9999.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-EGIT_COMMIT="18822f9a4fb35d1349eb256f4cd2bfd372474d84"
+MY_PN=${PN//-cni-plugin}
+MY_P=${MY_PN}-${PV}
 
-inherit go-module unpacker
+inherit go-module
 
 DESCRIPTION="name resolution for containers"
 HOMEPAGE="https://github.com/containers/dnsname"
@@ -18,7 +19,7 @@ else
 	SRC_URI+=" ${P}-deps.tar.xz"
 	KEYWORDS="~amd64 ~arm64"
 	RESTRICT="mirror test"
-	S="${WORKDIR}"/${P}
+	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="Apache-2.0"
diff --git a/net-misc/dnsname/metadata.xml b/net-misc/dnsname-cni-plugin/metadata.xml
index 5e4235484..5e4235484 100644
--- a/net-misc/dnsname/metadata.xml
+++ b/net-misc/dnsname-cni-plugin/metadata.xml
diff --git a/net-misc/dnsname/Manifest b/net-misc/dnsname/Manifest
deleted file mode 100644
index 9fa13a788..000000000
--- a/net-misc/dnsname/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST dnsname-1.3.0-deps.tar.xz 21020340 BLAKE2B 59f1bf713d464193dea3ff0e02cf6b82d1d9edf882186fbdf53959c3f70b2fb5a6a73bfbdf4c910613f6253c9f7f1c1c19e87f8586ee59a3e501c96931171936 SHA512 53322b89eccd639e1bde14496542f335ff10bbea711ea395ab36807d2d204f811cb051a07120f54679e3d61da2e3271983a36724fa91db5d5e52c7d3cc736b59
-DIST dnsname-1.3.0.tar.gz 2526598 BLAKE2B 0a17998c61c72e858d8f7a13d31c54e2b6e3495c61a2cbaaeadbade863361a468aaaf1c291fd073e77df3ff83f231d168208551143009400ad60a25f921f9bf2 SHA512 df48c4715582f098c41d45533163632ac1953621ce91fc78e88cc84e61d8a0a537e6da5aabab2be18cbddccd8e4c867670ae1fbc5ff7b6473bf7f4b464cb6ee2
-DIST dnsname-1.3.1-deps.tar.xz 21051388 BLAKE2B 39393408677061355f04995d12df11bb53260f5cee5309f44d99719fa61d1ab29032a7cee931e4277098b5bb98d051587ac585c69b4a19633a79085106744d25 SHA512 4ea0249b7ba747cbe10162725abc56282ee3453213d9f590a53d2d8475c071c0ffabfa50b919bb119fff37a85d3d40d544e94d008fe9969100cac9c3d60039fe
-DIST dnsname-1.3.1.tar.gz 2526593 BLAKE2B 1fd7ced187ee25a6b31746ed7c73eba412f74c809adcf531aa9a03ed53e5c1b14f065dcc81eac28eff56d1c213583e931c861d31743abe164290867e84b1b95a SHA512 ebebbe62394b981e86cd21fa8b92639a6d67e007a18c576ffdbac8067084a4cffdc9d077213bf7c9ee1e2731c7d69e4d4c02465f2340556c8723b6e302238aad