gentoo auto-resync : 28:02:2024 - 05:40:38

2 files changed, 48 insertions, 18 deletions

diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 0b9e156c72b5..d80533b31fce 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -5,11 +5,11 @@ AUX coredns.initd 779 BLAKE2B 355a1b90856f596a10fa4c0ba294cf2d888ff9a5f7b0b71ef4
 AUX coredns.logrotated 81 BLAKE2B 7fe70e32133a9470a60834dee5632151ed215e478a9de697dbca3ee553e5a8719bc941251c6a37723625b7c59f10f5050c79edb94ac8d4127561c12813ba6a27 SHA512 c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece
 AUX coredns.service 516 BLAKE2B a28a1aa078abc4946c67a8d65114fee6a845af2e6338e052ea5fccf217dea7a61b962dc37306dc3250b7b71c498c45c6fadc48412831c9e18ca324201d4b8dda SHA512 53f865f29642ffc77e960cdfa82ca341d33ecb9555991ca0f9abcbe238f050e786519c414ea570f66731e27f770fdd02fece0fb2a64343f0c41c11ed208c47a6
 AUX coredns.tmpfiles 42 BLAKE2B 06e6b3be85cc66f5eb126639496dc962cbb3e9b77ca59da1acc4749208212ac24bbc53cd694ce63c579528ca040443a5cb3886ea05baf5b0cceb3f46fe94ff20 SHA512 b6aaf9b399a5c25efbbb4f23d9a0c97af0749adea7a58ae83af8b8220a167778ac8debc0359c75d3ac8b904176ee870523c9101f22e8352b61b2012c9002bab4
-DIST coredns-1.10.1-deps.tar.xz 230970760 BLAKE2B 79e9199256ddcb5c6728aa1cab62608177099d278a44bc5393148ed49139fa97ebc82fd0e749847bb04f34b409165c44082cbec502e807e0e44c58b4f1df5f6f SHA512 2c1a5d6ba3392444a25ca0488c8c0ebae4090b601276a17fdc01c64b70c22fa45b297c8784dbb7214865ceafe4b93bb166d3e84b170a5e1b21ff3811b59ab885
-DIST coredns-1.10.1.tar.gz 632459 BLAKE2B ade57e2f7028cf4c3b69e08396a7cd41cde79c6f0b9b1edeb4c9e73204e9eab295d9b44dce437f337900ca6a622832c6f784f7088b2eed7ac6759e6959e587bd SHA512 6906ecf64b6274f4d3957faec6930ec3ed4de0bddd9e2d72ea2794f43186689ede1f440d7626c5ea66956fdec41e354242f99fa489f1f992b86fede5f580a328
 DIST coredns-1.11.1-deps.tar.xz 252844888 BLAKE2B c249a6d52965ac4a6b7e06343d5155e3bc6f0528c11556fda9eb111beec1b4a71ac1b7cc8c76d0c593fedddccf3d3808a0da8145555a804b0284557280bb8dab SHA512 0a22fa25cdbe5e8686612d411b59758ab604a3cf9a92a02eed7b5487506c25dee90c113dcb479fb9da199a31ead2c818ebe856f6f7182967ba13b9852d6e785a
 DIST coredns-1.11.1.tar.gz 647236 BLAKE2B 0f2c58608a6a13b57c7df45a8f750ef5b9b6da4be4e5b593cb992141dc6d0e238121789e4ca0b430a100963c3bf08c0257506c812da776ea47a164f83b4fd0cc SHA512 f8752811e9e7913311f47ae13f35c755ac86ea240572be1c1dabc1712b6c42380c60ac385fa9573c77d6fcf4c144df2bc00574f18e8d7b70da21ed8ae4fb87cd
-EBUILD coredns-1.10.1.ebuild 2369 BLAKE2B fff6a9a01bdda4b46859b6382d4a0a6a9bb6aa89e0d39c2d83747b31b490a56d640952c82e43ef1e05ea25b1229d0ac293880ce1cbf1dbce4e79b7227118efc7 SHA512 f51761c89f13a80a1421ed7286fcd2a4744dafbef1129fa525bf603ae6d37a95bc4ed9274c7e86c6aecbb66063230252358d8a634582b7443f422858f0ae84a0
+DIST coredns-1.11.2-deps.tar.xz 261482588 BLAKE2B 39e30800ac1fc404dc60f859b929c4a69614b9f0be8937c3fd7b1a872ec1e163ab4f6a313ed7661d2a101318187aaa2419168c0511cf2108c43ada38db0d1e0b SHA512 91282766d10d28d564d14fb20d8d82808507e509c58b7bb1959bb03a2665a287057aa4d547bfc8cc60ff080eea807af1c57d86bf9ff000125ef0642d8557e47f
+DIST coredns-1.11.2.tar.gz 651994 BLAKE2B 1a7a272756eaf83170e242a573c8a765d6ea7b70fe422d36a87850b600a88287291aa0fe0d49462c34453d4d3c4d33f9497be409379ff8fccc87f41e2195efc1 SHA512 0e90ef4793555bd46aa5ce84cf639c015d1869b407627c69746eb948abff1920f891c45e5f00c0127f23e2c6394c07cc55c1776af840881210f90faa6ec22b40
 EBUILD coredns-1.11.1.ebuild 3093 BLAKE2B 8757fa5b04ac33e0c13d04364f9e5297f612cee03f921a3e3913bfbf4619992e7662a9dbb506448eddfb741aba6ff81dbdbf77d9a4f7834916ef98f00e3a5815 SHA512 186df02c8c41cf547bd85c7adec400fd372df1ec392668969c07e320815c1a1ffe043c52cd563923a3b851789639e8de1a4c4279b50770e6318478cd37073a49
+EBUILD coredns-1.11.2.ebuild 3023 BLAKE2B db61880b8a1a65c28818cdd89da4e10e4f3ac631322bad44ea8b2faf7a6bd2180848ac672724eb3084d37efca1b2608675b26ee1339ac1742a7af5c76efb15ea SHA512 97235cf8245d64472037b63389966a28996b442c648a6e1d49f53b5ac3fe97bb29ecd15c3db41073d27efcb7f2053f9503bb249eed66d19195a8745fa3ff34b3
 EBUILD coredns-9999.ebuild 3072 BLAKE2B c582e3318993aad0e51ae7f310db7425d1b98c7be3830e2450fe5aa3133fc220a3c8efcccabb86a8e8be0fb7dcd59abe99cf368adb2c1c2374cc3af21e282af5 SHA512 b9476241fce9b3198e88fca5800504e958abf47d6b970be505443c398a90d3794e2e9fac1df976f53157da88460b16df8eccf9e80b840c629286eef6015a51c5
 MISC metadata.xml 1154 BLAKE2B ebdfb6dea854f81e82c8d02fe60a315db893dc395b649bf4f37c2aae90721f1af73ac7a2394ee15964e78154e40580cfc29eb9bdac518514b1314cc55190e657 SHA512 511ecdf71de14a237f0288f817e791dfb81a7abacb53746e32d79c880ba4c5288a86c310fa877b503176c31a737d98329f6c2b6bd1b175ce4ec2a73df6a9fe9d
diff --git a/net-dns/coredns/coredns-1.10.1.ebuild b/net-dns/coredns/coredns-1.11.2.ebuild
index afdc040d8a49..759fa46ccff5 100644
--- a/net-dns/coredns/coredns-1.10.1.ebuild
+++ b/net-dns/coredns/coredns-1.11.2.ebuild
@@ -3,34 +3,64 @@
 
 EAPI=8
 
-# Don't forget to update when bumping. Used in --version output
-EGIT_COMMIT="055b2c31a9cf28321734e5f71613ea080d216cd3"
+inherit fcaps go-module multiprocessing systemd tmpfiles toolchain-funcs
 
-inherit fcaps go-module systemd tmpfiles
-
-ARCHIVE_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="${ARCHIVE_URI} https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+DESCRIPTION="CoreDNS is a DNS server that chains plugins"
+HOMEPAGE="https://github.com/coredns/coredns"
 
-KEYWORDS="~amd64"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coredns/coredns.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+	KEYWORDS="~amd64"
+fi
 
-DESCRIPTION="A DNS server that chains middleware"
-HOMEPAGE="https://github.com/coredns/coredns"
+# main
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2"
 
-LICENSE="Apache-2.0 MIT BSD ISC MPL-2.0 BSD-2"
 SLOT="0"
-RDEPEND="acct-user/coredns
-	acct-group/coredns"
-
+IUSE="test"
 # TODO: debug test failure with deps tarball
 RESTRICT="test"
 
+RDEPEND="acct-user/coredns
+	acct-group/coredns"
+
 FILECAPS=(
 	-m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
 )
 
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	use test || sed -i -e 's|coredns: $(CHECKS)|coredns:|' Makefile
+}
+
 src_compile() {
-	go build -v -ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${EGIT_COMMIT}" ||
-		die "go build failed"
+	# For non-live versions, prevent git operations which causes sandbox violations
+	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
+	[[ ${PV} != 9999* ]] && export GITCOMMIT=''
+
+	# Mimicking go-module.eclass's GOFLAGS
+	if use amd64 || use arm || use arm64 ||
+			( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use s390 || use x86; then
+		local buildmode="-buildmode=pie"
+	fi
+	export BUILDOPTS="-buildvcs=false -modcacherw -v -x -p=$(makeopts_jobs) ${buildmode}"
+
+	default
 }
 
 src_install() {