Cleanup, security bug #489944

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

10 files changed, 22 insertions, 559 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index bacb8b79e875..ab38e973f4c2 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,12 @@
 # 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.66 2013/12/06 20:41:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.67 2013/12/06 21:15:29 blueness Exp $
+
+  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
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index a41839194a92..e614c5b364ee 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,41 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX varnish-3.0.2-automagic.patch 1653 SHA256 de03979318fbde390e56106ed77fc32451bf904e7b564998e452a6e151218dae SHA512 62d17701574664fa4ce1a9cfe7204b4eea97a9f0deb822384878169bcb31839e12dd7ff7d1603779ea6cba6f20e07fc8a92eced8c7b5a9e5dca02ae449db66d0 WHIRLPOOL 6c03bd168e894cf87841a90ec8ec5e03f792d2b3f0e0e5ae15622225971667ec76f84564b7c57a6a14ac20169e9d7706bc834dc820edd69d6268ce130703f74e
-AUX varnish-3.0.3-automagic.patch 3809 SHA256 f5707e08120b78f092e49b4ea4428a5a9bd25386429677a6af286fb081404c14 SHA512 4d3ab3b19c49bb51a7be26d4dd1937164ea5cb86d43992aef3e4cf162bd2c90141b0d908cc7c1b9b9799fbe7a5e262fe5a86f98a677d9f71702d9be2a2431433 WHIRLPOOL c300c98d130f281d9c405e8cf02a37ef2c563f26812d2e3b24eedec7d31e1aa54ce201150899998136f4dbff063a7a8efb84bf33462b0d48d4a1bbb896e68e5d
 AUX varnish-3.0.3-pthread-uclibc.patch 1348 SHA256 3e39323ff4d741a9a0337e84eee7ce9f8b5419722a3b905f09ccf2486a9ff24f SHA512 c06cd005ba04725ec69a9b5cb138fe2487bbd0b0e0aa4c6a39314b6473b160874d0c8452fca466e4efa907a998752e65940288a65a33b88cc4f206f1180b68d8 WHIRLPOOL 467f0e6c04b7c2fd12e4f55e670f73cc2042ae2312f3d5a3dd785ff0f94e62285acb1a5aea40694ee1dad2433e32c69933b6835e05c42b34ee83e50157a343d7
 AUX varnish-3.0.4-automagic.patch 2837 SHA256 b7dbb426522349bdd7c7c825f3dd0bd116bfdf15514546d7f526cc8e006310e2 SHA512 5fd631c3e02ab7f39873acc91881e72a3cecc45d60b6d160dae3c6b6cd3d4ee5ef0b64dd8953d09761fc5f2cd30549047b8af5ddcccceea08f64af9094c92d53 WHIRLPOOL a6ce7a97df0d256fcb8459a816a13e97cade34bb6b616bf1c919f659fc07e59733d61cbc2a45de9d00db69212414a2a1993361e6e0bb8861c7f451d4587a2665
 AUX varnish-3.0.4-fix-automake-1.13.patch 586 SHA256 d4bc6d5832c8ea22026da3a892bf04cc1c7787c2e99a7f641dcda36b81082f39 SHA512 1e158c49397be49dc47ea7d442f5e7208507675ed0ce07773a4867b5cf787075dd0f45f6bc54d86bb1550a1ac28d2b151c45c155538f2090e439f66826f15ba4 WHIRLPOOL f1746a4bf02a85dabe24d0deb89de2e05bcfd470b71fca72b52912b0679d9b4dd4ff51385380a44dcf9a8e4d422ca8c195b189d84bd6cd321323152b976062d1
-AUX varnishd.confd 617 SHA256 2d84c001637cd7b063cbd75c0de7868301e00083d7bc74e737c15427828bf214 SHA512 3bbb90724114ba0ad83d630a40bec813e2369aa3f20bec11f6ad12db673bbcc27d7bc39318ab395b22a7611e214ce543302d01428276b148c18d1c9d078a959a WHIRLPOOL 40b5447223f31bd08f188eeb6bcebd7dc80e7a711bbdb99fea67900985d397e151279dd2e2e830e794f5b6510258740f933ec22342be39df4b93383324d0917e
 AUX varnishd.confd-r1 706 SHA256 4d1b2498c78ce8ae4bfccafb2847598f9aad68fb6fbd521770dd198b7619a647 SHA512 053e61b72978028f4899d1da207a0ca69050bb48a07112186e6415f7a92fbacf4d55ca80d963ca35fac99b9440eefb4e9d252cd623bda49ea3f1b7e5b6520b9c WHIRLPOOL 4c3b0273b2ee4943bf662bcbec62176eebc2756ffcbf6cd3f7bf646e917402679085e43af383aa6d9633a5730f7d755fb68f0e7d45b3438d5f9a4b1e7d920c69
-AUX varnishd.initd 989 SHA256 269c359025843051676972e505d0cc232cee54cbc6fed71ad72538ac2fce387f SHA512 4f0ae674354c3a682aa45b645cfdd475f7f5cad229d50234c9eebd916a046386370ec1adf210857e0e456003e93be18193653146b9950994361bb1e3c53d780c WHIRLPOOL c0621ef18e874505e96e368b8b6bb33c8dcec679af5f63dd4d621835382458224e238b49fe7f8469324d393d8655bf81cc744a2cb413da38d7a607e25015b539
 AUX varnishd.initd-r1 2046 SHA256 484b9e53523f1509d48fc6253d99e0ae5e7fed61d112274ef0957449e248ac94 SHA512 ff5c3a2eab71ac6800e9ff0d49045fd7c7404242f2e64a36fc5f72475868baeb92a2e8d6cf26e6eb2d08d01e6eae98dd4c2484f99cf8979d0c1e76bd172513d5 WHIRLPOOL 0a9a2fe5857df26c2e3d49696e86570afb9048889072ee65de6112b8ac7a7e6736757cef0098343007bd58fae2055bc438043c2780f47f33f2494864a3b91930
 AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e SHA512 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
-DIST varnish-3.0.2.tar.gz 1977852 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243 SHA512 a0942ff5dbdabac55f94240077d61905bc7ad4dff4ae9af80c937458554e7530d008f30e26a3f8533a38d927b8734da9a7e313977a2828c9f67e8ca1af16edfd WHIRLPOOL 20e8812336344a5c140382b4c24a04501cb7a11525e0cda71c6755c2a6d6f8c7e727a52fdd44e5066c9563f2196363864343e10b2a921673d802aa396a237562
-DIST varnish-3.0.3.tar.gz 2070020 SHA256 2d37d18d952f58b208ac3a0706d4d3e4c0de304b1fcc9df5019571c75f148ab2 SHA512 5865248135e5c4dad4f104cf8efcc317836fdb580213f4fb898d67f3a4a9a7afb8d40f2fcfe986ba81d5774ab4f772ed45998c12356d92d463c6eb97d20d5942 WHIRLPOOL 00d7a8e0329f2efce5f35c51af03e407493e2a49831c5e5201e007497e6f79f45eeb006c170a9cc26221d5a83000d6e0e5c8fcc9a4d19435fef714590ff8ed49
-DIST varnish-3.0.4.tar.gz 2081361 SHA256 4e044ccb5c76222bddf89c808f13ea8f66977972675aecb48a920f6800ad0f79 SHA512 d6fa8d320050f659f341af20b24c4401609ffd77207a7889b98e5378c507db04eda310e2b953b5144d748a0b3c08884e87d5c36962f0a38f03014708ff7c78d0 WHIRLPOOL 9fa9c685ad54cc014b2369d7bc1ea67f6a9e2bcfce46c4a7d8451a6080e56d27d7d6dcc6de02ac3e986c5c4c7511a1fb33b848d68505a821b5d9116079e6a1f6
 DIST varnish-3.0.5.tar.gz 2116664 SHA256 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 SHA512 0fe8a0f45ebe3b159fde811ac374ef8fb5be7712d8a61474778c57ddf4e7fb0404c7b28abeb614a16255a1c9ef0c780db44d03b1c8fbfee54adc49d92cbf733d WHIRLPOOL 5c33e510b5c511790a38451068e569ac62a5db4dc0c9aab99ef1509166674474c12dc5e0e9cdcde0245eb1b5c7b9947fed19a513114f363d468f2fbeff1c8d0d
-EBUILD varnish-3.0.2-r1.ebuild 1590 SHA256 ae9f08eb8d8a0ddcc5bd806fd807efc91614b4bd69f48b9b6cbf34a90cc545c9 SHA512 efc1d3144248540a971bfee88e71587a565b1effe2ef4813d40a49415460aa1289e7868dc0c1985b92bf3098ce2ca62d9c066a5977af76ebac2a87eba76fcadf WHIRLPOOL bc70951ba5f16fbad710bf96bf8ed0b9ad904147c83272a1700a751f5584132e14532e7825f7f85dbc88a447a22a094f9039e6636d43405442a102e75b4defbb
-EBUILD varnish-3.0.3-r1.ebuild 1849 SHA256 45942cff0dfcb92f929d7d215d0d6dc914b452d61c9d17878a3772de6b03ce9b SHA512 8644fd477e73ace9b479a0b92b5a055c7146f6ee0fcbfcdc3ca31aa531e6c9535105721da0ad1f3ee490af4ea24b5cdcedde3e8192a9f56a2c0c71c2ec78f5f1 WHIRLPOOL 7534254259d54749da8ca29d551ecf08c9ada90812fb8caf943dd692a24061b067973448fc84253f724681bc6356dfe682f45a73b63f2286a2f09faf649cbc5c
-EBUILD varnish-3.0.4-r1.ebuild 1985 SHA256 d9fab607abcaa82d8367f8dfec11b70c3f404919edbaea58f49d608c1afc6177 SHA512 22682fe70f231913f008b939a4944e2b0128b0890f40f7d74f1b8b8833599e56f110b0fe27e5a5e55b26086448a5e227492e2d4f6b73cdf55a2aa28d246e05fc WHIRLPOOL 811719d10bd6271d389d60d035d4f7eaffb697e688bf328b32d641c34fb2d49e771cb07262e33775530a78228d1074e76e909f6f9b8a599d4ea256f7158b3499
-EBUILD varnish-3.0.4.ebuild 1976 SHA256 a5b11c13b8e8fc3731dab13f74ae24b938ac134267269dce16549c4d7a57c8a5 SHA512 de10123bcfe27aa57f09c7a4e229385136a03e5056850743d707df116da208a5fa70d866eff5352487535f24bfa7cb74e02301b96429d59e6e953248a3291272 WHIRLPOOL 901d9b6eab31ff14b18709df6edc14ceaae2fad321d778d352e1d1c3c428cfdc79182a44a0f7bef3894d20942dd231a54465ce6c70713df77860b98a35e45c4a
 EBUILD varnish-3.0.5.ebuild 1975 SHA256 3b76c80bc0c5aedde002a2dd41a90a7519b190db8f98f0bc05e6a15a50d627ec SHA512 3fba7c6b93490bb013809d52b3ae81d0bfea61fc783495c74fad689f9561645c50749533569529106be8c5afddf05b994b01611017f6581533e0763b72f36827 WHIRLPOOL 437337047d3d0719cdb4729d00f296aad0c8db5dc6d244c56c70306ac60a86e407220cbc42872c4e0fa1e9c8e3c5cd5f81cb42ad2a924f4d0e1bb3c8bd5df8c6
-MISC ChangeLog 10089 SHA256 ea1192c80875a803f4e72372fca7606c45b5c8fd657ecf56f2c9f1f9f0bed699 SHA512 ca9789c2de87e0a9419daef7ba95d0df5dac39ac335b782d35de3f9bab003717b96024226c4481f3e1f3af77db2c3bcaa7a1fde0b700279c7afa7a665704823d WHIRLPOOL 271139acd46e8ee1dcebae62d798a7329831f668adb4f5e9eb06df85bc97c0ea65f682c563cfcf335a4972a866f9d1ee15453eb61162712583d566ee420a8138
+MISC ChangeLog 10411 SHA256 f0a0997778cf8b44a93af5d0d807f12f0df37aa33aa1744f15c8ad824681fe5f SHA512 7fb2bd7037e01b852f4d12f9c67b566cd23cf0ca8b0f70ac0bac5d77fcf96eabce2d2788859e26020ce502fdb0fa105371844ef173d25aeb3a4c30144e4ac239 WHIRLPOOL 3916e818f3049f40509516be8f6db5709b7b6a6774caca4b91588c9f6398d5274ed42f024f54f2e0cd35f79466b468fa8812bcf59541dafa049c8c4a9b9e5c7e
 MISC metadata.xml 1233 SHA256 090efc54afbb430a517196775dbee9ea43526b1155602d36fa5c6a78253a378d SHA512 df155931660201fa2e392cb10ecc150b2782520528e6534ee9ce538f9feb37c78fca9a33d0bdedc8c97831389b5d9313327b5564d7684749423da7c5856e12f6 WHIRLPOOL b2376a4917199bf8c235dd5a27567e8c7c6f23d41626e6ff873bf41ad9c4712bcec75eb64e08cad06b012020b56c1e6b52f51abb1093827d17fa35b938c9e656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSojaWAAoJELp701BxlEWfJcIP/08TE8EAZHq/beJavXP/+hSh
-lMkCznkXWymcaSCJ/wlF/fDZKRXHwZQQw/HQ54w4A76j5Ofq4VHvTrCM+ze3sBv5
-NmKTfS1xnQigScCzj0uCbXyx2obG/uMzwqEqyZUjQLFX5AVH82Bn/3WKGFR5J+h+
-pe+cubQe23ZQD0ii2SV+/sCfgvO0aCBzWLrxhoZ8yT7qrLWxqKKcczYaCj7bVlIr
-CI6k0oOO+pJ1S3FdawU8Hobc5lX1xXMKT/Mdj1gHymhGL1yTY1rttfhOTe3Psm1e
-vyi9QQ0mKGrPd2W8LUVUDhWqrDHgwenymjJNoktq3AQeKGkY7g1JGNaYFMhjt2KA
-j23G9nmMsUAzQYi6ya5ODN4XWaG1cJz6Pp6gmbaIbDntkHb2k11TSePc0oKy1uA2
-Mkf2x5T1IxnBv3h3CbJ4kwvF/CcoyTcCkfXB3hbpKxTVpllEAuQ6OX2DLeqTvWnq
-dZ6t1JvfK2N79X1h7XYAffCpFpCqYIuHe5lfamdDs+d7KRxu/K3KjAtmqbBHdswq
-1oZuZb3HK1c8M6KmAQZA1Yzfhpa9/WOvMPFDFuJOJp7QGHps3nYdGmidbfT3nsE6
-+9yXNTQ5+FfEjq7uRlKxx+ONmm6iVE7FNn4ffdJYHyKjdEDF4bN+dDiBrM5OiLUj
-m9+3w09cEBegGBt3UehI
-=pW+N
+iQIcBAEBCAAGBQJSoj7LAAoJEJOE+m71LUu653sP/2qY4KF9UP2IYjB/Xzd1+Jjh
+i5d2hViVB4Z9WZLMxapHgLrYzVpqTHBp/ZJv+PVXJfDO274NXuTlqHm8ES9EUdwN
+tV6BmK7K+02b3XKBmjFHNK0uEwkASxaeqO/d0eRYLqYAeapQ3yTYxVPqrkl3f8kR
+BGoRPJrvZVG3nKId/ydQi0p4Nt+hHAbZeuc1y2f7C8VxEhCTV7YvV+oks1HjvNc7
+a/+rymrlzPg3ji35T7uTlnDrzj/jQa9Rj8FpOp2Po7TEuJMPtY2Sz/EGl8f7GeEf
+BTJxZvanKjrVGp7c5IQPEHfzZqxSxh1T7Bk9ooht4M6U4G27ZrIKiOFpK29seF/a
+bHeB4ZYuTxWEWSNfSbF+1B81oDrjZqHbVSHxHHy9XFyshO/IqZB8K/UNq0w1qqJ+
+LU7W0PInmnJhK53WxlTPwzZT1AEI1gGE0S1OXhf4fb2ldObmXFNI4MtbUgSVzjEW
+aCAks0llO8ecrK/9DY3X6IUk15Vqlqc1igz1tmmhpGUs9RVQhIg08uv+2j5YfNij
+EurH9gPlEbaR7lLwqRHsHX+CeHES5NNKCBJ62jmFRBd4k7xyp8PthsLGUXkYcYxp
+d6H9sxz7sdSOBAjegCJXcA9JyEMpifYTk4MFEsgnoVbKVPXIziuh3zcOv5u4kdFv
+lVJr5NeFzjZY8cILcWXZ
+=PC5x
 -----END PGP SIGNATURE-----
diff --git a/www-servers/varnish/files/varnish-3.0.2-automagic.patch b/www-servers/varnish/files/varnish-3.0.2-automagic.patch
deleted file mode 100644
index 204e558eb113..000000000000
--- a/www-servers/varnish/files/varnish-3.0.2-automagic.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- varnish-3.0.2/configure.ac.orig
-+++ varnish-3.0.2/configure.ac
-@@ -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}"
-@@ -147,9 +152,13 @@
- AC_SUBST(PCRE_CFLAGS)
- AC_SUBST(PCRE_LIBS)
- 
--PKG_CHECK_MODULES([LIBEDIT], [libedit], 
--	[AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])],
--	[AC_MSG_WARN([libedit not found, disabling libedit support])])
-+AC_ARG_WITH([libedit], AS_HELP_STRING([--with-libedit],
-+            [Enable support for libedit in varnishadm (default: disabled)]))
-+AS_IF([test "x$with_libedit" = "xyes"], [
-+	PKG_CHECK_MODULES([LIBEDIT], [libedit],
-+		[AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])],
-+		[AC_MSG_ERROR([libedit not found])])
-+])
- 
- # Checks for header files.
- AC_HEADER_STDC
diff --git a/www-servers/varnish/files/varnish-3.0.3-automagic.patch b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
deleted file mode 100644
index ba18a3bbbc1c..000000000000
--- a/www-servers/varnish/files/varnish-3.0.3-automagic.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur varnish-3.0.3.orig/configure.ac varnish-3.0.3/configure.ac
---- varnish-3.0.3.orig/configure.ac	2012-08-20 05:20:40.000000000 -0400
-+++ varnish-3.0.3/configure.ac	2013-03-14 10:57:55.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}"
-@@ -147,17 +152,13 @@
- AC_SUBST(PCRE_CFLAGS)
- AC_SUBST(PCRE_LIBS)
- 
--PKG_CHECK_MODULES([LIBEDIT], [libedit], 
--	[AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])],
--	[AC_CHECK_HEADERS([readline/readline.h])
--	 AC_CHECK_HEADERS([edit/readline/readline.h])
--	 AC_CHECK_LIB(edit, el_init,
--	        [ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])
--		  LIBEDIT_CFLAGS=""
--		  LIBEDIT_LIBS="-ledit ${CURSES_LIBS}"
--		],
--               [AC_MSG_WARN([libedit not found, disabling libedit support])],
--               [${CURSES_LIBS}])])
-+AC_ARG_WITH([libedit], AS_HELP_STRING([--with-libedit],
-+            [Enable support for libedit in varnishadm (default: disabled)]))
-+AS_IF([test "x$with_libedit" = "xyes"], [
-+	PKG_CHECK_MODULES([LIBEDIT], [libedit],
-+		[AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])],
-+		[AC_MSG_ERROR([libedit not found])])
-+])
- 
- # Checks for header files.
- AC_HEADER_STDC
-@@ -271,7 +272,6 @@
- CFLAGS="${save_CFLAGS}" 
- 
- # Use jemalloc on Linux
--JEMALLOC_SUBDIR=
- JEMALLOC_LDADD=
- AC_ARG_WITH([jemalloc],
-             [AS_HELP_STRING([--with-jemalloc],
-@@ -279,18 +279,13 @@
-             [],
-             [with_jemalloc=check])
- 
--case $target in
--    *-*-linux*)
--        if test "x$with_jemalloc" != xno; then
--            AC_CHECK_LIB([jemalloc], [malloc_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)
-+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_ERROR([No system jemalloc found])])])
-+fi
- AC_SUBST(JEMALLOC_LDADD)
- 
- # Userland slab allocator, available only on Solaris
-@@ -582,7 +577,6 @@
-     lib/libvcl/Makefile
-     lib/libvgz/Makefile
-     lib/libvmod_std/Makefile
--    lib/libjemalloc/Makefile
-     man/Makefile
-     redhat/Makefile
-     varnishapi.pc
---- varnish-3.0.3.orig/lib/Makefile.am	2012-08-20 05:20:40.000000000 -0400
-+++ varnish-3.0.3/lib/Makefile.am	2013-03-14 10:58:39.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/varnishd.confd b/www-servers/varnish/files/varnishd.confd
deleted file mode 100644
index 56366d8a74de..000000000000
--- a/www-servers/varnish/files/varnishd.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/conf.d/varnishd
-
-# 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 /etc/varnish/default.vcl"
-
-# 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 b/www-servers/varnish/files/varnishd.initd
deleted file mode 100755
index 33f5d74b75bf..000000000000
--- a/www-servers/varnish/files/varnishd.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/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,v 1.8 2013/03/14 12:18:17 blueness Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting varnish"
-	start-stop-daemon --quiet --start --pidfile /var/run/varnishd.pid --exec /usr/sbin/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
-}
diff --git a/www-servers/varnish/varnish-3.0.2-r1.ebuild b/www-servers/varnish/varnish-3.0.2-r1.ebuild
deleted file mode 100644
index 05ecd2782fe2..000000000000
--- a/www-servers/varnish/varnish-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,66 +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-3.0.2-r1.ebuild,v 1.6 2012/07/11 23:27:45 blueness Exp $
-
-EAPI="4"
-
-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 libedit static-libs +tools"
-
-CDEPEND="dev-libs/libpcre
-	libedit? ( dev-libs/libedit )
-	tools? ( sys-libs/ncurses )"
-#varnish compiles stuff at run time
-RDEPEND="${CDEPEND}
-	sys-devel/gcc"
-DEPEND="${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=( "${FILESDIR}"/${P}-automagic.patch )
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with libedit)
-		$(use_with tools)
-	)
-	autotools-utils_src_configure
-}
-
-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"
-}
diff --git a/www-servers/varnish/varnish-3.0.3-r1.ebuild b/www-servers/varnish/varnish-3.0.3-r1.ebuild
deleted file mode 100644
index 3b9536163827..000000000000
--- a/www-servers/varnish/varnish-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.3-r1.ebuild,v 1.1 2013/03/14 15:49:37 blueness 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 libedit static-libs +tools"
-
-CDEPEND="
-	dev-libs/libpcre
-	jemalloc? ( dev-libs/jemalloc )
-	libedit? ( dev-libs/libedit )
-	tools? ( sys-libs/ncurses )"
-
-#varnish compiles stuff at run time
-RDEPEND="
-	${CDEPEND}
-	sys-devel/gcc"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.3-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_with jemalloc)
-		$(use_with libedit)
-		$(use_with tools)
-	)
-	autotools-utils_src_configure
-}
-
-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"
-}
diff --git a/www-servers/varnish/varnish-3.0.4-r1.ebuild b/www-servers/varnish/varnish-3.0.4-r1.ebuild
deleted file mode 100644
index c8f982fa7f89..000000000000
--- a/www-servers/varnish/varnish-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.4-r1.ebuild,v 1.1 2013/07/08 22:11:35 blueness 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."
-}
diff --git a/www-servers/varnish/varnish-3.0.4.ebuild b/www-servers/varnish/varnish-3.0.4.ebuild
deleted file mode 100644
index 51588347230d..000000000000
--- a/www-servers/varnish/varnish-3.0.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.4.ebuild,v 1.3 2013/06/21 12:51:35 blueness 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 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.  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."
-}