add wireshark-plugins use flag, bug 508340; do not install into runtime paths, bug 520408; do not install into units use /etc/sysconfig, bug 477524

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

8 files changed, 624 insertions, 63 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 32ed54aa5826..bab1c08c1438 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,15 @@
 # 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.378 2014/10/31 12:15:03 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.379 2014/11/03 01:30:36 tamiko Exp $
+
+*libvirt-1.2.9-r1 (03 Nov 2014)
+
+  03 Nov 2014; Matthias Maier <tamiko@gentoo.org>
+  +files/libvirt-1.2.9-do_not_use_sysconf.patch, +files/libvirtd.service.conf,
+  +libvirt-1.2.9-r1.ebuild, -files/libvirt-1.2.6-numa.patch,
+  libvirt-9999.ebuild, metadata.xml:
+  add wireshark-plugins use flag, bug 508340; do not install into runtime paths,
+  bug 520408; do not install into units use /etc/sysconfig, bug 477524
 
   31 Oct 2014; Matthias Maier <tamiko@gentoo.org> libvirt-1.2.9.ebuild,
   libvirt-9999.ebuild:
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 84277625bc01..155880a62697 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libvirt-1.2.6-numa.patch 686 SHA256 44ce5b439bc246ea8f19ad8a391493141205217028daded83f321849b5e2e977 SHA512 7785e2f5a991716e99444887f1f873f0bdd88f8b47cfb9230736009ab0a92b7c8a768fc535076e02885e71f3d5bd059a4534c6868a436ca9571da7867ee98b0e WHIRLPOOL ae924454ffad7ca2746a4f3e658d0d824befedf18ac78cca432eab22a8b72daceee500447ef24b1e86cd9db61a42e8863ddaa4d4a6e4f99acc638da55689ef6a
+AUX libvirt-1.2.9-do_not_use_sysconf.patch 3879 SHA256 1a0c0b29c481097ee218cc752b11f00193a87a010feefc71ea3f56e041c5844d SHA512 cd8881ed2fd928e4fc122a8615fc328f515181129253cba1124c1faf48549729428113822b56034143e192c44944b1a40e83b960f742db64738e5bc05b9bb371 WHIRLPOOL 9413e40883d98d5d78a2c269786a2f640ec9689744ef431a4e9a092d251d33deda954ad8631520a04a16d8c30ca2e9b28bc8b78562f27267f80740901907a253
 AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3
 AUX libvirtd.init-r13 3678 SHA256 5744e7392b0777d14142552237f517ff1fbf6c4734aff96fa340158ceed09e35 SHA512 d50898c07291aefc0025aa51e7f4356c1e5d7b22c3d6d4c31f6da3dc4b23d88e2678568c4f2c755c6763ddce9bfc0e2aedeba52f001daba9ff3cbba2cd57ebf3 WHIRLPOOL 6a8a39b39b7e9d6efca47800e886cbb1e88b9e948c3ac623d120780d34f1fd8bba48c83e445fd0c0bdbff67926fcc577640eb4db0137fb5d703abc6eaf790dfb
+AUX libvirtd.service.conf 401 SHA256 1cfb6f7dec5746364d9a4cccddb4b63f8ccd0ebf8bfaa000b13a09962ca24fac SHA512 27adbd104ea87e51d423b057392a0c6726692ad8ee9723f73dc4bfe8eb54069725d64883434424ba810d36992d404d1ba4afe6bcefb866d3d3d92dfd161c2b32 WHIRLPOOL d6b960b7d18bdbaf0ff6dc5ecf29e7d10e22fa7d16933a149d6287c007d864a0e0dd67048c25a038dd5f73c9ea911d2cd49bf21c072b0c7eab1e92be35d8b545
 AUX virtlockd.init 437 SHA256 0894a839f85dff6f97bde514437935f4c1589ba4f2cbd3e0efe28753698694a1 SHA512 3d7b366736fb98acd26577e29a3c00592e7be038634fc3b51891f557426cd9945bf08a4486f1d62aa91ce7dc7d6bf96d7e57ef06a3a0b4aceb55b9e9c9e9b2da WHIRLPOOL d633a1a7358dbf7bd94d70f44753c9c346adfc78537643e5f379cea017d20e1097998ecfaf87e47e4e0f9216d43a3053af24e3129ecfb8f110f5283a769f368f
 DIST libvirt-1.2.9.tar.gz 30154430 SHA256 95931a5a52f451b9ab73d6a5ae11a5740e1ba69a66520c2a0cffc6068a7e8fc4 SHA512 e91367037622da17b5081ccf471e17d36f474596f19034b30e86f42940939340dc4cf455697e54bf9023005fc45cd9982a0f39d244373dd4d585fd7b9aee918c WHIRLPOOL 771025eb6fdda434f9413b03f6c6e0e8a36fd314eb650f913b695481adb71cff3a07ba19934857dcd468b6357c371ba3972a67b71c4ca29092c2094e482cb24d
+EBUILD libvirt-1.2.9-r1.ebuild 12945 SHA256 744304c69d21edddb47ecbc791143cf59348c90c00659d8f47ba4d3625aaf8e0 SHA512 1d6bd9900ec0064a5d2f66cf7ec97f559a0759921eb9ca9b12e735b9dc058e6295d705eeb1294219ee897c2abc9ebcfb947541f9dfe00b8818016d3fc82584e5 WHIRLPOOL 1a034e88cd1bc5f4c7ca17ed4c1036a1480ed028df5353ab9a25ce04e4db4ba01d2a7cc9b870890f500ac67cb2697df2a839445da106d9deac457d1c9817b702
 EBUILD libvirt-1.2.9.ebuild 12535 SHA256 15119a80b32e4c38f60ca171acdb2f81a32bd4a52eb0f0ec509cc60fa0942443 SHA512 28164fde352359c4f5cc52859eb26ea836c61fb24b9bf196a48e70eea09b8963bb11cfcce67452f4a6aec65602d8b6b7c94dfb2ae6671cf198f117a5bcb3b185 WHIRLPOOL 3b85c9512cc647493ac1b7d2dd17273e1db2b8e17c973e3af1c88e836bb927c105527c426f586c27bcf765600d2e8e46a598da4f36e6e501fa90e933692934ce
-EBUILD libvirt-9999.ebuild 12533 SHA256 5624f519ee878429426f7266994e0709e3d380ee590c2f51da1ddaca2c405dff SHA512 bdbe35f0ea3aef16af2ab32d98ad96d0da5c5d1cff45edc30e8225a21c82a884609a13c3e7f10c2986f3aca4a7d90574b8f583cf7f4dfc5850280e0425a3b88f WHIRLPOOL d5146816170104b00cd76a1b87d27a8d27fd8d452f38f8e5a92dd2dfd2fff12bb5431a1481c274c47e53eda7dc2ed889757ea0624ab70788ce477f0e9bf4b286
-MISC ChangeLog 20227 SHA256 c5419fd8f39efb8b3f6d91aeb00959f4983df98408f5a3fedda0b498d4566d6d SHA512 03c5f487f9647b1861d5d077f9610ec8a2dd5a10a83d4bd4f9e42b02f5d3e33abcf8066e2886bfc44f13eb7100f667ac53a7eb12fa9d79e3c58c263917d783bc WHIRLPOOL eb3d24257222825bafe05ab29a8bd378f7bd172768d51e94d20f437a56766ed6b772dc3275cb99c3be9b98faceeb97a2cda0bcb553c00162b5d4414b7a47264a
-MISC metadata.xml 3612 SHA256 6f3c6747711d393c4954bdde587c82962477a6491e59213ea0369d194a167a6f SHA512 b94c96669fea151e145624cd878a0fda66d6280106bbe3dfe654a16683f8e532813ea46f07bbaa3ff4469a5c23bafcb2b6403aa5576c128042aa4f16952308dd WHIRLPOOL bc1fb0b4256bd3169bafabe412316caacaa4f43def265ffdc24db003e562af5a4c5a57b727f8550b424e4a8cce3dcdd0859af0349a44341198dfec1719129047
+EBUILD libvirt-9999.ebuild 12398 SHA256 c3c926f6eb424701dd2ec42a9bb58d218f3cb1e8f84615ed9cd9d042f2200a08 SHA512 883cfb98d8e8a3aa308cb48da5cfe902b082959ae4d45960a232d1a3abdde9cb1c65d782f99b25e103981fdc406a2c67a8a85a27f64b7a04f7548cb2a6e71322 WHIRLPOOL 32f938cfae97866d54f14491b8492545d713797c4d9cf20bbbd3c5f456226411500062fa9bc9231bd1f4933dbf0ac717cc1b652395d9ca7958323f50bf918c93
+MISC ChangeLog 20640 SHA256 5893893d52d9b83c258e0e7b04efaab25f804000cf50a1edb19c913c5c1848ee SHA512 b447d649a86aa4fc948b6a4f0b09b440cf14718c0296c084c74422a68b56eb18c7201c5629a5c4ca97612d0ab57b17588fd6f73cced690c893331b0441d2d317 WHIRLPOOL f4859f05cd523ca91c0864fcb0c12e325b546d752ff16a74ac3cff039ba3fed7662e255e6d4b541bc1dc5b9edfa7ddc08529f91a9ef2ceb4a137e4097a804096
+MISC metadata.xml 3736 SHA256 376b65feea8c2f85dccad2e564cc6111f2dc2de2a3b785a4c10af8c95c4920ee SHA512 93933d1ddfce67739e0647adce2f9253ae596429c794b73562737b508400a0fa7af93eae06808b088888b1d44f421ce4765cc6b56b9b5356140af80ca36bebfc WHIRLPOOL 7ef396db2e624c2798ba30ad4b8099237fb699c5e94cd1470ec6161a068f1e815930a87104545b4b98183784465a9a5f9dc051beb99ef1c5731e61f42f5c7381
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUU30qAAoJELhOzYlK7nn/gcsQAIPMQ2gecjvH5cn4zzh1/wiA
-4p2Tcosa36iHlkhlKMNSIreS7VZq0Z0GvplpVdWuUyh0K1hjfhaMQHG6yuZACoPD
-z0OB2YXYjwb02Y4iGad9uslmuoxJBX9IYPC7hdgq5fRtGX8ayZKovHVFN4jRRiPB
-nKnRRLP42UNnzMhS3eaDrhCrKuipPL/JmB9yg9bPL1x3azOShFF9aB2OcuQzrooA
-Qj+BRi+d5tfJytlbWuF4YKjCdiCBA2UJJEb6gDoJZRJjjx7xnk9kiMcujrq14Djr
-zTQca+VIAmQZkkQGIAFv5Fomexe1LW0k9qhJW9OnGhDinSoEdmijOVdQNcoL+Oia
-/SsetcJQGHhNNdYeAc/giV7cTBKn210hJgrTHdgz7ez5VBUCpwI++HM7WstTp4JX
-PfFQ5l79/H4oII+r9c334zWJiQppER3Voj1tlIuSRo/jsqRtGt0UZ2Wla2o3w3nf
-fX7HDNnYiiMSZLp11xhHxpyxhbQLdOa07kJS/aw6V7RmAHTwT/YGiO+ZXYr1/3d2
-u3mqCwpYzDd2lkiexwc/ggcQOuV6/tx7kkEvdnTJHdZFuf1reDa0Ci8rNteAQqnI
-PFFmGRSZLvOPegAeZpuobCtQ65Hr+Ggxnna6ITYujyQ9cdEUaVGkDvfCFUlP35j9
-WEBe81IkKz9sg4oTm+9R
-=bJk+
+iQIcBAEBCAAGBQJUVtrKAAoJELhOzYlK7nn/a1UP/jwBv+Y1NGyfbCwgGL0MDfIe
+nQ7WrqRcm1eXQLV0xLEz7sAElm57RCJ8b71nxM1d7odw+3shIJ2joOvV/9uJD9jY
+dW0jrWDXq5O/qm44BiBxd+LoeG0U7xOom5bl4W9lYJiWE0nu0Trr0LHVO7STHKv3
+S+b2Hh1lOWYeRQPxf0S037m3aJDneVBuoayzWfAyjWnYMo9X9gPrdKfFg2DWs91m
+j57OTT95RWXYW4ZL8rauDCiEWFziGWc9V2Ci6xnSvEZGVMDidCc1R4rpvFlWkpan
+xzk2IZMEhEFAtXv7RqhQCa3NdceVSuTrqrq/0/deG3qCS37SEgt6KcGnq3+CXUGi
+mRw9x5+9Mh19gA6/7beSeOxqhi/K+4nr0kv5L6q80s+uqNCy45AE06BCchzbHcPC
+ecdi3d3Dw2Le9HMvMwmJW6HJf1dUvx7CuRAmf1duXHX++bwFnAnfIK1rYaXFqoXQ
+uA4KeW79Wn50hDwF3vwOdaD8H0oWM84brdx4p1a5vnZtOUxmMTQPRYhWUaB/RIb4
+BYHKZHjsQxb/BAZbfqcxU8ZMKoqZCpfE0HnWjjMwDwCr7bZ4bpg+cZh+E/BnOLUO
+JpkDkja0JxIvI6GldFBt/1fHboZNm8H9ifHSsCGNDjRbTVVkBXL9m3ZNsAHaOvdd
+XXq/hzglSEiOQbn+4PMm
+=sEVR
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/files/libvirt-1.2.6-numa.patch b/app-emulation/libvirt/files/libvirt-1.2.6-numa.patch
deleted file mode 100644
index 5102d6aad9dc..000000000000
--- a/app-emulation/libvirt/files/libvirt-1.2.6-numa.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From https://www.redhat.com/archives/libvir-list/2014-July/msg01076.html
-
-diff --git a/src/util/virnuma.c b/src/util/virnuma.c
-index 46f48d2..7a11a3b 100644
---- a/src/util/virnuma.c
-+++ b/src/util/virnuma.c
-@@ -390,7 +390,7 @@ virNumaGetMaxCPUs(void)
- }
-
-
--#ifdef HAVE_NUMA_BITMASK_ISBITSET
-+#if WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET
- /**
-  * virNumaNodeIsAvailable:
-  * @node: node to check
-@@ -485,7 +485,7 @@ virNumaGetDistances(int node ATTRIBUTE_UNUSED,
- {
-     *distances = NULL;
-     *ndistances = 0;
--    VIR_DEBUG("NUMA distance information isn't availble on this host");
-+    VIR_DEBUG("NUMA distance information isn't available on this host");
-     return 0;
- }
- #endif
diff --git a/app-emulation/libvirt/files/libvirt-1.2.9-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-1.2.9-do_not_use_sysconf.patch
new file mode 100644
index 000000000000..e766f49d33e9
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-1.2.9-do_not_use_sysconf.patch
@@ -0,0 +1,112 @@
+From 69372a32025ac16578ad277c6356e89713a3f9f4 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@kyomu.43-1.org>
+Date: Mon, 3 Nov 2014 00:51:35 +0100
+Subject: [PATCH] Do not use /etc/sysconf
+
+---
+ daemon/Makefile.am               | 4 +---
+ daemon/libvirtd.service.in       | 3 +--
+ src/Makefile.am                  | 3 ---
+ src/locking/virtlockd.service.in | 3 +--
+ tools/Makefile.am                | 2 +-
+ tools/libvirt-guests.service.in  | 2 +-
+ 6 files changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index b95a79d..1e98422 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -328,9 +328,7 @@ uninstall-logrotate:
+ 	rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
+ 
+ install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	$(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
+-	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
++
+ uninstall-sysconfig:
+ 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
+ 	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
+index 1759ac8..cd337a1 100644
+--- a/daemon/libvirtd.service.in
++++ b/daemon/libvirtd.service.in
+@@ -10,8 +10,7 @@ Documentation=http://libvirt.org
+ 
+ [Service]
+ Type=notify
+-EnvironmentFile=-/etc/sysconfig/libvirtd
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e65177f..18bbbb4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2269,9 +2269,6 @@ EXTRA_DIST += locking/virtlockd.sysconf \
+ 	locking/test_libvirt_lockd.aug.in
+ 
+ install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	$(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \
+-	  $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
+ 
+ uninstall-sysconfig:
+ 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 57089b0..ace0c83 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -5,8 +5,7 @@ Documentation=man:virtlockd(8)
+ Documentation=http://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlockd
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
++ExecStart=@sbindir@/virtlockd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the locks is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 93d642d..2da0e97 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -259,7 +259,7 @@ uninstall-local: uninstall-init uninstall-systemd
+ install-sysconfig:
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+ 	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
+-	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
++	  $(DESTDIR)$(sysconfdir)/libvirt/libvirt-guests.conf
+ 
+ uninstall-sysconfig:
+ 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index cc04b6d..9be514b 100644
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8)
+ Documentation=http://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+--- a/tools/libvirt-guests.sysconf
++++ b/tools/libvirt-guests.sysconf
+@@ -1,3 +1,10 @@
++#
++# Warning: This configuration file is only sourced by the systemd
++# libvirt-guests.service unit. The coresponding openrc facility is in
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
++#
++
++
+ # URIs to check for running guests
+  # example: URIS='default xen:/// vbox+tcp://host/system lxc:///'
+   #URIS=default
+-- 
+2.0.4
diff --git a/app-emulation/libvirt/files/libvirtd.service.conf b/app-emulation/libvirt/files/libvirtd.service.conf
new file mode 100644
index 000000000000..f08792260b72
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.service.conf
@@ -0,0 +1,10 @@
+# Uncomment the following three lines to start libvirtd with the '--listen'
+# directive such that it listens for TCP/IP connections (honoring the
+# listen_tls and listen_tcp settings in /etc/libvirt/libvirtd.conf). If
+# libvirtd is started without the '--listen' parameter, network connection
+# (for the daemon) is globally disabled:
+
+# [Service]
+# ExecStart=
+# ExecStart=/usr/sbin/libvirtd --listen
+
diff --git a/app-emulation/libvirt/libvirt-1.2.9-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..47eefab20287
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.9-r1.ebuild
@@ -0,0 +1,452 @@
+# 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-1.2.9-r1.ebuild,v 1.1 2014/11/03 01:30:36 tamiko Exp $
+
+EAPI=5
+
+#BACKPORTS=062ad8b2
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils user autotools linux-info systemd readme.gentoo
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	AUTOTOOLIZE=yes
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
+		${BACKPORTS:+
+			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
+	nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+	selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
+	elibc_glibc systemd"
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )
+	virt-network? ( libvirtd )
+	firewalld? ( virt-network )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	dev-libs/libgcrypt:0
+	>=dev-libs/libxml2-2.7.6
+	dev-libs/libnl:3
+	>=net-libs/gnutls-1.0.25
+	net-libs/libssh2
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	app-misc/scrub
+	audit? ( sys-process/audit )
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
+	iscsi? ( sys-block/open-iscsi )
+	lxc? ( !systemd? ( sys-power/pm-utils ) )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+		!systemd? ( sys-power/pm-utils )
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	systemd? ( sys-apps/systemd )
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+	virt-network? ( net-dns/dnsmasq[script]
+		>=net-firewall/iptables-1.4.10
+		net-misc/radvd
+		net-firewall/ebtables
+		sys-apps/iproute2[-minimal]
+		firewalld? ( net-firewall/firewalld )
+	)
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt"
+
+DOC_CONTENTS="For the basic networking support (bridged and routed networks)
+you don't need any extra software. For more complex network modes
+including but not limited to NATed network, you can enable the
+'virt-network' USE flag.\n\n
+If you are using dnsmasq on your system, you will have
+to configure /etc/dnsmasq.conf to enable the following settings:\n\n
+ bind-interfaces\n
+ interface or except-interface\n\n
+Otherwise you might have issues with your existing DNS server."
+
+LXC_CONFIG_CHECK="
+	~CGROUPS
+	~CGROUP_FREEZER
+	~CGROUP_DEVICE
+	~CGROUP_CPUACCT
+	~CGROUP_SCHED
+	~CGROUP_PERF
+	~BLK_CGROUP
+	~NET_CLS_CGROUP
+	~CGROUP_NET_PRIO
+	~CPUSETS
+	~RESOURCE_COUNTERS
+	~NAMESPACES
+	~UTS_NS
+	~IPC_NS
+	~PID_NS
+	~NET_NS
+	~USER_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~VETH
+	~MACVLAN
+	~POSIX_MQUEUE
+	~SECURITYFS
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+VIRTNET_CONFIG_CHECK="
+	~BRIDGE_NF_EBTABLES
+	~BRIDGE_EBT_MARK_T
+	~NETFILTER_ADVANCED
+	~NETFILTER_XT_TARGET_CHECKSUM
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MARK
+"
+
+BWLMT_CONFIG_CHECK="
+	~BRIDGE_EBT_T_NAT
+	~NET_SCH_HTB
+	~NET_SCH_SFQ
+	~NET_SCH_INGRESS
+	~NET_CLS_FW
+	~NET_CLS_U32
+	~NET_ACT_POLICE
+"
+
+MACVTAP_CONFIG_CHECK=" ~MACVTAP"
+
+LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
+
+ERROR_USER_NS="Optional depending on LXC configuration."
+
+pkg_setup() {
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu kvm
+
+	# Some people used the masked ebuild which was not adding the qemu
+	# user to the kvm group originally. This results in VMs failing to
+	# start for some users. bug #430808
+	egetent group kvm | grep -q qemu
+	if [[ $? -ne 0 ]]; then
+		gpasswd -a qemu kvm
+	fi
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
+	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
+	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
+	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	if [[ ${PV} = *9999* ]]; then
+
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch "${FILESDIR}"/libvirt-1.2.9-do_not_use_sysconf.patch
+
+	epatch_user
+
+	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+
+	# Tweak the init script
+	local avahi_init=
+	local iscsi_init=
+	local rbd_init=
+	local firewalld_init=
+	cp "${FILESDIR}/libvirtd.init-r13" "${S}/libvirtd.init"
+	use avahi && avahi_init='avahi-daemon'
+	use iscsi && iscsi_init='iscsid'
+	use rbd && rbd_init='ceph'
+	use firewalld && firewalld_init='need firewalld'
+
+	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
+}
+
+src_configure() {
+	local myconf=""
+
+	## enable/disable daemon, otherwise client only utils
+	myconf="${myconf} $(use_with libvirtd)"
+
+	## enable/disable the daemon using avahi to find VMs
+	myconf="${myconf} $(use_with avahi)"
+
+	## hypervisors on the local host
+	myconf="${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)"
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf="${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"
+
+	## 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)"
+
+	# udev for device support details
+	myconf="${myconf} $(use_with udev)"
+
+	# linux capability support so we don't need privileged accounts
+	myconf="${myconf} $(use_with caps capng)"
+
+	## auth stuff
+	myconf="${myconf} $(use_with policykit polkit)"
+	myconf="${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)"
+
+	## other
+	myconf="${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"
+	else
+		myconf="${myconf} --with-qemu-user=root"
+		myconf="${myconf} --with-qemu-group=root"
+	fi
+
+	# audit support
+	myconf="${myconf} $(use_with audit)"
+
+	# wireshark dissector
+	myconf="${myconf} $(use_with wireshark-plugins wireshark-dissector)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# locking support
+	myconf="${myconf} --without-sanlock"
+
+	# systemd unit files
+	use systemd && myconf="${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
+	# it'll require us to rebuild autotools (and we don't really want
+	# to do that right now). The proper solution has been sent
+	# upstream and should hopefully land in 0.7.7, in the mean time,
+	# mime the same functionality with this.
+	case ${CHOST} in
+		*cygwin* | *mingw* )
+			;;
+		*)
+			ac_cv_prog_WINDRES=no
+			;;
+	esac
+
+	econf \
+		${myconf} \
+		--disable-static \
+		--docdir=/usr/share/doc/${PF} \
+		--with-remote \
+		--localstatedir=/var
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		HTML_DIR=/usr/share/doc/${PF}/html \
+		DOCS_DIR=/usr/share/doc/${PF} \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconf
+	rm -rf "${D}"/var/cache
+	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/log
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
+	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# We really don't want to use or support old PolicyKit cause it
+	# screws with the new polkit integration
+	if has_version sys-auth/policykit; then
+		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
+	fi
+
+	# Only sysctl files ending in .conf work
+	dodir /etc/sysctl.d
+	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+
+	if ! use policykit; then
+		elog "To allow normal users to connect to libvirtd you must change the"
+		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+
+	if use caps && use qemu; then
+		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
+		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
+	fi
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog ""
+		elog "The systemd service-file configuration under /etc/sysconfig has"
+		elog "been removed. Please use"
+		elog "    /etc/systemd/system/libvirt.d/00gentoo.conf"
+		elog "to control the '--listen' parameter for libvirtd. The configuration"
+		elog "for the libvirt-guests.service is now found under"
+		elog "    /etc/libvirt/libvirt-guests.conf"
+		elog "The openrc configuration has not been changed. Thus no action is"
+		elog "required for the openrc service manager."
+		elog ""
+	fi
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index ae4a1fd5d5a2..6339dbada0c9 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.60 2014/10/31 12:15:03 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.61 2014/11/03 01:30:36 tamiko Exp $
 
 EAPI=5
 
@@ -32,8 +32,8 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
 	nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
-	systemd"
+	selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
+	elibc_glibc systemd"
 REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
 	lxc? ( caps libvirtd )
 	openvz? ( libvirtd )
@@ -92,6 +92,7 @@ RDEPEND="sys-libs/readline
 	selinux? ( >=sys-libs/libselinux-2.0.85 )
 	systemd? ( sys-apps/systemd )
 	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
 	xen? ( app-emulation/xen-tools app-emulation/xen )
 	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
 	virt-network? ( net-dns/dnsmasq[script]
@@ -221,6 +222,8 @@ src_prepare() {
 		) >.git-module-status
 	fi
 
+	epatch "${FILESDIR}"/libvirt-1.2.9-do_not_use_sysconf.patch
+
 	epatch_user
 
 	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
@@ -317,9 +320,11 @@ src_configure() {
 	# audit support
 	myconf="${myconf} $(use_with audit)"
 
+	# wireshark dissector
+	myconf="${myconf} $(use_with wireshark-plugins wireshark-dissector)"
+
 	## stuff we don't yet support
 	myconf="${myconf} --without-netcf"
-	myconf="${myconf} --without-wireshark-dissector"
 
 	# we use udev over hal
 	myconf="${myconf} --without-hal"
@@ -375,17 +380,22 @@ src_install() {
 
 	find "${D}" -name '*.la' -delete || die
 
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconf
+	rm -rf "${D}"/var/cache
+	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/log
+
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
+	systemd_install_serviced "${FILESDIR}"/libvirtd.service.conf libvirtd
+
 	newinitd "${S}/libvirtd.init" libvirtd || die
 	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
 	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
 
-	keepdir /var/lib/libvirt/{boot,images,network}
-	use qemu && keepdir /var/{cache,lib,log}/libvirt/qemu
-	use lxc && keepdir /var/{cache,lib,log}/libvirt/lxc
-
 	readme.gentoo_create_doc
 }
 
@@ -411,19 +421,6 @@ pkg_postinst() {
 		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
 	fi
 
-	# support for dropped privileges
-	if use qemu; then
-		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
-		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if use caps && use qemu; then
-		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
-	elif use qemu; then
-		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
-	fi
 
 	if ! use policykit; then
 		elog "To allow normal users to connect to libvirtd you must change the"
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index a6c782b0e955..eeda6d85b669 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -87,5 +87,8 @@
 	</flag>
     <flag name="firewalld">DBus interface to iptables/ebtables allowing
 		for better runtime management of your firewall.</flag>
+	<flag name="wireshark-plugins">
+		Build the <pkg>net-analyzer/wireshark</pkg> plugin for the Libvirt RPC protocol
+	</flag>
   </use>
 </pkgmetadata>