summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer/hydra')
-rw-r--r--net-analyzer/hydra/ChangeLog6
-rw-r--r--net-analyzer/hydra/hydra-7.5.ebuild10
2 files changed, 14 insertions, 2 deletions
diff --git a/net-analyzer/hydra/ChangeLog b/net-analyzer/hydra/ChangeLog
index 4eda3f640e49..7d26a165ee31 100644
--- a/net-analyzer/hydra/ChangeLog
+++ b/net-analyzer/hydra/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/hydra
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.80 2013/08/26 15:30:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.81 2013/11/20 01:18:04 zx2c4 Exp $
+
+ 20 Nov 2013; Jason A. Donenfeld <zx2c4@gentoo.org> hydra-7.5.ebuild:
+ Don't link to svn and mysql if it's not enabled in the use flags. This is
+ neccessary for binary packages to work properly.
*hydra-7.5 (26 Aug 2013)
diff --git a/net-analyzer/hydra/hydra-7.5.ebuild b/net-analyzer/hydra/hydra-7.5.ebuild
index 1f1b9b67ea3e..eedbb9d6803f 100644
--- a/net-analyzer/hydra/hydra-7.5.ebuild
+++ b/net-analyzer/hydra/hydra-7.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-7.5.ebuild,v 1.1 2013/08/26 15:30:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-7.5.ebuild,v 1.2 2013/11/20 01:18:04 zx2c4 Exp $
EAPI=5
inherit eutils toolchain-funcs
@@ -53,6 +53,14 @@ src_configure() {
# Note: despite the naming convention, the top level script is not an
# autoconf-based script.
export OPTS="${CFLAGS}"
+ if ! use subversion; then
+ einfo "Disabling Subversion support..."
+ sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die "Could not disable Subversion"
+ fi
+ if ! use mysql; then
+ einfo "Disabling MYSQL support..."
+ sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die "Could not disable MYSQL"
+ fi
./configure \
--prefix=/usr \
--nostrip \