From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 64F5B158089 for ; Fri, 29 Sep 2023 02:43:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B5A42BC01F; Fri, 29 Sep 2023 02:43:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 71BE92BC01F for ; Fri, 29 Sep 2023 02:43:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE8F2335C7A for ; Fri, 29 Sep 2023 02:43:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30ACD1270 for ; Fri, 29 Sep 2023 02:43:53 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1695955428.6ea209549aff585b3ce12b65f3313fec6cf712b0.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/aardvark-dns/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/aardvark-dns/aardvark-dns-1.8.0-r1.ebuild app-containers/aardvark-dns/aardvark-dns-1.8.0.ebuild X-VCS-Directories: app-containers/aardvark-dns/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6ea209549aff585b3ce12b65f3313fec6cf712b0 X-VCS-Branch: master Date: Fri, 29 Sep 2023 02:43:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 108467cc-fd12-4e9b-8652-c42219073c49 X-Archives-Hash: ca43790d798819478f5ed74c5e4da0ec commit: 6ea209549aff585b3ce12b65f3313fec6cf712b0 Author: Zac Medico gentoo org> AuthorDate: Fri Sep 29 02:40:52 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Sep 29 02:43:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea20954 app-containers/aardvark-dns: Revbump to 1.8.0-r1 Drop /usr/bin/aardvark-dns and just install /usr/libexec/podman/aardvark-dns via Makefile. Signed-off-by: Zac Medico gentoo.org> ...s-1.8.0.ebuild => aardvark-dns-1.8.0-r1.ebuild} | 0 .../aardvark-dns/aardvark-dns-1.8.0.ebuild | 158 +++++++++++++++++++-- 2 files changed, 146 insertions(+), 12 deletions(-) diff --git a/app-containers/aardvark-dns/aardvark-dns-1.8.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.8.0-r1.ebuild similarity index 100% copy from app-containers/aardvark-dns/aardvark-dns-1.8.0.ebuild copy to app-containers/aardvark-dns/aardvark-dns-1.8.0-r1.ebuild diff --git a/app-containers/aardvark-dns/aardvark-dns-1.8.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.8.0.ebuild index 32b5cc8f5e20..6470c7204b7f 100644 --- a/app-containers/aardvark-dns/aardvark-dns-1.8.0.ebuild +++ b/app-containers/aardvark-dns/aardvark-dns-1.8.0.ebuild @@ -3,7 +3,148 @@ EAPI=8 -[[ ${PV} == *9999* ]] || CRATES="${PN}@${PV}" +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" inherit cargo DESCRIPTION="A container-focused DNS server" @@ -13,14 +154,11 @@ 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/libexec/podman/${PN}" -QA_PRESTRIPPED="usr/libexec/podman/${PN}" -ECARGO_VENDOR="${WORKDIR}/vendor" +QA_FLAGS_IGNORED="usr/bin/${PN}" src_unpack() { if [[ ${PV} == *9999* ]]; then @@ -31,12 +169,8 @@ 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 + cargo_src_install + dodir /usr/libexec/podman + dosym -r /usr/bin/"${PN}" /usr/libexec/podman/"${PN}" }