[gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/

[Anthony G. Basile]

commit:     ab08a26b3f655a479fd7de317375ff6a4efe8c0f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 24 20:46:12 2021 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 20:46:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab08a26b

www-servers/varnish: version bump to 6.5.2 and 6.6.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 www-servers/varnish/Manifest                        |  4 ++--
 .../{varnish-6.5.1.ebuild => varnish-6.5.2.ebuild}  |  2 +-
 .../{varnish-6.5.0.ebuild => varnish-6.6.1.ebuild}  | 21 +++++++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 2ceb806b473..31c941ad80e 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,4 +1,4 @@
 DIST varnish-6.3.2.tgz 3323908 BLAKE2B 
5bde1b2ececeb8aed884db22ed75bfd74f82d68416e71400a4c0d27483fcceb029fe8e724e30754899c872d7028da5cb759545f0743a11d0e90b0fd604af0ad7
 SHA512 
0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd
 DIST varnish-6.4.0.tgz 3404617 BLAKE2B 
0ef0f7303f5c926bb1b80ec14cdd9755d65c1938fa8645240800ac2997f954022133625a74dd9c30ce21850674c3b00777fcc896309f528e6ba90d347333d7f7
 SHA512 
cda8f9e1d301a2b79db14685a23e25e36225f37065a1b7f37c5ae12fbb0483be51be9ffcc8ba72c1f65f5a022d1e408825694daed6780e206b9ba91feb2a07a1
-DIST varnish-6.5.0.tgz 3476969 BLAKE2B 
bafa8704f28dfa96f681805cc053dd6415e143016b1bbff7f8962f2c3ac5cd07be6dc2f4129a423ddfcbf9f9f8afc57388930685d0ed400f3c06ba03bd667d87
 SHA512 
43f8cd6429a903a353ac4448b6e9aff445b0d52178141a148d3b29b987c0974841820af0da4917731775b46899c12b0327d64d12e3ddbb8fd438e2802ac66a1c
-DIST varnish-6.5.1.tgz 3460024 BLAKE2B 
20abebf1df826987623c951122dd8ab2b500c0a64aca192fb12db8846e60938c2f444cf5f471d02aee4f3aeea05f4074bec335e963ab8a2fd59bef47e77df501
 SHA512 
0f34f2c6fe68bfcdba488cda40cc387b3c10343923a75a6a1791c890d20e79c64069697c45720cd5f0cba666d506d3ab6bb814ef4f9120cf0c8519a01144844f
+DIST varnish-6.5.2.tgz 3464372 BLAKE2B 
68a7bca159ed9539126f66d21450c87780b49b66a2d45a5abc7db6fe9d68c8526aa059546fb1d865de753736793e700611f4f110edb1c649f4e9753c4dfedacc
 SHA512 
31673eaa95e5d3413cd3a4a6fb324c1f0ad2efb22b75409fc0e02c61446787eb167bd530ee5b0a199da4fc76cc36f3603984d86781f856cc6a4aac48260fe4ef
+DIST varnish-6.6.1.tgz 3518308 BLAKE2B 
6a88165394c0578427de20588ac2c17f502242bf94f30e9284f7bc2c271b77c3d6511a9dfb8d1cb6d75e1fc4563360fb0bec762aa17481fa598cb5e9d9527705
 SHA512 
af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b

diff --git a/www-servers/varnish/varnish-6.5.1.ebuild 
b/www-servers/varnish/varnish-6.5.2.ebuild
similarity index 97%
rename from www-servers/varnish/varnish-6.5.1.ebuild
rename to www-servers/varnish/varnish-6.5.2.ebuild
index 87201493f01..9901f81c14f 100644
--- a/www-servers/varnish/varnish-6.5.1.ebuild
+++ b/www-servers/varnish/varnish-6.5.2.ebuild
@@ -41,7 +41,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test" #315725
 
 PATCHES=(
-       "${FILESDIR}/${P}-autoconf-2.70.patch" #751190
+       "${FILESDIR}/varnish-6.5.1-autoconf-2.70.patch" #751190
 )
 
 src_prepare() {

diff --git a/www-servers/varnish/varnish-6.5.0.ebuild 
b/www-servers/varnish/varnish-6.6.1.ebuild
similarity index 84%
rename from www-servers/varnish/varnish-6.5.0.ebuild
rename to www-servers/varnish/varnish-6.6.1.ebuild
index d8b86fe79c7..5a49d8e6ee1 100644
--- a/www-servers/varnish/varnish-6.5.0.ebuild
+++ b/www-servers/varnish/varnish-6.6.1.ebuild
@@ -49,16 +49,17 @@ src_prepare() {
        # the original location
        ln -sf ../varnish.m4 m4/varnish.m4
 
-       eapply_user
-
+       default
        eautoreconf
 }
 
 src_configure() {
-       econf \
-               $(use_enable static-libs static) \
-               $(use_enable jit pcre-jit ) \
+       local myeconfargs=(
+               $(use_enable static-libs static)
+               $(use_enable jit pcre-jit)
                $(use_with jemalloc)
+       )
+       econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -86,7 +87,15 @@ src_install() {
        systemd_dounit "${FILESDIR}/${PN}d.service"
 
        insinto /etc/varnish/
-       doins lib/libvmod_std/vmod_std.vcc
+       doins vmod/vmod_vtc.vcc
+       doins vmod/vmod_directors.vcc
+       doins vmod/vmod_blob.vcc
+       doins vmod/vmod_proxy.vcc
+       doins vmod/vmod_debug.vcc
+       doins vmod/vmod_std.vcc
+       doins vmod/vmod_unix.vcc
+       doins vmod/vmod_cookie.vcc
+       doins vmod/vmod_purge.vcc
        doins etc/example.vcl
 
        dodoc README.rst