gentoo resync : 03.11.2018

2 files changed, 105 insertions, 0 deletions

diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index ffded9ba4f6a..c2a4c7771db4 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -14,10 +14,12 @@ DIST varnish-5.1.3.tgz 2643223 BLAKE2B 85bae87785da1284d7d916b8948a0984eea9cf07e
 DIST varnish-5.2.1.tgz 2827676 BLAKE2B 6f50a55a9b16d137eaec59aea98a0179b808bb67fc3de26c9b0924b9937a3688b7f9db45d2f0a71be2b7c6f77bfd47cd22e7b898348b5236114572b5bb33ff22 SHA512 2e979983c7f2325e289768752cc474dc3032c3420de65ccfd5871098c076aecf18e962b04308ecb1860f542fd6f6418dc79220fdd6cf4a75f7476a733faa589c
 DIST varnish-6.0.1.tgz 3065822 BLAKE2B b99d0d50444872353367007f2ee97c5d5f0e60031ece7b07f8b2c3a7a84b31be88fe2b850304b1f2e47a35f35c2c41f43888bee1d1874721a72ad078acfddfa1 SHA512 057cb69ae6a4d980401effb7561d3a9b537216d8626fdf4e7bcc75971958517f51b6bd7f7af86c11bc92a2e77876831c577736dfcd11447ad0128f222c5ad138
 DIST varnish-6.1.0.tgz 3137149 BLAKE2B 8db1fb3460a25763bd28c92fa8b9181711b497a7d1cadfbbf19794c9df3e64e60aefac87032892a02eed3ff380686f047fb67d8c7f70b602e65c63b69224e674 SHA512 48584fc2d938cc0759fa5d795992a0c6d5d9fb49db5f3063dca8d3d88c6282dac971ed268edc07bec95b4f25e26562089b1b84abdd26099e12be9ea66557716d
+DIST varnish-6.1.1.tgz 3135623 BLAKE2B c39904fe2745ab601e7c1f6d85850fe1a83c19e8d80e8af5a60ac5f134817b26b3274ba62c78c3839fd7e6c2da3e58b6c211a7452d37dd864f0f658d500a6138 SHA512 67e546e5fee2d10ec038d7b011a3f61a0a056ce8a4813556526c8fce23bb1fe4e29952a773e6cbc2433c0228971a5e90693d5ce61f6cb5f2242e055e0ce13d18
 EBUILD varnish-4.0.5.ebuild 2050 BLAKE2B 22e332f95d1138577e37deebee8e0e77f11bb1ead55f672cd67db4765b3d3e8ae5854b940d59a652ec6619c56a5e3a379f425c39780685c0e8fa7a54869a2141 SHA512 b1520598b99b94f29afd63305470e06fc9a8ef4f6d816cc56390b73fb980cbffcd62488e644e4eaa56991445f153ff39661a04726babbb89e574bca3f891a796
 EBUILD varnish-4.1.8.ebuild 2208 BLAKE2B 6a0509906c324ead94dc1706dfcb22156d04c2390615acd541277d90c25fe2e0bf4e96d1210d03f8f886711b67b2deb6fa635d14ef4fe249ab7b71bcf350fdf3 SHA512 166fe6d8e1d89fbf4064f2d6995b00156bbca7920b1131a6fbbde45605d26fdfaf54dadff626ed72546fdfd66ccdec20efb31a526c2ff3336261da2f31d6b84e
 EBUILD varnish-5.1.3.ebuild 2213 BLAKE2B 33a0b63f322d721c352748ac54b9e78c3df4b1916950bf698960bab57cfabfd39efa1c7a5ca4ea945f77fbebd943cfdf2579eb92e21a98bf24690a8a537b14b6 SHA512 290570d1a668f5ed0a4acda504313d5264c9d0dc7dc2d49a237b4bfa16c5c5b31749c48fa20e79fc06cb54a5ad100231da6fef00cdb75362a926f123ff17320f
 EBUILD varnish-5.2.1.ebuild 2267 BLAKE2B 6b6886e00415115a3649eee695bbbd4bbc2a7ab8590edf9cd7951a50cdf6f6e32bd3384514bd3330086dfab18dfc5a39c79db36f40cec76a9c66cdbc4e26ce3b SHA512 d3dec4d67b7e22981ecb643cefdb8729e51cb7545178eee996d96e15875e6373cf9b2956e29b3acc888b5ec6db430164096f0ce9e2bb24b295c01435870d27a3
 EBUILD varnish-6.0.1.ebuild 2241 BLAKE2B ddfcb5a33309872865b766f3259d00a16368f895e786ece160217cfa134643a8f776f5c87733461a8a57d3f6d715b0d618412b6fbbfc3c14c81dc95c853a45d1 SHA512 0b7c5e688d3d0cd2003842b2085c8894b52acdb0f1ecb72d77ef35ecc349ac5e00adc4c34ea488d60c01e648d7eca6582b5dbfd5939c1d99819f11fdd72a41b2
 EBUILD varnish-6.1.0.ebuild 2260 BLAKE2B 317004952169a6c652e229f606e6616c3b12489df02a71a184c61bf5470a4c03d410ec592e845ef9f5ddbecb2b0759ece1992af071b5b30afc03ed9e11945d78 SHA512 a1a936029d0120ba00b45eccdb95eba69c8c48d184ec95f3c03e61715b1bddcf7226aa0f646c4a9caaee491c7b2b29407bd2a8dd216bad3731965c210cb84bee
+EBUILD varnish-6.1.1.ebuild 2260 BLAKE2B 317004952169a6c652e229f606e6616c3b12489df02a71a184c61bf5470a4c03d410ec592e845ef9f5ddbecb2b0759ece1992af071b5b30afc03ed9e11945d78 SHA512 a1a936029d0120ba00b45eccdb95eba69c8c48d184ec95f3c03e61715b1bddcf7226aa0f646c4a9caaee491c7b2b29407bd2a8dd216bad3731965c210cb84bee
 MISC metadata.xml 1154 BLAKE2B eef29e16772e06a4b08bb7c2de3c02570a698eafe1eb9f3d1d6708cbf4ea3ef2644642b3040ebea108477e331aff164e4e540dc7f5620f15643b385d1523fd7f SHA512 a429d2e7604fb1e1f1d3ef48c13ab2151f7e2adab6a81021f473d7b56bdc9fc8d7700370125908b0278c2b0621afb3cccb73c4f3284b288cbceac05294e70f99
diff --git a/www-servers/varnish/varnish-6.1.1.ebuild b/www-servers/varnish/varnish-6.1.1.ebuild
new file mode 100644
index 000000000000..af7e42b863da
--- /dev/null
+++ b/www-servers/varnish/varnish-6.1.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit user 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 ~mips ~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}
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	dev-python/sphinx
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+pkg_setup() {
+	ebegin "Creating varnish user and group"
+	enewgroup varnish
+	enewuser varnish -1 -1 /var/lib/varnish varnish
+	eend $?
+}
+
+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
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable jit pcre-jit ) \
+		$(use_with jemalloc)
+}
+
+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 lib/libvmod_std/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/
+}