Fix werror during build. Resolves bug#387841.

Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64

2 files changed, 32 insertions, 21 deletions

diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
index d3140c82d0b1..bf0fbd32c576 100644
--- a/net-analyzer/openvas-libraries/Manifest
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST openvas-libraries-2.0.3.tar.gz 482097 RMD160 b6e70fb81c5ec034954ee0257ba6f5057e44f1db SHA1 6fbcc358dbafaa80eb0e92195cf2a90f67db439a SHA256 9847e99b92bf2269c5157c69799de127fadcb83af19bfb7320c1c91036a6cc62
 DIST openvas-libraries-2.0.4.tar.gz 512846 RMD160 bb4702277401e657e20ccff082990f68a74f178e SHA1 271f42118fc41ffec2d1365d618fa09e294aa4e5 SHA256 caf1ccdcd530bc4c7b4298886f7b55a5e73252a7000893759324f56bb8010e4f
 DIST openvas-libraries-4.0.5.tar.gz 664966 RMD160 2f508f55c7f9b2d4ceb41add63c27ab3658957de SHA1 3dad9907800a0cbfbe4229be41ad124f1a56c085 SHA256 88bfe25bd5d255327fc6b61378b599c0caeec9cbb106b8dff5bce07bb65d727b
 EBUILD openvas-libraries-2.0.3.ebuild 670 RMD160 8f41ed21d3c8cf5f413c4e8929cbfa57b4d84066 SHA1 86b531bd7762e202b988a9778bc0c77a3d889f99 SHA256 aaab284022a166d3e4c97379252585b20f3c9c443d2e8d1f956f045ca829c910
 EBUILD openvas-libraries-2.0.4.ebuild 670 RMD160 cb32a891649683473e06c869e62ed75723d85f31 SHA1 3e02e07b674f4dfb21304bafd3473790eecebf75 SHA256 1b0be9206da3ce994b2723b6b0e0dfb94849570266e9aee70971966ce2b422be
-EBUILD openvas-libraries-4.0.5.ebuild 1038 RMD160 2f6e0504c3ea6baf7ba141a34cd21b2725f81685 SHA1 4511e6b63f777dc28931c4e701b32807a8f96b92 SHA256 5623350d1ee0d0f30dc9593d562a9317c80e3dd69f337c28236c03d64e2d3dfa
+EBUILD openvas-libraries-4.0.5.ebuild 1086 RMD160 159a326079336e4e664973b83557dc0b2fa48f78 SHA1 9c54d3a4f1c250fef7bea234369299996c3b23d6 SHA256 3b13c6a77639900eb82a4e97ce0877826e66ab2d0a23e32f59fe4f73d5541066
 MISC ChangeLog 1867 RMD160 b4c4cf273bb690507d04c35754b5ff9483e7582f SHA1 8392eeb0e08096c02ebff6f56ce699ec804f452f SHA256 ceabbc2ce122456d5e1fa3e5db0a38ecb925acae600aaef8d483aead294fb8e4
 MISC metadata.xml 196 RMD160 38d93373061ffec39f901f9710573fe2eb6224fc SHA1 9f792f2f8c83cd88b49c8d7e989604a2b21cff6e SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOkfJzAAoJEKWIAHK7tR5CflMQAKkPs4HknNYhOtacZVVtM9ad
-J/SnW63vtK/7M0fklaQf+7yC2CgpJsDfLbrLFqC4nbX2OWpdGe3RCDh7EMykLxJ0
-/nLtTggXT+WkDGAdP1lgFZvXio6lENMrQ5YjSrm8w+OwZa0AU6K6jnu2eCLhY60o
-VoE/PkPJSf+IAdXJJHk0KsTiNxlBitYFJoNOt8ojhPCTwMnyoh2MfLyR2Qp1uV05
-xC4BK01IprRhcmVgE7KwFMJwkHpewPly5piUcoCrb7T40ak9E0UkD3WrZR0ETR/b
-B7SimTAEhlXog5GTYIayviLgbIvAdfes1oIk+TH5JKmNdGNxv+m56ZX2SCq41liP
-Q8EYysp6iYwwxJBtBC2F1djt8IRG/DLmCmxjsvMh5/f4muAzGGJTKZDUXO07mXRg
-v5Yxc/ppKWh9mL9go9+kBm/DF8XmTIBLB2/6/bJ453oTB17xEJFoui2iqUmXthCf
-YGNvRY4mI5rX1J25qw3d5few60Grp700/Oj8OB3alyoZ4iY+Nsz9SuDmP1I91RYA
-8UeEMP9bOE34b4cMUuQh1CJ7RyGlSkRF3KfZhoROkSJsn9FeTbBKVEgQBa+LAYfp
-O+KmHMDC5Al3ovRapa2Spybi7oVB4w+2msX1SnfjG5LtBs5TlApEf9O7r34bVNG0
-f9aRLIucieTt708Rozvs
-=Q5ju
+iQIcBAEBAgAGBQJPcaG8AAoJEOSiRoyO7jvo3oQQAKmdQs1O8PHO69490qvADFdB
+niTBbyVGAZFPraVga0rg5Z1DYIg7mYscRQXI8SEE3+vjxL5eyA6GaVVyQ1Kq0eGn
+UV1zGPe3AHo7skl/tyQgdkKXzClpke/cPf4GO00qMcqUOKkPJQnbncQHW6HmpCVA
+irAyCkAKS1aAjJgLOICcsZjjydyR1pu0r/+YoB2zARyCR4LyJuWKt99mdQezuiun
+qxaZG4v7nnJXEYp0IqkcR/sre5WSWVxd2r1jf/dzkIzn4t//RMgAPtXgK5j5tw+D
+0PBTxmAY/9leVu2lboNQrB57ZJjH2uAIpsgMcHbIA3IzuY1seNgiTW88Nsieo53I
+4j0d5kjH3Sa5RNBEBVoHIidWO883G+1lgZn5mrH7BiJAchJ4LJswD0a/bXSKYhpB
+heYnqnEnmO3+wYUDjDtl/lbx2bB+bEXRjqBxSKCIRXGZPe+szmfEonBXLOvKfD/9
+5aBr9rcXWd/4un74tdxjBywkEoIRl6Z1t2NH4BsGzbPtUShpEGQr2MAqofdk4dQe
+pP0ENIPL3mdb+VDZPL5n/duM7hk/mt12kW6W7lq+mQ3DZze7gFXnZZPhN5tCY3AV
+RbQeC0lzcXsPlUHRAwEblwP6YoZxPine71KSCSLsfamCIGCgo/fn5dlLB30Es1Vj
+TzqpqpmCHjUdMO8axHzN
+=DOTj
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-4.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-4.0.5.ebuild
index aee041325b77..08baadc02e0c 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-4.0.5.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-4.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-4.0.5.ebuild,v 1.1 2011/10/09 17:13:53 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-4.0.5.ebuild,v 1.2 2012/03/27 11:17:06 scarabeus Exp $
 
 EAPI=4
 
@@ -9,6 +9,7 @@ inherit cmake-utils
 DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
 HOMEPAGE="http://www.openvas.org/"
 SRC_URI="http://wald.intevation.org/frs/download.php/872/${P}.tar.gz"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -25,16 +26,26 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/cmake"
 
-# Workaround for upstream bug, it doesn't like out-of-tree builds.
-CMAKE_BUILD_DIR="${S}"
+DOCS="ChangeLog CHANGES README"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	sed \
+		-e 's:-Werror::g' \
+		-i CMakeLists.txt \
+		-i */CMakeLists.txt || die
+}
 
 src_configure() {
-	local mycmakeargs="-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc"
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+	)
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	dodoc ChangeLog CHANGES README || die "dodoc failed"
 	keepdir /var/cache/openvas/
 }