Version bump

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 140 insertions, 7 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 38b8f5bf8bcc..ab9f276915bb 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.51 2012/07/11 23:27:45 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.52 2012/08/23 20:59:46 blueness Exp $
+
+*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:
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index e20ebdf535ef..8bb4fff6ec35 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -6,19 +6,22 @@ AUX varnish-2.0.4-virtual-ncsa.patch 1722 SHA256 f7a2fd243c1a103dc4d26b1deb6d11d
 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 varnishd.confd 311 SHA256 06330cb231b6d64d85be34e5537c3c8741c0d50291f82cd549a2d0685f294e37 SHA512 8564151fbea198947c2db7ae28ab1d9865461fab81dc6c75fef9ad487b3b1d06468fe787319a479a57cdbee95eb7575df43d74839a590a843d6c8d812c9c7ba4 WHIRLPOOL c239fedf66d6f2a4d74af448d37204255b9a6df7ff275e490d9e40e8ae6151c29b477dc62a72f5fdb1325decfcfce139fba601734a283509ba511d9d5b0c7b5b
 AUX varnishd.initd 1047 SHA256 e8c46f79bf38a6e6aebfbbfea6dcbdd69865527301d03928c7ee4f2a379624a5 SHA512 ddedba87d69f2606edde1fcc9f7851f647e1d603b3fd6ef8e536a7a68ce55cd8e09d66cb93bdd7e7ab95311edadad6aa2eaab774152dbe204a40b0835e4fdc61 WHIRLPOOL 8284dd04e4ded9bc7244a78852720d50770792894d531bac5663c343ac0b191a2639ac4cda43b1c8e0a1bd2a9ec249afea9cb7852080d0c7eda704ae9e4aa899
 AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e SHA512 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
-DIST varnish-2.0.4.tar.gz 786945 RMD160 93f94555f42205ff5f324e76acb121c8da71f6e9 SHA1 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
-DIST varnish-3.0.2.tar.gz 1977852 RMD160 6093839815ba72107fa2b52f0a198167a3a6b79b SHA1 906f1536cb7e728d18d9425677907ae723943df7 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243
+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
-MISC ChangeLog 7653 SHA256 953218f14b5ddf7df58927150a76e92b57b1dfcf359f2c809d7a03523c9981d2 SHA512 6c9b7e94a2798768c9ce397327ad72202b296dba75bd72aafdfe5613520cc9c3679b52dd49ac0f085bec8a6f47db006fc32a5c2f9777134ac5e83c235069880b WHIRLPOOL 6f4094484be5d4050e89259f2c6e1e88430b9085037d11463f4b62c680b8a6af2899ab948414ee7904f0e380cfb81793da4e7fb279f67c9acb69ec382a1e4f9f
+EBUILD varnish-3.0.3.ebuild 1596 SHA256 626f07279180ef2833272981c3ff933d9779b820f477e729c8ad08ba4f0ee94c SHA512 2819dd3179015547c58588b4ecab564e3ef072313bd3cee80344300baef4492061535fd20e567f189761b29ae3c72749e9901eba0e7442c584fd567881e3eeab WHIRLPOOL f893d3c00b593119734ce45a9b3c8b3651db719d35c12de77d695af19038e3c4e2576b19cfcf0635f8269fe9c64929c8a54b4ae9f4c98085476c0c75790fc367
+MISC ChangeLog 7817 SHA256 28bce1bf5f9313356f52c6dca786f6c0522efccbc90bcc5e0ad25fdb94ab4c9d SHA512 2ad7058b48806cc240281fb332a482d5bb568c5af0e080d744660edc70e604a43d0d62c7dba06c2dec87d8233150db5d45eaf537e96c609c3c589529739b9b2e WHIRLPOOL 1f4422779e538ca8e37432c4123549ad977dacf8a9d5ad83e2570f75d31650412441a6d527e35ffc86dab803b97b377f4d8da245ec53afe82ed204616a081069
 MISC metadata.xml 1164 SHA256 40643a9267541e9550f18776cc5ab97e443ca53dc9e59f768cef18f3a6ef732b SHA512 15c7fe9cf443d0b1917feab552c494a36a85a4fa7f0937971adc1608ca92f9304251b300138fc9c4144b1a80da3123c9e7768ee7b507c5872842c05bd57077ae WHIRLPOOL 0c0aa67266333f1090915e1ed08a9a315f6a01c7c7a57f5793bc3f97ddb0f390daa8a6830492d2bda084bcff65d950b3af2a8bf448f1e0c913a06e19eb684a24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAk/+C/wACgkQl5yvQNBFVTXIiACdHG4oxas30GSXCH/s21eycopp
-lS4Anig9ryzziB3IaASbztgrgxdBzpH6
-=IGsh
+iEYEAREIAAYFAlA2mbcACgkQl5yvQNBFVTVtUACfTZ9wMz5me+X8Mb6u1R7/BPQo
+/UgAnRDbVM8mZysDjhvMTG5qwapz1XpB
+=A0p0
 -----END PGP SIGNATURE-----
diff --git a/www-servers/varnish/files/varnish-3.0.3-automagic.patch b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
new file mode 100644
index 000000000000..b492e3c080b6
--- /dev/null
+++ b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
@@ -0,0 +1,58 @@
+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	2012-08-23 15:58:15.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
diff --git a/www-servers/varnish/varnish-3.0.3.ebuild b/www-servers/varnish/varnish-3.0.3.ebuild
new file mode 100644
index 000000000000..c2e8ac5de738
--- /dev/null
+++ b/www-servers/varnish/varnish-3.0.3.ebuild
@@ -0,0 +1,66 @@
+# 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.3.ebuild,v 1.1 2012/08/23 20:59:46 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}"/${PN}-3.0.3-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"
+}