Fix bug 153904; thanks to Jakub for the patch

Package-Manager: portage-2.1.2_rc3-r1

diff --git a/app-benchmarks/httperf/ChangeLog b/app-benchmarks/httperf/ChangeLog
index 98164113abd350d37f0433a9cbd9f39f47d777c9..0ab748c3c0b968c0bd41ed54249843cdc1da1167 100644 (file)
--- a/app-benchmarks/httperf/ChangeLog
+++ b/app-benchmarks/httperf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/httperf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/httperf/ChangeLog,v 1.6 2006/12/06 19:59:13 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/httperf/ChangeLog,v 1.7 2006/12/13 17:49:21 masterdriverz Exp $
+
+  13 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  httperf-0.8.ebuild:
+  Fix bug 153904; thanks to Jakub for the patch
 
   06 Dec 2006; Alexander H. Færøy <eroyf@gentoo.org> httperf-0.8.ebuild:
   Stable on MIPS.

diff --git a/app-benchmarks/httperf/Manifest b/app-benchmarks/httperf/Manifest
index b81ebb1f172b44b1c0e7b3bafb7ba8a6b1fd892a..cd6770b9f7e3ba35f9fac44951f065fa39095e05 100644 (file)
--- a/app-benchmarks/httperf/Manifest
+++ b/app-benchmarks/httperf/Manifest
@@ -7,14 +7,14 @@ MD5 a719ff22f9a66c55067ea922e45d13a0 files/httperf-0.8-respect-DESTDIR.diff 712
 RMD160 919301006813f5aa69f47c7e9ea3528d709602f3 files/httperf-0.8-respect-DESTDIR.diff 712
 SHA256 b5279e0211d05684f14f65fd35c6e451969ce55b92140acbdc7d8b5056ed26f1 files/httperf-0.8-respect-DESTDIR.diff 712
 DIST httperf-0.8.tar.gz 146107 RMD160 c3b728c2afbaef2bcd4e93c2d5b01df4d4e336ce SHA1 ce52f699bcdaf4bf62b928ad7b4a762cc0c0c958 SHA256 3222281a92dd4d3c7d5424f574b41d809c9aff8b86100e6fd44bb3b93b26df67
-EBUILD httperf-0.8.ebuild 1013 RMD160 546b1939dad2f53a7de51bca7cda2b64c015c141 SHA1 4a020dbb499ba01ed3c7a4c1c51d1c445be6a6bf SHA256 387d701f0b018dd4f20fae53b6c4f2350a42a46a95a30a18ee7bc9fbc9e4e0b4
-MD5 15bd56bc7db065240d75381495db73a0 httperf-0.8.ebuild 1013
-RMD160 546b1939dad2f53a7de51bca7cda2b64c015c141 httperf-0.8.ebuild 1013
-SHA256 387d701f0b018dd4f20fae53b6c4f2350a42a46a95a30a18ee7bc9fbc9e4e0b4 httperf-0.8.ebuild 1013
-MISC ChangeLog 934 RMD160 856bc87652202eab1d600148fd20868a68ee5f88 SHA1 54b62526383c1cd8691814ef5d3db854c7421244 SHA256 bef643fca79253ef5a11ce4da928e14eae924ccf7d8966da9dabb920c3fb3bb2
-MD5 e28e4ffe2aae4c4d264bb3037b59b9ac ChangeLog 934
-RMD160 856bc87652202eab1d600148fd20868a68ee5f88 ChangeLog 934
-SHA256 bef643fca79253ef5a11ce4da928e14eae924ccf7d8966da9dabb920c3fb3bb2 ChangeLog 934
+EBUILD httperf-0.8.ebuild 1060 RMD160 f8801ce59eadc1189374151a7edfd39c211f483f SHA1 c0df7881755c580f40736ab1b523cb437fad819b SHA256 ae34dbc3c33d6981d66d18e0d235deff627e57ba3a2d109cf6c5b5b44d29f750
+MD5 5f54f3b57b893cf4c0e66278d2ffd62c httperf-0.8.ebuild 1060
+RMD160 f8801ce59eadc1189374151a7edfd39c211f483f httperf-0.8.ebuild 1060
+SHA256 ae34dbc3c33d6981d66d18e0d235deff627e57ba3a2d109cf6c5b5b44d29f750 httperf-0.8.ebuild 1060
+MISC ChangeLog 1072 RMD160 c9655d0916476259cffe8ac343c78e4a9e1cb2a7 SHA1 3643f29447a464a6010d33ec466bb4fc1fc37efa SHA256 1d458e1bcaff8729722811aab7f39d17b33a23750e9e5e107cf5caec3b46b474
+MD5 7502c7ec18a48afe1d9a82c5e64a4d7b ChangeLog 1072
+RMD160 c9655d0916476259cffe8ac343c78e4a9e1cb2a7 ChangeLog 1072
+SHA256 1d458e1bcaff8729722811aab7f39d17b33a23750e9e5e107cf5caec3b46b474 ChangeLog 1072
 MISC metadata.xml 945 RMD160 6000f628e3ac61bf7406557c6f81d8be6e73b4e0 SHA1 ff5768407992d76b3200203165c695d13d351090 SHA256 8d47bea6a08aaf0cd61204d6130eedd09dbc204f832aa3365f0ec5ecd421feb6
 MD5 895c658c1644917118d147978f7d1147 metadata.xml 945
 RMD160 6000f628e3ac61bf7406557c6f81d8be6e73b4e0 metadata.xml 945

diff --git a/app-benchmarks/httperf/httperf-0.8.ebuild b/app-benchmarks/httperf/httperf-0.8.ebuild
index ada4b17e48a0291c75c888aee6159d77e11842f1..28a0b17a3c8db861991a344c58bb7e6f8fb21d7b 100644 (file)
--- a/app-benchmarks/httperf/httperf-0.8.ebuild
+++ b/app-benchmarks/httperf/httperf-0.8.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/httperf/httperf-0.8.ebuild,v 1.6 2006/12/06 19:59:13 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/httperf/httperf-0.8.ebuild,v 1.7 2006/12/13 17:49:21 masterdriverz Exp $
 
-inherit eutils
+WANT_AUTOCONF="2.1"
+
+inherit eutils autotools toolchain-funcs
 
 DESCRIPTION="A tool from HP for measuring web server performance."
 HOMEPAGE="http://www.hpl.hp.com/research/linux/httperf/index.php"
@@ -16,8 +18,6 @@ IUSE="debug ssl"
 DEPEND=""
 RDEPEND=""
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_unpack() {
        unpack ${A}
        cd ${S}
@@ -27,14 +27,14 @@ src_unpack() {
 
 src_compile() {
        einfo "Regenerating configure"
-       autoconf || die "autoconf failed"
+       eautoconf || die "autoconf failed"
 
        econf --bindir=/usr/bin \
                $(use_enable debug) \
                $(use_enable ssl) \
                || die "econf failed"
 
-       emake || die "emake failed"
+       emake CC=$(tc-getCC) -j1 || die "emake failed"
 }
 
 src_install() {