Remove bundled jemalloc and fix automagic dependency, bug #461638

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 110 insertions, 30 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index f60a72b212fc..1d04d0b8fcdd 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.55 2013/03/14 12:38:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.56 2013/03/14 15:49:37 blueness Exp $
+
+*varnish-3.0.3-r1 (14 Mar 2013)
+
+  14 Mar 2013; Anthony G. Basile <blueness@gentoo.org> +varnish-3.0.3-r1.ebuild,
+  -varnish-3.0.3.ebuild, files/varnish-3.0.3-automagic.patch, metadata.xml:
+  Remove bundled jemalloc and fix automagic dependency, bug #461638
 
   14 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
   -files/varnish-2.0.4-link-order.patch,
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 8cce8000dea6..d98ecbafd0ae 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -2,31 +2,31 @@
 Hash: SHA256
 
 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 varnish-3.0.3-automagic.patch 3767 SHA256 b77e0f365740eb41ca84d1c6546ee3b16c4b80ae3b34d29f3276fff5b9120411 SHA512 19e2c72a55cad22a81c8ccdb650dcf0c1e5c214d6f22bac2d5a3532d44047e79f1ec9989802cd4d4831a3210454ae32e2c10acd055c2855305314a8b5cb6e8c7 WHIRLPOOL 0400209b8d3fcd5cfd3b5546153353b0b93124601c1784b95e39f5bb37164696f482ae8bff9b51c3be9d80b4e71885a9e600abdb68073d39bebeea755ffdffd6
 AUX varnish-3.0.3-pthread-uclibc.patch 1348 SHA256 3e39323ff4d741a9a0337e84eee7ce9f8b5419722a3b905f09ccf2486a9ff24f SHA512 c06cd005ba04725ec69a9b5cb138fe2487bbd0b0e0aa4c6a39314b6473b160874d0c8452fca466e4efa907a998752e65940288a65a33b88cc4f206f1180b68d8 WHIRLPOOL 467f0e6c04b7c2fd12e4f55e670f73cc2042ae2312f3d5a3dd785ff0f94e62285acb1a5aea40694ee1dad2433e32c69933b6835e05c42b34ee83e50157a343d7
 AUX varnishd.confd 460 SHA256 9886fcc8b109e0eb603bb4e5a36156356b0763eb9c678faeab9b26481cd9aba0 SHA512 be6180eb23c46b1888fe4877470355da7369f863804ff7a59c3e5d03faefb29180518459c94b3adb4080ee7799a81017a9821c1bc6953b1666d856c1a11096ff WHIRLPOOL 1d7dbff9988b6418f6211bff4b7e2ae9790274e5edbc0fd7851ec24c8dadc0005be99273f2a45b4d0dd0f292ec2ae619c6f5989b7e9cb0d9bfcbbca48cd43cb5
 AUX varnishd.initd 989 SHA256 269c359025843051676972e505d0cc232cee54cbc6fed71ad72538ac2fce387f SHA512 4f0ae674354c3a682aa45b645cfdd475f7f5cad229d50234c9eebd916a046386370ec1adf210857e0e456003e93be18193653146b9950994361bb1e3c53d780c WHIRLPOOL c0621ef18e874505e96e368b8b6bb33c8dcec679af5f63dd4d621835382458224e238b49fe7f8469324d393d8655bf81cc744a2cb413da38d7a607e25015b539
 AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e SHA512 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
-DIST varnish-3.0.2.tar.gz 1977852 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243
+DIST varnish-3.0.2.tar.gz 1977852 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243 SHA512 a0942ff5dbdabac55f94240077d61905bc7ad4dff4ae9af80c937458554e7530d008f30e26a3f8533a38d927b8734da9a7e313977a2828c9f67e8ca1af16edfd WHIRLPOOL 20e8812336344a5c140382b4c24a04501cb7a11525e0cda71c6755c2a6d6f8c7e727a52fdd44e5066c9563f2196363864343e10b2a921673d802aa396a237562
 DIST varnish-3.0.3.tar.gz 2070020 SHA256 2d37d18d952f58b208ac3a0706d4d3e4c0de304b1fcc9df5019571c75f148ab2 SHA512 5865248135e5c4dad4f104cf8efcc317836fdb580213f4fb898d67f3a4a9a7afb8d40f2fcfe986ba81d5774ab4f772ed45998c12356d92d463c6eb97d20d5942 WHIRLPOOL 00d7a8e0329f2efce5f35c51af03e407493e2a49831c5e5201e007497e6f79f45eeb006c170a9cc26221d5a83000d6e0e5c8fcc9a4d19435fef714590ff8ed49
 EBUILD varnish-3.0.2-r1.ebuild 1590 SHA256 ae9f08eb8d8a0ddcc5bd806fd807efc91614b4bd69f48b9b6cbf34a90cc545c9 SHA512 efc1d3144248540a971bfee88e71587a565b1effe2ef4813d40a49415460aa1289e7868dc0c1985b92bf3098ce2ca62d9c066a5977af76ebac2a87eba76fcadf WHIRLPOOL bc70951ba5f16fbad710bf96bf8ed0b9ad904147c83272a1700a751f5584132e14532e7825f7f85dbc88a447a22a094f9039e6636d43405442a102e75b4defbb
-EBUILD varnish-3.0.3.ebuild 1645 SHA256 b1020a60b9409a304ba3d2dd5dd4631a5959abf01ea5fac0bae3005544ddcc2c SHA512 624ffa0855cccb4ed8543547213a1b93c27d73248ad51c24c03272d208c56da8379afb5d3d59bcbd892337f2842c2db6a90e198e7c0c3bef44c584c5200d3bd9 WHIRLPOOL 02590c9875d68d4f75e7627fc4cfbdf28d26a28b79d6ef745d77a6ee0d6a34630ebacd57579235cc22b5bb72cbad6ec8b53104ca0231274661c29b02d0d994f8
-MISC ChangeLog 8398 SHA256 1d5b04bc0a7e1a834eabecbe455aeed5cd1d92ef03225bfc2ebb32e0161bce0a SHA512 5511b2175a9c47de39a2719dc31e1dc95bcfcdbf16552dd31020ee8f2a070cb6e35c5859d561f0a0975f6aa1eea0ea173052b5bccde084fd6cd796f1a5c7f0ad WHIRLPOOL 065158bacaa68c992c9c45a9ff1de732b4d3e888a1feb51aa367f1deb9bcc0cd4fcdfa05cb862861d17f9f26c42fe9645b1e943c7d4727f0deef22ccd4f903c5
-MISC metadata.xml 1164 SHA256 40643a9267541e9550f18776cc5ab97e443ca53dc9e59f768cef18f3a6ef732b SHA512 15c7fe9cf443d0b1917feab552c494a36a85a4fa7f0937971adc1608ca92f9304251b300138fc9c4144b1a80da3123c9e7768ee7b507c5872842c05bd57077ae WHIRLPOOL 0c0aa67266333f1090915e1ed08a9a315f6a01c7c7a57f5793bc3f97ddb0f390daa8a6830492d2bda084bcff65d950b3af2a8bf448f1e0c913a06e19eb684a24
+EBUILD varnish-3.0.3-r1.ebuild 1849 SHA256 45942cff0dfcb92f929d7d215d0d6dc914b452d61c9d17878a3772de6b03ce9b SHA512 8644fd477e73ace9b479a0b92b5a055c7146f6ee0fcbfcdc3ca31aa531e6c9535105721da0ad1f3ee490af4ea24b5cdcedde3e8192a9f56a2c0c71c2ec78f5f1 WHIRLPOOL 7534254259d54749da8ca29d551ecf08c9ada90812fb8caf943dd692a24061b067973448fc84253f724681bc6356dfe682f45a73b63f2286a2f09faf649cbc5c
+MISC ChangeLog 8657 SHA256 002c800cf4f86eb4de0c46e3b98546a4c287fa35e604dc81c9c1f7bfd360c035 SHA512 bfb1b4fb062fa225d16559edca2d14c709f483687c2786242d1165965ac29470d85d2500432a1c3af9eb350b2ea5303de9487b9d5c6ef1591b01ef6c2f5fbace WHIRLPOOL 5fa23532677741272acd5cb023eb248822ef3198462ebf13b8427743fe5e2be66f62980581f9e0b3479b19c83b1e5ee19f7ff0c80224b438c769035aa4f3c430
+MISC metadata.xml 1233 SHA256 090efc54afbb430a517196775dbee9ea43526b1155602d36fa5c6a78253a378d SHA512 df155931660201fa2e392cb10ecc150b2782520528e6534ee9ce538f9feb37c78fca9a33d0bdedc8c97831389b5d9313327b5564d7684749423da7c5856e12f6 WHIRLPOOL b2376a4917199bf8c235dd5a27567e8c7c6f23d41626e6ff873bf41ad9c4712bcec75eb64e08cad06b012020b56c1e6b52f51abb1093827d17fa35b938c9e656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRQcS9AAoJEJOE+m71LUu64WYQALWVln8Bpvnb2mbxuvZkl9+8
-vnAnAL1zkAYk6YMRvR/ENCV9sFeCB9iPmKot164b5Kwv0BPfhFgzsHs5aErKc87j
-0C473yB0riBpUpSlJpqBYayMmaYvH8JyqngGjP8xg6Y00BU5tTY0C12BtizM6HcK
-0tm3wew3Bod3ilgIAVHliHtSKbigQcfOtCYFwOXFOUXACJpxZe0eMp7KO0YHDtYH
-wVYzyV4Kwvtw/GQeWfTmncOQQPwLIuKMZEry4uBhOc7LVniauK8Da1nrE1AEMn92
-Z4SOaFT9zG1WGYfbnYJmdAh8VDtRbrlYIKU/VoPX/6XThKPlR0ApQtq5Amnrcs9W
-ubzgwmTA5ekWeDeUDfTIFihHOvAv0BUQa0mSpMF5LdEmE8uShc4+gP+etCTaaW9s
-zmh8EbtJY2NJZLOgOKVcpEsgjiVAOSu0FVSsNhwI5YD3gevfnmN/77oCkCI4JaRY
-Z33+akLJzrhnB056S4uIRlkNAUL5vyaMQt37nfMifzX8UtDvt/ZZF9Rlf/dpeUq6
-LtIXab5s4CCicuzaKenNG2cFdu/g+pD8SHkEDOGfC5CR+CfHlo3n3IF/7dCrJirS
-jRWew6iT9ys5IfJP6EZr2GL8+wQgswl5r7gyo9uVLjhH5X4MMeuu/0WAlkzfhrtg
-/xCBI9UW2nfUCOZFySXt
-=gKj4
+iQIcBAEBCAAGBQJRQfGBAAoJEJOE+m71LUu6odQP/0aC4uVp4wjUoNDRyeDQ9L8k
+tD0lVJbw9zdq0Wp3yyDE46eRN9WhRGJAK24rCGsoUKqMXhflbNPJMqES+giS32wD
+sxDrdQW27RdSUSqvzld9ttc2SRuEdUkF7+u3LUNRouWjW0braq/FbpyqHv3DBMnP
+uvoxSow7wcdy1xMGWxzSZSrLrMS9mPwuCOOp86PnZPG2NL9ePBvKFjA/SCpKfwDq
+/dBpz21CjmgGPiylmaLPf99xAsNooGeSB3yAZkMh/gZXNHuhUkKYOzpIotDDQ06T
+8xPAkE5Xj0QNRD7r10yS3l2O9ukT4o5AzK/0aQzhXFxAz05rssXIJePBG+fjioTC
+ncl0Xr22BsQXDmH++OGIZiTuOKVxe07vQuYL0id+ul4phdCymAswJtSmJpZ8oXDY
+Q9BzxyIkOdSe1JoMCvVt+ZvKEvOHkIfErClYLFFXrtEUTicQsboU5yhy+48m7Hqq
+AsUiqgQqNT6eXb0aeEcR7mm7r42RohP+gfMIxkudQCgfjetyCtALiwm/rrPzAgLP
+TSXMVdTiVagksNqvDNzJRkJSVOXk12QvQi4GGE2eSjIpPVYoEKwQYSs+CqhmrNDd
+v0AYOFBhRX256DNND51pDrBSgWZ7NDUXPP7vM6x4cjOsFEzV/oQ4aU288A12+Ai9
+qa+pAZas9GzFY7wQLVLQ
+=qxUF
 -----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
index b492e3c080b6..70ca9f8cb2ee 100644
--- a/www-servers/varnish/files/varnish-3.0.3-automagic.patch
+++ b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
@@ -1,6 +1,6 @@
-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
+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	2013-03-14 10:57:55.000000000 -0400
 @@ -87,15 +87,20 @@
  
  save_LIBS="${LIBS}"
@@ -56,3 +56,64 @@ diff -Naur varnish-3.0.3.orig//configure.ac varnish-3.0.3/configure.ac
  
  # Checks for header files.
  AC_HEADER_STDC
+@@ -271,7 +272,6 @@
+ CFLAGS="${save_CFLAGS}" 
+ 
+ # Use jemalloc on Linux
+-JEMALLOC_SUBDIR=
+ JEMALLOC_LDADD=
+ AC_ARG_WITH([jemalloc],
+             [AS_HELP_STRING([--with-jemalloc],
+@@ -279,18 +279,11 @@
+             [],
+             [with_jemalloc=check])
+ 
+-case $target in
+-    *-*-linux*)
+-        if test "x$with_jemalloc" != xno; then
+-            AC_CHECK_LIB([jemalloc], [malloc_conf],
+-                  [JEMALLOC_LDADD="-ljemalloc"],
+-                  [AC_MSG_NOTICE([No system jemalloc found, using bundled version])
+-                   JEMALLOC_SUBDIR=libjemalloc
+-                   JEMALLOC_LDADD='$(top_builddir)/lib/libjemalloc/libjemalloc_mt.la'])
+-	fi
+-	;;
+-esac
+-AC_SUBST(JEMALLOC_SUBDIR)
++if test "x$with_jemalloc" != xno; then
++      AC_CHECK_LIB([jemalloc], [jmalloc_conf],
++            [JEMALLOC_LDADD="-ljemalloc"],
++            [AC_MSG_ERROR([No system jemalloc found])])
++fi
+ AC_SUBST(JEMALLOC_LDADD)
+ 
+ # Userland slab allocator, available only on Solaris
+@@ -582,7 +575,6 @@
+     lib/libvcl/Makefile
+     lib/libvgz/Makefile
+     lib/libvmod_std/Makefile
+-    lib/libjemalloc/Makefile
+     man/Makefile
+     redhat/Makefile
+     varnishapi.pc
+diff -Naur varnish-3.0.3.orig/lib/Makefile.am varnish-3.0.3/lib/Makefile.am
+--- varnish-3.0.3.orig/lib/Makefile.am	2012-08-20 05:20:40.000000000 -0400
++++ varnish-3.0.3/lib/Makefile.am	2013-03-14 10:58:39.000000000 -0400
+@@ -6,14 +6,12 @@
+ 	libvarnishapi \
+ 	libvcl \
+ 	libvgz \
+-	libvmod_std \
+-	@JEMALLOC_SUBDIR@
++	libvmod_std
+ 
+-DIST_SUBDIRS = 	\
++DIST_SUBDIRS = \
+ 	libvarnishcompat \
+ 	libvarnish \
+ 	libvarnishapi \
+ 	libvcl \
+ 	libvgz \
+-	libvmod_std \
+-	libjemalloc
++	libvmod_std
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
index 8e1583de7e20..dbe2f20cdba1 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 	<use>
 		<flag name="tools">Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes</flag>
+		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
 	</use>
 	<longdescription lang="en">
 	Varnish is an HTTP accelerator. An HTTP accelerator (often called Reverse Proxy)
diff --git a/www-servers/varnish/varnish-3.0.3.ebuild b/www-servers/varnish/varnish-3.0.3-r1.ebuild
index 59861be943fb..3b9536163827 100644
--- a/www-servers/varnish/varnish-3.0.3.ebuild
+++ b/www-servers/varnish/varnish-3.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.3.ebuild,v 1.2 2012/11/22 20:54:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.3-r1.ebuild,v 1.1 2013/03/14 15:49:37 blueness Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools-utils eutils
 
@@ -13,15 +13,21 @@ 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"
+IUSE="doc jemalloc libedit static-libs +tools"
 
-CDEPEND="dev-libs/libpcre
+CDEPEND="
+	dev-libs/libpcre
+	jemalloc? ( dev-libs/jemalloc )
 	libedit? ( dev-libs/libedit )
 	tools? ( sys-libs/ncurses )"
+
 #varnish compiles stuff at run time
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	sys-devel/gcc"
-DEPEND="${CDEPEND}
+
+DEPEND="
+	${CDEPEND}
 	dev-python/docutils
 	virtual/pkgconfig"
 
@@ -34,13 +40,19 @@ PATCHES=(
 	"${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
-	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		$(use_with jemalloc)
 		$(use_with libedit)
 		$(use_with tools)
 	)