www-servers/varnish: remove older versions.

Package-Manager: portage-2.2.20.1

11 files changed, 6 insertions, 724 deletions

diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index f05044f0488f..b6e8a478abab 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,8 +1,3 @@
-DIST varnish-3.0.5.tar.gz 2116664 SHA256 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 SHA512 0fe8a0f45ebe3b159fde811ac374ef8fb5be7712d8a61474778c57ddf4e7fb0404c7b28abeb614a16255a1c9ef0c780db44d03b1c8fbfee54adc49d92cbf733d WHIRLPOOL 5c33e510b5c511790a38451068e569ac62a5db4dc0c9aab99ef1509166674474c12dc5e0e9cdcde0245eb1b5c7b9947fed19a513114f363d468f2fbeff1c8d0d
-DIST varnish-3.0.6.tar.gz 2049810 SHA256 840ded8f25e7343117f6e3e2015759118f1d2db357ae8d7e02ea964e6fb680b7 SHA512 6dcbbf1407e72f9fe6c156a4074d9d42ce147d225cd3001b3240a22ed02e7adf2e900671f9f7e81cbd6b565b29ac65e0436c08c295763b5f7d48b6ab76a1c6b3 WHIRLPOOL 6254de1210f179c0e523cbdb7a1ecd36535cc50ee085d5093a7bc2285d666db45fa4fd130253ae6c94c09037b1225f0c89b5d73a2e0e51f0e5fda7d3e2e2d81d
 DIST varnish-3.0.7.tar.gz 2102037 SHA256 a27e9f11391617fab27cc6edc31d3c8681b8d6975f8c2cd07f6e081bc54c24ce SHA512 5fa9749305eb1a546ef4aae8a1797247fcc9098e1661453b9b87916da9fbc60d76bc0de9542ab17136e3da4b256c8a547aded2b4372dbbb54c44e93eff34a061 WHIRLPOOL 00ff6d16603ba4bf42608d55d769048f35c275a8ffa2b6860df6de2571d0481c39019d58d5b843f8a64492a5bf26caf9d841a023826d2fd2771ed8d35447a659
-DIST varnish-4.0.0.tar.gz 2372630 SHA256 4bbf73656be11687cbb8c7d4a7315786081687664b40a8ccbe67b36f8c0b1c17 SHA512 5eb3806f6c7c46438b6ebbe30c42f5a6afc53a9fa9e8f4b809c7d18b465712640950601be9873810a0f408865fba6ae9d18e46e4f22c89cc3a2e0c351753ac71 WHIRLPOOL 431dad47430a7b2a2eba3dd635eb487cb4d112a9ebdf6a3cb946b0bd8476653bded2d29128bcac1f98c6b3dfc3d7bc9c32f25ea76bccc9f427519f8dc36e2eb6
-DIST varnish-4.0.1.tar.gz 1877657 SHA256 49c3cebc89cb08fbc89d6680c1c8b42efc9313888172f3cdbdae7324b5c8f35b SHA512 e1ae846ff5b5e6ac0b694e8b197f9f7ec8c47677cbaaab6c0c490b6d5fa52f58f84fa3001bee8fe57451328cb809be0b5be55ddb41bd9c2444f23e0af582116b WHIRLPOOL 3013ae885a1eb6d44600b7c5513109a526cbed8f6bf687a81fa31111088713d68a9a059a67912966d7bed3b6404988c5fc785f02c91a63ea1f2a5037caf21e7b
-DIST varnish-4.0.2.tar.gz 1853668 SHA256 d9fb6a6eaf05bbb0c8eb5855556a4b092183b2c1a61281bfd73adf83a304555b SHA512 262bef5823f56c70fa9c7f24225b02b0218889c216143f63bb11db978ca7eddb174f605a5e48a4e774d88b20af5f5845bb2a6aef6fa3aaaf7cacd8c7c17cb82f WHIRLPOOL 35977069c6908a2fd731984585b447055730a288300de8709d83bec2df3677337535970c503b3b3d26635b0c747e7c387a423d93e776a755b8d8f0078c845696
 DIST varnish-4.0.3.tar.gz 1866760 SHA256 94b9a174097f47db2286acd2c35f235e49a2b7a9ddfdbd6eb7aa4da9ae8f8206 SHA512 db7bb141afd4617ac95573983dc30591b0eb9bc1af06df1094f2c1eeac539da936afb4a239d2f446d3c3a51b88a781b7f9f6d9a0b2028eaf0e7049ea2159d883 WHIRLPOOL 942456e19be427859283959dabe5522667519d36decbc598c8ee1e949767ea7435469393289d4373db6abac5275e50a95fc3799a837dc17740a490b4912bfe6f
 DIST varnish-4.1.0.tar.gz 1990932 SHA256 4a6ea08e30b62fbf25f884a65f0d8af42e9cc9d25bf70f45ae4417c4f1c99017 SHA512 b50aaa41247b912b40307423f99ae519ae5e19bea3546b049f148661727887f06b3d27712e685c219ae18cb6d53d89b415ddbd10bada7cfac00b2fd995995f5c WHIRLPOOL ae462819521b2ad5df29e82a1966190b849eba2c0d9d146cf97c8a0dba325653c24a6c67ed8a154c1cb1cba6a1a25c78bfda6d83deff72ad7756a57725521d92
diff --git a/www-servers/varnish/varnish-3.0.5-r3.ebuild b/www-servers/varnish/varnish-3.0.5-r3.ebuild
deleted file mode 100644
index f1acfed37bce..000000000000
--- a/www-servers/varnish/varnish-3.0.5-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit autotools-utils eutils systemd python-single-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="doc jemalloc jit static-libs +tools"
-
-CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	tools? ( sys-libs/ncurses )"
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
-	"${FILESDIR}"/${PN}-3.0.4-automagic.patch
-	"${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
-	"${FILESDIR}"/${PN}-3.0.5-fix-python-path.patch
-	"${FILESDIR}"/${PN}-3.0.5-path-to-vmod_vcc.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove bundled libjemalloc. We also fix
-	# automagic dep in our patches, bug #461638
-	rm -rf lib/libjemalloc
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit )
-		$(use_with jemalloc)
-		$(use_with tools)
-		--without-rst2man
-		--without-rst2html
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/varnishd.initd-r1 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r1 varnishd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/varnishd.logrotate" varnishd
-
-	dodir /var/log/varnish
-
-	use doc && dohtml -r "doc/sphinx/=build/html/"
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	python_doscript lib/libvmod_std/vmod.py
-	insinto /etc/varnish
-	doins  lib/libvmod_std/vmod.vcc
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution.  Please"
-	elog "read the man-page for more info.  A sample configuration proxying"
-	elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-3.0.5-r4.ebuild b/www-servers/varnish/varnish-3.0.5-r4.ebuild
deleted file mode 100644
index 3dc57eb4af29..000000000000
--- a/www-servers/varnish/varnish-3.0.5-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit autotools-utils eutils systemd python-single-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="doc jemalloc jit static-libs +tools"
-
-CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	tools? ( sys-libs/ncurses )"
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
-	"${FILESDIR}"/${PN}-3.0.4-automagic.patch
-	"${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
-	"${FILESDIR}"/${PN}-3.0.5-fix-python-path.patch
-	"${FILESDIR}"/${PN}-3.0.5-path-to-vmod_vcc.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove bundled libjemalloc. We also fix
-	# automagic dep in our patches, bug #461638
-	rm -rf lib/libjemalloc
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit )
-		$(use_with jemalloc)
-		$(use_with tools)
-		--without-rst2man
-		--without-rst2html
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/varnishd.initd-r2 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r2 varnishd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/varnishd.logrotate" varnishd
-
-	dodir /var/log/varnish
-
-	use doc && dohtml -r "doc/sphinx/=build/html/"
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	python_doscript lib/libvmod_std/vmod.py
-	insinto /etc/varnish
-	doins  lib/libvmod_std/vmod.vcc
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution.  Please"
-	elog "read the man-page for more info.  A sample configuration proxying"
-	elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-3.0.5.ebuild b/www-servers/varnish/varnish-3.0.5.ebuild
deleted file mode 100644
index 151d66c75111..000000000000
--- a/www-servers/varnish/varnish-3.0.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="doc jemalloc jit static-libs +tools"
-
-CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	tools? ( sys-libs/ncurses )"
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
-	"${FILESDIR}"/${PN}-3.0.4-automagic.patch
-	"${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-src_prepare() {
-	# Remove bundled libjemalloc. We also fix
-	# automagic dep in our patches, bug #461638
-	rm -rf lib/libjemalloc
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit )
-		$(use_with jemalloc)
-		$(use_with tools)
-		--without-rst2man
-		--without-rst2html
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/varnishd.initd-r1 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r1 varnishd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/varnishd.logrotate" varnishd
-
-	dodir /var/log/varnish
-
-	use doc && dohtml -r "doc/sphinx/=build/html/"
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution.  Please"
-	elog "read the man-page for more info.  A sample configuration proxying"
-	elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-3.0.6.ebuild b/www-servers/varnish/varnish-3.0.6.ebuild
deleted file mode 100644
index 3bb22aa80824..000000000000
--- a/www-servers/varnish/varnish-3.0.6.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit autotools-utils eutils systemd python-single-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="doc jemalloc jit static-libs +tools"
-
-CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	tools? ( sys-libs/ncurses )"
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
-	"${FILESDIR}"/${PN}-3.0.4-automagic.patch
-	"${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
-	"${FILESDIR}"/${PN}-3.0.5-fix-python-path.patch
-	"${FILESDIR}"/${PN}-3.0.5-path-to-vmod_vcc.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove bundled libjemalloc. We also fix
-	# automagic dep in our patches, bug #461638
-	rm -rf lib/libjemalloc
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit )
-		$(use_with jemalloc)
-		$(use_with tools)
-		--without-rst2man
-		--without-rst2html
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/varnishd.initd-r2 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r2 varnishd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/varnishd.logrotate" varnishd
-
-	dodir /var/log/varnish
-
-	use doc && dohtml -r "doc/sphinx/=build/html/"
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	python_doscript lib/libvmod_std/vmod.py
-	insinto /etc/varnish
-	doins  lib/libvmod_std/vmod.vcc
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution.  Please"
-	elog "read the man-page for more info.  A sample configuration proxying"
-	elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-3.0.7.ebuild b/www-servers/varnish/varnish-3.0.7.ebuild
index 3dc57eb4af29..b43cc84491f6 100644
--- a/www-servers/varnish/varnish-3.0.7.ebuild
+++ b/www-servers/varnish/varnish-3.0.7.ebuild
@@ -18,10 +18,10 @@ KEYWORDS="amd64 ~mips x86"
 IUSE="doc jemalloc jit static-libs +tools"
 
 CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
+	|| ( dev-libs/libedit sys-libs/readline:= )
 	dev-libs/libpcre[jit?]
 	jemalloc? ( dev-libs/jemalloc )
-	tools? ( sys-libs/ncurses )"
+	tools? ( sys-libs/ncurses:= )"
 
 #varnish compiles stuff at run time
 RDEPEND="
diff --git a/www-servers/varnish/varnish-4.0.0-r1.ebuild b/www-servers/varnish/varnish-4.0.0-r1.ebuild
deleted file mode 100644
index 8f7b4e21c55b..000000000000
--- a/www-servers/varnish/varnish-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit user autotools-utils eutils systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses"
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.0-fix-man-Makefile_am.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
-	ebegin "Creating varnish user and group"
-	enewgroup varnish 40
-	enewuser varnish 40 -1 /var/lib/varnish varnish
-	eend $?
-}
-
-src_prepare() {
-	# Remove bundled libjemalloc. We also fix
-	# automagic dep in our patches, bug #461638
-	rm -rf lib/libjemalloc
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit )
-		$(use_with jemalloc)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_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-r3 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	dodir /var/log/varnish/
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins  lib/libvmod_std/vmod.vcc
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution.  Please"
-	elog "read the man-page for more info.  A sample configuration proxying"
-	elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-4.0.1-r1.ebuild b/www-servers/varnish/varnish-4.0.1-r1.ebuild
deleted file mode 100644
index 8d7018d9e6e2..000000000000
--- a/www-servers/varnish/varnish-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit user autotools-utils eutils systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses"
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-fix-man-Makefile_am.patch
-	"${FILESDIR}"/${PN}-4.0.1-fix-doc-Makefile_am.patch
-	"${FILESDIR}"/${PN}-4.0.1-fix-warning.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
-	ebegin "Creating varnish user and group"
-	enewgroup varnish 40
-	enewuser varnish 40 -1 /var/lib/varnish varnish
-	eend $?
-}
-
-src_prepare() {
-	# Remove bundled libjemalloc. We also fix
-	# automagic dep in our patches, bug #461638
-	rm -rf lib/libjemalloc
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit )
-		$(use_with jemalloc)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
-	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
-	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
-	newinitd "${FILESDIR}"/varnishncsa.initd-r1 varnishncsa
-	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
-	newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	dodir /var/log/varnish/
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins lib/libvmod_std/vmod.vcc
-	doins etc/example.vcl
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution.  Please"
-	elog "read the man-page for more info.  A sample configuration proxying"
-	elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-4.0.2.ebuild b/www-servers/varnish/varnish-4.0.2.ebuild
deleted file mode 100644
index 8d7018d9e6e2..000000000000
--- a/www-servers/varnish/varnish-4.0.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit user autotools-utils eutils systemd python-r1
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="jemalloc jit static-libs"
-
-CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
-	dev-libs/libpcre[jit?]
-	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses"
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-fix-man-Makefile_am.patch
-	"${FILESDIR}"/${PN}-4.0.1-fix-doc-Makefile_am.patch
-	"${FILESDIR}"/${PN}-4.0.1-fix-warning.patch
-)
-
-AUTOTOOLS_AUTORECONF="yes"
-
-pkg_setup() {
-	ebegin "Creating varnish user and group"
-	enewgroup varnish 40
-	enewuser varnish 40 -1 /var/lib/varnish varnish
-	eend $?
-}
-
-src_prepare() {
-	# Remove bundled libjemalloc. We also fix
-	# automagic dep in our patches, bug #461638
-	rm -rf lib/libjemalloc
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable jit pcre-jit )
-		$(use_with jemalloc)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
-
-	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
-	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
-
-	newinitd "${FILESDIR}"/varnishncsa.initd-r1 varnishncsa
-	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
-
-	newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
-	newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
-
-	diropts -m750
-
-	dodir /var/log/varnish/
-
-	systemd_dounit "${FILESDIR}/${PN}d.service"
-
-	insinto /etc/varnish/
-	doins lib/libvmod_std/vmod.vcc
-	doins etc/example.vcl
-
-	fowners root:varnish /etc/varnish/
-	fowners varnish:varnish /var/lib/varnish/
-	fperms 0750 /var/lib/varnish/ /etc/varnish/
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution.  Please"
-	elog "read the man-page for more info.  A sample configuration proxying"
-	elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd."
-}
diff --git a/www-servers/varnish/varnish-4.0.3.ebuild b/www-servers/varnish/varnish-4.0.3.ebuild
index 9bf65e5b5e59..24d34d0063ad 100644
--- a/www-servers/varnish/varnish-4.0.3.ebuild
+++ b/www-servers/varnish/varnish-4.0.3.ebuild
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~mips ~x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
+	|| ( dev-libs/libedit sys-libs/readline:= )
 	dev-libs/libpcre[jit?]
 	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses"
+	sys-libs/ncurses:="
 
 #varnish compiles stuff at run time
 RDEPEND="
diff --git a/www-servers/varnish/varnish-4.1.0.ebuild b/www-servers/varnish/varnish-4.1.0.ebuild
index 9bf65e5b5e59..24d34d0063ad 100644
--- a/www-servers/varnish/varnish-4.1.0.ebuild
+++ b/www-servers/varnish/varnish-4.1.0.ebuild
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~mips ~x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline )
+	|| ( dev-libs/libedit sys-libs/readline:= )
 	dev-libs/libpcre[jit?]
 	jemalloc? ( dev-libs/jemalloc )
-	sys-libs/ncurses"
+	sys-libs/ncurses:="
 
 #varnish compiles stuff at run time
 RDEPEND="