4 files changed, 121 insertions, 15 deletions
diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index ab38e973f4c2..6b09738ec2e1 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.67 2013/12/06 21:15:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.68 2013/12/20 01:06:47 blueness Exp $
+
+*varnish-3.0.5-r1 (20 Dec 2013)
+
+  20 Dec 2013; Anthony G. Basile <blueness@gentoo.org> +files/varnishd.service,
+  +varnish-3.0.5-r1.ebuild:
+  Add systemd unit file, bug #494708.  Thanks Roc Vallès!
 
   06 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
   -files/varnish-3.0.2-automagic.patch, -files/varnish-3.0.3-automagic.patch,
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index e614c5b364ee..5858095ad822 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -7,24 +7,26 @@ AUX varnish-3.0.4-fix-automake-1.13.patch 586 SHA256 d4bc6d5832c8ea22026da3a892b
 AUX varnishd.confd-r1 706 SHA256 4d1b2498c78ce8ae4bfccafb2847598f9aad68fb6fbd521770dd198b7619a647 SHA512 053e61b72978028f4899d1da207a0ca69050bb48a07112186e6415f7a92fbacf4d55ca80d963ca35fac99b9440eefb4e9d252cd623bda49ea3f1b7e5b6520b9c WHIRLPOOL 4c3b0273b2ee4943bf662bcbec62176eebc2756ffcbf6cd3f7bf646e917402679085e43af383aa6d9633a5730f7d755fb68f0e7d45b3438d5f9a4b1e7d920c69
 AUX varnishd.initd-r1 2046 SHA256 484b9e53523f1509d48fc6253d99e0ae5e7fed61d112274ef0957449e248ac94 SHA512 ff5c3a2eab71ac6800e9ff0d49045fd7c7404242f2e64a36fc5f72475868baeb92a2e8d6cf26e6eb2d08d01e6eae98dd4c2484f99cf8979d0c1e76bd172513d5 WHIRLPOOL 0a9a2fe5857df26c2e3d49696e86570afb9048889072ee65de6112b8ac7a7e6736757cef0098343007bd58fae2055bc438043c2780f47f33f2494864a3b91930
 AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e SHA512 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
+AUX varnishd.service 312 SHA256 b8a69d0049c87565f1f2d819bdaecf2fe3de12e2b14714219235b107602f8afb SHA512 b497f3ec5359e620d6cefe801ecd3576122e614b5c6ae1be3ed69bbf1499050260e1643205f45900662b3c1421d98bbcb87a941729283a2342b12ec47692e545 WHIRLPOOL b7fc4e9f2a66bec20cf024b4cea39b11a16c2768120218f960ff453523084e09081055f7d6b5a8910ce2af6665d860743ccedcf55538a7923ecafeb1a3510ee7
 DIST varnish-3.0.5.tar.gz 2116664 SHA256 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 SHA512 0fe8a0f45ebe3b159fde811ac374ef8fb5be7712d8a61474778c57ddf4e7fb0404c7b28abeb614a16255a1c9ef0c780db44d03b1c8fbfee54adc49d92cbf733d WHIRLPOOL 5c33e510b5c511790a38451068e569ac62a5db4dc0c9aab99ef1509166674474c12dc5e0e9cdcde0245eb1b5c7b9947fed19a513114f363d468f2fbeff1c8d0d
+EBUILD varnish-3.0.5-r1.ebuild 2039 SHA256 e787b36d233d50dd886c79177cc197697eaee62276f0a8e1219ddffa202fafb8 SHA512 32b63380a8b63264c510f1ff9099a838bc5c894c3fc80ab33913e74fb5963938ea53cbe5a19887be2ae654f26bfbd8298d8bfcd76780d7cf585335b31b854cd2 WHIRLPOOL 5cdb880ffa5e1f9bb0e10c490cd80916fc38afc462faece92e162da76756b92d667c7a9dc6a74d0fb0135732d4641b90bdb0aa08398dc821620b23e0b5f420d1
 EBUILD varnish-3.0.5.ebuild 1975 SHA256 3b76c80bc0c5aedde002a2dd41a90a7519b190db8f98f0bc05e6a15a50d627ec SHA512 3fba7c6b93490bb013809d52b3ae81d0bfea61fc783495c74fad689f9561645c50749533569529106be8c5afddf05b994b01611017f6581533e0763b72f36827 WHIRLPOOL 437337047d3d0719cdb4729d00f296aad0c8db5dc6d244c56c70306ac60a86e407220cbc42872c4e0fa1e9c8e3c5cd5f81cb42ad2a924f4d0e1bb3c8bd5df8c6
-MISC ChangeLog 10411 SHA256 f0a0997778cf8b44a93af5d0d807f12f0df37aa33aa1744f15c8ad824681fe5f SHA512 7fb2bd7037e01b852f4d12f9c67b566cd23cf0ca8b0f70ac0bac5d77fcf96eabce2d2788859e26020ce502fdb0fa105371844ef173d25aeb3a4c30144e4ac239 WHIRLPOOL 3916e818f3049f40509516be8f6db5709b7b6a6774caca4b91588c9f6398d5274ed42f024f54f2e0cd35f79466b468fa8812bcf59541dafa049c8c4a9b9e5c7e
+MISC ChangeLog 10612 SHA256 52acbcdd1167254c26b4bd4cea0ce82c6dbdd2c76813e140318d03ae7bc0eac8 SHA512 904ef92d2cdd61aa2d35cc32785612ed3cfe89d5212122e0f5a9d5da0a7c80c9389f7fa09e44b32fa2cbf39dae66c7f6a73541e00338d20fa3ca285664c1c51f WHIRLPOOL 6f5d0d2c310794f0f34a375dda07a53b263ece83334101a5f35e4b97476b5eae5c2f3d80b38f8e247170b7a1185835b1957a2ce563900a491fc136f0c312580b
 MISC metadata.xml 1233 SHA256 090efc54afbb430a517196775dbee9ea43526b1155602d36fa5c6a78253a378d SHA512 df155931660201fa2e392cb10ecc150b2782520528e6534ee9ce538f9feb37c78fca9a33d0bdedc8c97831389b5d9313327b5564d7684749423da7c5856e12f6 WHIRLPOOL b2376a4917199bf8c235dd5a27567e8c7c6f23d41626e6ff873bf41ad9c4712bcec75eb64e08cad06b012020b56c1e6b52f51abb1093827d17fa35b938c9e656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJSs5hOAAoJEJOE+m71LUu6/s8P/273XlXtm+4OnNxbqNU4Xxbo
+ffQF1oa9ttam49JgKA8cL4sryy6mAg8BSqv0p/rvAQF7mv1ArReS38tt1Nw/ZL4U
+i61AVKJNWQGX0t/IAIqU1WniaLMz5EEC0vnFmr9j3xV6gkSDCEorj9TWy0wdUk4Y
+XZWPsI+nHSTwONV3rGUP6jfYtdwvNuf4ZG0ZhtyOmDE5JheU8c2K/epQvC/sbb4A
+JwluORYlhK8KO0ED84OKP71mndchVWCIJHzA3NNELmIPQcsbim+pyPnI11r4LUOt
+W9arpDhwG1y4wc1XTS850/4G22AF4646x6Op3NlsciEHssi33qWVJednXO8MYP8o
+CCm1E8E9udgZ1hQuxeSe1cIdKngzEcfVbAVIimkTBYz68e6ScDfC0hCX/V/bVUoN
+MQ/IASx0BNMK4jupaiHiJym/5TVrAoeLL9mMnzK5rWh+TiGfpsBg9bCJJ9hkfxc0
+l78ruJTvJ0LDHrGBTlmkGkAkX6ZngLiyV1xj0lQZLcSFeS7x2b25ejH6cOgBCvfR
+JSi2212WxtxsTnHcqQiCo3MCxoErpOT/W5zmsaCeke1a3V+8XhRmMJDlskLwKEuT
+MPVbsEmhdgZj9y5Dq+KVGX/5oerS7R8dANLUuEVhMSGikWrSYiw5u5jZotQUzQGL
+dSrZ3zkCEAiatxulvqNs
+=yAwS
 -----END PGP SIGNATURE-----
diff --git a/www-servers/varnish/files/varnishd.service b/www-servers/varnish/files/varnishd.service
new file mode 100644
index 000000000000..169206e0714b
--- /dev/null
+++ b/www-servers/varnish/files/varnishd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Varnish is a high-performance HTTP accelerator
+After=network.target
+
+[Service]
+Type=forking
+LimitNOFILE=32786
+LimitMEMLOCK=82000
+PIDFile=/var/run/varnishd.pid
+ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -P /var/run/varnishd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-servers/varnish/varnish-3.0.5-r1.ebuild b/www-servers/varnish/varnish-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..3922e0dd60a5
--- /dev/null
+++ b/www-servers/varnish/varnish-3.0.5-r1.ebuild
@@ -0,0 +1,85 @@
+# 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.5-r1.ebuild,v 1.1 2013/12/20 01:06:47 blueness Exp $
+
+EAPI="5"
+
+inherit autotools-utils eutils systemd
+
+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/"
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+}
+
+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."
+}