www-servers/varnish: Import

Package-Manager: portage-2.2.8-r1
RepoMan-Options: --force

11 files changed, 714 insertions, 0 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
new file mode 100644
index 00000000..a1e6be47
--- /dev/null
+++ b/www-servers/varnish/ChangeLog
@@ -0,0 +1,322 @@
+# ChangeLog for www-servers/varnish
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.70 2014/01/16 18:49:32 blueness Exp $
+
+*varnish-3.0.5-r3 (16 Jan 2014)
+
+  16 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/varnish-3.0.5-fix-python-path.patch,
+  +files/varnish-3.0.5-path-to-vmod_vcc.patch, +varnish-3.0.5-r3.ebuild,
+  -varnish-3.0.5-r2.ebuild:
+  Account for bug #498274
+
+*varnish-3.0.5-r2 (16 Jan 2014)
+
+  16 Jan 2014; Anthony G. Basile <blueness@gentoo.org> +varnish-3.0.5-r2.ebuild:
+  Install vmod.py for bug #498268
+
+*varnish-3.0.5-r1 (20 Dec 2013)
+
+  20 Dec 2013; Anthony G. Basile <blueness@gentoo.org> +files/varnishd.service,
+  +varnish-3.0.5-r1.ebuild:
+  Add systemd unit file, bug #494708.  Thanks Roc Vallès!
+
+  06 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
+  -files/varnish-3.0.2-automagic.patch, -files/varnish-3.0.3-automagic.patch,
+  -files/varnishd.confd, -files/varnishd.initd, -varnish-3.0.2-r1.ebuild,
+  -varnish-3.0.3-r1.ebuild, -varnish-3.0.4-r1.ebuild, -varnish-3.0.4.ebuild:
+  Cleanup, security bug #489944
+
+  06 Dec 2013; Agostino Sarubbo <ago@gentoo.org> varnish-3.0.5.ebuild:
+  Stable for x86, wrt bug #489944
+
+  06 Dec 2013; Agostino Sarubbo <ago@gentoo.org> varnish-3.0.5.ebuild:
+  Stable for amd64, wrt bug #489944
+
+*varnish-3.0.5 (03 Dec 2013)
+
+  03 Dec 2013; Anthony G. Basile <blueness@gentoo.org> +varnish-3.0.5.ebuild:
+  Version bump
+
+*varnish-3.0.4-r1 (08 Jul 2013)
+
+  08 Jul 2013; Anthony G. Basile <blueness@gentoo.org> +files/varnishd.confd-r1,
+  +files/varnishd.initd-r1, +varnish-3.0.4-r1.ebuild:
+  Add sanity test and reload functionality to init.d script, bug #475600
+
+  21 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +files/varnish-3.0.4-fix-automake-1.13.patch, varnish-3.0.4.ebuild:
+  Fix for automake-1.13, bug #468070
+
+  18 Jun 2013; Anthony G. Basile <blueness@gentoo.org> files/varnishd.confd:
+  Be more explicit in varnishd.confd, bug #461624
+
+  16 Jun 2013; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+  Fix failed gpg signature
+
+  16 Jun 2013; Anthony G. Basile <blueness@gentoo.org> varnish-3.0.4.ebuild:
+  Dep on either libedit or readline, drop useless dep on docutils
+
+*varnish-3.0.4 (16 Jun 2013)
+
+  16 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +files/varnish-3.0.4-automagic.patch, +varnish-3.0.4.ebuild:
+  Version bump
+
+  19 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  files/varnish-3.0.3-automagic.patch:
+  Fix AC_CHECK_LIB for malloc_conf in jemalloc-2 and -3, bug #461638
+
+*varnish-3.0.3-r1 (14 Mar 2013)
+
+  14 Mar 2013; Anthony G. Basile <blueness@gentoo.org> +varnish-3.0.3-r1.ebuild,
+  -varnish-3.0.3.ebuild, files/varnish-3.0.3-automagic.patch, metadata.xml:
+  Remove bundled jemalloc and fix automagic dependency, bug #461638
+
+  14 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  -files/varnish-2.0.4-link-order.patch,
+  -files/varnish-2.0.4-virtual-ncsa.patch,
+  -files/varnish-2.1.4-find-rst2man.py.patch,
+  -files/varnish-2.1.4-virtual-ncsa.patch, -varnish-2.0.4-r1.ebuild:
+  Remove older stable
+
+  14 Mar 2013; Anthony G. Basile <blueness@gentoo.org> files/varnishd.confd,
+  files/varnishd.initd:
+  Increase number of open files, bug #459142
+
+  22 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +files/varnish-3.0.3-pthread-uclibc.patch, varnish-3.0.3.ebuild:
+  Fix build on uclibc, bug #444294
+
+*varnish-3.0.3 (23 Aug 2012)
+
+  23 Aug 2012; Anthony G. Basile <blueness@gentoo.org> +varnish-3.0.3.ebuild,
+  +files/varnish-3.0.3-automagic.patch:
+  Version bump
+
+  11 Jul 2012; Anthony G. Basile <blueness@gentoo.org> varnish-2.0.4-r1.ebuild,
+  varnish-3.0.2-r1.ebuild:
+  Add GPL-2 for init scripts, bug #426184
+
+  11 Jul 2012; Anthony G. Basile <blueness@gentoo.org> varnish-3.0.2-r1.ebuild:
+  Keyword ~mips
+
+  15 Jun 2012; Agostino Sarubbo <ago@gentoo.org> varnish-3.0.2-r1.ebuild:
+  Stable for amd64, wrt bug #421205
+
+  15 Jun 2012; Jeff Horelick <jdhore@gentoo.org> varnish-3.0.2-r1.ebuild:
+  marked x86 per bug 421205
+
+  21 May 2012; Kacper Kowalik <xarthisius@gentoo.org> varnish-2.0.4-r1.ebuild:
+  Add missing inheritance of eutils.eclass
+
+  02 May 2012; Jeff Horelick <jdhore@gentoo.org> varnish-3.0.2-r1.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  24 Mar 2012; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
+  Adopt package
+
+  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)
+
+  14 Dec 2011; Tim Harder <radhermit@gentoo.org> +varnish-3.0.2-r1.ebuild,
+  +files/varnish-3.0.2-automagic.patch, metadata.xml:
+  Revbump to fix automagic dependencies. Add libedit and tools use flags.
+
+  14 Dec 2011; Tim Harder <radhermit@gentoo.org> varnish-2.1.5.ebuild,
+  varnish-3.0.1.ebuild, varnish-3.0.2.ebuild:
+  Add missing libpcre rdep.
+
+  14 Dec 2011; Tim Harder <radhermit@gentoo.org> varnish-2.1.5.ebuild,
+  varnish-3.0.1.ebuild, varnish-3.0.2.ebuild:
+  Add pkgconfig build dep (bug #394713).
+
+  14 Dec 2011; Tim Harder <radhermit@gentoo.org> -varnish-2.0.6.ebuild,
+  -varnish-2.1.3.ebuild, -varnish-2.1.4.ebuild, -varnish-3.0.0.ebuild:
+  Remove old.
+
+  28 Nov 2011; Tim Harder <radhermit@gentoo.org> varnish-3.0.2.ebuild:
+  Fix autotools-utils usage (bug #392131).
+
+*varnish-3.0.2 (05 Nov 2011)
+
+  05 Nov 2011; Tim Harder <radhermit@gentoo.org> +varnish-3.0.2.ebuild:
+  Version bump.
+
+*varnish-3.0.1 (02 Sep 2011)
+
+  02 Sep 2011; Tim Harder <radhermit@gentoo.org> +varnish-3.0.1.ebuild:
+  Version bump. Add static-libs USE flag.
+
+*varnish-3.0.0 (30 Jul 2011)
+
+  30 Jul 2011; Patrick Lauer <patrick@gentoo.org> +varnish-3.0.0.ebuild:
+  Bump for #372281
+
+  20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Drop maintainer due retirement, bug #118937
+
+*varnish-2.1.5 (28 Jan 2011)
+
+  28 Jan 2011; Thilo Bangert <bangert@gentoo.org> +varnish-2.1.5.ebuild:
+  version bump
+
+*varnish-2.1.4 (21 Oct 2010)
+
+  21 Oct 2010; Thilo Bangert <bangert@gentoo.org> +varnish-2.1.4.ebuild,
+  +files/varnish-2.1.4-find-rst2man.py.patch,
+  +files/varnish-2.1.4-virtual-ncsa.patch:
+  version bump (#313377)
+
+*varnish-2.1.3 (21 Oct 2010)
+
+  21 Oct 2010; Thilo Bangert <bangert@gentoo.org> +varnish-2.1.3.ebuild:
+  version bump (#313377)
+
+  09 Aug 2010; Thilo Bangert <bangert@gentoo.org> -varnish-2.0.4.ebuild,
+  varnish-2.0.4-r1.ebuild, -varnish-2.0.5.ebuild, varnish-2.0.6.ebuild:
+  remove old ebuilds - RESTRICT=test (#315725)
+
+*varnish-2.0.6 (13 Apr 2010)
+
+  13 Apr 2010; Thilo Bangert <bangert@gentoo.org> +varnish-2.0.6.ebuild:
+  version bump
+
+*varnish-2.0.5 (20 Nov 2009)
+
+  20 Nov 2009; Thilo Bangert <bangert@gentoo.org> +varnish-2.0.5.ebuild:
+  version bump
+
+  07 Oct 2009; Benedikt Böhm <hollow@gentoo.org> varnish-2.0.4-r1.ebuild:
+  stable on amd64
+
+  06 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
+  varnish-2.0.4-r1.ebuild:
+  stable x86, bug 283211
+
+  30 Aug 2009; Benedikt Böhm <hollow@gentoo.org> varnish-2.0.4-r1.ebuild,
+  files/varnishd.initd:
+  make HTTP_HDR_MAX_VAL configurable in case broken webapps set more than 32
+  headers; only start varnishncsa logging if desired
+
+*varnish-2.0.4-r1 (12 Jul 2009)
+
+  12 Jul 2009; Thilo Bangert <bangert@gentoo.org> +varnish-2.0.4-r1.ebuild,
+  files/varnishd.confd, files/varnishd.initd, +files/varnishd.logrotate:
+  implement logging (bug #270597)
+
+  11 Jun 2009; Benedikt Böhm <hollow@gentoo.org>
+  +files/varnish-2.0.4-virtual-ncsa.patch, varnish-2.0.4.ebuild:
+  support virtual host log format in varnishncsa (upstream #485)
+
+  18 Apr 2009; Thilo Bangert <bangert@gentoo.org> -varnish-2.0.2.ebuild,
+  -varnish-2.0.3.ebuild:
+  remove old versions
+
+*varnish-2.0.4 (13 Apr 2009)
+
+  13 Apr 2009; Thilo Bangert <bangert@gentoo.org>
+  +files/varnish-2.0.4-link-order.patch, +varnish-2.0.4.ebuild:
+  version bump - fix build with --as-needed (bug #248488)
+
+  19 Feb 2009; Dawid Węgliński <cla@gentoo.org> varnish-2.0.3.ebuild:
+  Keywording ~amd64
+  
+  > Hi, i'm using www-servers/varnish for some time in a production
+  > environment here, and it works fine. Can i keyword it ~amd64?
+  
+  sure! thanks for your feedback.
+
+*varnish-2.0.3 (12 Feb 2009)
+
+  12 Feb 2009; Thilo Bangert <bangert@gentoo.org> +varnish-2.0.3.ebuild:
+  version bump
+
+  27 Jan 2009; Thilo Bangert <bangert@gentoo.org>
+  -files/varnish-2.0.1-fix-ESI-coredump.diff, -varnish-1.1.2.ebuild,
+  -varnish-2.0.1-r1.ebuild:
+  remove old versions
+
+*varnish-2.0.2 (14 Nov 2008)
+
+  14 Nov 2008; Thilo Bangert <bangert@gentoo.org> +varnish-2.0.2.ebuild:
+  version bump
+
+  23 Oct 2008; Thilo Bangert <bangert@gentoo.org> -varnish-1.0.4.ebuild,
+  -varnish-1.1.1.ebuild:
+  remove old versions
+
+*varnish-2.0.1-r1 (23 Oct 2008)
+
+  23 Oct 2008; Thilo Bangert <bangert@gentoo.org>
+  +files/varnish-2.0.1-fix-ESI-coredump.diff, -varnish-2.0.1.ebuild,
+  +varnish-2.0.1-r1.ebuild:
+  add ESI core dump fix - dont use default src_compile
+
+*varnish-2.0.1 (22 Oct 2008)
+
+  22 Oct 2008; Thilo Bangert <bangert@gentoo.org> +varnish-2.0.1.ebuild:
+  version bump
+
+  10 Mar 2008; Thilo Bangert <bangert@gentoo.org> files/varnishd.initd:
+  allow varnish to lock the logfile to memory - the next version of varnish
+  will require this. Add RDEPEND on gcc - varnish compiles vcl into c code. 
+
+  21 Dec 2007; Thilo Bangert <bangert@gentoo.org>
+  -files/varnish-1.1-build-DESTDIR.patch, varnish-1.0.4.ebuild,
+  -varnish-1.1.ebuild, varnish-1.1.1.ebuild:
+  remove old version - fix quoting
+
+*varnish-1.1.2 (21 Dec 2007)
+
+  21 Dec 2007; Thilo Bangert <bangert@gentoo.org> +varnish-1.1.2.ebuild:
+  version bump
+
+*varnish-1.1.1 (21 Aug 2007)
+
+  21 Aug 2007; Thilo Bangert <bangert@gentoo.org> +varnish-1.1.1.ebuild:
+  version bump
+
+*varnish-1.1 (02 Aug 2007)
+
+  02 Aug 2007; Thilo Bangert <bangert@gentoo.org>
+  +files/varnish-1.1-build-DESTDIR.patch, +varnish-1.1.ebuild:
+  version bump
+
+  11 Jun 2007; Thilo Bangert <bangert@gentoo.org> files/varnishd.initd,
+  -varnish-1.0.3.ebuild:
+  remove old version - init script creates a pidfile
+
+*varnish-1.0.4 (21 May 2007)
+
+  21 May 2007; Thilo Bangert <bangert@gentoo.org> +varnish-1.0.4.ebuild:
+  version bump
+
+  19 May 2007; Thilo Bangert <bangert@gentoo.org> files/varnishd.initd:
+  fix stop in init script
+
+  02 Mar 2007; Thilo Bangert <bangert@gentoo.org> files/varnishd.initd:
+  fix path to varnishd (moved to sbin)
+
+  22 Feb 2007; Thilo Bangert <bangert@gentoo.org> -varnish-1.0.1.ebuild:
+  punt old version
+
+  22 Feb 2007; Thilo Bangert <bangert@gentoo.org> varnish-1.0.3.ebuild:
+  einfo -> elog
+
+*varnish-1.0.3 (20 Feb 2007)
+
+  20 Feb 2007; Thilo Bangert <bangert@gentoo.org> +varnish-1.0.3.ebuild:
+  version bump
+
+  10 Dec 2006; Elfyn McBratney <beu@gentoo.org> varnish-1.0.1.ebuild:
+  Kill redundant *DEPEND on sys-libs/ncurses.
+
+*varnish-1.0.1 (19 Oct 2006)
+
+  19 Oct 2006; Thilo Bangert <bangert@gentoo.org> +files/varnishd.confd,
+  +files/varnishd.initd, +metadata.xml, +varnish-1.0.1.ebuild:
+  varnish - Varnish is an HTTP accelerator. aka a better squid
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
new file mode 100644
index 00000000..a605817b
--- /dev/null
+++ b/www-servers/varnish/Manifest
@@ -0,0 +1,11 @@
+AUX varnish-3.0.3-pthread-uclibc.patch 1348 SHA256 3e39323ff4d741a9a0337e84eee7ce9f8b5419722a3b905f09ccf2486a9ff24f WHIRLPOOL 467f0e6c04b7c2fd12e4f55e670f73cc2042ae2312f3d5a3dd785ff0f94e62285acb1a5aea40694ee1dad2433e32c69933b6835e05c42b34ee83e50157a343d7
+AUX varnish-3.0.4-automagic.patch 2837 SHA256 b7dbb426522349bdd7c7c825f3dd0bd116bfdf15514546d7f526cc8e006310e2 WHIRLPOOL a6ce7a97df0d256fcb8459a816a13e97cade34bb6b616bf1c919f659fc07e59733d61cbc2a45de9d00db69212414a2a1993361e6e0bb8861c7f451d4587a2665
+AUX varnish-3.0.4-fix-automake-1.13.patch 586 SHA256 d4bc6d5832c8ea22026da3a892bf04cc1c7787c2e99a7f641dcda36b81082f39 WHIRLPOOL f1746a4bf02a85dabe24d0deb89de2e05bcfd470b71fca72b52912b0679d9b4dd4ff51385380a44dcf9a8e4d422ca8c195b189d84bd6cd321323152b976062d1
+AUX varnishd.confd-r1 706 SHA256 4d1b2498c78ce8ae4bfccafb2847598f9aad68fb6fbd521770dd198b7619a647 WHIRLPOOL 4c3b0273b2ee4943bf662bcbec62176eebc2756ffcbf6cd3f7bf646e917402679085e43af383aa6d9633a5730f7d755fb68f0e7d45b3438d5f9a4b1e7d920c69
+AUX varnishd.initd-r1 2046 SHA256 484b9e53523f1509d48fc6253d99e0ae5e7fed61d112274ef0957449e248ac94 WHIRLPOOL 0a9a2fe5857df26c2e3d49696e86570afb9048889072ee65de6112b8ac7a7e6736757cef0098343007bd58fae2055bc438043c2780f47f33f2494864a3b91930
+AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
+AUX varnishd.service 312 SHA256 b8a69d0049c87565f1f2d819bdaecf2fe3de12e2b14714219235b107602f8afb WHIRLPOOL b7fc4e9f2a66bec20cf024b4cea39b11a16c2768120218f960ff453523084e09081055f7d6b5a8910ce2af6665d860743ccedcf55538a7923ecafeb1a3510ee7
+DIST varnish-3.0.5.tar.gz 2116664 SHA256 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 WHIRLPOOL 5c33e510b5c511790a38451068e569ac62a5db4dc0c9aab99ef1509166674474c12dc5e0e9cdcde0245eb1b5c7b9947fed19a513114f363d468f2fbeff1c8d0d
+EBUILD varnish-3.0.5.ebuild 1975 SHA256 3b76c80bc0c5aedde002a2dd41a90a7519b190db8f98f0bc05e6a15a50d627ec WHIRLPOOL 437337047d3d0719cdb4729d00f296aad0c8db5dc6d244c56c70306ac60a86e407220cbc42872c4e0fa1e9c8e3c5cd5f81cb42ad2a924f4d0e1bb3c8bd5df8c6
+MISC ChangeLog 11023 SHA256 db70028eca91f8bdc6376603c08b0d65b042f063e4b8ea5977b9848e947a015d WHIRLPOOL d4644776de9d1366e4b3ac74dc2db84aa81600b670373a13bfc46fd0636198df88bf3f4cd85ec4b4ae8c3948002df2b9b86cd5ed04fcd29931d8aa35143a3b57
+MISC metadata.xml 1233 SHA256 090efc54afbb430a517196775dbee9ea43526b1155602d36fa5c6a78253a378d WHIRLPOOL b2376a4917199bf8c235dd5a27567e8c7c6f23d41626e6ff873bf41ad9c4712bcec75eb64e08cad06b012020b56c1e6b52f51abb1093827d17fa35b938c9e656
diff --git a/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch b/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch
new file mode 100644
index 00000000..93f3da3f
--- /dev/null
+++ b/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch
@@ -0,0 +1,35 @@
+Refine header check in bin/varnishd/mgt/mgt.h, mgt_main.c for uClibc
+
+Because of the difference in how uClibc and glibc stack their header
+files, stdio.h indirectly brings in PTHREAD_CANCELED from pthread.h
+on a uClibc system, whereas it does not on a glibc system.  This happens
+in mgt.h and mgt_main.c.  This patch refines the check in those files
+to take this fact into consideration.
+
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/444294
+---
+
+diff --git a/bin/varnishd/mgt.h b/bin/varnishd/mgt.h
+index 905fbcc..5d3ab09 100644
+--- a/bin/varnishd/mgt.h
++++ b/bin/varnishd/mgt.h
+@@ -126,6 +126,6 @@ extern unsigned mgt_vcc_unsafe_path;
+ 		syslog(pri, fmt, __VA_ARGS__);		\
+ 	} while (0)
+ 
+-#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
++#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
+ #error "Keep pthreads out of in manager process"
+ #endif
+diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
+index 1b7f1e3..dce42d9 100644
+--- a/bin/varnishd/varnishd.c
++++ b/bin/varnishd/varnishd.c
+@@ -656,6 +656,6 @@ main(int argc, char * const *argv)
+ 	exit(exit_status);
+ }
+ 
+-#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
++#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
+ #error "Keep pthreads out of in manager process"
+ #endif
diff --git a/www-servers/varnish/files/varnish-3.0.4-automagic.patch b/www-servers/varnish/files/varnish-3.0.4-automagic.patch
new file mode 100644
index 00000000..6a517cc9
--- /dev/null
+++ b/www-servers/varnish/files/varnish-3.0.4-automagic.patch
@@ -0,0 +1,94 @@
+diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac
+--- varnish-3.0.4.orig/configure.ac	2013-06-14 04:39:32.000000000 -0400
++++ varnish-3.0.4/configure.ac	2013-06-15 23:51:51.000000000 -0400
+@@ -87,15 +87,20 @@
+ 
+ save_LIBS="${LIBS}"
+ LIBS=""
+-AC_SEARCH_LIBS(initscr, [curses ncurses],
+-	[have_curses=yes], [have_curses=no])
+-CURSES_LIBS="${LIBS}"
+-LIBS="${save_LIBS}"
+-AC_SUBST(CURSES_LIBS)
+-if test "$have_curses" = no; then
+-	AC_MSG_WARN([curses not found; some tools will not be built])
+-fi
+-AC_CHECK_HEADERS([ncurses/curses.h curses.h])
++AC_ARG_WITH([tools], AS_HELP_STRING([--without-tools],
++            [Don't build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes (default: test)]))
++
++AS_IF([test "x$with_tools" != "xno"], [
++  AC_SEARCH_LIBS(initscr, [curses ncurses],
++    [have_curses=yes], [have_curses=no])
++  CURSES_LIBS="${LIBS}"
++  LIBS="${save_LIBS}"
++  AC_SUBST(CURSES_LIBS)
++  if test "$have_curses" = no; then
++    AC_MSG_ERROR([curses not found, required to build additional tools])
++  fi
++  AC_CHECK_HEADERS([ncurses/curses.h curses.h])
++])
+ AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes])
+ 
+ save_LIBS="${LIBS}"
+@@ -266,7 +271,6 @@
+ CFLAGS="${save_CFLAGS}" 
+ 
+ # Use jemalloc on Linux
+-JEMALLOC_SUBDIR=
+ JEMALLOC_LDADD=
+ AC_ARG_WITH([jemalloc],
+             [AS_HELP_STRING([--with-jemalloc],
+@@ -274,18 +278,13 @@
+             [],
+             [with_jemalloc=check])
+ 
+-case $target in
+-    *-*-linux*)
+-        if test "x$with_jemalloc" != xno; then
+-            AC_CHECK_LIB([jemalloc], [malloc_conf],
++if test "x$with_jemalloc" != xno; then
++      AC_CHECK_LIB([jemalloc], [malloc_conf],
++            [JEMALLOC_LDADD="-ljemalloc"],
++            [AC_CHECK_LIB([jemalloc], [jmalloc_conf],
+                   [JEMALLOC_LDADD="-ljemalloc"],
+-                  [AC_MSG_NOTICE([No system jemalloc found, using bundled version])
+-                   JEMALLOC_SUBDIR=libjemalloc
+-                   JEMALLOC_LDADD='$(top_builddir)/lib/libjemalloc/libjemalloc_mt.la'])
+-	fi
+-	;;
+-esac
+-AC_SUBST(JEMALLOC_SUBDIR)
++                        [AC_MSG_ERROR([No system jemalloc found])])])
++fi
+ AC_SUBST(JEMALLOC_LDADD)
+ 
+ # Userland slab allocator, available only on Solaris
+@@ -588,7 +587,6 @@
+     lib/libvcl/Makefile
+     lib/libvgz/Makefile
+     lib/libvmod_std/Makefile
+-    lib/libjemalloc/Makefile
+     man/Makefile
+     redhat/Makefile
+     varnishapi.pc
+--- varnish-3.0.4.orig/lib/Makefile.am	2013-06-14 04:39:32.000000000 -0400
++++ varnish-3.0.4/lib/Makefile.am	2013-06-15 23:51:08.000000000 -0400
+@@ -6,14 +6,12 @@
+ 	libvarnishapi \
+ 	libvcl \
+ 	libvgz \
+-	libvmod_std \
+-	@JEMALLOC_SUBDIR@
++	libvmod_std
+ 
+-DIST_SUBDIRS = 	\
++DIST_SUBDIRS = \
+ 	libvarnishcompat \
+ 	libvarnish \
+ 	libvarnishapi \
+ 	libvcl \
+ 	libvgz \
+-	libvmod_std \
+-	libjemalloc
++	libvmod_std
diff --git a/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch b/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
new file mode 100644
index 00000000..0034c807
--- /dev/null
+++ b/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac
+--- varnish-3.0.4.orig/configure.ac	2013-06-14 04:39:32.000000000 -0400
++++ varnish-3.0.4/configure.ac	2013-06-21 08:48:32.000000000 -0400
+@@ -4,7 +4,7 @@
+ AC_REVISION([$Id: varnish-3.0.4-fix-automake-1.13.patch,v 1.1 2013/06/21 12:51:35 blueness Exp $])
+ AC_INIT([Varnish], [3.0.4], [varnish-dev@varnish-cache.org])
+ AC_CONFIG_SRCDIR(include/varnishapi.h)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ # save command line CFLAGS for use in VCC_CC (to pass through things like -m64)
+ OCFLAGS="$CFLAGS"
diff --git a/www-servers/varnish/files/varnishd.confd-r1 b/www-servers/varnish/files/varnishd.confd-r1
new file mode 100644
index 00000000..472b26f9
--- /dev/null
+++ b/www-servers/varnish/files/varnishd.confd-r1
@@ -0,0 +1,22 @@
+# /etc/conf.d/varnishd
+
+VARNISHD="/usr/sbin/varnishd"
+VARNISHADM="/usr/bin/varnishadm"
+CONFIGFILE="/etc/varnish/default.vcl"
+
+# Listen on 127.0.0.1:8080 and connect to backend 127.0.0.1:80
+# Ignore the config file, /etc/varnish/default.vcl
+VARNISHD_OPTS="-a 127.0.0.1:8080 -b 127.0.0.1:80"
+
+# Alternatively, don't listen to a backend and use 
+# the config file
+#VARNISHD_OPTS="-a 127.0.0.1:8080 -f $CONFIGFILE"
+
+# arguments passed to varnishncsa
+# please see the varnishncsa man page for more options
+VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log"
+
+# We need to increase the number of open files (-n)
+# and the maximum amount off locked memory (-l)
+# See bug #459142
+rc_ulimit="-n 32786 -l 82000"
diff --git a/www-servers/varnish/files/varnishd.initd-r1 b/www-servers/varnish/files/varnishd.initd-r1
new file mode 100755
index 00000000..41e0e302
--- /dev/null
+++ b/www-servers/varnish/files/varnishd.initd-r1
@@ -0,0 +1,87 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd-r1,v 1.1 2013/07/08 22:11:35 blueness Exp $
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+description_configtest="Run syntax tests for configuration files."
+description_reload="Reloads the configuration."
+
+depend() {
+	need net
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
+checkconfig() {
+	${VARNISHD} -C -f ${CONFIGFILE} >/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} has detected an error in your setup:"
+		${VARNISHD} -C -f ${CONFIGFILE}
+	fi
+
+	return $ret
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting varnish"
+	start-stop-daemon --quiet --start --pidfile /var/run/varnishd.pid --exec ${VARNISHD} -- -P /var/run/varnishd.pid ${VARNISHD_OPTS} &> /dev/null
+	eend $?
+
+	if [ "${VARNISHNCSA_ARGS}" != "" ]; then
+		ebegin "Starting varnish logging"
+		start-stop-daemon --quiet --start --pidfile /var/run/varnishncsa.pid --exec /usr/bin/varnishncsa -- -D -P /var/run/varnishncsa.pid ${VARNISHNCSA_ARGS}
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Stopping varnish"
+	start-stop-daemon --quiet --stop --pidfile /var/run/varnishd.pid
+	eend $?
+
+	if [ -e /var/run/varnishncsa.pid ]; then
+		ebegin "Stopping varnish logging"
+		start-stop-daemon --quiet --stop --pidfile /var/run/varnishncsa.pid
+		eend $?
+	fi
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading varnish"
+
+	$VARNISHADM vcl.list >/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} cannot list configuration"
+		return 1
+	fi
+
+	new_config="reload_$(date +%FT%H:%M:%S)"
+	$VARNISHADM vcl.load $new_config $CONFIGFILE >/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} cannot load configuration"
+		return 1
+	fi
+	
+	$VARNISHADM vcl.use $new_config >/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} cannot switch configuration"
+		return 1
+	fi
+
+	eend 0
+}
diff --git a/www-servers/varnish/files/varnishd.logrotate b/www-servers/varnish/files/varnishd.logrotate
new file mode 100644
index 00000000..62ee6000
--- /dev/null
+++ b/www-servers/varnish/files/varnishd.logrotate
@@ -0,0 +1,9 @@
+/var/log/varnish/*.log {
+  weekly
+  rotate 10
+  copytruncate
+  delaycompress
+  compress
+  notifempty
+  missingok
+}
diff --git a/www-servers/varnish/files/varnishd.service b/www-servers/varnish/files/varnishd.service
new file mode 100644
index 00000000..169206e0
--- /dev/null
+++ b/www-servers/varnish/files/varnishd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Varnish is a high-performance HTTP accelerator
+After=network.target
+
+[Service]
+Type=forking
+LimitNOFILE=32786
+LimitMEMLOCK=82000
+PIDFile=/var/run/varnishd.pid
+ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -P /var/run/varnishd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
new file mode 100644
index 00000000..dbe2f20c
--- /dev/null
+++ b/www-servers/varnish/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>blueness@gentoo.org</email>
+	<name>Anthony G. Basile</name>
+</maintainer>
+	<use>
+		<flag name="tools">Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes</flag>
+		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
+	</use>
+	<longdescription lang="en">
+	Varnish is an HTTP accelerator. An HTTP accelerator (often called Reverse Proxy)
+	is an application that stores (caches) documents that have been requested over
+	the HTTP protocol.
+	Based on certain criteria the next client requesting the document is either
+	given the cached document, or a "fresh" document requested from a backend
+	server. The purpose of this is to minimize the requests going to the backend
+	server(s) by serving the same document to potentially many users.
+
+	The goal of Varnish is to be a very fast, stable and effective light-weight HTTP
+	accelerator daemon, by using modern and effective technologies. Ease of
+	managment and good documentation is also a main goal of the project since the
+	lack of either one will render Varnish useless.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-servers/varnish/varnish-3.0.5.ebuild b/www-servers/varnish/varnish-3.0.5.ebuild
new file mode 100644
index 00000000..29c5dd61
--- /dev/null
+++ b/www-servers/varnish/varnish-3.0.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.5.ebuild,v 1.3 2013/12/06 20:41:58 ago Exp $
+
+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."
+}