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.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5DE03AE

3 files changed, 30 insertions, 8 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/Manifest b/net-analyzer/hydra/Manifest
index 2319b4ce7da2..edb410e82744 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -4,13 +4,23 @@ Hash: SHA256
 DIST hydra-7.4.2.tar.gz 666187 SHA256 bdf670f8d197e1e7e03fb1bca9156ac34cd961496f1a4c3a3b7d79706d4d19df SHA512 78ed0cdce5ca10eabce82f69d2a123219464f07aed2edb42441f71acfb9f1a4f3568436d95721ba253a83496b56b90739c03f112de00beea9de45711b8d09e33 WHIRLPOOL 5b9b441a64bd588840e0c5f0143dc3c28271d3fbedf415c9c5951e34816709ba7df42431242de8f56d99437625cf6136f0433d7a089e7bfa1864d6027c6e99d9
 DIST hydra-7.5.tar.gz 681784 SHA256 7293e7c32198219688e5bf5308f7e8eab37ad78d49701c9860a6b22aecda0ab6 SHA512 b15ca32da6f1cd675d7149e9ef32fbb7b3d01e1fa2d648a1ed12bb6ae38d131f1123d84ff125d5f98677f62cddc97597d98d9cee662fcd305342c6f3fd2e10f8 WHIRLPOOL b245eeb9e4380fd4fb740ec85cd006f81169b3e964f0eb6d723742bfb3307446286603239ae285599b5291f5f7588b2f1e8ca623107d27f1b6f81d99510774eb
 EBUILD hydra-7.4.2.ebuild 2184 SHA256 32a8d938628dfca5f0bb4be49fc802c546b9ffda1d5971ff1ea46c3829e40d91 SHA512 4c199b8977837c6914194a66b529bc9ba8fa10aabbde13a15d6a690c33df6fa5bd77c6588f059b22ba03d42eca31a03825900ea88f41840a1d3a4e08d0be0eaa WHIRLPOOL 2ea889afd65ebb9d6b4795f746aab60b9a3856aa1c85e8748ca1099f50bafbfcc061a22bc3356a95258014a2e4979df64813072e5241d30eacd4ca256bdca5a2
-EBUILD hydra-7.5.ebuild 2185 SHA256 90a9da07f0d29540234459075267072fbe9aa61410efca9635bb18cc578b6aa1 SHA512 4a5e26f9953800eac75adc09597649d953941ed0e7a3bc61a3d7a47b3b39e3dac3140ebd3b8e6f45bbcf6cc6099d946bd7a54d7e9ca6e876b05d44ab02f31f5d WHIRLPOOL e91bd5b3f6845041c3959c4758cf4a5c28c9fb66b00dbb9ead9c0e2fc7d9382c0126af38ac7409d6368e075ecaabe852635e9a06e5e0cee058cb56c67ef58c9b
-MISC ChangeLog 10516 SHA256 3282a0c3ba3280fbe4c03501799e5c05bd2a854a172e4faaff5137315e84eaa2 SHA512 d46703bfba0469a1f5975f8b94b761dbb582d2048e40f97d0277158e12edf27dbd910a5196a8b290cbd59af5ad04e575fabc0cd9a87bb8a487ceba9f9f50ccda WHIRLPOOL 2916dd6f25a0515fc15eee1fcbf6ec210665fafdd0c11176d8e2d16a2b722f65c06ab6d65ec0c2e35e478ea64cd990e7b02975b7aaa584d7e4a28fb91b2be56a
+EBUILD hydra-7.5.ebuild 2540 SHA256 c61c8418ed846956f0e5ea7141f1dd51c821c216d4459189f82a95a96483c34a SHA512 898f064c633d23528ff7e11e58625582de6e5b02110df55e51ec1d84c33f92a82fc436bce7181053226e8ea7f7e28ad082cf7030ffdd6db9b0e4bd16eadd80ed WHIRLPOOL ad8cfb0c0cd34eaad62b2b7c05a77633a8b0d727b9db1df226b21dbaeeb3b7d6c03075e586381267cf04ca536d952251e6fefad0af64f604bb14f3c5571a607b
+MISC ChangeLog 10717 SHA256 6dfe8eb759e5330e6e6ff05bcae236229999703db25f2417e32ed22e1eba57fb SHA512 cc68366715fba9c2482ba5c5fe40a710c76350100a8d2948544b31c99015c12c9befd08bc28f1188ed7a1898d7ea412d06d46a6da8984e3dc2026956c489ec04 WHIRLPOOL 46423c6b2439bda9045709122519637b843d382470ed56253c23eafc771f846702fdbbc350c5495c57f4a9cc4fdb57790b7925442d4de1bbb3c39ca25272ea0d
 MISC metadata.xml 325 SHA256 51ac19ac1cb61a0ee06bdbb7016d57609518824e153e51bd160ff1a4a74a4f26 SHA512 a23291b48b10877e604f3fc24beb77613f315c4c136909dc457d7ad027d6a917ac9fa64812416c397d54f4fa2a0ef9ea417ff2df1a8a5ea3f312af4dbed4ed63 WHIRLPOOL 5271ebeac40e1622a0f2c64993e5e81ea0f3fa709a02d5050896f43efaefce0041de31b7aec82f78e150630a637d371851e19f6a9abfdc020c44c3e6e0044075
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIbdLIACgkQVWmRsqeSphMSlQCcCVwKhGuHXmuDVeLF0EICBBUY
-C1UAmQGh0QHR+Rs/a2Wmzxmy+sQI5QGB
-=Q0KL
+iQIcBAEBCAAGBQJSjA3UAAoJEEn8cBKl3gOuPxAP/3nHrZTCVir2AMM5H88jYaGS
+l3hxk4ewOvTiN5cyryeSDVTucWkbrG1BhlAhBrMbjAvgATaQYC00Os7B0fttdY75
+Wzxrjine5lWnYLR3GWjcc4v7rTGB1sUOIkU2Q9mZTrEA6QyoQjPE5Ug8DG8m/87S
+c59Igt2v9LDgrVyOIjmM8XNQ9+iMJ2yQUwyO62MPkUPrgQ0LJZm6zVy8NjB3skPM
+7vPiauUy1b+KMY1B+MJtx8wWjLErh3aPE4H+Dyaa7EpNNxa7+7J4mmKB4F3rSC6n
+1loENJhTukJJ0enpEEc5/3qbRtHlUuy2VnJta4elnspsu2iYF/BDpg/EDZyPNQwB
+UNEnLwGXqrVHJGtn8YIxICOp6hCXYlC0M2RE3V30Kw+DzqPC5ZLvrIObohMdSdEt
+4udcOlmfP7aSKmuB86u2+z0wCRRp0DbaDx3Eow+j2law5myxdUZaAXsrPMmDhYL2
+U+JWflUYtrFTvEXMNONBfEcEgHh4ZReRbsqFMm+hE6N2xlpMKx5WNrgT1hZ2pR1M
+9hDBuabeWlzjuYsd+UsnKEoX/aiV616SJI0gYCuptDcHtndFpIw7e3+0AB1U6SmN
+2Q8QjSzb97Ir/XF7QXEIvQg7oRP3gYI+OxoRFflv8vNDvoSp4qdYUq6WulCT0baT
+/yqsJziEXl6ghy7pasHF
+=CU+t
 -----END PGP SIGNATURE-----
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 \