10 files changed, 20 insertions, 318 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e30c7fe8fb92..1f7392a2ad14 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
deleted file mode 100644
index ddd902926d94..000000000000
--- a/www-servers/resin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX resin-4.0.48-build.xml.patch 2186 BLAKE2B 1864f7896312c7b2952f5aac8d73924b90d4a75e9f5021804b7ba9eed37a4a45541b611897d4eddb92f3f3834044a0206324e518b8e72cc196362c94a444e435 SHA512 9bc4e5f695473945fd9a18fd28eb18e8f306fd6054bc910b5dfd86382046e2b850c7e4b0f533f012f1c0b84ef58ab61051e6a33c0c94a7f44f1d9416ee14e49c
-AUX resin-4.0.48.conf 542 BLAKE2B 96cc8e582b5e5af4b72d29652fa690928bedf51f8ee74d7acfd16244690eb9f346cb616e20e8711f9b85b77ee1145e74d0dca04d026e04808ded22345c7b6b67 SHA512 61b34c022712f31d3cadcf8e78095900085c8cde5ba5b8cc46d603019f461ae3271fc41a9f6b63d89aeb675de9fb72b27123fc6c6774eaee5349d37cc2c9693f
-AUX resin-4.0.48.init 791 BLAKE2B dd8f14fdbdb5e7be3b8511d33db86781c4595a2f925be613d31036588c2444acfe149a1e215a9d26978fa612ef223c325d6f1bdefc19722c429bdbccdb663b11 SHA512 9fa5db204bf4a3a6e040493dda96adcf86e9fff271b6a98951b03c15f00a18a62c9469d48e155bf7847229e005f8c570fd10737bb120271122a2d746ea22e13a
-DIST resin-4.0.48-src.zip 40883010 BLAKE2B 33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40 SHA512 a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee
-EBUILD resin-4.0.48-r1.ebuild 4255 BLAKE2B 3a07b03177c0eb689a017164a07615b1e13ce18ab57d30129aedbe55b11bf27330ee28abfccadf3fa6ee1376d8fe0f6d943705d851624d835dd50e40c8a2b222 SHA512 1d00de7cde95edeb7a16ef02d16a4fb9099bc7b9d72a225c7c5bfdb03f1338e6e334f0a88c278fedfd9c65b6ea477595ef6bf660ec079838ec4992d0df9a5c32
-MISC metadata.xml 305 BLAKE2B cd9ab46596ac556fb225d0d9d087c89a8f46a185aa3ed9524d6258d04b8690373efc1a587b28da5bb0485edbaa18e5f7db1b6dcc84656df09a01b7401027c48c SHA512 2f36d477675c49a8b3475b49891dd9eb45c02cbc5d83a3f60c3ba3b35252a3bdc34214dbdf2c3fb8da37138fec49281f95c3c70055fdf47a8cace006a46137e9
diff --git a/www-servers/resin/files/resin-4.0.48-build.xml.patch b/www-servers/resin/files/resin-4.0.48-build.xml.patch
deleted file mode 100644
index 5ef1abc63c56..000000000000
--- a/www-servers/resin/files/resin-4.0.48-build.xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -12,7 +12,7 @@
-   <property name="eclipse.home" value="${user.home}/eclipse"/>
- 
-   <target name="compile"
--          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink, gae, jasper">
-+          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae">
-   </target>
- 
-   <!--
-@@ -27,10 +27,6 @@
-     </antcall>
-   </target>
-   -->
--  <target name="resin-eclipselink" depends="eclipselink">
--    <copy file="modules/eclipselink/dist/resin-eclipselink.jar"
--          todir="${resin.lib}"/>
--  </target>
- 
-   <target name="richfaces" depends="init">
-     <antcall target="artifact" inheritRefs="true">
-@@ -92,13 +88,6 @@
-     </antcall>
-   </target>
- 
--  <target name="eclipselink" depends="init">
--    <antcall target="module" inheritRefs="true">
--      <param name="module.name" value="eclipselink"/>
--      <param name="module.jar" value="resin-eclipselink.jar"/>
--    </antcall>
--  </target>
--
-   <!-- gae APIs for quercus testing -->
-   <target name="gae" depends="init">
-     <antcall target="module" inheritRefs="true">
-@@ -437,13 +426,6 @@
-     </antcall>
-   </target>
- 
--  <target name="jasper" depends="init">
--    <antcall target="module" inheritRefs="true">
--      <param name="module.name" value="jasper"/>
--      <param name="module.jar" value="resin-jasper.jar"/>
--    </antcall>
--  </target>
--
-   <target name="version">
-     <copy file="${resin.modules}/kernel/src/com/caucho/Version.tmpl"
-           tofile="${resin.modules}/kernel/src/com/caucho/Version.java"
-@@ -903,7 +885,7 @@
-     <delete dir="${dist}/${dist.name}"/>
-   </target>
- 
--  <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/>
-+  <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/>
- 
-   <target name="configure" depends="init">
-      <copy tofile="modules/c/src/resin/Makefile.in"
diff --git a/www-servers/resin/files/resin-4.0.48.conf b/www-servers/resin/files/resin-4.0.48.conf
deleted file mode 100644
index a48840b5e9f2..000000000000
--- a/www-servers/resin/files/resin-4.0.48.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-
-# You can override this value with whatever JDK you want.
-# For a list of valid values for GENTOO_VM see output of
-#   java-config -L
-#GENTOO_VM=sun-jdk-1.5
-
-# Verbose starting and stopping? (yes/no, defaults to no)
-#VERBOSE="yes"
-
-# Select which server will be started, this is an advanced feature, please refer
-# to Resin documentation.
-SERVER_ID=""
diff --git a/www-servers/resin/files/resin-4.0.48.init b/www-servers/resin/files/resin-4.0.48.init
deleted file mode 100644
index a0e5cfb49b67..000000000000
--- a/www-servers/resin/files/resin-4.0.48.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-runResin() {
-	JAVA_HOME=$(java-config -O)
-	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
-	export JAVA_HOME
-
-	local extraArgs=
-	if [ "${VERBOSE}" = "yes" ]; then
-		extraArgs="-verbose"
-	fi
-
-	local msg="${1}"
-	shift
-
-	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.xml -server \"${SERVER_ID}\" -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}"
-
-	ebegin "${msg}"
-	su - resin -c "${cmdline}"
-	eend $?
-}
-
-start()	{
-	runResin "Starting Resin" "start"
-}
-
-stop()	{
-	runResin "Stopping Resin" "shutdown"
-}
diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml
deleted file mode 100644
index 42183598824f..000000000000
--- a/www-servers/resin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<use>
-		<flag name="admin">Enable Resin admin webapp</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild
deleted file mode 100644
index a0c767c66282..000000000000
--- a/www-servers/resin/resin-4.0.48-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 epatch flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com"
-SRC_URI="http://www.caucho.com/download/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-java/jsr101:0
-	dev-java/mojarra:2.2
-	dev-java/oracle-javamail:0
-	dev-java/validation-api:1.0
-	dev-java/resin-servlet-api:3.1
-	dev-java/glassfish-xmlrpc-api:0
-	dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	dev-libs/openssl
-	>=virtual/jdk-1.6
-	dev-java/ant-core:0"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-	jsr101
-	mojarra-2.2
-	oracle-javamail
-	validation-api-1.0
-	glassfish-xmlrpc-api
-	resin-servlet-api-3.1
-	glassfish-deployment-api-1.2
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.48-build.xml.patch
-)
-
-pkg_setup() {
-	export RESIN_HOME="/usr/$(get_libdir)/resin"
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash "${RESIN_HOME}" resin
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	# No bundled JARs!
-	rm -rv "${S}"/modules/ext/*.jar "${S}"/project-jars || die
-
-	java-ant_bsfix_one "${S}/build.xml"
-	java-ant_bsfix_one "${S}/build-common.xml"
-
-	rm -rv lib/* || die
-
-	ln -s $(java-config --jdk-home)/lib/tools.jar || die
-}
-
-src_configure() {
-	append-flags -fPIC -DPIC
-
-	chmod 755 "${S}/configure" || die
-	econf --prefix=${RESIN_HOME}
-}
-
-src_compile() {
-	einfo "Building libraries..."
-	emake
-
-	einfo "Building jars..."
-	eant || die "ant failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	einfo "Moving configuration to /etc ..."
-	dodir /etc/
-	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die
-	dosym /etc/resin ${RESIN_HOME}/conf
-
-	einfo "Rewriting resin.xml ..."
-	sed -i \
-		-e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
-		-e 's,${resin.root}/doc/admin,webapps/admin,' \
-		"${D}/etc/resin/resin.xml" || die
-
-	einfo "Fixing log directory ..."
-	rm -rv "${D}/${RESIN_HOME}"/log || die
-	keepdir /var/log/resin
-	dosym /var/log/resin ${RESIN_HOME}/log
-
-	einfo "Installing basic documentation ..."
-	dodoc README "${S}"/conf/*.xml
-
-	einfo "Installing init.d script ..."
-	newinitd "${FILESDIR}/${PN}-4.0.48.init" resin
-	newconfd "${FILESDIR}/${PN}-4.0.48.conf" resin
-
-	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die
-
-	einfo "Fixing location of jars ..."
-	#rm -v "${S}"/lib/tools.jar || die
-	java-pkg_dojar "${S}"/lib/*.jar
-	rm -rv "${D}/${RESIN_HOME}"/lib || die
-	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
-	dodir /var/lib/resin/webapps
-	keepdir /var/lib/resin/hosts
-	keepdir /var/lib/resin/resin-data
-	keepdir /var/lib/resin/watchdog-data
-
-	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || die
-	rm -rv "${D}/${RESIN_HOME}"/webapps || die
-	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
-	dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
-	dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
-	dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
-
-	dosym \
-		"$(java-pkg_getjar resin-servlet-api-3.1 resin-servlet-api.jar)" \
-		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
-
-	use admin && {
-		einfo "Installing administration app ..."
-		cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
-	}
-	use doc && {
-		einfo "Installing documentation app ..."
-		cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die
-	}
-
-	use source && {
-		einfo "Installing sources ..."
-		java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null
-	}
-
-	einfo "Removing stale directories ..."
-	rm -rv "${D}/${RESIN_HOME}"/{bin,doc} || die
-	#rm -rv "${D}"/etc/resin/*.orig || die
-
-	einfo "Fixing ownerships and permissions ..."
-	fowners -R 0:root /
-	fowners -R resin:resin /etc/resin
-	fowners -R resin:resin /var/lib/resin
-	fowners -R resin:resin /var/log/resin
-
-	fperms 644 /etc/conf.d/resin
-	fperms 755 /etc/init.d/resin
-	fperms 750 /var/lib/resin
-	fperms 750 /etc/resin
-}
-
-pkg_postinst() {
-	elog
-	elog " User and group 'resin' have been added."
-	elog
-	elog " By default, Resin runs on port 8080. You can change this"
-	elog " value by editing /etc/resin/resin.properties."
-	elog
-}
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index ce56dfddd6b1..45abf2f08261 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -9,10 +9,10 @@ AUX varnishncsa.confd 84 BLAKE2B fbb338ec2163562d7679a7371cda3cd297449186bfcaa66
 AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a33d1d4e87c1da28088b9f25ce917d16a9ed777b1d6e1ece5a916af0c4ff293db82b94d264fd5baafa9 SHA512 1d0c781675ecba5adce02c37a02c431c4b44d64310a0945bff4f6f57f7d0c87cb7dda874311e44d667317d5beda113b62f4ba49c81534a0c078314b3fa15a512
 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
 EBUILD varnish-6.3.2.ebuild 2142 BLAKE2B 84d773d218c330e2b9dc0aaccd4460cb66e452562449d194f25688e23a1564692d6bd2da2e765c2d8fd592b7ab250690fd71790375119180a5cc30397f1d3753 SHA512 9ba6c279d716c158df6784949d450d3c755d664d75d78cdfd54d619389fa2984d205cb4f73da4e3f22ed38df6ad941886f80522a8babc40a9bfba625caf5a46b
 EBUILD varnish-6.4.0.ebuild 2144 BLAKE2B ed913f10eda43049bce760b54e4d032d8ef5fdd85f224f41d50e51fa57749875c6d00531fb31313fcda43b89e64e6301b7c28d3d2f2b9399927c296f2439112a SHA512 66d1273707e09f049d0095825eba1382332686ed441bc681582d3bf6485a53122ec510a786ea56c48f1506ac00ea5462c016537c72494bb13681bdd9dbe2e050
-EBUILD varnish-6.5.0.ebuild 2148 BLAKE2B 0a9046dc717ee032241f567e4835932d49b0f88adc5822670cff04b377a30ca8c440bf4f06119f9711de37c0d818ea612d47aee47714d889aeb9c039c3d947b8 SHA512 86a6d7af15583e3cbea9e9dd56d60801723a3d979c224a75ba22168c8afae0732d226837b23ff0d8619bec76275ec9977c581a8b49b85c6b25cd7f9671bd9fd9
-EBUILD varnish-6.5.1.ebuild 2241 BLAKE2B 1b16f9257c56dae4c4620a13437d18a03f5f14fd01b42da2028399fccd8f344239273d53d3fe9b92ed6fd3e095c91a7f05ff4fcf0d33f44c1ba3166b7f16500d SHA512 b87b067cb2c4ea0dcc048a4e6c7c7aeb9d2b12b7b48c0f0c3af7e2c517e833df82d710e53f23bb3f0d61a902f2cb0ca6a5930d12be43cc83026af8544e2a9aa6
+EBUILD varnish-6.5.2.ebuild 2250 BLAKE2B 9feb9dc308d07deeaa05fc5f26b5f76dc44e72d56a3eccfe452c2bb5dd7ed38b5bac422956c8dec67e50aa7b7baca032bae4cb063599d581808837494b2b10e3 SHA512 78acc8747a193d647c3e494b25546a41e8feaa51bc1b2976f71d3b6cb81273e6a89e39d3ef728b3049d3c31b388a36f33361446877e3a071fc29745220bc9fee
+EBUILD varnish-6.6.1.ebuild 2386 BLAKE2B a4dfd27b217b6b171da976bf5290dad54ece7691e7ccd1db0fbc2eba4d580bea81053e22262ffe7b3d307ac1518de98378d621892e16581df6b23477430ade18 SHA512 91de5039eb2b449eff5102228c88856264711f5d1b0cfe8243a1505abae1387a682d92532b30fc8db1216ce8f1533b0f7d0f7e18c7b887dedcb134437478d846
 MISC metadata.xml 1154 BLAKE2B eef29e16772e06a4b08bb7c2de3c02570a698eafe1eb9f3d1d6708cbf4ea3ef2644642b3040ebea108477e331aff164e4e540dc7f5620f15643b385d1523fd7f SHA512 a429d2e7604fb1e1f1d3ef48c13ab2151f7e2adab6a81021f473d7b56bdc9fc8d7700370125908b0278c2b0621afb3cccb73c4f3284b288cbceac05294e70f99
diff --git a/www-servers/varnish/varnish-6.5.1.ebuild b/www-servers/varnish/varnish-6.5.2.ebuild
index 87201493f019..9901f81c14fc 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
index d8b86fe79c7d..5a49d8e6ee1c 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