version bump - fix build with --as-needed (bug #248488)

Package-Manager: portage-2.2_rc26/cvs/Linux i686

4 files changed, 84 insertions, 2 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 57a6344aa920..0537e3d00fc9 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.21 2009/02/19 19:21:14 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.22 2009/04/13 09:54:47 bangert Exp $
+
+*varnish-2.0.4 (13 Apr 2009)
+
+  13 Apr 2009; Thilo Bangert <bangert@gentoo.org>
+  +files/varnish-2.0.4-link-order.patch, +varnish-2.0.4.ebuild:
+  version bump - fix build with --as-needed (bug #248488)
 
   19 Feb 2009; Dawid Węgliński <cla@gentoo.org> varnish-2.0.3.ebuild:
   Keywording ~amd64
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index f3f1e27d01a5..24d59a6d8985 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,8 +1,11 @@
+AUX varnish-2.0.4-link-order.patch 1163 RMD160 35a19df782493e71ac6645278cba7857509ede5d SHA1 28ef7346f0cdbe08acd6ea0ce95589108d7138eb SHA256 f1e796285ca4427619ed493b0bea17366260c7cb72e9edb86faa3b18421206c9
 AUX varnishd.confd 166 RMD160 ce275968c702f547f6b0db2de24fc1abd3488b04 SHA1 29f426d4ab8de3fb79217fa738e9d8e0800b3662 SHA256 f98389902b477307b1bf4856c4ce744b4c57c88869fffcf0b47217d6b24c24a6
 AUX varnishd.initd 639 RMD160 e747e7077565d189024b61fc907d88aa6b566d77 SHA1 0dedb667ab2c0075009d71b3b183e578fa33aaae SHA256 f5bf12825fd3c844d9d299d84b4f1dc1aaa6987f9f3ab09e2290b06245d4f613
 DIST varnish-2.0.2.tar.gz 788327 RMD160 258aafdda23b9d88e3f9e1936f3463fea9a38bdb SHA1 2f3031418ceca74752ecca3ae04844023b8e85ac SHA256 a920f01aa6efbafaa28346afc57823e4caebc89cf7b6d0b2af2c85b92c66c641
 DIST varnish-2.0.3.tar.gz 815468 RMD160 8d9eca5b4c3bef5c4509ec3548a8031c1e394a43 SHA1 c5ebf65fe46c90246211e1f23280c11aa68f831b SHA256 1e36787422236bf6639036a2f7cf3c85827e75e15399c9d5de4124c47629f09c
+DIST varnish-2.0.4.tar.gz 786945 RMD160 93f94555f42205ff5f324e76acb121c8da71f6e9 SHA1 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
 EBUILD varnish-2.0.2.ebuild 949 RMD160 c9cddeabbefe8d5b9fac1f89025befa0d5cae7b0 SHA1 be289ed42c6e1f0a59181ca03c3a266501539411 SHA256 83c24c0e545904037a2b836343a318c6dca76ab2f653c5c3e2651d63a9083b15
 EBUILD varnish-2.0.3.ebuild 952 RMD160 10b63264e54208ec045a5bd2fd878ecdedf25a19 SHA1 1cb3d169c09c7dd98c7e385425ade30886b52db8 SHA256 e67c8cc6d8fd290387121632f049f6b034c88a069380e9ce7794fbc08fffea4e
-MISC ChangeLog 3305 RMD160 9f86799c5c13ab745ffd7b5c296cb77b3eeadd6e SHA1 d6d7caae286cdbc17d58190daa75e1e89958fa79 SHA256 222d926beaad8c1a84d840c975ddae8bf11e7d7beb62bac2ceb738042c221856
+EBUILD varnish-2.0.4.ebuild 1061 RMD160 e6db95fce1fbaeb89dd73532f4df54d255adddc0 SHA1 8d5de9bf5c7612396d9693aaa2af16fcae218ad0 SHA256 5fa44682730039f94cf2531cde07153a93655a5eb0fa81cbd2fb45b39d15579f
+MISC ChangeLog 3512 RMD160 6ab65cc9db7403eba62e57a3aef48e79f2466eaf SHA1 d17ef794e938775dfa13ceda340a151e7ca5f695 SHA256 7b9ae68d341d0e12c2db335c864bcf01613e62b38016d4ea1b516346910fdf16
 MISC metadata.xml 1026 RMD160 e7e9f2813e22bea7b993644082badd89460d3d7f SHA1 3bd5b7b70bb6904df77374f7df74f6cedf074d08 SHA256 fda15c7ee0557ab9d595e3e98caa18bc7b3da81875bbac233f312b32eb4d84f5
diff --git a/www-servers/varnish/files/varnish-2.0.4-link-order.patch b/www-servers/varnish/files/varnish-2.0.4-link-order.patch
new file mode 100644
index 000000000000..e3eca384b5b0
--- /dev/null
+++ b/www-servers/varnish/files/varnish-2.0.4-link-order.patch
@@ -0,0 +1,36 @@
+patch by bangert to fix build with --as-needed.
+sent upstream at http://varnish.projects.linpro.no/ticket/486
+
+diff -Naur varnish-2.0.4/lib/libvarnish/Makefile.am varnish-2.0.4.new/lib/libvarnish/Makefile.am
+--- varnish-2.0.4/lib/libvarnish/Makefile.am	2009-04-01 15:35:14.000000000 +0200
++++ varnish-2.0.4.new/lib/libvarnish/Makefile.am	2009-04-07 21:55:06.000000000 +0200
+@@ -29,7 +29,7 @@
+ 	vss.c \
+ 	vtmpfile.c
+ 
+-libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM}
++libvarnish_la_LIBADD = $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la ${RT_LIBS} ${NET_LIBS} ${LIBM}
+ 
+ 
+ if ENABLE_TESTS
+diff -Naur varnish-2.0.4/lib/Makefile.am varnish-2.0.4.new/lib/Makefile.am
+--- varnish-2.0.4/lib/Makefile.am	2009-04-01 15:35:14.000000000 +0200
++++ varnish-2.0.4.new/lib/Makefile.am	2009-04-07 21:57:40.000000000 +0200
+@@ -1,15 +1,15 @@
+ # $Id: varnish-2.0.4-link-order.patch,v 1.1 2009/04/13 09:54:47 bangert Exp $
+ 
+ SUBDIRS = \
++	libvarnishcompat \
+ 	libvarnish \
+ 	libvarnishapi \
+-	libvarnishcompat \
+ 	libvcl \
+ 	@JEMALLOC_SUBDIR@
+ 
+ DIST_SUBDIRS = 	\
++	libvarnishcompat \
+ 	libvarnish \
+ 	libvarnishapi \
+-	libvarnishcompat \
+ 	libvcl \
+ 	libjemalloc
diff --git a/www-servers/varnish/varnish-2.0.4.ebuild b/www-servers/varnish/varnish-2.0.4.ebuild
new file mode 100644
index 000000000000..c9827da2b091
--- /dev/null
+++ b/www-servers/varnish/varnish-2.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.4.ebuild,v 1.1 2009/04/13 09:54:47 bangert Exp $
+
+EAPI="2"
+
+inherit autotools
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator."
+HOMEPAGE="http://varnish.projects.linpro.no/"
+SRC_URI="mirror://sourceforge/varnish/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+#varnish compiles stuff at run time
+RDEPEND="sys-devel/gcc"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-link-order.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newinitd "${FILESDIR}"/varnishd.initd varnishd || die
+	newconfd "${FILESDIR}"/varnishd.confd varnishd || die
+}
+
+pkg_postinst () {
+	elog "No demo-/sample-configfile is included in the distribution -"
+	elog "please read the man-page for more info."
+	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
+	elog "   /etc/conf.d/varnishd"
+	echo
+}