app-containers/netavark: add 1.9.0 and update live

1. split LICENSE
2. QoL improvements

Signed-off-by: Rahil Bhimjiani <me@rahil.website>
Signed-off-by: Zac Medico <zmedico@gentoo.org>

3 files changed, 71 insertions, 4 deletions

diff --git a/app-containers/netavark/Manifest b/app-containers/netavark/Manifest
index 191810c9141b..53418e0d949f 100644
--- a/app-containers/netavark/Manifest
+++ b/app-containers/netavark/Manifest
@@ -119,7 +119,9 @@ DIST mptcp-pm-0.1.2.crate 14732 BLAKE2B 6cce10cbe3ae86490bfa6f90f9a256062de24619
 DIST multimap-0.8.3.crate 13518 BLAKE2B 7e00324be2944f3ca38bf02bfe37f47313aa501fc166ec417cd05f11059b14aa761b58f7a737792e2f9488ef5e7825fbb13cbb6ba2ce4935f4c39414fe069730 SHA512 8580982dde6624a0d181cfdf6cc2293c368762b548f32d196fb7a29fb698d1cb743bc2572ca284c6ecd107a632ea2a428fc998c05df164437f2cb470d24d23cd
 DIST netavark-1.6.0.crate 124778 BLAKE2B faa702392cf6952ed410a67f0a2e4a92cf2da002c53ddd3d7533e5236940a5c35a72e6bcb167c5e3c8ab2eb823bdd8971da131cb41cf3e704d909a0ec5f405c9 SHA512 c2764b9bdd71e6eba864b52044ddce3b5f67a945ee58e237d9c951189ace14200885a8f8678377b416b9254fa8f5b74b67f80e338646918cf9b0aeeebe9c95da
 DIST netavark-1.8.0.crate 132651 BLAKE2B 3659cc97d784c7575d9ce4602461d151ba53ebf998ee9f819a05ab796d24d582f20700fd4f1810219245af118cc885c74c176777b147b1d175b68e1465063f48 SHA512 0094e2831ec3a0d92d18e7efb0ba6972ab4b5ddafaf0465f990e9ac07e8e8952233d8ddd2cad6c1fd450144714fc5e92c6aa079d415764ab1d1e3a6db5b789b9
+DIST netavark-1.9.0.crate 139321 BLAKE2B c0c40c5b109544c094bf83ba9c73f829472c7703a72e25ec3dcb9b62b926f404618b2cb143fcc944f2240db074de14e711115d6f51d722125e152eea0ac0a631 SHA512 7a5fb4a856b5815c141ad63abbe0f122d762a411b86189add76cfff99adfdb066e24a7b577683950efdc39f2b7955bbdfb31f2c1c41037702fb732916e8aeebe
 DIST netavark-v1.8.0-vendor.tar.gz 44454969 BLAKE2B ad13f7b80d9f1d7ae82cbf39e45244e7609f7881474637eb64ad765e00c01566b72cb4e88d0c58c60e638ce7a400b59bdbb1aba5ff68e1ebf53103a1945e203b SHA512 2d35baceda02c44a2d5393caab5391f4dbf27c92c18ca464fe06922656ed9ceefe32475b49948e76a20a77463ae7bd441a3962f062dc91aedd67ef1334fc8551
+DIST netavark-v1.9.0-vendor.tar.gz 16032862 BLAKE2B 313bcde75f2355dab3fa4fdc82881109924c07408aa352e92b590356cf292cd60ad39d8ef31687935e3fed6f22ec8c3b8f26e6eae21fdf211c29c83b745c8a84 SHA512 a5c11dd47122490579a260b6ac3b1c8f01d1c2881e58dbcc5bece398c7d6ef01f376f8c342df4ef619b135cc92a95c48741c8098413c33ede696c87a9cdcc96c
 DIST netlink-packet-core-0.5.0.crate 14989 BLAKE2B 3a432de3545ad7f203d6e27e4587171bfec781dd86695acf124b0672e29bd1f6966e3ab66fad2e56a507d8377db6df2b8de8f3a13612dab39a73d8ad9459690e SHA512 e4ccc75964be99251d1bce7267711f57167b39219ee6b9bbd4c184def0a323c136b82ca93bce5a0cdcc7e842d23435a042e23556e69e91452d74d3292f65deda
 DIST netlink-packet-generic-0.3.2.crate 13590 BLAKE2B 9c7971c5711e390533933b08022c4253e98851097d7c702a486f96b58b55de1dedff17e12bac1d2cd4b8bce9d0bb41b7dd812482ba064f057bde212d57b7c142 SHA512 648ade4cf4423b76fd849fff9f9cacb8b87c4930e0963b516f03622f830b55a8e9bfe3e9d656f63432a22ddaf6f3a5d884820d16f9b0e4c654e52cfd81ac0d59
 DIST netlink-packet-route-0.15.0.crate 107447 BLAKE2B 06823227a6eb76c578874c4c75bdc0d395df77fede7b888f724f84f0aa9d4ffdfb19872c3a265c179b7a31f8f43436b5f1541534a785fb1b7069e748c2375d7b SHA512 3af2f0cda2111987e708fe4684ecf0dedca5c189005d205fe51904ab98690425bac7dc88aaa7399a69cf05918e6f1174d055530bdb0e77649efb631a59e9463a
diff --git a/app-containers/netavark/netavark-1.9.0.ebuild b/app-containers/netavark/netavark-1.9.0.ebuild
new file mode 100644
index 000000000000..31531a21ec6e
--- /dev/null
+++ b/app-containers/netavark/netavark-1.9.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
+
+inherit cargo systemd
+
+DESCRIPTION="A container network stack"
+HOMEPAGE="https://github.com/containers/netavark"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/netavark.git"
+else
+	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+fi
+
+# main
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+BDEPEND="dev-go/go-md2man
+	dev-libs/protobuf"
+
+QA_FLAGS_IGNORED="
+	usr/libexec/podman/${PN}"
+QA_PRESTRIPPED="
+	usr/libexec/podman/${PN}"
+
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die
+}
+
+src_compile() {
+	cargo_src_compile
+	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
+	emake docs
+}
+
+# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
+src_install() {
+	default
+}
diff --git a/app-containers/netavark/netavark-9999.ebuild b/app-containers/netavark/netavark-9999.ebuild
index 7cb769c2a876..31531a21ec6e 100644
--- a/app-containers/netavark/netavark-9999.ebuild
+++ b/app-containers/netavark/netavark-9999.ebuild
@@ -3,20 +3,25 @@
 
 EAPI=8
 
-[[ ${PV} == *9999* ]] || CRATES="${PN}@${PV}"
+[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
 
 inherit cargo systemd
 
 DESCRIPTION="A container network stack"
 HOMEPAGE="https://github.com/containers/netavark"
-if [[ ${PV} == *9999* ]]; then
+
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/netavark.git"
 else
 	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 fi
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
+
+# main
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 BDEPEND="dev-go/go-md2man
 	dev-libs/protobuf"
@@ -29,7 +34,7 @@ QA_PRESTRIPPED="
 ECARGO_VENDOR="${WORKDIR}/vendor"
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
+	if [[ ${PV} == 9999* ]]; then
 		git-r3_src_unpack
 		cargo_live_src_unpack
 	else
@@ -48,6 +53,7 @@ src_compile() {
 	emake docs
 }
 
+# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
 src_install() {
 	default
 }