gentoo auto-resync : 29:09:2023 - 05:36:31

3 files changed, 57 insertions, 147 deletions

diff --git a/app-containers/aardvark-dns/Manifest b/app-containers/aardvark-dns/Manifest
index aa336a680678..4f267aac476a 100644
--- a/app-containers/aardvark-dns/Manifest
+++ b/app-containers/aardvark-dns/Manifest
@@ -1,5 +1,6 @@
 DIST aardvark-dns-1.6.0.crate 49504 BLAKE2B aecd930746027146603e069febcd7a65c239f36cc22f5eba1077485cf251a46949b14876b7d44ddeeb259e5f196464f1c0ac9e7004c3cdd9b33ef5df9c447811 SHA512 c81b8a33a0287fa42fbe8ee582957e9f3614432dc53af95f1b6da8c4f919be35ef3dd7c707a47d2b5fc138487897007c1a8b99d991168e9ff1a25559a88dbae9
 DIST aardvark-dns-1.8.0.crate 49928 BLAKE2B f27808d6bf0f38cde54c32e11f8a70d6d66f99e97ef43c89494e2a736997fc60a0774e000fcab9338d815efab81aeeda497ac1ec82ff47bf10ecf250169d6091 SHA512 f8c85815e6e0e8d26fc5c40cf5864b0bb584b0d33b0e6b6e3fc4cae5459c81568a50cebcfa2ccedb62d7fdb0a5a32b92433c735cb3226396fca75556756b4195
+DIST aardvark-dns-v1.8.0-vendor.tar.gz 8307543 BLAKE2B c60ceb4b3bf16e651ba5d490a9969a47ccdb76b85f1008d6c69da9e89fb8b106587341f06a05cc6c2e9866214ef7bc3b89f84523ea940f15ea36bc5b0f9b3b78 SHA512 da300932f27f3fcde2f3bc2b67f0e5eb2184c428274844363fdaccc29c845e7f2efc238019f4bf3ff10bcd3e867a1d9dc603a0fac37686e579f47a3ac9cb2e55
 DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
@@ -251,6 +252,7 @@ DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d65
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST winnow-0.5.15.crate 145621 BLAKE2B 039262561227641c2d8b996ebb59c79718de3f2b7dd8e369fc3e341f3458b1e0213f35c575d615e87d5f89aad639c7a258e4efb2c10f58c2cd6e120482702cc2 SHA512 42dce18906f41e45e6dd75ba01af6a94501317dee8b45f4c7340f7c9c94f8935afe2536cd9ad5a91eef6f3a6135cab0a451d67a35b5a0fd69130a90e6aa47603
 EBUILD aardvark-dns-1.6.0.ebuild 3349 BLAKE2B e59c87a10b7ed211fa85c50b7410abefd76051aa3b1cfcff4d7210062964e3a8cf366d442423e93dc1a16a0334fbb3aaf1ee0f86fd12f8538dbd4dc36880ef25 SHA512 c635d4ba79cc45d938c137935282413421e6488b6317454e059d36efca0d6712ec541d16db54cbb52dbb758d8356553d87ebd7d580d374ac7b96105008d2a20c
+EBUILD aardvark-dns-1.8.0-r1.ebuild 1084 BLAKE2B b96944761c759f5b6ca000fa8d39b013ded702c12b83737f8f6a8271beb1f58e81f3fac3d0249ab0402b15add9c508f1a13c5da8ad5ebad05c1ec0a2056ca045 SHA512 03731b32cfd81058cb61bd707bf4e957843e2d5d31c5eb242597d359d37281d8873baadb52e8b71a54186e591cdd24c34e83b111235a5dc54fb2eddfa267946a
 EBUILD aardvark-dns-1.8.0.ebuild 3541 BLAKE2B 75614368a3c8f6db8847ae0081612e7b7c88b9869e4c99f1f2667e234e48865087f909d2b888cbdd305ebbc0ccdf30e7bd8cdd5b3e889dbd5c487fbcb87c0cf4 SHA512 5974ad1f75492b2bddd88ef5d1ac11725686dfe35cf501857ea87609b16a46edd3f6b133d6758b6dd53325431bef858fbc0021fc53bd87b4e121fcc5f99e4a1d
-EBUILD aardvark-dns-9999.ebuild 3541 BLAKE2B 75614368a3c8f6db8847ae0081612e7b7c88b9869e4c99f1f2667e234e48865087f909d2b888cbdd305ebbc0ccdf30e7bd8cdd5b3e889dbd5c487fbcb87c0cf4 SHA512 5974ad1f75492b2bddd88ef5d1ac11725686dfe35cf501857ea87609b16a46edd3f6b133d6758b6dd53325431bef858fbc0021fc53bd87b4e121fcc5f99e4a1d
+EBUILD aardvark-dns-9999.ebuild 1084 BLAKE2B b96944761c759f5b6ca000fa8d39b013ded702c12b83737f8f6a8271beb1f58e81f3fac3d0249ab0402b15add9c508f1a13c5da8ad5ebad05c1ec0a2056ca045 SHA512 03731b32cfd81058cb61bd707bf4e957843e2d5d31c5eb242597d359d37281d8873baadb52e8b71a54186e591cdd24c34e83b111235a5dc54fb2eddfa267946a
 MISC metadata.xml 920 BLAKE2B d141b374533f40dbb6801fccf2bb46552ce0a092c7469575d625507c0fc9d1944e002f07d9f603ec369592a809aface288f0bb55d43a8361da14c0fd63c78fb7 SHA512 a4c50b755748a5f95916a5e01fffe3b9f94524a0cf50b90346c5c6763221739f621ccf3d6a897d229d7187a9288233e4507de4319ceecead54d4484d07554d55
diff --git a/app-containers/aardvark-dns/aardvark-dns-1.8.0-r1.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..32b5cc8f5e20
--- /dev/null
+++ b/app-containers/aardvark-dns/aardvark-dns-1.8.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == *9999* ]] || CRATES="${PN}@${PV}"
+inherit cargo
+
+DESCRIPTION="A container-focused DNS server"
+HOMEPAGE="https://github.com/containers/aardvark-dns"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git"
+else
+	SRC_URI="${CARGO_CRATE_URIS}"
+	SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+fi
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB"
+SLOT="0"
+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_install() {
+	export PREFIX="${EPREFIX}"/usr
+	default
+}
diff --git a/app-containers/aardvark-dns/aardvark-dns-9999.ebuild b/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
index 6470c7204b7f..32b5cc8f5e20 100644
--- a/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
+++ b/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
@@ -3,148 +3,7 @@
 
 EAPI=8
 
-CRATES="
-	addr2line@0.21.0
-	adler@1.0.2
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anstream@0.3.2
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@1.0.2
-	anstyle@1.0.2
-	anyhow@1.0.75
-	async-broadcast@0.5.1
-	async-trait@0.1.73
-	autocfg@1.1.0
-	backtrace@0.3.69
-	bitflags@2.4.0
-	bumpalo@3.14.0
-	bytes@1.5.0
-	cc@1.0.83
-	cfg-if@1.0.0
-	chrono@0.4.31
-	clap@4.3.24
-	clap_builder@4.3.24
-	clap_derive@4.3.12
-	clap_lex@0.5.0
-	colorchoice@1.0.0
-	core-foundation-sys@0.8.4
-	data-encoding@2.4.0
-	drain@0.1.1
-	endian-type@0.1.2
-	enum-as-inner@0.6.0
-	equivalent@1.0.1
-	errno-dragonfly@0.1.2
-	errno@0.3.3
-	error-chain@0.12.4
-	event-listener@2.5.3
-	form_urlencoded@1.2.0
-	futures-channel@0.3.28
-	futures-core@0.3.28
-	futures-executor@0.3.28
-	futures-io@0.3.28
-	futures-task@0.3.28
-	futures-util@0.3.28
-	getrandom@0.2.10
-	gimli@0.28.0
-	hashbrown@0.14.0
-	heck@0.4.1
-	hermit-abi@0.3.3
-	hostname@0.3.1
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.57
-	idna@0.4.0
-	indexmap@2.0.0
-	ipnet@2.8.0
-	is-terminal@0.4.9
-	itoa@1.0.9
-	js-sys@0.3.64
-	libc@0.2.148
-	linux-raw-sys@0.4.7
-	log@0.4.20
-	match_cfg@0.1.0
-	memchr@2.6.3
-	miniz_oxide@0.7.1
-	mio@0.8.8
-	nibble_vec@0.1.0
-	nix@0.27.1
-	num-traits@0.2.16
-	num_cpus@1.16.0
-	num_threads@0.1.6
-	object@0.32.1
-	once_cell@1.18.0
-	percent-encoding@2.3.0
-	pin-project-lite@0.2.13
-	pin-utils@0.1.0
-	ppv-lite86@0.2.17
-	proc-macro2@1.0.67
-	quick-error@1.2.3
-	quote@1.0.33
-	radix_trie@0.2.1
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	resolv-conf@0.7.0
-	rustc-demangle@0.1.23
-	rustix@0.38.14
-	serde@1.0.188
-	serde_derive@1.0.188
-	serde_spanned@0.6.3
-	signal-hook-registry@1.4.1
-	signal-hook@0.3.17
-	slab@0.4.9
-	smallvec@1.11.1
-	socket2@0.5.4
-	strsim@0.10.0
-	syn@2.0.37
-	syslog@6.1.0
-	thiserror-impl@1.0.48
-	thiserror@1.0.48
-	time-core@0.1.1
-	time-macros@0.2.10
-	time@0.3.23
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.1.0
-	tokio@1.32.0
-	toml@0.7.8
-	toml_datetime@0.6.3
-	toml_edit@0.19.15
-	tracing-attributes@0.1.26
-	tracing-core@0.1.31
-	tracing@0.1.37
-	trust-dns-client@0.23.0
-	trust-dns-proto@0.23.0
-	trust-dns-server@0.23.0
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.22
-	url@2.4.1
-	utf8parse@0.2.1
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.87
-	wasm-bindgen-macro-support@0.2.87
-	wasm-bindgen-macro@0.2.87
-	wasm-bindgen-shared@0.2.87
-	wasm-bindgen@0.2.87
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-sys@0.48.0
-	windows-targets@0.48.5
-	windows@0.48.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-	winnow@0.5.15
-"
-CRATES+="${PN}@1.8.0"
+[[ ${PV} == *9999* ]] || CRATES="${PN}@${PV}"
 inherit cargo
 
 DESCRIPTION="A container-focused DNS server"
@@ -154,11 +13,14 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git"
 else
 	SRC_URI="${CARGO_CRATE_URIS}"
+	SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 fi
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB"
 SLOT="0"
-QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_FLAGS_IGNORED="usr/libexec/podman/${PN}"
+QA_PRESTRIPPED="usr/libexec/podman/${PN}"
+ECARGO_VENDOR="${WORKDIR}/vendor"
 
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
@@ -169,8 +31,12 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+	sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die
+}
+
 src_install() {
-	cargo_src_install
-	dodir /usr/libexec/podman
-	dosym -r /usr/bin/"${PN}" /usr/libexec/podman/"${PN}"
+	export PREFIX="${EPREFIX}"/usr
+	default
 }