apply security fix for 1.2.10 (CVE-2015-0236)

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

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 8167d460dc531dac62a34a51378d7f8d0407027b..8debb0eb51cf31e38b335ad3379bd9c640af5150 100644 (file)
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.412 2015/01/27 10:42:52 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.413 2015/01/27 10:55:18 tamiko Exp $
+
+*libvirt-1.2.10-r4 (27 Jan 2015)
+
+  27 Jan 2015; Matthias Maier <tamiko@gentoo.org> +libvirt-1.2.10-r4.ebuild:
+  apply security fix for 1.2.10 (CVE-2015-0236)
 
 *libvirt-1.2.12 (27 Jan 2015)
 *libvirt-1.2.11-r3 (27 Jan 2015)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 2655cfe62dbd0ce4bebde0a7349bdccb88aeaed7..35184a1e7057ae79d345816bb294901394cf6972 100644 (file)
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -9,30 +9,32 @@ AUX libvirtd.init-r14 4349 SHA256 ed8514d347d3a8a0b243cfc25a85dedb1e595f1e29e874
 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.10-20141223.tar.xz 5012 SHA256 a1d31d12f04631e46748b6dfc6893d20127bd97204415c9642b1af68077d68b4 SHA512 70148beb288d0df468bd3c82b42da1ccae54f4914514f7bd9817a4aa6e6bb54d21aba58ce9ab6cb35ec539af8c6ce9f5c2f91f1a67f29824bcf0a13e6c1a2975 WHIRLPOOL 0569ad4b4222f968684ab2e108bd761bdb750eb59348e70c38ebc809a9ee0cb74445126d2517f5b660a5600d4de9c20d3f3d7f96abff1cc9d3e2b5a834fc87f4
+DIST libvirt-1.2.10-20150127.tar.xz 5584 SHA256 f2b259ca1161322b09851c481ea69c352f4efb065ec593aaf2589cada4282604 SHA512 6247f133dae53d0387e11846c8afced5baeb7cc3794adc015039a9fb34a850afbf2e898add7af4806a1f6f1c1400a0f5978a69b830c74776258de0dfa85d0ed4 WHIRLPOOL 1a6154558bf36416df3db4fe54de3b8fa4e730b689a4e166b75bef9e053d14ae02bd99ddc343bdc4734eef298b8d98e32021186e931d7fd330da290fa81f9469
 DIST libvirt-1.2.10.tar.gz 30029503 SHA256 5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e SHA512 9cd5d2a604769cf70e388c367abcde27ee8d6d7043227f17dd2cac92a467ea06547374e1d83c7b1ee4c5322d8b3d9e4cbb6db373efae5eaaceed1b1376cbd09d WHIRLPOOL 986c1fd0128101f936897c97a36d646b8893d9ee0a223d05b004d73408a2720aeb9bb5fe3e4a7c476947021b89d955fb4a1b3a64dfe8dfe0d30dbfe75487b8fe
 DIST libvirt-1.2.11-20150127.tar.xz 1248 SHA256 a5ba09f85eb2bbe5f6a727c667777b5bdefe3447c8fe6532ad665368b42a4a1d SHA512 ffe0a8f0c207bdb7ca4d99b77fae9b2653bf37551c182334ad3c60874b5fc8942a6ee31e260da8b832c90c904f9caccc57e4f49651c0cd6e0ed8a7fbfb172c7e WHIRLPOOL 907fb49dc0228bcf0624833d3e27dfe609df8dac9420e014e4d0882edc9f1c8cbca008d24bd072d98c351681b33f167d678d88db96fc939a87ab46f6e7dc72da
 DIST libvirt-1.2.11.tar.gz 30571605 SHA256 1b886429734a53fc9a201f46d77448fda963e1323246269eb0dcb4c12fb02fcc SHA512 4aaeb2eeb563f0a9105a1586054d69c24dada12ddf9b71edd3742ad602eb8c892d9f615ee1a2159051bec52699897c6707d9d0204b8f0fe61bae15885ee986f2 WHIRLPOOL b64ee58d633e4b3fec52125bd9b582f7d07045baa66c492fd2b6bc521d994cec95fa460c3a8b32a0f73043ad812e36d81832c31046bbacc280fb2f2764e9bd75
 DIST libvirt-1.2.12.tar.gz 30710487 SHA256 eff5227f774560d97f0b44402a444e821c51e8cd44add89f74bc3c1f4dede66a SHA512 643986d72886fe3de0191b282f561241721a8967911418ff317cecd68e1afb13f32e0aeb5000ae11cc452bfaac6220c472091276c81a69eb569166b87d05e736 WHIRLPOOL 1b02150643145efb851335139661b69999641904c1350c3a1b391efcc7761de7c28ba19307867e21a5c1516da8ab365e01fcdfb542efb56a3cce8ed61be65f0f
 EBUILD libvirt-1.2.10-r3.ebuild 12905 SHA256 3c93a3ef108dd5124cf288a8a3298f4f7a616ab7a2ca0f923e8412fd20639f44 SHA512 e09fbc055cc277c3d537982318266a262e47526418f4e192c26d40b45cce30eaa47afbd0b530a63159189ee88e6040d0389ce615a0a03bcb28250717a8dc9c99 WHIRLPOOL d3929af83f9dcfbdbaa8dcadef9cb42258190527fe2bda013ecfd35fcdcfe712f42c1fa2f6a5cbe0c1e49f08bc6b082d63128a59267a2768111b829f70dbca41
+EBUILD libvirt-1.2.10-r4.ebuild 12907 SHA256 1e80cb8e4a08cde69ab02034d5e12b600b908ce129f7514624a8467bc1cfef4c SHA512 42fb0abf5350a4362852e66bff6a5ae6c31e26745a73e8230035a14fec2d97a5005f39335a208da1b36ba493815d29647ec0fb9407416b4de647985cf09d3bbc WHIRLPOOL 6493655be569dcebb463b2d6a2d4b7591bfe862196c8a14ef2b1880d8b3b94490efe40b987a4cf08b8a6cca9dab722937dd8f2b138bbe98339a7bd2d66e676bb
 EBUILD libvirt-1.2.11-r3.ebuild 12980 SHA256 4fe76409fc40c43420f0b9dbca9a6d32fbed1623c4a00aa7d2dab126ce65f18c SHA512 c3582840553a7998cf0808e594e9ca128489da9385a41c2bddc16b0255b30ed2d7a3f86f38271395ec01684efb9fe93ba98343dcf26c08a2a5eb5db46e4f38f6 WHIRLPOOL 7d2dbdb1358dd7897df4e0e4cadfc8bf55472d40e082912305fed29d5cd12fef55a20cdba158104f05ea1a609c7b968cbb7f4889662ce68bbdf98b7f7156846a
 EBUILD libvirt-1.2.12.ebuild 12989 SHA256 26d9ecd2a0e9c057e706c42006fef4e37a8f84f525ac55a0b3d8a8c8a1051fd2 SHA512 6db15cec2cd1fe545d051ad24060b803207550a8a27074c31c93514125d3cd583f43a65822d4349503d371b9aa502b025669d4cd7d89481b59d889cabdeb6f15 WHIRLPOOL 9b1b23d0d2669bc3bcab31d59bfde8ebf2a162e36f381e08c0617e20b6a40bcb2fef777d552f840f81cee94b3674870415b4e8d8d2ad4869440941daba3ba4e6
 EBUILD libvirt-9999.ebuild 12988 SHA256 98cdb6ef8c4f90d4061d0f2f3747933488103462264de37699072089fb436f9f SHA512 c0d9d4fe8a0156259b21088f32c196946af9f70b5e7004bd60d14ab96fd25d8febbffe394768ea00281b3c7465a6e29c1b3c711648f2daf3b8fb90fcd14d37d3 WHIRLPOOL 1cf5c3669dac38949635459a688ec476f6355dd34fdcf185b50218e673480d59069ba2609af5597579fb2df762a7e03f47721c21661f79e6872403da54a5a253
-MISC ChangeLog 26180 SHA256 7c8c5cfe70761d31f0b992aaa728aebf4318dffdf6c4d30f00ba0c89e25f2a48 SHA512 9c0db507b4cf04f2592c2683d1027ca153e628284979791683898092b1501124e7ff2c28e31ab8d5168469c41ca22d8f81019d3f0fdca077015c4c59582cf7d4 WHIRLPOOL 6be14b5d7999773a5fb153587ba365778af859bfdcc12f7ef7085ec37661e9a66c6eeaf5b6496d256ed0c878c352b5a180c39058d545214a94b2a9c63afb02bc
+MISC ChangeLog 26340 SHA256 cdee601373c3936c85dbda7875301fdec0a43dd88e5e34cfed6b5c12aca54e86 SHA512 9bfacc99f63c76300b1e6380cfee547230c2f23caecd0ab0e4eeaf9263fa19322f9d7bc3ad5e2cfbd0321c5a4265640409ff19624f04c29c411d858657730c31 WHIRLPOOL 96041c95151f4e2b25ff045e3ad2d7916b3e4b3fece947f2f64cd1e76b976d76bade3179f23d235de0dfad05d81a55ccdd27f5e15e553cc4ce2ea2b9bdc35290
 MISC metadata.xml 3604 SHA256 90d98bcf32df9c4ff5d3fc90cdcac46ddc486efa9706b945cbf749d4a1ddcd30 SHA512 35b1fd9faa961efddec324d3721699068b9b2aefb49271f064b3930c9c246a71829f55566438754c34f294db9b8c2ad55386113a72ab11b31cbb604e4afe7816 WHIRLPOOL 6315f8a01134f62a1f7b9845f0e89624bb1edd713b4965a53209b199609ba4f510f0cbb4ee85f348947556cdeee27ab7ae7fcf52b1b9ed82176076d149c00116
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUx2utAAoJELhOzYlK7nn/guMQAO3gBLzQV/iqJ0cBDltOWJf6
-gI3UarwvVwShlaqO1A9CVTpDNgp5ZtKRHIMV14D+WRFZI1doVdrZzSTdlP39l4IH
-15+9tcP4DQV9m8uqdAQreCdQwwKsa8mGhtIZjEiuC/z1KZefrbl+O0V34cBnpJpW
-gtQjluGJPWtsd2Chr/h+v83vDZWV1T/Vi1Ql8vE6i2iu8JdMfL5EfZF2IkX6Ox3C
-CXchrql9jZvzZwKlk4VN/2eAIg1yqHD1EmY3ee4t/MEjdHHoqEuCVsO2bg0IwiBA
-qz3X87spNzx91ERZ6ZbmD8e/4RgUD7stVVAntIBHTcFN9QRFmwpxQgwzYwPFZ2CG
-lf73lFgiywnrKwkPTVR5sqkbYV9whbyjUgxCnr5iaiNdLEZbgePayB0/A4tk2Ds5
-5uR72qhrEUJ7M9nNlPgYXAhiGs+WxrITY3JZjaJH0QhsPb3fEbo941qdiAicNJZ5
-nE50wNmniSL37ucY0XCmkgqXSbnlF8XHP/J/NO3luJ+iW5LjHnkZwSYxA8nbH/Ie
-0l1hcAN7oEWoYNq+97xGn3tVFjCTHUMFSB8MniP6fGyqQ6N4OB4Jl3cVOqlsi2Q2
-H89kk3AxCFIxXF6iumEoF6SuRlnR+WprsguoKttveNGqhhfa7j/uAe6cuW2dKxoo
-3Mf6dyTI/uIYtf2zoDiG
-=iim6
+iQIcBAEBCAAGBQJUx26XAAoJELhOzYlK7nn/lfIQAMNzCdxWx7/qBQzNBWpv7Puf
+yIRONWz+9BlkhZODX8GzcLdw6OPLO6x8PO9e+6HToieU/mmSh0AoGo+F49SEydBd
+ZzhMb5F6NuTETd2CzXw7kzo1OJWGB107cqe+4qJO6/osj7qSsmAHsRtXZrMU0izl
+mg19H1YWmZhMb2bdqwCOjYre8WO9znC2mX1DvFRonWAlyujF0zTseWTO1M6jcZyE
+ti06iv4n+MXe8SUJ9e92Zbatowbh77ctkJ3UzTCNFBPY//kfSWyf3LiayIzLrX8n
+E22udrtbnWi18eJzOuJ/sNw3p3cVraC2j0XMXMoapdP55hupBwBnHxT/6RUD6ELY
+jL/8120krl5CzGmxL6pcOomeRymT7/m3f6G+nJ4w39NnGps5NMkKuqShhuOeRcZD
+ahdxRfEDNxXsNKP9qrVcbU3Y5zGRm9Sxo8yiGzN59qsPjm3TSTdkDg/yOu6fMWng
+Zjq5lBWsCs42yi+iY83waR+b8JXRy26A5bV4LL1ehS47NmjggCMfILfjsdQjE9Aa
+gWnMeRD+L0psmUoDBJCRa+XOW6tAjrszyYWAI+sxc4UGo0GfDMiKVCx+tnGlOOeo
+HhGmFRhNDx93Qv7P3OSRvEMy/JvQk+ezUnnV76Ee3JPiIK/aoEB+dnsOX30E6vpq
+AAlEDKt4H5/f9A0l83Az
+=v1jl
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/libvirt/libvirt-1.2.10-r4.ebuild b/app-emulation/libvirt/libvirt-1.2.10-r4.ebuild
new file mode 100644 (file)
index 0000000..0e142ed
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.2.10-r4.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.10-r4.ebuild,v 1.1 2015/01/27 10:55:18 tamiko Exp $
+
+EAPI=5
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils user autotools linux-info systemd readme.gentoo
+
+BACKPORTS="20150127"
+
+if [[ ${PV} = *9999* ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+       SRC_URI=""
+       KEYWORDS=""
+       SLOT="0"
+else
+       # Versions with 4 numbers are stable updates:
+       if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+               SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
+       else
+               SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
+       fi
+       SRC_URI+=" ${BACKPORTS:+
+               http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+               http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+       KEYWORDS="~amd64 ~x86"
+       SLOT="0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+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 ) )"
+
+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"
+
+       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}"/${PN}-1.2.9-do_not_use_sysconf.patch
+       epatch "${FILESDIR}"/${PN}-1.2.9-fix-firewalld-configuration.patch
+       [[ -n ${BACKPORTS} ]] && \
+               EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+                       EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+       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+=" $(use_with libvirtd)"
+
+       ## enable/disable the daemon using avahi to find VMs
+       myconf+=" $(use_with avahi)"
+
+       ## hypervisors on the local host
+       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+=" $(use_with openvz)"
+       myconf+=" $(use_with lxc)"
+       if use virtualbox && has_version app-emulation/virtualbox-ose; then
+               myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
+       else
+               myconf+=" $(use_with virtualbox vbox)"
+       fi
+       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+=" $(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+=" $(use_with udev)"
+       myconf+=" --without-hal"
+
+       # linux capability support so we don't need privileged accounts
+       myconf+=" $(use_with caps capng)"
+
+       ## auth stuff
+       myconf+=" $(use_with policykit polkit)"
+       myconf+=" $(use_with sasl)"
+
+       # network bits
+       myconf+=" $(use_with macvtap)"
+       myconf+=" $(use_with pcap libpcap)"
+       myconf+=" $(use_with vepa virtualport)"
+       myconf+=" $(use_with firewalld)"
+
+       ## other
+       myconf+=" $(use_enable nls)"
+
+       # user privilege bits fir qemu/kvm
+       if use caps; then
+               myconf+=" --with-qemu-user=qemu"
+               myconf+=" --with-qemu-group=qemu"
+       else
+               myconf+=" --with-qemu-user=root"
+               myconf+=" --with-qemu-group=root"
+       fi
+
+       # audit support
+       myconf+=" $(use_with audit)"
+
+       # wireshark dissector
+       myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
+
+       ## stuff we don't yet support
+       myconf+=" --without-netcf"
+
+       # locking support
+       myconf+=" --without-sanlock"
+
+       # systemd unit files
+       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
+       # 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 \
+               --disable-werror \
+               --with-remote \
+               --docdir=/usr/share/doc/${PF} \
+               --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!
+
+       use systemd && \
+               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 [[ -n "${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
+}