[gentoo-commits] repo/gentoo:master commit in: dev-libs/libevent/

[Mike Frysinger]

commit:     ff621f037fa0134b97c78d42f3dff2dc965716c0
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 01:20:51 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 01:26:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff621f03

dev-libs/libevent: use configure flags to disable samples/tests

We don't want to spend time compiling things that we aren't going to
use, so pass configure flags to disable them.

 dev-libs/libevent/libevent-2.1.5-r4.ebuild | 5 ++---
 dev-libs/libevent/libevent-9999.ebuild     | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev-libs/libevent/libevent-2.1.5-r4.ebuild b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
index 16300fc..4df26f2 100644
--- a/dev-libs/libevent/libevent-2.1.5-r4.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
@@ -37,9 +37,6 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	elibtoolize
 	epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch"
-	# don't waste time building tests
-	# https://github.com/libevent/libevent/pull/144
-	sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
 }
 
 multilib_src_configure() {
@@ -48,10 +45,12 @@ multilib_src_configure() {
 
 	ECONF_SOURCE="${S}" \
 	econf \
+		--disable-samples \
 		$(use_enable debug debug-mode) \
 		$(use_enable debug malloc-replacement) \
 		$(use_enable ssl openssl) \
 		$(use_enable static-libs static) \
+		$(use_enable test libevent-regress) \
 		$(use_enable threads thread-support)
 }
 

diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index 179af26..c807cd3 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -30,9 +30,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 src_prepare() {
 	eautoreconf
-	# don't waste time building tests
-	# https://github.com/libevent/libevent/pull/144
-	sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
 }
 
 multilib_src_configure() {
@@ -41,10 +38,12 @@ multilib_src_configure() {
 
 	ECONF_SOURCE="${S}" \
 	econf \
+		--disable-samples \
 		$(use_enable debug debug-mode) \
 		$(use_enable debug malloc-replacement) \
 		$(use_enable ssl openssl) \
 		$(use_enable static-libs static) \
+		$(use_enable test libevent-regress) \
 		$(use_enable threads thread-support)
 }