gentoo auto-resync : 22:07:2022 - 20:47:41

3 files changed, 4 insertions, 102 deletions

diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 25ccdf1f8ab5..bcbc37ac336b 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -9,10 +9,8 @@ AUX varnishncsa.confd 84 BLAKE2B fbb338ec2163562d7679a7371cda3cd297449186bfcaa66
 AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a33d1d4e87c1da28088b9f25ce917d16a9ed777b1d6e1ece5a916af0c4ff293db82b94d264fd5baafa9 SHA512 1d0c781675ecba5adce02c37a02c431c4b44d64310a0945bff4f6f57f7d0c87cb7dda874311e44d667317d5beda113b62f4ba49c81534a0c078314b3fa15a512
 DIST varnish-6.5.2.tgz 3464372 BLAKE2B 68a7bca159ed9539126f66d21450c87780b49b66a2d45a5abc7db6fe9d68c8526aa059546fb1d865de753736793e700611f4f110edb1c649f4e9753c4dfedacc SHA512 31673eaa95e5d3413cd3a4a6fb324c1f0ad2efb22b75409fc0e02c61446787eb167bd530ee5b0a199da4fc76cc36f3603984d86781f856cc6a4aac48260fe4ef
 DIST varnish-6.6.1.tgz 3518308 BLAKE2B 6a88165394c0578427de20588ac2c17f502242bf94f30e9284f7bc2c271b77c3d6511a9dfb8d1cb6d75e1fc4563360fb0bec762aa17481fa598cb5e9d9527705 SHA512 af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b
-DIST varnish-7.0.1.tgz 3712763 BLAKE2B ec47b557d8623e349032ac48459ea0c636a4b2810b4354666a651b652b65389abedafd0b665ca1e8178ea2b8339be8fd782dc61e1245f9307e00d665a3c20500 SHA512 7541d50b03a113f0a13660d459cc4c2eb45d57fb19380ab56a5413a4e5d702f9c0856585f09aeea6084a239ad8c69017af3805a864540b4697e0eac29f00b408
 DIST varnish-7.1.0.tgz 3787588 BLAKE2B 1a019b140c467063861460b529c253361975826cee797c304c7c096645c315b67ad20400467ecf11711abae5354134ac29a934793691283e12e3fbe29921943b SHA512 ad9ce0cdc759976fcb7044914d28863edd197167f583fab2d1bc57f4e5b86c224b7c948faf1f7364a2a16bde9c415375d011462bdc43026c5f7a60e65bd21f73
 EBUILD varnish-6.5.2.ebuild 2243 BLAKE2B 2b1e7f9685f8a6a186db6d6df4a6ed15b9b343e65c14cc9afec774bc1c9ae424dc205e17c0de64f5c2a5a285b353049eec0bb044ca28b11f6acaf008296c9409 SHA512 26f158e94c4d3567c6ffe85f6e20694a9711d6a6a456413727290ee0aaf1ca0ce2b6f610bd19a2ba32cff8543f03342f0bb5c9bed5360fc7b6cf7636732afc3c
 EBUILD varnish-6.6.1.ebuild 2379 BLAKE2B ce581f92c3be51eb6d032daa06fb1a84dcdc523efd0726ae26e876445fad09cefb51a78c627f8900c8de03bdbfe1c7ead4189bae02be425958851069d43ba8a2 SHA512 4dd59ccac111c157db93bc648ad67a0bd4b67693aac1fc18772cf08a0ef22f03d3a70b3a8c19f6c187f3e2f4329faf08c7a03cc0cb00f7e755b7f60d8d0f2514
-EBUILD varnish-7.0.1.ebuild 2163 BLAKE2B bd669e328fad668363b83365a014c9b6a16de61feec9571c82ab7cd188ab3bc7c8da3ef0c2c81c615ee415ee0da0db5675d4ad34e1724d437a51074ca252a7d5 SHA512 cd58c3d8d3c987f1ecb3742aa4aa8f9d73e353b640431ffe5ef627547a5f4018f7385fb4fb3ad07a5f57c61da7682ecf49438d4501c40a6091ba5a9b77f125c7
-EBUILD varnish-7.1.0.ebuild 2175 BLAKE2B 23b5c7263da46e0569f89e6a0f88052d76e9e8253dc54b67353c5efa7a931d9f29129f0dfbc0a62cecf317611fc6a337e755c1369a23bb1d0a319bc301865fa6 SHA512 d912be53d7ada88e92b69cb388cd2649356fe2a6fe09cccd2bf9884bb153de77244f4fa489005e33dcb15a0cbc5e114a38ec38d9cb82369f22443a8705086dad
+EBUILD varnish-7.1.0.ebuild 2236 BLAKE2B c469af8f3fbd4569a8021074d8a5731993f18becec637c26716c4b3e9aec1065108b46ecb418c6fb83595e4cda32f50fc96070057dd6b5d87e06fbed3bf78de9 SHA512 8da3030f1a7c916a2ced77857944c9a66e35e0c7501ad23c0a207d40dc1a7532971f54e0ff5e2c901502b0880343cad21ab222e80cedfb12cc5b5d0c12eb8240
 MISC metadata.xml 1155 BLAKE2B 84875f3204cf314d1cb22e323ae8edb4e439e11d165c019bdf959925236ee4df671a9dbfd5a98d4c8841f8ec19cf8e602b703052d9a864d7e3c652ffe40054f0 SHA512 34bad8011b4530abc02f35b1bacb3d632ea5d57da41162a246d5601d766f192448efb31445536e02485fa195ab5f5eb564b4a1886632d0fd32626184d1173db7
diff --git a/www-servers/varnish/varnish-7.0.1.ebuild b/www-servers/varnish/varnish-7.0.1.ebuild
deleted file mode 100644
index 853efe7b4987..000000000000
--- a/www-servers/varnish/varnish-7.0.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="https://varnish-cache.org/"
-SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	sys-libs/readline:0=
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses:0="
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	acct-user/varnish
-	acct-group/varnish
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	dev-python/sphinx
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-src_prepare() {
-	# Remove -Werror bug #528354
-	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
-
-	# 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
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre2-jit)
-		$(use_with jemalloc)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
-	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
-	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
-	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
-	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
-	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	keepdir /var/lib/varnish
-	keepdir /var/log/varnish
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins vmod/vmod_*.vcc
-	doins etc/example.vcl
-
-	dodoc README.rst
-	dodoc doc/changes.rst
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
diff --git a/www-servers/varnish/varnish-7.1.0.ebuild b/www-servers/varnish/varnish-7.1.0.ebuild
index b8393fda8c2c..e96a88314f50 100644
--- a/www-servers/varnish/varnish-7.1.0.ebuild
+++ b/www-servers/varnish/varnish-7.1.0.ebuild
@@ -18,6 +18,7 @@ IUSE="jemalloc jit static-libs"
 
 CDEPEND="
 	sys-libs/readline:0=
+	dev-libs/libedit
 	dev-libs/libpcre[jit?]
 	jemalloc? ( dev-libs/jemalloc )
 	sys-libs/ncurses:0="
@@ -96,4 +97,6 @@ src_install() {
 	fowners root:varnish /etc/varnish/
 	fowners varnish:varnish /var/lib/varnish/
 	fperms 0750 /var/lib/varnish/ /etc/varnish/
+
+	find "${ED}" -name "*.la" -delete || die
 }