disable -Werror for live builds; minor cleanup

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

3 files changed, 66 insertions, 62 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 6452ebf6ccb7..855ea11cd4c7 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.383 2014/11/06 22:36:08 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.384 2014/11/08 17:24:40 tamiko Exp $
+
+  08 Nov 2014; Matthias Maier <tamiko@gentoo.org> libvirt-9999.ebuild:
+  disable -Werror for live builds; minor cleanup
 
 *libvirt-1.2.10 (06 Nov 2014)
 *libvirt-1.2.9-r2 (06 Nov 2014)
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 8815e94fe7e4..d681d13b3029 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -13,23 +13,23 @@ DIST libvirt-1.2.9.tar.gz 30154430 SHA256 95931a5a52f451b9ab73d6a5ae11a5740e1ba6
 EBUILD libvirt-1.2.10.ebuild 13061 SHA256 4804bb54d0004985d81c481804a2194c619ddc5bc1c1ce7f95cd4e92f105a80c SHA512 8b1f46e1d90daa7d3079da724cf49c55c63a1e7ed146a4342f51586c6dccb427fc4dc20c50b53061668fa31aeab9b2c0d97e7bf304c9f79179d6502d8fecea0f WHIRLPOOL 5e063d2d7f41d8fae688853d6ade4a4287deae32b634b8bb5ba49407397506a7007b34a36b65796807b2f4be52c7313a0af0be5409590392f729836e161bf4bc
 EBUILD libvirt-1.2.9-r2.ebuild 13056 SHA256 40f6404ed96588700e79510e644bdd594a741cbdb43f6bc7087f0643bb213cbf SHA512 5694dcd7d6115f86abf322bef9223a41cce1047ef59ad99c4befe209083d80b376c763588d88aec29975cddfbacd399240567f0b089b29854440aba45fd1512a WHIRLPOOL c2cbfad1acc7d42305b16c443bfe349662575cb823cfd3ffe0b764eddb4b08c4527483ab3fa740302ac12b5269a3d0d125eeee02ab00ce0bc84c60c1d5445ac6
 EBUILD libvirt-1.2.9.ebuild 12535 SHA256 15119a80b32e4c38f60ca171acdb2f81a32bd4a52eb0f0ec509cc60fa0942443 SHA512 28164fde352359c4f5cc52859eb26ea836c61fb24b9bf196a48e70eea09b8963bb11cfcce67452f4a6aec65602d8b6b7c94dfb2ae6671cf198f117a5bcb3b185 WHIRLPOOL 3b85c9512cc647493ac1b7d2dd17273e1db2b8e17c973e3af1c88e836bb927c105527c426f586c27bcf765600d2e8e46a598da4f36e6e501fa90e933692934ce
-EBUILD libvirt-9999.ebuild 13013 SHA256 a19e7e0b78ffd0ed1887d27a65d85b16bdd266a4b1ac1547433275c291c25b6d SHA512 4592c4e88d8fa639c24fc3b7d177dbfafa0ad61f60fe1335f523fec67cdbeaacef8a87ed5126ad733a90d401cef571f59a322926e67d3335261524a468a3d862 WHIRLPOOL 499a2ec03b0ad79de042cb940456bc2d64cfc079934e2194aab3695c171ef7b66891c2cdc6786b3c6f86975c0c53a5e6f800f7ea585700580c084de318d0c2e7
-MISC ChangeLog 21420 SHA256 d21a4789f03a175b91e0c2759f025f6b83a2be5dadfd04c1f27aaeddbf4987ab SHA512 30986a10e4489a01cf30b939463fe54ff828434e22b814f151b685dc2480eea4b6c680f42ac2cc0c6199cbd879df4b99910071adf746e75fef976d8b7e49f67a WHIRLPOOL 3e317315d2b2a29b47cacc2421fe5696ffc53e4b762dfdd5993b6d0e913d50778df12c7336c8f9a6aadb59d70c61d55179ab1b0e3dc27986b0b232c0ca2112c7
+EBUILD libvirt-9999.ebuild 12682 SHA256 7647242f90c1cb9d518ba5c875b1fc8ec4e17614a0c26a6ffa5146b5c2532222 SHA512 31c80175c78d241c4232a3afa27d4a6e0ca50bcecbf83813446dd902029cfc988135f8c001d3548e5ad39ef1a9e6bfa5e4624d83d1a5123c1116834e5353bfb8 WHIRLPOOL f0e94f2491f0acc0d641f18523205c57c6b62bdd25af3aa1933d0cd53eaecd5bb20fd5971410bbf8a8b063420731ff5d5bb2def13c47e3ac564e102cc966c344
+MISC ChangeLog 21541 SHA256 e99b321096eee0b888a7e10cc460184c2a28301726242797175c7a063b01e7bb SHA512 2d01923b3379a558d72ee073d63f668c01d071add2d4196b1d4639754d970b2d6608682a187f6ae76162e5437418bf95753211e8ff83bd959d4bfb32aa0d6885 WHIRLPOOL 190a3de48c6ac7123fa88241aeadb6caaab6f4114c1b54eda162c5aee4fdb9c3f455e8242498481db51f12d70f77f23269d323ea68314f20311183887b43b25e
 MISC metadata.xml 3736 SHA256 376b65feea8c2f85dccad2e564cc6111f2dc2de2a3b785a4c10af8c95c4920ee SHA512 93933d1ddfce67739e0647adce2f9253ae596429c794b73562737b508400a0fa7af93eae06808b088888b1d44f421ce4765cc6b56b9b5356140af80ca36bebfc WHIRLPOOL 7ef396db2e624c2798ba30ad4b8099237fb699c5e94cd1470ec6161a068f1e815930a87104545b4b98183784465a9a5f9dc051beb99ef1c5731e61f42f5c7381
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUW/fjAAoJELhOzYlK7nn/IJYP/1RT7dpTeNyj0HG7LHedrur+
-SdYsrSTAvAGmtmdYB//Wz+LLKAvQUCvFxquDVnwiIEemNHHRYzzkd9MTDvqSRoMx
-4Tb4ZUXgB7ULwrEHGvEKkqWF63463hFuPQm4kWTPNHtSWthxZl66W326yu6xySIZ
-xIASlnHwnxNQ0+5WcGIh/pGQ/erKHx/ekNt35SJODKk+5Sz0jPRmO+D3iEbn19QO
-rhqj6rUqhIwBv7qUeR+Swl33axkd/vdvHUXaE/fDb+/R/ibQNZHbzAapWysLvDtR
-ptwSyPYjE37klExgxjoIMs2yIOb/NBULLdv08pawhbBGMSSo2hteJZCN1pzLgE1f
-j2jIrAN7sFO5zs4KE2FIS2uH8tCu/ezqXLYZnniKacCvhxEF1sDi9NenWlQP4tmk
-4VGUhjWNkM3u0HN+N9Nh/jC325w4QAIqxWI2aUyZGIHS/IsEiiVNedNW1u8AGrV5
-Wal0EorLddV+dY/kl9wni2PN350BQaRPhHDvpqoKy0D0seWKUxSd/0NmizYXhJq8
-WYpMDthdNFSfDKGof9Ev0gg9zJt+/Oo4epOt9x1+0gbzU+jqW8KXw3Xw8326/6P1
-6LZlcUVyad9wKWNh5URDdF5wpFSHDymtGIfYijHgIBU1uWwKf9HEb92sXuEuwihF
-jWcewFoJfsQcQUROwYFS
-=oe39
+iQIcBAEBCAAGBQJUXlHeAAoJELhOzYlK7nn/SvcP/jlBFG6xDTwV6eOdfnnDB76i
+i9+zjAgz+o8yZb+4o25U9P84cJ8CLsUOIVR19fZvHRaSSlAZ3jYBLQho9EIW/ktg
+y6NrO4m4lezAyTJh/0BQBq8ZGRRqpuYKLhSdGLfp6zoPPushWgNn9HLpq/vojrJV
+zBl5bfOBC/+ciTYaSEI2KGpFKQ3/gNaMQ5/bqI7OZR8Tqx0D749ZVapGhS3snZa6
+WXcau6h6ncWkdRAs7fwrikc5Y4e8/RSOvlBk01k41zcvC42KzvDR5j1AqlmIWPU1
+QYZfIvlLIscSLvKZAE4pW4AcC/xFYYziO9pz9m6Y4Uh5yLt3ZMeR9+JhvyVJEckG
+iVaYAfqxL68eo/y5668qSYl9vM0/KxrNTTOfq2b2RH7qLgEsJY8O3pH4HkF8QWH2
+DYmRrJE1OKPLrND7p3te6EPlX60Nkn4CtHopg+Sl+9WnreLx5Kqjh7gVXrSUcf37
+PkJW+GfFStjIpylZbo44EjHPdDtN4pUgkypu6/eJoaSKlPwAglSNPVuW68NKsN4l
+2xkRTaRBewqIW+s/DeAUbSyrZijzUoVyCi7YDIt4wm/zQKQtn2wBm86E2/dbklHI
++UfY1GQunl4p80XRr8FkF0CH6K3ARNPculjOPNwd3Oya0ly/6va9sdW/3ikNb24k
+9Gn9ttAvnMJjdvfe7pNc
+=tVwW
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index c62252390f4c..1180e825deea 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.64 2014/11/06 22:36:08 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.65 2014/11/08 17:24:40 tamiko Exp $
 
 EAPI=5
 
@@ -250,92 +250,92 @@ src_configure() {
 	local myconf=""
 
 	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
+	myconf+=" $(use_with libvirtd)"
 
 	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
+	myconf+=" $(use_with avahi)"
 
 	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
+	myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
 	myconf+=" --without-xenapi"
 	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
 		myconf+=" --with-libxl"
 	else
 		myconf+=" --without-libxl"
 	fi
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
+	myconf+=" $(use_with openvz)"
+	myconf+=" $(use_with lxc)"
 	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+		myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
 	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
+		myconf+=" $(use_with virtualbox vbox)"
 	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-	myconf="${myconf} --with-vmware"
+	myconf+=" $(use_with uml)"
+	myconf+=" $(use_with qemu)"
+	myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
+	myconf+=" $(use_with phyp)"
+	myconf+=" --with-esx"
+	myconf+=" --with-vmware"
 
 	## additional host drivers
-	myconf="${myconf} $(use_with virt-network network)"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with rbd storage-rbd)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with numa numad)"
-	myconf="${myconf} $(use_with selinux)"
-	myconf="${myconf} $(use_with fuse)"
+	myconf+=" $(use_with virt-network network)"
+	myconf+=" --with-storage-fs"
+	myconf+=" $(use_with lvm storage-lvm)"
+	myconf+=" $(use_with iscsi storage-iscsi)"
+	myconf+=" $(use_with parted storage-disk)"
+	myconf+=" $(use_with lvm storage-mpath)"
+	myconf+=" $(use_with rbd storage-rbd)"
+	myconf+=" $(use_with numa numactl)"
+	myconf+=" $(use_with numa numad)"
+	myconf+=" $(use_with selinux)"
+	myconf+=" $(use_with fuse)"
 
 	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
+	myconf+=" $(use_with udev)"
 
 	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
+	myconf+=" $(use_with caps capng)"
 
 	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
+	myconf+=" $(use_with policykit polkit)"
+	myconf+=" $(use_with sasl)"
 
 	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with vepa virtualport)"
-	myconf="${myconf} $(use_with firewalld)"
+	myconf+=" $(use_with macvtap)"
+	myconf+=" $(use_with pcap libpcap)"
+	myconf+=" $(use_with vepa virtualport)"
+	myconf+=" $(use_with firewalld)"
 
 	## other
-	myconf="${myconf} $(use_enable nls)"
+	myconf+=" $(use_enable nls)"
 
 	# user privilege bits fir qemu/kvm
 	if use caps; then
-		myconf="${myconf} --with-qemu-user=qemu"
-		myconf="${myconf} --with-qemu-group=qemu"
+		myconf+=" --with-qemu-user=qemu"
+		myconf+=" --with-qemu-group=qemu"
 	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
+		myconf+=" --with-qemu-user=root"
+		myconf+=" --with-qemu-group=root"
 	fi
 
 	# audit support
-	myconf="${myconf} $(use_with audit)"
+	myconf+=" $(use_with audit)"
 
 	# wireshark dissector
-	myconf="${myconf} $(use_with wireshark-plugins wireshark-dissector)"
+	myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
 
 	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
+	myconf+=" --without-netcf"
 
 	# we use udev over hal
-	myconf="${myconf} --without-hal"
+	myconf+=" --without-hal"
 
 	# locking support
-	myconf="${myconf} --without-sanlock"
+	myconf+=" --without-sanlock"
 
 	# systemd unit files
-	myconf="${myconf} $(use_with systemd systemd-daemon)"
-	use systemd && myconf="${myconf} --with-init-script=systemd"
+	myconf+=" $(use_with systemd systemd-daemon)"
+	use systemd && myconf+=" --with-init-script=systemd"
 
 	# this is a nasty trick to work around the problem in bug
 	# #275073. The reason why we don't solve this properly is that
@@ -354,8 +354,9 @@ src_configure() {
 	econf \
 		${myconf} \
 		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
+		--disable-werror \
 		--with-remote \
+		--docdir=/usr/share/doc/${PF} \
 		--localstatedir=/var
 
 	if [[ ${PV} = *9999* ]]; then