Remove bundled jemalloc and fix automagic dependency, bug #461638

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

4 files changed, 92 insertions, 12 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/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)
 	)