From 73b9458e58d7eb7ce3893b4cd3e618e263a98f57 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 13 Mar 2015 12:38:09 +0000 Subject: [PATCH] version bump, bug #542902 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xBD3A97A3 --- app-emulation/libvirt/ChangeLog | 7 +- app-emulation/libvirt/Manifest | 30 +- app-emulation/libvirt/libvirt-1.2.13.ebuild | 462 ++++++++++++++++++++ 3 files changed, 484 insertions(+), 15 deletions(-) create mode 100644 app-emulation/libvirt/libvirt-1.2.13.ebuild diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index d46d648ec5b1..8568e3208379 100644 --- 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.416 2015/02/15 15:34:59 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.417 2015/03/13 12:38:04 tamiko Exp $ + +*libvirt-1.2.13 (13 Mar 2015) + + 13 Mar 2015; Matthias Maier +libvirt-1.2.13.ebuild: + version bump, bug #542902 15 Feb 2015; Matthias Maier -libvirt-1.2.10-r3.ebuild: drop vulnerable, wrt bug #537956 diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index b2e52ddff72f..be07b52126d4 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -13,26 +13,28 @@ DIST libvirt-1.2.10.tar.gz 30029503 SHA256 5050f4cea3dd59d3eca25c3d3f16085e10d62 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 +DIST libvirt-1.2.13.tar.gz 30861600 SHA256 944163d93949db61f49eace85838b1bd55ce855e88b014df16c50fd2102bdaf6 SHA512 f590cd4ad55fb8f09980ba2dfd05eb6b978c602c2eecc1188acc6536ae2d4ffb8ad70756a39c95b2b69688981e950cce3e7f232bf96b50fdb01d60b05ecf990d WHIRLPOOL b46013116fe3872156de29c2c27bb76c5ad9fad08d7e489ad061db2be1d82e7d64117e3dd90ca999efb9edd35584ff944c03659fd6690fd9f961586d255a8d97 EBUILD libvirt-1.2.10-r4.ebuild 12902 SHA256 f858482a2dbdf5e57c7796189104d61f4abbe02511ce2d8cd2056b8db0180c9b SHA512 ab297624547f37c54566c11c70fe2729f02478c8cebdcb622f6ca62e0a3caf0a59ed55f1dfb2075a98ef47921faea858c1fd529865a48a2d8f89c2d888dc6e17 WHIRLPOOL b34f218eda9bce6e4d3ec72affbdf6cd74354fee1645a5479684d26a55674e25a1dc43b7b1e23cb6747b729fc1de69f1303937d2a10d73898769997f7a8cbe23 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-1.2.13.ebuild 12989 SHA256 c520391752508978c461284442e8b88e5fd8c34cc72eb06ce7988ccf85c805e4 SHA512 88e187ddfd0b36dba643670c943e7bdf9baef0ed57355a12c133d68807db3c42a05350b8a30700550b801bdbe02acdc593b98eba4acc9b4785b2ab59135e9314 WHIRLPOOL 74ea714c8c441518d43a19771a5f87226231bb07ae18c40befcc2b537b8d38bf4af0b8ce8e6cf8e6ae08f48cf4fa7de3f63f9a1ce34dfef5517e2e42fcf15e42 EBUILD libvirt-9999.ebuild 12988 SHA256 98cdb6ef8c4f90d4061d0f2f3747933488103462264de37699072089fb436f9f SHA512 c0d9d4fe8a0156259b21088f32c196946af9f70b5e7004bd60d14ab96fd25d8febbffe394768ea00281b3c7465a6e29c1b3c711648f2daf3b8fb90fcd14d37d3 WHIRLPOOL 1cf5c3669dac38949635459a688ec476f6355dd34fdcf185b50218e673480d59069ba2609af5597579fb2df762a7e03f47721c21661f79e6872403da54a5a253 -MISC ChangeLog 26675 SHA256 d5206ae4f9c815b063f70e6f5a72315513cf2909cddb0ea1bd1fe78b910620fd SHA512 6eed4d7d46b96e1eb7cf0660d4d10a72db6785f2497fc5ccebfa21bbf5604e3e0c71d7d7931f84aa05b3738e2b42d3dfe9b89f6660e205ba284296a898075db3 WHIRLPOOL 2a81369ca3970152eae90b6b609d0a4329477da0b80c2ebafb66ae27d85d1eda6b0459cb664d2e94311148c57c50e7f15964e086d0c41b5f05ca12cccb94a7c3 +MISC ChangeLog 26809 SHA256 359ea3a7af68c04b6258a7de20f4e2f870872c11cf03adbc92c707fd4285fc77 SHA512 7d13a52faa1bd212df3892be080295a530e44f83ed7531680f080a1b07c29c6152b68facb2bd5182f8827b7bd2045b13732a06a3150f64fee296aac4fe8d1c70 WHIRLPOOL 7989b4f7b5d1d748710776ecbd5569153950cfa93d99f61f407f8fc43e3e29eae63b65dbb86b69b0a1f7f37030ca82bcdf6ed3d2d92ee076c461e55d26aa12df MISC metadata.xml 3604 SHA256 90d98bcf32df9c4ff5d3fc90cdcac46ddc486efa9706b945cbf749d4a1ddcd30 SHA512 35b1fd9faa961efddec324d3721699068b9b2aefb49271f064b3930c9c246a71829f55566438754c34f294db9b8c2ad55386113a72ab11b31cbb604e4afe7816 WHIRLPOOL 6315f8a01134f62a1f7b9845f0e89624bb1edd713b4965a53209b199609ba4f510f0cbb4ee85f348947556cdeee27ab7ae7fcf52b1b9ed82176076d149c00116 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1 -iQIcBAEBCAAGBQJU4LykAAoJELhOzYlK7nn/lgcQALqcLCoKqOQiwmGh4DGh9vlE -By615z3FpadbC9q8vCHkOsV/2BaY6J3GIW0h60W2xeBV71r0WDq+SFK1cLhzRIJR -SAGybznbcNzHA0r9AJsEIDqyxj+QEaMKLtvPpRUu8ZtAUK81BUKk+rOFeJnS/TTp -06yBwfMp8AjFbv3OD3Gtw6y08E/j258HGXqBFAV9YxnVthXL5Q8sjhH9hz335SMT -4+nDgL0JyCuKVFKueE2BZdSPRbB3r2Ps71i/sr6E7cNs3aBl6dDyyfCooJd8enLh -nANPrjaMGbRGXpNPt4282LRw0TxHxfz4zuTDq3Fy3jbvuKe2mYp4Y6/6tTDEhr64 -1p2Q2VuW+eEtPrW+9uhAGxetx//bQd2EYMjpmlgluvMSlCCzIgAzhPTRKzm8Jq+d -n4yJX1EC3ytY6mHDOp1hzMyrDQAPte1fqTDCKZ5EU7C2XGVpdXenEcRBWjtp2iop -U9wNxgiA1rMkCn8OfsveAjwcm+0Krn8I3pLdorfWgN6VGd5z8+B5sSfCIAE6uxmC -3Cx32aXtlLM4ju217PXfLxuJ+HGBgYo5/vidh/6rg8FrONEL3Gabek0/xFyUfMgw -P12eVHrIyfQSsAZtSs+iAhG0ctgp0MuzqpDgXBR2mEGKYG7b8FdcD11iR01xjaKd -mWIFbdIt5LZT4/oLgaLH -=3omq +iQIcBAEBCAAGBQJVAtorAAoJELhOzYlK7nn/4YoP/2OKUiSdYafbZmioq+6oZMax +lcLnLZZwWXFSFm7K9NRBXo1NhdYeINXA5ETucFhKBADElUD6dMHZGmaiMbEgGP4u +zwELoFYHqsGc5fK6o7UfemEqXuxDw+rphMM5XyupjKDKbHdLt5+C/yk8U+PM4v1l +9VTnLOqLzpiEPJXBemYgIK3TlUhDOFntBtHTPv0hKiF8OpfxldckayfRUPc6LFEF +l6ckT58mmL/fH3l0zkLf5DUmRhOhKc5u0/gRZ0FlArDTkOi/I9aNhxd+yKjLgOhz +voJz3R9qPyg9XaKGiW+bvRDU5VncsfaEbSI48hSvNDedKeHGyn+pS4vo/7PYLqfj +GHR5/NYFsnbOx8rUrSicSIM/roXDfpGpiYghpRK+qnfE9Fm5QyfLySn+l0Opzbe+ +dHmYGsDZqNAgNitw3gbnyIPk+VaaaQMr/Xjgahd4Uc4J00sAG4zs85iF7zbly6CU +wOAipweOOQ7036gtNLgFPf5mwC5rWWy3tVdtXusNhbAi21qMU82977Kwtl+RgMqJ +TdQeOS4zpJPlRTyW3K/dZLyB/WiURWkMnVj5K6SoPvYvpS0o4bYIyFWzQIW0HftY +/K+cRZWL/o1z+8NRcJSRE/LQJyex+6RMfAi7ZUQWs0nMcSSVHsMUE3Lj6K/Or7vo +7knlFuVQgO1nh+fWHgGW +=Rlh8 -----END PGP SIGNATURE----- diff --git a/app-emulation/libvirt/libvirt-1.2.13.ebuild b/app-emulation/libvirt/libvirt-1.2.13.ebuild new file mode 100644 index 000000000000..6691cb159495 --- /dev/null +++ b/app-emulation/libvirt/libvirt-1.2.13.ebuild @@ -0,0 +1,462 @@ +# 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.13.ebuild,v 1.1 2015/03/13 12:38:04 tamiko Exp $ + +EAPI=5 + +AUTOTOOLIZE=yes + +MY_P="${P/_rc/-rc}" + +inherit eutils user autotools linux-info systemd readme.gentoo + +BACKPORTS="" + +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 glusterfs 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 ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + 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 .git-module-status + fi + + epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.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-r14" "${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)" + mycond+=" $(use_with glusterfs)" + mycond+=" $(use_with glusterfs storage-gluster)" + 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 +} -- 2.26.2