app-emulation/libvirt: ebuild maintenance (1.2.19, 1.2.20, 9999)
authorMatthias Maier <tamiko@gentoo.org>
Mon, 5 Oct 2015 06:13:59 +0000 (01:13 -0500)
committerMatthias Maier <tamiko@gentoo.org>
Mon, 5 Oct 2015 06:31:36 +0000 (01:31 -0500)
 - use autotools-utils eclass
 - clean up and reorganize configuration and pkg_setup phase
 - outsource README.gentoo contents into separate file under files/

Package-Manager: portage-2.2.22

app-emulation/libvirt/files/README.gentoo-r1 [new file with mode: 0644]
app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
app-emulation/libvirt/libvirt-1.2.20.ebuild
app-emulation/libvirt/libvirt-9999.ebuild

diff --git a/app-emulation/libvirt/files/README.gentoo-r1 b/app-emulation/libvirt/files/README.gentoo-r1
new file mode 100644 (file)
index 0000000..74d1e77
--- /dev/null
@@ -0,0 +1,53 @@
+Important: The openrc libvirtd init script is now broken up into two
+separate services: libvirtd, that solely handles the daemon, and
+libvirt-guests, that takes care of clients during shutdown/restart of the
+host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests
+and enable the service and start it:
+
+       $ rc-update add libvirt-guests
+       $ service libvirt-guests start
+
+
+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. It
+will pull in required runtime dependencies
+
+
+If you are using dnsmasq on your system, you will have to configure
+/etc/dnsmasq.conf to enable the following settings:
+
+       bind-interfaces
+       interface or except-interface
+
+Otherwise you might have issues with your existing DNS server.
+
+
+For openrc users:
+
+       Please use /etc/conf.d/libvirtd to control the '--listen' parameter for
+       libvirtd.
+
+       Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of
+       the host. The default configuration will suspend and resume running kvm
+       guests with 'managedsave'. This behavior can be changed under
+       /etc/conf.d/libvirt-guests
+
+
+For systemd users:
+
+       Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf
+       to control the '--listen' parameter for libvirtd.
+
+       The configuration for the 'libvirt-guests.service' is found under
+       /etc/libvirt/libvirt-guests.conf"
+
+
+If you have built libvirt without policykit support (USE=-policykit), you
+must change the unix sock group and/or perms in /etc/libvirt/libvirtd.conf
+in order to allow normal users to connect to libvirtd.
+
+
+If libvirtd is built with USE=caps, libvirt will now start qemu/kvm VMs
+with non-root privileges. Ensure any resources your VMs use are accessible
+by qemu:qemu.
index b949b33fa68521b0cf9a8e509a4988dabd66d50b..f345b06045479ffff3defb926530563989b320ea 100644 (file)
@@ -4,11 +4,7 @@
 
 EAPI=5
 
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
 
 BACKPORTS=""
 
@@ -21,9 +17,9 @@ if [[ ${PV} = *9999* ]]; then
 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"
+               SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
        else
-               SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
+               SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
        fi
        SRC_URI+=" ${BACKPORTS:+
                https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
@@ -31,45 +27,46 @@ else
        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"
-# TODO: Reenable IUSE wireshark-plugins
 IUSE="apparmor 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 ) )
+       selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+       xen elibc_glibc"
+
+REQUIRED_USE="
+       firewalld? ( virt-network )
+       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 )"
+       virtualbox? ( libvirtd )
+       xen? ( libvirtd )"
 
 # 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:0=
-       >=net-misc/curl-7.18.0
+RDEPEND="
+       app-misc/scrub
        dev-libs/libgcrypt:0
-       >=dev-libs/libxml2-2.7.6
        dev-libs/libnl:3
+       >=dev-libs/libxml2-2.7.6
+       >=net-analyzer/netcat6-1.0-r2
        >=net-libs/gnutls-1.0.25
        net-libs/libssh2
+       >=net-misc/curl-7.18.0
        sys-apps/dmidecode
        >=sys-apps/util-linux-2.17
        sys-devel/gettext
-       >=net-analyzer/netcat6-1.0-r2
-       app-misc/scrub
+       sys-libs/ncurses:0=
+       sys-libs/readline:=
        apparmor? ( sys-libs/libapparmor )
        audit? ( sys-process/audit )
        avahi? ( >=net-dns/avahi-0.6[dbus] )
@@ -77,8 +74,8 @@ RDEPEND="sys-libs/readline:=
        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 )
+       lxc? ( !systemd? ( sys-power/pm-utils ) )
        nfs? ( net-fs/nfs-utils )
        numa? (
                >sys-process/numactl-2.0.2
@@ -100,127 +97,26 @@ RDEPEND="sys-libs/readline:=
        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]
+       virt-network? (
+               net-dns/dnsmasq[script]
                net-firewall/ebtables
                >=net-firewall/iptables-1.4.10[ipv6]
                net-misc/radvd
                sys-apps/iproute2[-minimal]
                firewalld? ( net-firewall/firewalld )
        )
+       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 )
        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
        dev-perl/XML-XPath
-       dev-libs/libxslt"
-
-# gentoo.readme stuff:
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="Important: The openrc libvirtd init script is now broken up into two
-separate services: libvirtd, that solely handles the daemon, and
-libvirt-guests, that takes care of clients during shutdown/restart of the
-host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests
-and enable the service and start it:
-       $ rc-update add libvirt-guests
-       $ service libvirt-guests start
-
-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.
-
-If you are using dnsmasq on your system, you will have to configure
-/etc/dnsmasq.conf to enable the following settings:
-       bind-interfaces
-       interface or except-interface
-Otherwise you might have issues with your existing DNS server.
-
-For openrc users:
-
-       Please use /etc/conf.d/libvirtd to control the '--listen' parameter for
-       libvirtd.
-
-       Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of
-       the host. The default configuration will suspend and resume running kvm
-       guests with 'managedsave'. This behavior can be changed under
-       /etc/conf.d/libvirt-guests
-
-For systemd users:
-
-       Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf
-       to control the '--listen' parameter for libvirtd.
-
-       The configuration for the 'libvirt-guests.service' is found under
-       /etc/libvirt/libvirt-guests.conf"
-
-! use policykit && DOC_CONTENTS+="
-
-To allow normal users to connect to libvirtd you must change the unix sock
-group and/or perms in /etc/libvirt/libvirtd.conf"
-
-use caps && use qemu && DOC_CONTENTS+="
-
-libvirt will now start qemu/kvm VMs with non-root privileges. Ensure any
-resources your VMs use are accessible by qemu:qemu"
-
-LXC_CONFIG_CHECK="
-       ~CGROUPS
-       ~CGROUP_FREEZER
-       ~CGROUP_DEVICE
-       ~CGROUP_CPUACCT
-       ~CGROUP_SCHED
-       ~CGROUP_PERF
-       ~BLK_CGROUP
-       ~NET_CLS_CGROUP
-       ~CGROUP_NET_PRIO
-       ~CPUSETS
-       ~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."
+       virtual/pkgconfig"
 
 pkg_setup() {
        enewgroup qemu 77
@@ -234,18 +130,69 @@ pkg_setup() {
                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"
-
+       # Check kernel configuration:
        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}"
+       use fuse && CONFIG_CHECK+="
+               ~FUSE_FS"
+
+       use lvm && CONFIG_CHECK+="
+               ~BLK_DEV_DM
+               ~DM_MULTIPATH
+               ~DM_SNAPSHOT"
+
+       use lxc && CONFIG_CHECK+="
+               ~BLK_CGROUP
+               ~CGROUP_CPUACCT
+               ~CGROUP_DEVICE
+               ~CGROUP_FREEZER
+               ~CGROUP_NET_PRIO
+               ~CGROUP_PERF
+               ~CGROUPS
+               ~CGROUP_SCHED
+               ~CPUSETS
+               ~DEVPTS_MULTIPLE_INSTANCES
+               ~IPC_NS
+               ~MACVLAN
+               ~NAMESPACES
+               ~NET_CLS_CGROUP
+               ~NET_NS
+               ~PID_NS
+               ~POSIX_MQUEUE
+               ~SECURITYFS
+               ~USER_NS
+               ~UTS_NS
+               ~VETH
+               ~!GRKERNSEC_CHROOT_MOUNT
+               ~!GRKERNSEC_CHROOT_DOUBLE
+               ~!GRKERNSEC_CHROOT_PIVOT
+               ~!GRKERNSEC_CHROOT_CHMOD
+               ~!GRKERNSEC_CHROOT_CAPS"
+       # Handle specific kernel versions for different features
+       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+       kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+       use macvtap && CONFIG_CHECK+="
+               ~MACVTAP"
+
+       use virt-network && CONFIG_CHECK+="
+               ~BRIDGE_EBT_MARK_T
+               ~BRIDGE_NF_EBTABLES
+               ~NETFILTER_ADVANCED
+               ~NETFILTER_XT_CONNMARK
+               ~NETFILTER_XT_MARK
+               ~NETFILTER_XT_TARGET_CHECKSUM"
        # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
+       use virt-network && CONFIG_CHECK+="
+               ~BRIDGE_EBT_T_NAT
+               ~NET_ACT_POLICE
+               ~NET_CLS_FW
+               ~NET_CLS_U32
+               ~NET_SCH_HTB
+               ~NET_SCH_INGRESS
+               ~NET_SCH_SFQ"
+
+       ERROR_USER_NS="Optional depending on LXC configuration."
+
        if [[ -n ${CONFIG_CHECK} ]]; then
                linux-info_pkg_setup
        fi
@@ -270,145 +217,91 @@ src_prepare() {
                "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
                "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
 
-       [[ -n ${BACKPORTS} ]] && \
+       [[ -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-r15" "${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"
+       # Tweak the init script:
+       cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+               -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+               -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+               -e "s/USE_FLAG_RBD/$(usex rbd  ceph '')/" \
+               -i "${S}/libvirtd.init" || die "sed failed"
+
+       AUTOTOOLS_AUTORECONF=true
+       autotools-utils_src_prepare
 }
 
 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)"
+       local myeconfargs=(
+               $(use_with apparmor)
+               $(use_with apparmor apparmor-profiles)
+               $(use_with audit)
+               $(use_with avahi)
+               $(use_with caps capng)
+               $(use_with firewalld)
+               $(use_with fuse)
+               $(use_with glusterfs)
+               $(use_with glusterfs storage-gluster)
+               $(use_with iscsi storage-iscsi)
+               $(use_with libvirtd)
+               $(use_with lvm storage-lvm)
+               $(use_with lvm storage-mpath)
+               $(use_with lxc)
+               $(use_with macvtap)
+               $(use_enable nls)
+               $(use_with numa numactl)
+               $(use_with numa numad)
+               $(use_with openvz)
+               $(use_with parted storage-disk)
+               $(use_with pcap libpcap)
+               $(use_with phyp)
+               $(use_with policykit polkit)
+               $(use_with qemu)
+               $(use_with qemu yajl)
+               $(use_with rbd storage-rbd)
+               $(use_with sasl)
+               $(use_with selinux)
+               $(use_with systemd systemd-daemon)
+               $(usex systemd --with-init-script=systemd '')
+               $(use_with udev)
+               $(use_with uml)
+               $(use_with vepa virtualport)
+               $(use_with virt-network network)
+               $(use_with wireshark-plugins wireshark-dissector)
+               $(use_with xen)
+               $(use_with xen xen-inotify)
+               $(usex xen --with-libxl '')
+
+               --without-hal
+               --without-netcf
+               --without-sanlock
+               --without-xenapi
+               --with-esx
+               --with-qemu-group=$(usex caps qemu root)
+               --with-qemu-user=$(usex caps qemu root)
+               --with-remote
+               --with-storage-fs
+               --with-vmware
+
+               --disable-static
+               --disable-werror
+
+               --docdir=/usr/share/doc/${PF}
+               --htmldir=/usr/share/doc/${PF}/html
+               --localstatedir=/var
+       )
 
-       ## 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 apparmor)"
-       myconf+=" $(use_with apparmor apparmor-profiles)"
-       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 glusterfs)"
-       myconf+=" $(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"
+               myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
        else
-               myconf+=" --with-qemu-user=root"
-               myconf+=" --with-qemu-group=root"
+               myeconfargs+=( $(use_with virtualbox vbox) )
        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
+       autotools-utils_src_configure
 
        if [[ ${PV} = *9999* ]]; then
                # Restore gnulib's config.sub and config.guess
@@ -424,13 +317,9 @@ src_test() {
 }
 
 src_install() {
-       emake install \
+       autotools-utils_src_compile 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"
+               SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
 
        find "${D}" -name '*.la' -delete || die
 
@@ -456,6 +345,8 @@ src_install() {
        newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
        newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
 
+       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+       DISABLE_AUTOFORMATTING=true
        readme.gentoo_create_doc
 }
 
@@ -464,16 +355,6 @@ pkg_preinst() {
        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() {
@@ -488,5 +369,7 @@ pkg_postinst() {
                FORCE_PRINT_ELOG=true
        fi
 
+       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+       DISABLE_AUTOFORMATTING=true
        readme.gentoo_print_elog
 }
index b949b33fa68521b0cf9a8e509a4988dabd66d50b..f345b06045479ffff3defb926530563989b320ea 100644 (file)
@@ -4,11 +4,7 @@
 
 EAPI=5
 
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
 
 BACKPORTS=""
 
@@ -21,9 +17,9 @@ if [[ ${PV} = *9999* ]]; then
 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"
+               SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
        else
-               SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
+               SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
        fi
        SRC_URI+=" ${BACKPORTS:+
                https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
@@ -31,45 +27,46 @@ else
        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"
-# TODO: Reenable IUSE wireshark-plugins
 IUSE="apparmor 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 ) )
+       selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+       xen elibc_glibc"
+
+REQUIRED_USE="
+       firewalld? ( virt-network )
+       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 )"
+       virtualbox? ( libvirtd )
+       xen? ( libvirtd )"
 
 # 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:0=
-       >=net-misc/curl-7.18.0
+RDEPEND="
+       app-misc/scrub
        dev-libs/libgcrypt:0
-       >=dev-libs/libxml2-2.7.6
        dev-libs/libnl:3
+       >=dev-libs/libxml2-2.7.6
+       >=net-analyzer/netcat6-1.0-r2
        >=net-libs/gnutls-1.0.25
        net-libs/libssh2
+       >=net-misc/curl-7.18.0
        sys-apps/dmidecode
        >=sys-apps/util-linux-2.17
        sys-devel/gettext
-       >=net-analyzer/netcat6-1.0-r2
-       app-misc/scrub
+       sys-libs/ncurses:0=
+       sys-libs/readline:=
        apparmor? ( sys-libs/libapparmor )
        audit? ( sys-process/audit )
        avahi? ( >=net-dns/avahi-0.6[dbus] )
@@ -77,8 +74,8 @@ RDEPEND="sys-libs/readline:=
        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 )
+       lxc? ( !systemd? ( sys-power/pm-utils ) )
        nfs? ( net-fs/nfs-utils )
        numa? (
                >sys-process/numactl-2.0.2
@@ -100,127 +97,26 @@ RDEPEND="sys-libs/readline:=
        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]
+       virt-network? (
+               net-dns/dnsmasq[script]
                net-firewall/ebtables
                >=net-firewall/iptables-1.4.10[ipv6]
                net-misc/radvd
                sys-apps/iproute2[-minimal]
                firewalld? ( net-firewall/firewalld )
        )
+       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 )
        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
        dev-perl/XML-XPath
-       dev-libs/libxslt"
-
-# gentoo.readme stuff:
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="Important: The openrc libvirtd init script is now broken up into two
-separate services: libvirtd, that solely handles the daemon, and
-libvirt-guests, that takes care of clients during shutdown/restart of the
-host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests
-and enable the service and start it:
-       $ rc-update add libvirt-guests
-       $ service libvirt-guests start
-
-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.
-
-If you are using dnsmasq on your system, you will have to configure
-/etc/dnsmasq.conf to enable the following settings:
-       bind-interfaces
-       interface or except-interface
-Otherwise you might have issues with your existing DNS server.
-
-For openrc users:
-
-       Please use /etc/conf.d/libvirtd to control the '--listen' parameter for
-       libvirtd.
-
-       Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of
-       the host. The default configuration will suspend and resume running kvm
-       guests with 'managedsave'. This behavior can be changed under
-       /etc/conf.d/libvirt-guests
-
-For systemd users:
-
-       Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf
-       to control the '--listen' parameter for libvirtd.
-
-       The configuration for the 'libvirt-guests.service' is found under
-       /etc/libvirt/libvirt-guests.conf"
-
-! use policykit && DOC_CONTENTS+="
-
-To allow normal users to connect to libvirtd you must change the unix sock
-group and/or perms in /etc/libvirt/libvirtd.conf"
-
-use caps && use qemu && DOC_CONTENTS+="
-
-libvirt will now start qemu/kvm VMs with non-root privileges. Ensure any
-resources your VMs use are accessible by qemu:qemu"
-
-LXC_CONFIG_CHECK="
-       ~CGROUPS
-       ~CGROUP_FREEZER
-       ~CGROUP_DEVICE
-       ~CGROUP_CPUACCT
-       ~CGROUP_SCHED
-       ~CGROUP_PERF
-       ~BLK_CGROUP
-       ~NET_CLS_CGROUP
-       ~CGROUP_NET_PRIO
-       ~CPUSETS
-       ~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."
+       virtual/pkgconfig"
 
 pkg_setup() {
        enewgroup qemu 77
@@ -234,18 +130,69 @@ pkg_setup() {
                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"
-
+       # Check kernel configuration:
        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}"
+       use fuse && CONFIG_CHECK+="
+               ~FUSE_FS"
+
+       use lvm && CONFIG_CHECK+="
+               ~BLK_DEV_DM
+               ~DM_MULTIPATH
+               ~DM_SNAPSHOT"
+
+       use lxc && CONFIG_CHECK+="
+               ~BLK_CGROUP
+               ~CGROUP_CPUACCT
+               ~CGROUP_DEVICE
+               ~CGROUP_FREEZER
+               ~CGROUP_NET_PRIO
+               ~CGROUP_PERF
+               ~CGROUPS
+               ~CGROUP_SCHED
+               ~CPUSETS
+               ~DEVPTS_MULTIPLE_INSTANCES
+               ~IPC_NS
+               ~MACVLAN
+               ~NAMESPACES
+               ~NET_CLS_CGROUP
+               ~NET_NS
+               ~PID_NS
+               ~POSIX_MQUEUE
+               ~SECURITYFS
+               ~USER_NS
+               ~UTS_NS
+               ~VETH
+               ~!GRKERNSEC_CHROOT_MOUNT
+               ~!GRKERNSEC_CHROOT_DOUBLE
+               ~!GRKERNSEC_CHROOT_PIVOT
+               ~!GRKERNSEC_CHROOT_CHMOD
+               ~!GRKERNSEC_CHROOT_CAPS"
+       # Handle specific kernel versions for different features
+       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+       kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+       use macvtap && CONFIG_CHECK+="
+               ~MACVTAP"
+
+       use virt-network && CONFIG_CHECK+="
+               ~BRIDGE_EBT_MARK_T
+               ~BRIDGE_NF_EBTABLES
+               ~NETFILTER_ADVANCED
+               ~NETFILTER_XT_CONNMARK
+               ~NETFILTER_XT_MARK
+               ~NETFILTER_XT_TARGET_CHECKSUM"
        # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
+       use virt-network && CONFIG_CHECK+="
+               ~BRIDGE_EBT_T_NAT
+               ~NET_ACT_POLICE
+               ~NET_CLS_FW
+               ~NET_CLS_U32
+               ~NET_SCH_HTB
+               ~NET_SCH_INGRESS
+               ~NET_SCH_SFQ"
+
+       ERROR_USER_NS="Optional depending on LXC configuration."
+
        if [[ -n ${CONFIG_CHECK} ]]; then
                linux-info_pkg_setup
        fi
@@ -270,145 +217,91 @@ src_prepare() {
                "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
                "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
 
-       [[ -n ${BACKPORTS} ]] && \
+       [[ -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-r15" "${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"
+       # Tweak the init script:
+       cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+               -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+               -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+               -e "s/USE_FLAG_RBD/$(usex rbd  ceph '')/" \
+               -i "${S}/libvirtd.init" || die "sed failed"
+
+       AUTOTOOLS_AUTORECONF=true
+       autotools-utils_src_prepare
 }
 
 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)"
+       local myeconfargs=(
+               $(use_with apparmor)
+               $(use_with apparmor apparmor-profiles)
+               $(use_with audit)
+               $(use_with avahi)
+               $(use_with caps capng)
+               $(use_with firewalld)
+               $(use_with fuse)
+               $(use_with glusterfs)
+               $(use_with glusterfs storage-gluster)
+               $(use_with iscsi storage-iscsi)
+               $(use_with libvirtd)
+               $(use_with lvm storage-lvm)
+               $(use_with lvm storage-mpath)
+               $(use_with lxc)
+               $(use_with macvtap)
+               $(use_enable nls)
+               $(use_with numa numactl)
+               $(use_with numa numad)
+               $(use_with openvz)
+               $(use_with parted storage-disk)
+               $(use_with pcap libpcap)
+               $(use_with phyp)
+               $(use_with policykit polkit)
+               $(use_with qemu)
+               $(use_with qemu yajl)
+               $(use_with rbd storage-rbd)
+               $(use_with sasl)
+               $(use_with selinux)
+               $(use_with systemd systemd-daemon)
+               $(usex systemd --with-init-script=systemd '')
+               $(use_with udev)
+               $(use_with uml)
+               $(use_with vepa virtualport)
+               $(use_with virt-network network)
+               $(use_with wireshark-plugins wireshark-dissector)
+               $(use_with xen)
+               $(use_with xen xen-inotify)
+               $(usex xen --with-libxl '')
+
+               --without-hal
+               --without-netcf
+               --without-sanlock
+               --without-xenapi
+               --with-esx
+               --with-qemu-group=$(usex caps qemu root)
+               --with-qemu-user=$(usex caps qemu root)
+               --with-remote
+               --with-storage-fs
+               --with-vmware
+
+               --disable-static
+               --disable-werror
+
+               --docdir=/usr/share/doc/${PF}
+               --htmldir=/usr/share/doc/${PF}/html
+               --localstatedir=/var
+       )
 
-       ## 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 apparmor)"
-       myconf+=" $(use_with apparmor apparmor-profiles)"
-       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 glusterfs)"
-       myconf+=" $(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"
+               myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
        else
-               myconf+=" --with-qemu-user=root"
-               myconf+=" --with-qemu-group=root"
+               myeconfargs+=( $(use_with virtualbox vbox) )
        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
+       autotools-utils_src_configure
 
        if [[ ${PV} = *9999* ]]; then
                # Restore gnulib's config.sub and config.guess
@@ -424,13 +317,9 @@ src_test() {
 }
 
 src_install() {
-       emake install \
+       autotools-utils_src_compile 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"
+               SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
 
        find "${D}" -name '*.la' -delete || die
 
@@ -456,6 +345,8 @@ src_install() {
        newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
        newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
 
+       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+       DISABLE_AUTOFORMATTING=true
        readme.gentoo_create_doc
 }
 
@@ -464,16 +355,6 @@ pkg_preinst() {
        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() {
@@ -488,5 +369,7 @@ pkg_postinst() {
                FORCE_PRINT_ELOG=true
        fi
 
+       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+       DISABLE_AUTOFORMATTING=true
        readme.gentoo_print_elog
 }
index b949b33fa68521b0cf9a8e509a4988dabd66d50b..f345b06045479ffff3defb926530563989b320ea 100644 (file)
@@ -4,11 +4,7 @@
 
 EAPI=5
 
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
 
 BACKPORTS=""
 
@@ -21,9 +17,9 @@ if [[ ${PV} = *9999* ]]; then
 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"
+               SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
        else
-               SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
+               SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
        fi
        SRC_URI+=" ${BACKPORTS:+
                https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
@@ -31,45 +27,46 @@ else
        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"
-# TODO: Reenable IUSE wireshark-plugins
 IUSE="apparmor 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 ) )
+       selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+       xen elibc_glibc"
+
+REQUIRED_USE="
+       firewalld? ( virt-network )
+       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 )"
+       virtualbox? ( libvirtd )
+       xen? ( libvirtd )"
 
 # 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:0=
-       >=net-misc/curl-7.18.0
+RDEPEND="
+       app-misc/scrub
        dev-libs/libgcrypt:0
-       >=dev-libs/libxml2-2.7.6
        dev-libs/libnl:3
+       >=dev-libs/libxml2-2.7.6
+       >=net-analyzer/netcat6-1.0-r2
        >=net-libs/gnutls-1.0.25
        net-libs/libssh2
+       >=net-misc/curl-7.18.0
        sys-apps/dmidecode
        >=sys-apps/util-linux-2.17
        sys-devel/gettext
-       >=net-analyzer/netcat6-1.0-r2
-       app-misc/scrub
+       sys-libs/ncurses:0=
+       sys-libs/readline:=
        apparmor? ( sys-libs/libapparmor )
        audit? ( sys-process/audit )
        avahi? ( >=net-dns/avahi-0.6[dbus] )
@@ -77,8 +74,8 @@ RDEPEND="sys-libs/readline:=
        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 )
+       lxc? ( !systemd? ( sys-power/pm-utils ) )
        nfs? ( net-fs/nfs-utils )
        numa? (
                >sys-process/numactl-2.0.2
@@ -100,127 +97,26 @@ RDEPEND="sys-libs/readline:=
        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]
+       virt-network? (
+               net-dns/dnsmasq[script]
                net-firewall/ebtables
                >=net-firewall/iptables-1.4.10[ipv6]
                net-misc/radvd
                sys-apps/iproute2[-minimal]
                firewalld? ( net-firewall/firewalld )
        )
+       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 )
        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
        dev-perl/XML-XPath
-       dev-libs/libxslt"
-
-# gentoo.readme stuff:
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="Important: The openrc libvirtd init script is now broken up into two
-separate services: libvirtd, that solely handles the daemon, and
-libvirt-guests, that takes care of clients during shutdown/restart of the
-host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests
-and enable the service and start it:
-       $ rc-update add libvirt-guests
-       $ service libvirt-guests start
-
-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.
-
-If you are using dnsmasq on your system, you will have to configure
-/etc/dnsmasq.conf to enable the following settings:
-       bind-interfaces
-       interface or except-interface
-Otherwise you might have issues with your existing DNS server.
-
-For openrc users:
-
-       Please use /etc/conf.d/libvirtd to control the '--listen' parameter for
-       libvirtd.
-
-       Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of
-       the host. The default configuration will suspend and resume running kvm
-       guests with 'managedsave'. This behavior can be changed under
-       /etc/conf.d/libvirt-guests
-
-For systemd users:
-
-       Please use /etc/systemd/system/libvirtd.service.d/00gentoo.conf
-       to control the '--listen' parameter for libvirtd.
-
-       The configuration for the 'libvirt-guests.service' is found under
-       /etc/libvirt/libvirt-guests.conf"
-
-! use policykit && DOC_CONTENTS+="
-
-To allow normal users to connect to libvirtd you must change the unix sock
-group and/or perms in /etc/libvirt/libvirtd.conf"
-
-use caps && use qemu && DOC_CONTENTS+="
-
-libvirt will now start qemu/kvm VMs with non-root privileges. Ensure any
-resources your VMs use are accessible by qemu:qemu"
-
-LXC_CONFIG_CHECK="
-       ~CGROUPS
-       ~CGROUP_FREEZER
-       ~CGROUP_DEVICE
-       ~CGROUP_CPUACCT
-       ~CGROUP_SCHED
-       ~CGROUP_PERF
-       ~BLK_CGROUP
-       ~NET_CLS_CGROUP
-       ~CGROUP_NET_PRIO
-       ~CPUSETS
-       ~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."
+       virtual/pkgconfig"
 
 pkg_setup() {
        enewgroup qemu 77
@@ -234,18 +130,69 @@ pkg_setup() {
                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"
-
+       # Check kernel configuration:
        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}"
+       use fuse && CONFIG_CHECK+="
+               ~FUSE_FS"
+
+       use lvm && CONFIG_CHECK+="
+               ~BLK_DEV_DM
+               ~DM_MULTIPATH
+               ~DM_SNAPSHOT"
+
+       use lxc && CONFIG_CHECK+="
+               ~BLK_CGROUP
+               ~CGROUP_CPUACCT
+               ~CGROUP_DEVICE
+               ~CGROUP_FREEZER
+               ~CGROUP_NET_PRIO
+               ~CGROUP_PERF
+               ~CGROUPS
+               ~CGROUP_SCHED
+               ~CPUSETS
+               ~DEVPTS_MULTIPLE_INSTANCES
+               ~IPC_NS
+               ~MACVLAN
+               ~NAMESPACES
+               ~NET_CLS_CGROUP
+               ~NET_NS
+               ~PID_NS
+               ~POSIX_MQUEUE
+               ~SECURITYFS
+               ~USER_NS
+               ~UTS_NS
+               ~VETH
+               ~!GRKERNSEC_CHROOT_MOUNT
+               ~!GRKERNSEC_CHROOT_DOUBLE
+               ~!GRKERNSEC_CHROOT_PIVOT
+               ~!GRKERNSEC_CHROOT_CHMOD
+               ~!GRKERNSEC_CHROOT_CAPS"
+       # Handle specific kernel versions for different features
+       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+       kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+       use macvtap && CONFIG_CHECK+="
+               ~MACVTAP"
+
+       use virt-network && CONFIG_CHECK+="
+               ~BRIDGE_EBT_MARK_T
+               ~BRIDGE_NF_EBTABLES
+               ~NETFILTER_ADVANCED
+               ~NETFILTER_XT_CONNMARK
+               ~NETFILTER_XT_MARK
+               ~NETFILTER_XT_TARGET_CHECKSUM"
        # Bandwidth Limiting Support
-       use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
+       use virt-network && CONFIG_CHECK+="
+               ~BRIDGE_EBT_T_NAT
+               ~NET_ACT_POLICE
+               ~NET_CLS_FW
+               ~NET_CLS_U32
+               ~NET_SCH_HTB
+               ~NET_SCH_INGRESS
+               ~NET_SCH_SFQ"
+
+       ERROR_USER_NS="Optional depending on LXC configuration."
+
        if [[ -n ${CONFIG_CHECK} ]]; then
                linux-info_pkg_setup
        fi
@@ -270,145 +217,91 @@ src_prepare() {
                "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
                "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
 
-       [[ -n ${BACKPORTS} ]] && \
+       [[ -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-r15" "${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"
+       # Tweak the init script:
+       cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+               -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+               -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+               -e "s/USE_FLAG_RBD/$(usex rbd  ceph '')/" \
+               -i "${S}/libvirtd.init" || die "sed failed"
+
+       AUTOTOOLS_AUTORECONF=true
+       autotools-utils_src_prepare
 }
 
 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)"
+       local myeconfargs=(
+               $(use_with apparmor)
+               $(use_with apparmor apparmor-profiles)
+               $(use_with audit)
+               $(use_with avahi)
+               $(use_with caps capng)
+               $(use_with firewalld)
+               $(use_with fuse)
+               $(use_with glusterfs)
+               $(use_with glusterfs storage-gluster)
+               $(use_with iscsi storage-iscsi)
+               $(use_with libvirtd)
+               $(use_with lvm storage-lvm)
+               $(use_with lvm storage-mpath)
+               $(use_with lxc)
+               $(use_with macvtap)
+               $(use_enable nls)
+               $(use_with numa numactl)
+               $(use_with numa numad)
+               $(use_with openvz)
+               $(use_with parted storage-disk)
+               $(use_with pcap libpcap)
+               $(use_with phyp)
+               $(use_with policykit polkit)
+               $(use_with qemu)
+               $(use_with qemu yajl)
+               $(use_with rbd storage-rbd)
+               $(use_with sasl)
+               $(use_with selinux)
+               $(use_with systemd systemd-daemon)
+               $(usex systemd --with-init-script=systemd '')
+               $(use_with udev)
+               $(use_with uml)
+               $(use_with vepa virtualport)
+               $(use_with virt-network network)
+               $(use_with wireshark-plugins wireshark-dissector)
+               $(use_with xen)
+               $(use_with xen xen-inotify)
+               $(usex xen --with-libxl '')
+
+               --without-hal
+               --without-netcf
+               --without-sanlock
+               --without-xenapi
+               --with-esx
+               --with-qemu-group=$(usex caps qemu root)
+               --with-qemu-user=$(usex caps qemu root)
+               --with-remote
+               --with-storage-fs
+               --with-vmware
+
+               --disable-static
+               --disable-werror
+
+               --docdir=/usr/share/doc/${PF}
+               --htmldir=/usr/share/doc/${PF}/html
+               --localstatedir=/var
+       )
 
-       ## 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 apparmor)"
-       myconf+=" $(use_with apparmor apparmor-profiles)"
-       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 glusterfs)"
-       myconf+=" $(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"
+               myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
        else
-               myconf+=" --with-qemu-user=root"
-               myconf+=" --with-qemu-group=root"
+               myeconfargs+=( $(use_with virtualbox vbox) )
        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
+       autotools-utils_src_configure
 
        if [[ ${PV} = *9999* ]]; then
                # Restore gnulib's config.sub and config.guess
@@ -424,13 +317,9 @@ src_test() {
 }
 
 src_install() {
-       emake install \
+       autotools-utils_src_compile 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"
+               SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
 
        find "${D}" -name '*.la' -delete || die
 
@@ -456,6 +345,8 @@ src_install() {
        newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
        newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
 
+       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+       DISABLE_AUTOFORMATTING=true
        readme.gentoo_create_doc
 }
 
@@ -464,16 +355,6 @@ pkg_preinst() {
        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() {
@@ -488,5 +369,7 @@ pkg_postinst() {
                FORCE_PRINT_ELOG=true
        fi
 
+       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+       DISABLE_AUTOFORMATTING=true
        readme.gentoo_print_elog
 }