Version bump

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

5 files changed, 164 insertions, 1 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index b7bbcfc32985..54bdfa189499 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,14 @@
 # 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.78 2014/05/22 20:51:19 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.79 2014/06/25 12:46:50 blueness Exp $
+
+*varnish-4.0.1 (25 Jun 2014)
+
+  25 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/varnish-4.0.1-fix-doc-Makefile_am.patch,
+  +files/varnish-4.0.1-fix-man-Makefile_am.patch,
+  +files/varnish-4.0.1-fix-warning.patch, +varnish-4.0.1.ebuild:
+  Version bump
 
   22 May 2014; Christian Ruppert <idl0r@gentoo.org> metadata.xml:
   Add myself as secondary maintainer
diff --git a/www-servers/varnish/files/varnish-4.0.1-fix-doc-Makefile_am.patch b/www-servers/varnish/files/varnish-4.0.1-fix-doc-Makefile_am.patch
new file mode 100644
index 000000000000..57885c6488ea
--- /dev/null
+++ b/www-servers/varnish/files/varnish-4.0.1-fix-doc-Makefile_am.patch
@@ -0,0 +1,14 @@
+diff -Naur varnish-4.0.1.orig/man/Makefile.am varnish-4.0.1/man/Makefile.am
+--- varnish-4.0.1.orig/man/Makefile.am	2014-06-23 09:43:06.000000000 -0400
++++ varnish-4.0.1/man/Makefile.am	2014-06-25 08:40:43.498765372 -0400
+@@ -86,8 +86,8 @@
+ 	$(top_srcdir)/doc/sphinx/include/varnishhist_synopsis.rst
+ 	${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishhist.rst $@
+ 
+-vmod_std.3: $(top_srcdir)/lib/libvmod_std/vmod_std.man.rst
++vmod_std.3: $(top_builddir)/lib/libvmod_std/vmod_std.man.rst
+ 	${RST2MAN} $(RST2ANY_FLAGS) $? $@
+ 
+-vmod_directors.3: $(top_srcdir)/lib/libvmod_directors/vmod_directors.man.rst
++vmod_directors.3: $(top_builddir)/lib/libvmod_directors/vmod_directors.man.rst
+ 	${RST2MAN} $(RST2ANY_FLAGS) $? $@
diff --git a/www-servers/varnish/files/varnish-4.0.1-fix-man-Makefile_am.patch b/www-servers/varnish/files/varnish-4.0.1-fix-man-Makefile_am.patch
new file mode 100644
index 000000000000..c65fba2391e0
--- /dev/null
+++ b/www-servers/varnish/files/varnish-4.0.1-fix-man-Makefile_am.patch
@@ -0,0 +1,19 @@
+diff -Naur varnish-4.0.1.orig/doc/sphinx/Makefile.am varnish-4.0.1/doc/sphinx/Makefile.am
+--- varnish-4.0.1.orig/doc/sphinx/Makefile.am	2014-06-23 09:43:06.000000000 -0400
++++ varnish-4.0.1/doc/sphinx/Makefile.am	2014-06-25 08:35:11.887750279 -0400
+@@ -144,11 +144,13 @@
+ BUILT_SOURCES += include/varnishhist_options.rst \
+ 	 include/varnishhist_synopsis.rst
+ 
+-reference/vmod_std.generated.rst: $(top_srcdir)/lib/libvmod_std/vmod_std.rst
++reference/vmod_std.generated.rst: $(top_builddir)/lib/libvmod_std/vmod_std.rst
++	mkdir -p reference
+ 	cp $? $@
+ BUILT_SOURCES += reference/vmod_std.generated.rst
+ 
+-reference/vmod_directors.generated.rst: $(top_srcdir)/lib/libvmod_directors/vmod_directors.rst
++reference/vmod_directors.generated.rst: $(top_builddir)/lib/libvmod_directors/vmod_directors.rst
++	mkdir -p reference
+ 	cp $? $@
+ BUILT_SOURCES += reference/vmod_directors.generated.rst
+ 
diff --git a/www-servers/varnish/files/varnish-4.0.1-fix-warning.patch b/www-servers/varnish/files/varnish-4.0.1-fix-warning.patch
new file mode 100644
index 000000000000..ae327292fb7c
--- /dev/null
+++ b/www-servers/varnish/files/varnish-4.0.1-fix-warning.patch
@@ -0,0 +1,12 @@
+diff -Naur /root/varnish-4.0.1/lib/libvcc/vcc_expr.c varnish-4.0.1/lib/libvcc/vcc_expr.c
+--- /root/varnish-4.0.1/lib/libvcc/vcc_expr.c	2014-06-25 07:06:42.550508615 -0400
++++ varnish-4.0.1/lib/libvcc/vcc_expr.c	2014-06-23 09:43:06.000000000 -0400
+@@ -670,7 +670,7 @@
+ 	struct expr *e1, *e2;
+ 	const char *ip;
+ 	const struct symbol *sym;
+-	double d;
++	double d = 0.0;
+ 
+ 	*e = NULL;
+ 	if (tl->t->tok == '(') {
diff --git a/www-servers/varnish/varnish-4.0.1.ebuild b/www-servers/varnish/varnish-4.0.1.ebuild
new file mode 100644
index 000000000000..6a25ea65783d
--- /dev/null
+++ b/www-servers/varnish/varnish-4.0.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-4.0.1.ebuild,v 1.1 2014/06/25 12:46:50 blueness Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+
+inherit user autotools-utils eutils systemd python-r1
+
+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="jemalloc jit static-libs"
+
+CDEPEND="
+	|| ( dev-libs/libedit sys-libs/readline )
+	dev-libs/libpcre[jit?]
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses"
+
+#varnish compiles stuff at run time
+RDEPEND="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+DOCS=( README doc/changes.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-fix-man-Makefile_am.patch
+	"${FILESDIR}"/${PN}-4.0.1-fix-doc-Makefile_am.patch
+	"${FILESDIR}"/${PN}-4.0.1-fix-warning.patch
+)
+
+AUTOTOOLS_AUTORECONF="yes"
+
+pkg_setup() {
+	ebegin "Creating varnish user and group"
+	enewgroup varnish 40
+	enewuser varnish 40 -1 /var/lib/varnish varnish
+	eend $?
+}
+
+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)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r3 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r3 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	dodir /var/log/varnish/
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	insinto /etc/varnish/
+	doins  lib/libvmod_std/vmod.vcc
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
+
+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."
+}