Install vmod.py for bug #498268

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

2 files changed, 103 insertions, 2 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 6b09738ec2e1..4b17a3e219b2 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,11 @@
 # 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.68 2013/12/20 01:06:47 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.69 2014/01/16 18:04:26 blueness Exp $
+
+*varnish-3.0.5-r2 (16 Jan 2014)
+
+  16 Jan 2014; Anthony G. Basile <blueness@gentoo.org> +varnish-3.0.5-r2.ebuild:
+  Install vmod.py for bug #498268
 
 *varnish-3.0.5-r1 (20 Dec 2013)
 
diff --git a/www-servers/varnish/varnish-3.0.5-r2.ebuild b/www-servers/varnish/varnish-3.0.5-r2.ebuild
new file mode 100644
index 000000000000..d8097999b111
--- /dev/null
+++ b/www-servers/varnish/varnish-3.0.5-r2.ebuild
@@ -0,0 +1,96 @@
+# 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-3.0.5-r2.ebuild,v 1.1 2014/01/16 18:04:26 blueness Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit autotools-utils eutils systemd python-single-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="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="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+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/"
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	python_doscript lib/libvmod_std/vmod.py
+}
+
+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."
+}