gentoo auto-resync : 18:11:2022 - 06:58:04

3 files changed, 19 insertions, 14 deletions

diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index a402247377b8..0b2166660f3d 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -9,6 +9,6 @@ AUX varnishncsa.confd 84 BLAKE2B fbb338ec2163562d7679a7371cda3cd297449186bfcaa66
 AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a33d1d4e87c1da28088b9f25ce917d16a9ed777b1d6e1ece5a916af0c4ff293db82b94d264fd5baafa9 SHA512 1d0c781675ecba5adce02c37a02c431c4b44d64310a0945bff4f6f57f7d0c87cb7dda874311e44d667317d5beda113b62f4ba49c81534a0c078314b3fa15a512
 DIST varnish-7.1.1.tgz 3742869 BLAKE2B d41e7214c3b51ac18b1a89012b48d3db58f4f777df675fa93d6ac75d3cf14b78af23f9d6e8b8686fdfa82add70a1a42e5e54f382506444ec81ad6d121a99e447 SHA512 7c3c081bd37c63b429337a25ebc0c14d780b0c4fd235d18b9ac1004e0bb2f65e70664c5bd25c5d941deeb6bc078f344fa2629cf0d641a0149fe29dcfa07ffcd2
 DIST varnish-7.1.2.tgz 3758689 BLAKE2B a5c05d9dd7c5f0cd4dc0cae8cc365b658a15d017c7fb19cbe17088f009304375eb123f35935045c35c61ec3dfd7d8858774c2bbc918cc436415bd50b8894bb3b SHA512 e16a4b75ede25f3812dfc4e95545e39a80022835b9155a4e42118f911e41b691cbedd296db48d307ba4a4d0d01df1149306d752de07cabe459ccbf5bcdd49238
-EBUILD varnish-7.1.1.ebuild 2234 BLAKE2B 751a1ee4b19575d5965b507f20318b6fd203030cf0dd6a19090ee4989871bff9bd5f2a1fc6af5f0d4e36dccb57603bf446bd45ac0e82411a4dfdc4c6679ae5b8 SHA512 6c10b0d06a27c735c886de7545e0df562ba17b0880c710ca9ea569c1eef61893e4d1808639e21633d6a6962b5e8538ac8318beb6f0e917e27752a09760839ebf
-EBUILD varnish-7.1.2.ebuild 2268 BLAKE2B b646826375a8dd66256f9df609ff9b09aaebfd3fdb67afb71edc742ab1b2832f7c99da0baac6088ac4d8f9317f61943a2d432171084ba7bcd467ce7f4e95c8bf SHA512 6254bacdc2148e1c6577acfe35713f9daa9e7735082449ec3e5b06f8e3587bf0ea5d144f5cc2d06b1e93ada5023d66d4a1984f84e1847c71f9fb4e7f57b5fe0d
+EBUILD varnish-7.1.1-r1.ebuild 2236 BLAKE2B 3739a63d84f77f25d459e8f4bd7bdac5ffbb1dec178194e67289b7d144cfc3dfd07394874627504d14a0adb3a633032818cd291aa925c991c33cbb38f406e1f6 SHA512 3924be9268e27da174ed05484e0b52049b252dab1b344fa908e8b71f4a3515a5d36424c709b83f7cb16dfc2108984b9c13b0ee8f528fba432d639fc448a53070
+EBUILD varnish-7.1.2-r1.ebuild 2347 BLAKE2B 156112d6fee3d8f2baff5d29a47581e64343beaa2b294af9bf53854a688f410bc1d2d3b4eb4ba9d13413e2678c521863ddcaf8e389af77533c4854d8d43fbdd9 SHA512 1b482d88dbc434945872fa7f252662115eed4b1e99a06a7075e7f69a39223f8bc1e2e6daffbfdf31038bb9d4af0c08f6e52610b54c1b724def09105b95bfa693
 MISC metadata.xml 1246 BLAKE2B a0b1e7aebb8a984e49c46460840ef4a984b285a49d0f8095a6252ac072c65588d4f7fae4b40c0b33b1d14bae1dfb887f94bbcd5acf3dacd7708cdf5ad0124d72 SHA512 0e4f1f2ec351e97fdfe31e6fe3f7b5b1f5c5d984b3313e84feed76c4d99a2f4e1825ffe971f4acf44498efbc4aa9bf80c2756ad4d0f96adf834b0ea4f2ecd1a2
diff --git a/www-servers/varnish/varnish-7.1.1.ebuild b/www-servers/varnish/varnish-7.1.1-r1.ebuild
index c4ac2a18ef9c..1ab7e2d2b04a 100644
--- a/www-servers/varnish/varnish-7.1.1.ebuild
+++ b/www-servers/varnish/varnish-7.1.1-r1.ebuild
@@ -17,11 +17,12 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="
-	sys-libs/readline:0=
+	sys-libs/readline:=
 	dev-libs/libedit
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses:0="
+	dev-libs/libpcre2[jit?]
+	sys-libs/ncurses:=
+	jemalloc? ( dev-libs/jemalloc:= )
+"
 
 #varnish compiles stuff at run time
 RDEPEND="
diff --git a/www-servers/varnish/varnish-7.1.2.ebuild b/www-servers/varnish/varnish-7.1.2-r1.ebuild
index 6fe4beac2068..6e46c6ba6cd4 100644
--- a/www-servers/varnish/varnish-7.1.2.ebuild
+++ b/www-servers/varnish/varnish-7.1.2-r1.ebuild
@@ -14,14 +14,16 @@ SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 LICENSE="BSD-2 GPL-2"
 SLOT="0/2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="jemalloc jit static-libs"
+IUSE="jemalloc jit static-libs unwind"
 
 CDEPEND="
-	sys-libs/readline:0=
+	sys-libs/readline:=
 	dev-libs/libedit
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses:0="
+	dev-libs/libpcre2[jit?]
+	sys-libs/ncurses:=
+	jemalloc? ( dev-libs/jemalloc:= )
+	unwind? ( sys-libs/libunwind:= )
+"
 
 #varnish compiles stuff at run time
 RDEPEND="
@@ -42,15 +44,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=( "${FILESDIR}/${PN}-7.1.2-disable-tests.patch" )
 
 src_prepare() {
+	default
+
 	# Remove -Werror bug #528354
-	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac || die
 
 	# Upstream doesn't put varnish.m4 in the m4/ directory
 	# We link because the Makefiles look for the file in
 	# the original location
-	ln -sf ../varnish.m4 m4/varnish.m4
+	ln -sf ../varnish.m4 m4/varnish.m4 || die
 
-	default
 	eautoreconf
 }
 
@@ -59,6 +62,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable jit pcre2-jit)
 		$(use_with jemalloc)
+		$(use_with unwind)
 	)
 	econf "${myeconfargs[@]}"
 }