5 files changed, 9 insertions, 154 deletions
diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index e20256aeb40c..4eb9e190f3fb 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/varnish
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.43 2011/12/14 22:55:13 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.44 2012/03/21 11:37:53 pacho Exp $
+
+  21 Mar 2012; Pacho Ramos <pacho@gentoo.org> -varnish-2.1.5.ebuild,
+  -varnish-3.0.1.ebuild, -varnish-3.0.2.ebuild, metadata.xml:
+  Drop www-server herd as discussed in gentoo-dev ML. Drop old.
 
 *varnish-3.0.2-r1 (14 Dec 2011)
 
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
index 86e5e5315cb3..3bb61ff04e6f 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>www-servers</herd>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
 	<use>
 		<flag name="tools">Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes</flag>
 	</use>
diff --git a/www-servers/varnish/varnish-2.1.5.ebuild b/www-servers/varnish/varnish-2.1.5.ebuild
deleted file mode 100644
index 782a539f7a5f..000000000000
--- a/www-servers/varnish/varnish-2.1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.1.5.ebuild,v 1.3 2011/12/14 22:48:29 radhermit Exp $
-
-EAPI="3"
-
-inherit eutils autotools
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-CDEPEND="dev-libs/libpcre"
-#varnish compiles stuff at run time
-RDEPEND="${CDEPEND}
-	sys-devel/gcc"
-DEPEND="${CDEPEND}
-	dev-python/docutils
-	dev-util/pkgconfig"
-
-RESTRICT="test" #315725
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.4-virtual-ncsa.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/varnishd.initd varnishd || die
-	newconfd "${FILESDIR}"/varnishd.confd varnishd || die
-
-	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 -"
-	elog "please read the man-page for more info."
-	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
-	elog "   /etc/conf.d/varnishd"
-	echo
-	ewarn "Varnish 2.1.x introduces VCL changes wrt. 2.0.x. See also"
-	ewarn "http://www.varnish-cache.org/docs/2.1/reference/vcl.html"
-}
diff --git a/www-servers/varnish/varnish-3.0.1.ebuild b/www-servers/varnish/varnish-3.0.1.ebuild
deleted file mode 100644
index 933d647d970b..000000000000
--- a/www-servers/varnish/varnish-3.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.1.ebuild,v 1.3 2011/12/14 22:48:29 radhermit Exp $
-
-EAPI="4"
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-CDEPEND="dev-libs/libpcre"
-#varnish compiles stuff at run time
-RDEPEND="${CDEPEND}
-	sys-devel/gcc"
-DEPEND="${CDEPEND}
-	dev-python/docutils
-	dev-util/pkgconfig"
-
-RESTRICT="test" #315725
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newinitd "${FILESDIR}"/varnishd.initd varnishd
-	newconfd "${FILESDIR}"/varnishd.confd 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 -"
-	elog "please read the man-page for more info."
-	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
-	elog "   /etc/conf.d/varnishd"
-}
diff --git a/www-servers/varnish/varnish-3.0.2.ebuild b/www-servers/varnish/varnish-3.0.2.ebuild
deleted file mode 100644
index a46c04c22a9d..000000000000
--- a/www-servers/varnish/varnish-3.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.2.ebuild,v 1.4 2011/12/14 22:48:29 radhermit Exp $
-
-EAPI="4"
-
-inherit autotools-utils
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-CDEPEND="dev-libs/libpcre"
-#varnish compiles stuff at run time
-RDEPEND="${CDEPEND}
-	sys-devel/gcc"
-DEPEND="${CDEPEND}
-	dev-python/docutils
-	dev-util/pkgconfig"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/varnishd.initd varnishd
-	newconfd "${FILESDIR}"/varnishd.confd 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 -"
-	elog "please read the man-page for more info."
-	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
-	elog "   /etc/conf.d/varnishd"
-}