Version bump (fixes bug #323397). Simplify src_test() code.

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

diff --git a/dev-libs/libevent/ChangeLog b/dev-libs/libevent/ChangeLog
index 9d4e34ab10710d0aa7c325fcfa163f882997a8ab..ee02642f25f23694687ba783f516efccb401137d 100644 (file)
--- a/dev-libs/libevent/ChangeLog
+++ b/dev-libs/libevent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libevent
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/ChangeLog,v 1.154 2010/06/14 22:03:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/ChangeLog,v 1.155 2010/06/20 15:53:08 jer Exp $
+
+*libevent-1.4.14b (20 Jun 2010)
+
+  20 Jun 2010; Jeroen Roovers <jer@gentoo.org> -libevent-1.4.14a.ebuild,
+  +libevent-1.4.14b.ebuild:
+  Version bump (fixes bug #323397). Simplify src_test() code.
 
 *libevent-1.4.14a (14 Jun 2010)
 

diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index efa6666dcba4b071b818d47efbfede9205a7aaa3..4872574c6e00e02f0b471dd6b58ab36d2702a67a 100644 (file)
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,8 +1,8 @@
 DIST libevent-1.4.13-stable.tar.gz 499603 RMD160 b363aee80f73f27a68516d57c00592fe923aa40a SHA1 b0c4e9801b74f8bed1502353674288a5e4f1ca16 SHA256 d6fff1d7e7b79e6e083b482b0b55190f71ba597b55c3541d64c0572ddf0747a3
-DIST libevent-1.4.14a-stable.tar.gz 499717 RMD160 a721c330f0693a3c9689e40419330fa53d755950 SHA1 20347207ca00b8f148de3e2bf0942a804925c08e SHA256 2d9a04417516db68f99816396ab9a173eea0625e64418557345e13849d8ca571
+DIST libevent-1.4.14b-stable.tar.gz 474874 RMD160 5eb739f0ae812e81ca2e196fbed849529cfbc689 SHA1 4a834364c28ad652ddeb00b5f83872506eede7d4 SHA256 afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e46301
 DIST libevent-2.0.5-beta.tar.gz 735342 RMD160 665bdd97b3f8badef6da6ef14c2da57ba3c53a5a SHA1 1961f21862b1d1a4d416ca744959f6a335f799ca SHA256 72ab197cd37640b694e8f54458012a634def2b58af35e49610c3588c95fcee40
 EBUILD libevent-1.4.13.ebuild 1388 RMD160 8e177713b0e5e793284c505e6d67a2aa3e1f4b32 SHA1 d0cfa0c5e45ff749f007c0f2e03df49d9a298197 SHA256 9be6ba201692615cdb2bbe6a9836288cb716ae9d3ef69ce00988c43dccf5e565
-EBUILD libevent-1.4.14a.ebuild 1398 RMD160 d9adb85a7939b8b9073aa6b894cea63b5b4021fc SHA1 7e6fb7630662a8a3558996c1344979b73d6453a7 SHA256 825a4da741ee59e086c656b261fa80473dccd85a8b268e3ec6c15f8694f2ed18
+EBUILD libevent-1.4.14b.ebuild 1274 RMD160 42715cd32882c0b433ab030356196a4f2c5effcb SHA1 059c3b04b45ec6cffcceb88cdbef409f91679c00 SHA256 d3462a29b2906081d997513bb1324c23c17c0ca6479bb02dac52e6bc7713e319
 EBUILD libevent-2.0.5.ebuild 1172 RMD160 c5b591484f6fd513bca7b4573f10969d6b4bfbb1 SHA1 014b5369823860eb23aa2f2791b05b7c88b970ee SHA256 b5436f93a32a96d882157796c48a31e41b00ac5b3b5925696fb227886fa6b8bf
-MISC ChangeLog 17800 RMD160 604d6e6576424c3b1f65449a5addd3d4c914133d SHA1 da0aaa316c2fa4dea145a4676c3dd21da6e8ee67 SHA256 415a5940d712024491433f24e6ff514a496133bf05335ab150186db17b495387
+MISC ChangeLog 17997 RMD160 161a5a61f0c24b394575054bf1e86b8f01482999 SHA1 18c00bceae849960524941a3378fbc16b40ffd39 SHA256 4e8b806e2c5de01e11687b19b1735d004863f04f13ae51c216ecb58509fb8bd9
 MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3

diff --git a/dev-libs/libevent/libevent-1.4.14a.ebuild b/dev-libs/libevent/libevent-1.4.14b.ebuild
similarity index 77%
rename from dev-libs/libevent/libevent-1.4.14a.ebuild
rename to dev-libs/libevent/libevent-1.4.14b.ebuild
index 7a0aa7bd3e4237384dc3660418d255705272e068..9cd20f7c092647fa930e858494e1a065ea2e4f66 100644 (file)
--- a/dev-libs/libevent/libevent-1.4.14a.ebuild
+++ b/dev-libs/libevent/libevent-1.4.14b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-1.4.14a.ebuild,v 1.1 2010/06/14 22:03:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-1.4.14b.ebuild,v 1.1 2010/06/20 15:53:08 jer Exp $
 
 inherit autotools
 
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="!dev-libs/9libs"
 
-S=${WORKDIR}/${MY_P/a/}
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
        prevver=$(best_version ${CATEGORY}/${PN})
@@ -27,7 +27,7 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       # don't waste time building tests/samples
+
        sed -i \
                -e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \
                -e 's/libevent_extra_la_LIBADD =/& libevent.la/' \
@@ -37,14 +37,10 @@ src_unpack() {
 }
 
 src_test() {
-       einfo "Building tests"
        cd test
-       make test || die "failed to build tests"
-
-       einfo "Running tests"
-       ./test.sh > "${T}"/tests
-       cat "${T}"/tests
-       grep FAILED "${T}"/tests &>/dev/null && die "1 or more tests failed"
+       emake test || die "failed to build tests"
+       sh test.sh | tee "${T}"/tests
+       grep -q FAILED "${T}"/tests && die "tests failed"
 }
 
 src_install() {