Revbump to fix automagic dependencies. Add libedit and tools use flags.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 150 insertions, 24 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index e2f6b5b82515..e20256aeb40c 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,12 @@
 # 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.42 2011/12/14 22:48:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.43 2011/12/14 22:55:13 radhermit Exp $
+
+*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:
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 76bcfee07fd6..3a2471d5760e 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -5,6 +5,7 @@ AUX varnish-2.0.4-link-order.patch 1163 RMD160 35a19df782493e71ac6645278cba78575
 AUX varnish-2.0.4-virtual-ncsa.patch 1722 RMD160 b5c99f2c5c39e9adc52ba4933b33813e600df374 SHA1 15e090b3d6c81e588a514eed9e57a22eb8c2fe35 SHA256 f7a2fd243c1a103dc4d26b1deb6d11d3a0d604ebbc4315520777769886b60227
 AUX varnish-2.1.4-find-rst2man.py.patch 558 RMD160 76800fdd0e6d047a3cfd20fa0d44ed932bc8c825 SHA1 36ee3afa89cff9c3ca5e2e33db3ee4baa7161352 SHA256 3bf1bbc6b8b103c9cfbe4e0ef366122c7dc84ea2aa039c147e45b35654c4d882
 AUX varnish-2.1.4-virtual-ncsa.patch 1540 RMD160 d4d13281be8320b57391a4a5d010daf0d249d23f SHA1 b1e2684af02501002609e44781f010aafbaf7df3 SHA256 6f08c3d21799cb845712f5c5590727521d857a5146347c582f6618a257825ecc
+AUX varnish-3.0.2-automagic.patch 1653 RMD160 c964b36a6a9885bb797fd27a6b46157adb1bfdc9 SHA1 0da199314044d9e3e728e23190fca47c9310b1a7 SHA256 de03979318fbde390e56106ed77fc32451bf904e7b564998e452a6e151218dae
 AUX varnishd.confd 311 RMD160 7ae692df018d0a889f4465ec9436b56a2b8d6368 SHA1 44abde826e884c35ff0748c62fe470dcdc2bb914 SHA256 06330cb231b6d64d85be34e5537c3c8741c0d50291f82cd549a2d0685f294e37
 AUX varnishd.initd 1047 RMD160 3afab33ab08be488111de692d8e6e06d05cf33ff SHA1 a19eab18e12550b0b16232f404badf24adc3c443 SHA256 e8c46f79bf38a6e6aebfbbfea6dcbdd69865527301d03928c7ee4f2a379624a5
 AUX varnishd.logrotate 115 RMD160 975e67b1250be86eec8b02c043e89dc045cc2d1e SHA1 f5fbed252083090c8a138063031be62e840137ee SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e
@@ -15,17 +16,18 @@ DIST varnish-3.0.2.tar.gz 1977852 RMD160 6093839815ba72107fa2b52f0a198167a3a6b79
 EBUILD varnish-2.0.4-r1.ebuild 1390 RMD160 3541f08e9564998fb6affe52bacde6138d1ea2f1 SHA1 98cd57f581c8dca74bb29728078499858cd27312 SHA256 27b7d1cc03006f0949297abcb0d1f4f19abedbe01e3741405abeedf197bba7d9
 EBUILD varnish-2.1.5.ebuild 1494 RMD160 35c0f1f045c4411a6e608fd31cd70b65e8664ffc SHA1 c88d8ff252b045535818ea3f85897eb176cab0fa SHA256 20c81c6bf42e88dd2e7701c5c5242346b1b814d588a9cbde2b2fe8c87d81dc5f
 EBUILD varnish-3.0.1.ebuild 1278 RMD160 08a3efd206f3991a63c35c2b5047b58f724f62cd SHA1 1ce2a64ff87df30366b3e8acc70eb03cea376ff8 SHA256 1616ee4b63d6bc0f86658550c3476746cba0e732683e693d8f9a4ce6346ebd3a
+EBUILD varnish-3.0.2-r1.ebuild 1582 RMD160 be550027ea7fbc5ffd4940de8f261543397f21a6 SHA1 02837998d064f484afd3ed6bfb6cccaaf4742494 SHA256 03dec5b8a007cd7dd726507f1ed066e724080905091af42a04de56ba5fde227c
 EBUILD varnish-3.0.2.ebuild 1270 RMD160 7f9ca881ed1d232b4c0fc37fb2a788baedf5fd32 SHA1 e16339776bd4f94187cde685f15db8a562f1b226 SHA256 b7f3110dac44d4b5e1e21cd785c7977b405f6b0a6651f5220acbb227b48e7523
-MISC ChangeLog 6434 RMD160 4bab2ae23cd413398ebc41ae125676011105842e SHA1 16ec1f5c9e75cb08d9e4b96f0571145203aad1df SHA256 336d8eab09ee8aaf5efb70f8f4e21f2f060e0b42e4f0238b00a3bed85b4850d3
-MISC metadata.xml 963 RMD160 1caa73fb36f5a55e8ab25d541991fb62e3780333 SHA1 faa0b5a5f36bc164dba6dea7894d5f790a02dba7 SHA256 8bda47903140b321aa8e15a61400b4f0676d7c6455fd450ff81633c191d89a09
+MISC ChangeLog 6671 RMD160 265bd2bdd32314f0247493f7e099d7ac3aa646ea SHA1 8ad965d44cef44529e54a10307589147a19014fa SHA256 07ce71a89bdf192f4a902ea09431e01ad0a2b03f6011723a00dfec948f4fc7ea
+MISC metadata.xml 1095 RMD160 4597341b77def06595361de877f547804bd1cf00 SHA1 cef813eab2508e03abb23f8ce9f140d79ca3ebd4 SHA256 bfa1d27137162a46cf3fcb094d9cbee2a748ee299c068861cb553ee905ec5ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO6SfGAAoJEEqz6FtPBkyjqLQIAJujguqtUaiow+7eNxUHe2IT
-wH4zA8CKrcq1W6IxrpYpQucOaMPkyh+EoqYpxifHAhv3wSX8hKmyiiq9J0QyMK7d
-KFKi2FUUw0sPYit3cJ39XKCQlpuhsn6hS78fdvHy3kXERitf2Ss8bBdJOUpyxCvK
-am5jzrkRbk4jJB4r7Wx+OJpC/v0Tf7y9N/aEmXBXDPu6b5HphgdmlLtcmlTx7SbP
-aCq1uObrQqYF6dD6jrIOzx1cRpwSx9zxeeW2y10GAVvcv6/Fzu8D3ASGcmkZyxLF
-q/iNWi3YnZS57UGBOBcYJAvaqssbh7rX17fjgSjUm6/ZyenKopiYUBrwEcpf2cg=
-=PweW
+iQEcBAEBCgAGBQJO6SlXAAoJEEqz6FtPBkyjGPkIAJsLr1x8+HJmNcuQKRL3L89U
+VfXDFuM+/4E7tvoGjymx6h8Am4UFRFoWWUjEuZVKQ2a4Xf/HtBQBlX4q84J2P/w5
+JhS38bLXvENkBIW/QlrBA1nbJJuTfU2uKGy537qniz1R0kGEStJdSK2LCVWERGDw
+G2fC3IeysEUb9KVipT+WNyP70gDE9P4lUngPYP6qGbKMJCpzd/g1W8UWrHhuGgny
+FfwZmsNqajilJC7XJdr8mcVCtTlK72ENpfPtqIw8LCugZ154TVdG41el6cu+lhEm
+5B9ECdXxfv0XG5WBawODBasH/qh5A3O33oPerANPYFxpUFwAL4PvSI5RWi5GmZE=
+=kJic
 -----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
new file mode 100644
index 000000000000..204e558eb113
--- /dev/null
+++ b/www-servers/varnish/files/varnish-3.0.2-automagic.patch
@@ -0,0 +1,49 @@
+--- 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/metadata.xml b/www-servers/varnish/metadata.xml
index 6a9d9e083d8e..86e5e5315cb3 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>www-servers</herd>
-<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.
+	<herd>www-servers</herd>
+	<use>
+		<flag name="tools">Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes</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>
+	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.2-r1.ebuild b/www-servers/varnish/varnish-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..8c6e4c7a6def
--- /dev/null
+++ b/www-servers/varnish/varnish-3.0.2-r1.ebuild
@@ -0,0 +1,66 @@
+# 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-r1.ebuild,v 1.1 2011/12/14 22:55:13 radhermit 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"
+SLOT="0"
+KEYWORDS="~amd64 ~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
+	dev-util/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"
+}