Remove older stable

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

7 files changed, 22 insertions, 231 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 32542eb0d059..f60a72b212fc 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.54 2013/03/14 12:18:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.55 2013/03/14 12:38:43 blueness Exp $
+
+  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:
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 65624ae1336e..8cce8000dea6 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,38 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX varnish-2.0.4-link-order.patch 1163 SHA256 f1e796285ca4427619ed493b0bea17366260c7cb72e9edb86faa3b18421206c9 SHA512 6145b8b70bee945014929429783ea8c3bf3ba0ec65b7a09de34de65e63d868dff0098a8de85089f3bf43a415ca7c2097e64a86cf8039c37526f67bc070e89137 WHIRLPOOL 22258d9657a3df010b4d8b56574a537308697a097ad070789cbf745372484db7e4fdc1b3305f4873f6e738d233c5caf3cb3b2f30b42c756d6f63bd65ce3de4cc
-AUX varnish-2.0.4-virtual-ncsa.patch 1722 SHA256 f7a2fd243c1a103dc4d26b1deb6d11d3a0d604ebbc4315520777769886b60227 SHA512 bb4c556cbff3f86a1af3421fc941fcd1787dbbfde9f31d75939a246f62a24482b06335a36b5ca89ee8f2158056d659b4448794b630acec272a266652f1358c8f WHIRLPOOL cb39e64b0e7fd9e1802ce78884d30f9451074b7c947123db8622355e995fc51e3ae84510d08efc4517b31ad5955723179f323d2690963fdb846e2c60fa50ec4e
-AUX varnish-2.1.4-find-rst2man.py.patch 558 SHA256 3bf1bbc6b8b103c9cfbe4e0ef366122c7dc84ea2aa039c147e45b35654c4d882 SHA512 099a3d8a708520468c48aa1cb4f2d415472275375d8080a7694ef0be32ec06d2862e6ccfb4cf1275004d96a2d0a3469f1452be7d89d84a84ced38456e0b4a08a WHIRLPOOL 349d9a1a295a8f4e53e3d7e1c552c25ca3db5a8d38c2ce71482704b46e168c57054d3f93da2770d74a058ae3cc012a8d6c9d98acbf4d050eedf765b7ae4212db
-AUX varnish-2.1.4-virtual-ncsa.patch 1540 SHA256 6f08c3d21799cb845712f5c5590727521d857a5146347c582f6618a257825ecc SHA512 ab834b3560ac876f175e4275e19ab6ec6c701d7c39574ea18e624c324ead91bd7e0d3d1aed73ce89046ce53af563b413813da31b9e535ff91d0278f89fc799eb WHIRLPOOL c539674dfa77114bf1321c48aaad6fe664ddfa9fcce5b7116e866f3283e729efa6b676b5658656ad67ee4dea3a287be7161ab3079665544ff1425f5b063b5a7a
 AUX varnish-3.0.2-automagic.patch 1653 SHA256 de03979318fbde390e56106ed77fc32451bf904e7b564998e452a6e151218dae SHA512 62d17701574664fa4ce1a9cfe7204b4eea97a9f0deb822384878169bcb31839e12dd7ff7d1603779ea6cba6f20e07fc8a92eced8c7b5a9e5dca02ae449db66d0 WHIRLPOOL 6c03bd168e894cf87841a90ec8ec5e03f792d2b3f0e0e5ae15622225971667ec76f84564b7c57a6a14ac20169e9d7706bc834dc820edd69d6268ce130703f74e
 AUX varnish-3.0.3-automagic.patch 2110 SHA256 01cbcc5f2aabf1d0a54b06fc53352d7d73c30b5c899d5327b7cf34a696367a9a SHA512 b81e1d41eb79df720c3d8b42ae84f98de3a9d4b62a0b5f3f5f4aff14ed70d5f9e1216a66f564a85a82916cdcaca4eb34b4defaa30811dc8e0e3cf2c5bca6e515 WHIRLPOOL 8bc5bd2222d518eefd077e283a8a5941a2ef7cdb19552ae60157c1c5a3c11c24c41c11008424d86df44dc69e2e9f572f33fa4f11085f045a664032e3a8b09cd0
 AUX varnish-3.0.3-pthread-uclibc.patch 1348 SHA256 3e39323ff4d741a9a0337e84eee7ce9f8b5419722a3b905f09ccf2486a9ff24f SHA512 c06cd005ba04725ec69a9b5cb138fe2487bbd0b0e0aa4c6a39314b6473b160874d0c8452fca466e4efa907a998752e65940288a65a33b88cc4f206f1180b68d8 WHIRLPOOL 467f0e6c04b7c2fd12e4f55e670f73cc2042ae2312f3d5a3dd785ff0f94e62285acb1a5aea40694ee1dad2433e32c69933b6835e05c42b34ee83e50157a343d7
 AUX varnishd.confd 460 SHA256 9886fcc8b109e0eb603bb4e5a36156356b0763eb9c678faeab9b26481cd9aba0 SHA512 be6180eb23c46b1888fe4877470355da7369f863804ff7a59c3e5d03faefb29180518459c94b3adb4080ee7799a81017a9821c1bc6953b1666d856c1a11096ff WHIRLPOOL 1d7dbff9988b6418f6211bff4b7e2ae9790274e5edbc0fd7851ec24c8dadc0005be99273f2a45b4d0dd0f292ec2ae619c6f5989b7e9cb0d9bfcbbca48cd43cb5
 AUX varnishd.initd 989 SHA256 269c359025843051676972e505d0cc232cee54cbc6fed71ad72538ac2fce387f SHA512 4f0ae674354c3a682aa45b645cfdd475f7f5cad229d50234c9eebd916a046386370ec1adf210857e0e456003e93be18193653146b9950994361bb1e3c53d780c WHIRLPOOL c0621ef18e874505e96e368b8b6bb33c8dcec679af5f63dd4d621835382458224e238b49fe7f8469324d393d8655bf81cc744a2cb413da38d7a607e25015b539
 AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e SHA512 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
-DIST varnish-2.0.4.tar.gz 786945 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
 DIST varnish-3.0.2.tar.gz 1977852 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243
 DIST varnish-3.0.3.tar.gz 2070020 SHA256 2d37d18d952f58b208ac3a0706d4d3e4c0de304b1fcc9df5019571c75f148ab2 SHA512 5865248135e5c4dad4f104cf8efcc317836fdb580213f4fb898d67f3a4a9a7afb8d40f2fcfe986ba81d5774ab4f772ed45998c12356d92d463c6eb97d20d5942 WHIRLPOOL 00d7a8e0329f2efce5f35c51af03e407493e2a49831c5e5201e007497e6f79f45eeb006c170a9cc26221d5a83000d6e0e5c8fcc9a4d19435fef714590ff8ed49
-EBUILD varnish-2.0.4-r1.ebuild 1404 SHA256 b8f9c1d52f0142be9cd411f73dfc0a4bb2957baebc311bce5f3fc9ef9d74b451 SHA512 ba2e71c114eab1f1a23610e41d225236222bb066a7e27315ec46f0943a585c66a4b4b145e00327b4c44887369f9c1f7378fe66433e624367398f4e4ad8d4deea WHIRLPOOL dcb22e78109eddf10e8baa9f9dda85a25519ea2537fcda28a27f275a7da973b406e180002d50437823798acc946c33da58972c07fc39139aa99f5d2f79f5fa87
 EBUILD varnish-3.0.2-r1.ebuild 1590 SHA256 ae9f08eb8d8a0ddcc5bd806fd807efc91614b4bd69f48b9b6cbf34a90cc545c9 SHA512 efc1d3144248540a971bfee88e71587a565b1effe2ef4813d40a49415460aa1289e7868dc0c1985b92bf3098ce2ca62d9c066a5977af76ebac2a87eba76fcadf WHIRLPOOL bc70951ba5f16fbad710bf96bf8ed0b9ad904147c83272a1700a751f5584132e14532e7825f7f85dbc88a447a22a094f9039e6636d43405442a102e75b4defbb
 EBUILD varnish-3.0.3.ebuild 1645 SHA256 b1020a60b9409a304ba3d2dd5dd4631a5959abf01ea5fac0bae3005544ddcc2c SHA512 624ffa0855cccb4ed8543547213a1b93c27d73248ad51c24c03272d208c56da8379afb5d3d59bcbd892337f2842c2db6a90e198e7c0c3bef44c584c5200d3bd9 WHIRLPOOL 02590c9875d68d4f75e7627fc4cfbdf28d26a28b79d6ef745d77a6ee0d6a34630ebacd57579235cc22b5bb72cbad6ec8b53104ca0231274661c29b02d0d994f8
-MISC ChangeLog 8121 SHA256 9f5e957d72ef48c3bd7a5693637b2e89c0bede3485d512c459767b6ed86ff0e5 SHA512 88f3bb43d0db840aa9a0e896b527475927c1555a49684e841d5ba569ca128eacbaa5a40973f296191aca7f13f1a2ff7a8a8ebeebceca1e3a11ac88c6bf6084c5 WHIRLPOOL 1d1bf83605da007c1369ffadaa430f341c0dd21f0aab0763e1be4d13077a0c5de9ad032256556e35df338a135d08f38ff12a21b2996517e19155de9be833780a
+MISC ChangeLog 8398 SHA256 1d5b04bc0a7e1a834eabecbe455aeed5cd1d92ef03225bfc2ebb32e0161bce0a SHA512 5511b2175a9c47de39a2719dc31e1dc95bcfcdbf16552dd31020ee8f2a070cb6e35c5859d561f0a0975f6aa1eea0ea173052b5bccde084fd6cd796f1a5c7f0ad WHIRLPOOL 065158bacaa68c992c9c45a9ff1de732b4d3e888a1feb51aa367f1deb9bcc0cd4fcdfa05cb862861d17f9f26c42fe9645b1e943c7d4727f0deef22ccd4f903c5
 MISC metadata.xml 1164 SHA256 40643a9267541e9550f18776cc5ab97e443ca53dc9e59f768cef18f3a6ef732b SHA512 15c7fe9cf443d0b1917feab552c494a36a85a4fa7f0937971adc1608ca92f9304251b300138fc9c4144b1a80da3123c9e7768ee7b507c5872842c05bd57077ae WHIRLPOOL 0c0aa67266333f1090915e1ed08a9a315f6a01c7c7a57f5793bc3f97ddb0f390daa8a6830492d2bda084bcff65d950b3af2a8bf448f1e0c913a06e19eb684a24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRQb/yAAoJEJOE+m71LUu66MoP/j9qtUSflP8z665xvnNIdM3+
-kS32pb78NuRwZErnxsy76x9brDReKv4TblHqov86nQ7aDNNEZCapcLWf55wuqqfv
-EepvpnBzVveoyOeyPHHcu/ECxF3by9/uISkas7XlROngn8htxXdGGy0ByWtjMNGx
-Hkzk6N0akmBB3Kea3pBNKvIrNEaOx9N0AHea2Qb9stPpQb/f7JOE5opwLxnDCiQa
-P4Xi6aS3vezq/8xy8T1BOYYmQLBBrqvEnmeM12SjsFo3jT9kFynijL03CHKoZ1Zj
-t5Y0qvFqb8RNxY9vgSQb+1XBruTze+0H581v7D5twy1KK+5i486o9JEjYQVS9zYT
-k/VT1lPerUlRUfqG4LftUMIgYC0TG7ZwvLfQtTHFzYjzn/tRnRVdEMRFGHUryCCe
-2z/M7xPxkW3vWEU7p15HZk2AUHM/vPZucNHTMg225GpGYCeBNgIR6retMBM4W+xg
-dXJJl70iPaBdaeO+dHyvRBY1BI8heH8QJsy6ja/vyhxuUMi6sGzIikSHcj/eXYjp
-LMgWTtyY0CfAN/nJAYl8ElM4vkTHcmqgH1AtcEXqtUAwhiyonlDLtWgCL5yb+efr
-kS64Q6mjWrvGpZJdqAAyTnITpFxuYRcJuytRmvCppwqfkNpJ/LAQY/4eFkeN2BLJ
-7+z4fEfdpIB82FWtx9vI
-=1JGa
+iQIcBAEBCAAGBQJRQcS9AAoJEJOE+m71LUu64WYQALWVln8Bpvnb2mbxuvZkl9+8
+vnAnAL1zkAYk6YMRvR/ENCV9sFeCB9iPmKot164b5Kwv0BPfhFgzsHs5aErKc87j
+0C473yB0riBpUpSlJpqBYayMmaYvH8JyqngGjP8xg6Y00BU5tTY0C12BtizM6HcK
+0tm3wew3Bod3ilgIAVHliHtSKbigQcfOtCYFwOXFOUXACJpxZe0eMp7KO0YHDtYH
+wVYzyV4Kwvtw/GQeWfTmncOQQPwLIuKMZEry4uBhOc7LVniauK8Da1nrE1AEMn92
+Z4SOaFT9zG1WGYfbnYJmdAh8VDtRbrlYIKU/VoPX/6XThKPlR0ApQtq5Amnrcs9W
+ubzgwmTA5ekWeDeUDfTIFihHOvAv0BUQa0mSpMF5LdEmE8uShc4+gP+etCTaaW9s
+zmh8EbtJY2NJZLOgOKVcpEsgjiVAOSu0FVSsNhwI5YD3gevfnmN/77oCkCI4JaRY
+Z33+akLJzrhnB056S4uIRlkNAUL5vyaMQt37nfMifzX8UtDvt/ZZF9Rlf/dpeUq6
+LtIXab5s4CCicuzaKenNG2cFdu/g+pD8SHkEDOGfC5CR+CfHlo3n3IF/7dCrJirS
+jRWew6iT9ys5IfJP6EZr2GL8+wQgswl5r7gyo9uVLjhH5X4MMeuu/0WAlkzfhrtg
+/xCBI9UW2nfUCOZFySXt
+=gKj4
 -----END PGP SIGNATURE-----
diff --git a/www-servers/varnish/files/varnish-2.0.4-link-order.patch b/www-servers/varnish/files/varnish-2.0.4-link-order.patch
deleted file mode 100644
index e3eca384b5b0..000000000000
--- a/www-servers/varnish/files/varnish-2.0.4-link-order.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-patch by bangert to fix build with --as-needed.
-sent upstream at http://varnish.projects.linpro.no/ticket/486
-
-diff -Naur varnish-2.0.4/lib/libvarnish/Makefile.am varnish-2.0.4.new/lib/libvarnish/Makefile.am
---- varnish-2.0.4/lib/libvarnish/Makefile.am	2009-04-01 15:35:14.000000000 +0200
-+++ varnish-2.0.4.new/lib/libvarnish/Makefile.am	2009-04-07 21:55:06.000000000 +0200
-@@ -29,7 +29,7 @@
- 	vss.c \
- 	vtmpfile.c
- 
--libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM}
-+libvarnish_la_LIBADD = $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la ${RT_LIBS} ${NET_LIBS} ${LIBM}
- 
- 
- if ENABLE_TESTS
-diff -Naur varnish-2.0.4/lib/Makefile.am varnish-2.0.4.new/lib/Makefile.am
---- varnish-2.0.4/lib/Makefile.am	2009-04-01 15:35:14.000000000 +0200
-+++ varnish-2.0.4.new/lib/Makefile.am	2009-04-07 21:57:40.000000000 +0200
-@@ -1,15 +1,15 @@
- # $Id: varnish-2.0.4-link-order.patch,v 1.1 2009/04/13 09:54:47 bangert Exp $
- 
- SUBDIRS = \
-+	libvarnishcompat \
- 	libvarnish \
- 	libvarnishapi \
--	libvarnishcompat \
- 	libvcl \
- 	@JEMALLOC_SUBDIR@
- 
- DIST_SUBDIRS = 	\
-+	libvarnishcompat \
- 	libvarnish \
- 	libvarnishapi \
--	libvarnishcompat \
- 	libvcl \
- 	libjemalloc
diff --git a/www-servers/varnish/files/varnish-2.0.4-virtual-ncsa.patch b/www-servers/varnish/files/varnish-2.0.4-virtual-ncsa.patch
deleted file mode 100644
index 7626bcad9ded..000000000000
--- a/www-servers/varnish/files/varnish-2.0.4-virtual-ncsa.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -NurpP varnish-2.0.4.orig/bin/varnishncsa/varnishncsa.c varnish-2.0.4/bin/varnishncsa/varnishncsa.c
---- varnish-2.0.4.orig/bin/varnishncsa/varnishncsa.c	2009-04-01 15:35:14.000000000 +0200
-+++ varnish-2.0.4/bin/varnishncsa/varnishncsa.c	2009-06-11 11:45:44.084537099 +0200
-@@ -102,6 +102,7 @@ static struct logline {
- 
- static size_t nll;
- static int prefer_x_forwarded_for = 0;
-+static int virtual_host_style_logging = 0;
- 
- static int
- isprefix(const char *str, const char *prefix, const char *end,
-@@ -399,6 +400,11 @@ h_ncsa(void *priv, enum shmlogtag tag, u
- 	if (!lp->bogus) {
- 		fo = priv;
- 
-+		/* the -v option */
-+		if (virtual_host_style_logging) {
-+			fprintf(fo, "%s ", lp->df_Host);
-+		}
-+
- 		/* %h */
- 		if (!lp->df_h && spec & VSL_S_BACKEND)
- 			fprintf(fo, "127.0.0.1 ");
-@@ -438,7 +444,7 @@ h_ncsa(void *priv, enum shmlogtag tag, u
- 		 * normalized the request URL.
- 		 */
- 		fprintf(fo, "\"%s ", lp->df_m);
--		if (lp->df_Host) {
-+		if (!virtual_host_style_logging && lp->df_Host) {
- 			if (strncmp(lp->df_Host, "http://", 7) != 0)
- 				fprintf(fo, "http://");
- 			fprintf(fo, "%s", lp->df_Host);
-@@ -512,7 +518,7 @@ usage(void)
- {
- 
- 	fprintf(stderr,
--	    "usage: varnishncsa %s [-aDV] [-n varnish_name] "
-+	    "usage: varnishncsa %s [-avDV] [-n varnish_name] "
- 	    "[-P file] [-w file]\n", VSL_USAGE);
- 	exit(1);
- }
-@@ -531,11 +537,14 @@ main(int argc, char *argv[])
- 
- 	vd = VSL_New();
- 
--	while ((c = getopt(argc, argv, VSL_ARGS "aDn:P:Vw:f")) != -1) {
-+	while ((c = getopt(argc, argv, VSL_ARGS "avDn:P:Vw:f")) != -1) {
- 		switch (c) {
- 		case 'a':
- 			a_flag = 1;
- 			break;
-+		case 'v':
-+			virtual_host_style_logging = 1;
-+			break;
- 		case 'f':
- 			prefer_x_forwarded_for = 1;
- 			break;
diff --git a/www-servers/varnish/files/varnish-2.1.4-find-rst2man.py.patch b/www-servers/varnish/files/varnish-2.1.4-find-rst2man.py.patch
deleted file mode 100644
index 190432f68065..000000000000
--- a/www-servers/varnish/files/varnish-2.1.4-find-rst2man.py.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur varnish-2.1.4.orig/configure.ac varnish-2.1.4/configure.ac
---- varnish-2.1.4.orig/configure.ac	2010-10-21 17:45:41.000000000 +0200
-+++ varnish-2.1.4/configure.ac	2010-10-21 23:05:35.000000000 +0200
-@@ -30,7 +30,7 @@
-    AC_MSG_WARN([xsltproc not found – not building documentation])
- fi
- AM_CONDITIONAL(HAVE_XSLTPROC,[test "x$XSLTPROC" != "xno"])
--AC_CHECK_PROGS(RST2MAN, [rst2man], "no")
-+AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
- if test "x$RST2MAN" = "xno"; then
-    AC_MSG_WARN([rst2man not found – not building man pages])
- fi
diff --git a/www-servers/varnish/files/varnish-2.1.4-virtual-ncsa.patch b/www-servers/varnish/files/varnish-2.1.4-virtual-ncsa.patch
deleted file mode 100644
index 4c5bb25b1f4b..000000000000
--- a/www-servers/varnish/files/varnish-2.1.4-virtual-ncsa.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur varnish-2.1.4.orig/bin/varnishncsa/varnishncsa.c varnish-2.1.4/bin/varnishncsa/varnishncsa.c
---- varnish-2.1.4.orig/bin/varnishncsa/varnishncsa.c	2010-10-21 17:45:41.000000000 +0200
-+++ varnish-2.1.4/bin/varnishncsa/varnishncsa.c	2010-10-21 22:42:50.000000000 +0200
-@@ -102,6 +102,7 @@
- 
- static size_t nll;
- static int prefer_x_forwarded_for = 0;
-+static int virtual_host_style_logging = 0;
- 
- static int
- isprefix(const char *str, const char *prefix, const char *end,
-@@ -469,6 +470,11 @@
- 
- 	fo = priv;
- 
-+	/* the -v option */
-+	if (virtual_host_style_logging) {
-+		fprintf(fo, "%s ", lp->df_Host);
-+	}
-+
- 	/* %h */
- 	if (!lp->df_h && spec & VSL_S_BACKEND)
- 		fprintf(fo, "127.0.0.1 ");
-@@ -508,7 +514,7 @@
- 	 * normalized the request URL.
- 	 */
- 	fprintf(fo, "\"%s ", lp->df_m);
--	if (lp->df_Host) {
-+	if (!virtual_host_style_logging && lp->df_Host) {
- 		if (strncmp(lp->df_Host, "http://", 7) != 0)
- 			fprintf(fo, "http://");
- 		fprintf(fo, "%s", lp->df_Host);
-@@ -568,7 +574,7 @@
- {
- 
- 	fprintf(stderr,
--	    "usage: varnishncsa %s [-aDV] [-n varnish_name] "
-+	    "usage: varnishncsa %s [-avDV] [-n varnish_name] "
- 	    "[-P file] [-w file]\n", VSL_USAGE);
- 	exit(1);
- }
-@@ -587,11 +593,14 @@
- 
- 	vd = VSL_New();
- 
--	while ((c = getopt(argc, argv, VSL_ARGS "aDn:P:Vw:f")) != -1) {
-+	while ((c = getopt(argc, argv, VSL_ARGS "avDn:P:Vw:f")) != -1) {
- 		switch (c) {
- 		case 'a':
- 			a_flag = 1;
- 			break;
-+		case 'v':
-+			virtual_host_style_logging = 1;
-+			break;
- 		case 'f':
- 			prefer_x_forwarded_for = 1;
- 			break;
diff --git a/www-servers/varnish/varnish-2.0.4-r1.ebuild b/www-servers/varnish/varnish-2.0.4-r1.ebuild
deleted file mode 100644
index d7d9eec65277..000000000000
--- a/www-servers/varnish/varnish-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.4-r1.ebuild,v 1.7 2012/07/11 23:27:45 blueness Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator."
-HOMEPAGE="http://varnish.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/varnish/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-#varnish compiles stuff at run time
-RDEPEND="sys-devel/gcc"
-
-RESTRICT="test" #315725
-HTTP_HDR_MAX_VAL=${HTTP_HDR_MAX_VAL:-32}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-link-order.patch
-	epatch "${FILESDIR}"/${P}-virtual-ncsa.patch
-	sed -e "s/#define HTTP_HDR_MAX_VAL .*/#define HTTP_HDR_MAX_VAL ${HTTP_HDR_MAX_VAL}/" \
-		-i bin/varnishd/cache.h
-	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
-}
-
-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
-}