From 3f41b6112e35ab0e2f687086cc95651899f8ae98 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 5 Oct 2015 01:13:59 -0500 Subject: [PATCH] app-emulation/libvirt: ebuild maintenance (1.2.19, 1.2.20, 9999) - 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 | 53 +++ .../libvirt/libvirt-1.2.19-r1.ebuild | 449 +++++++----------- app-emulation/libvirt/libvirt-1.2.20.ebuild | 449 +++++++----------- app-emulation/libvirt/libvirt-9999.ebuild | 449 +++++++----------- 4 files changed, 551 insertions(+), 849 deletions(-) create mode 100644 app-emulation/libvirt/files/README.gentoo-r1 diff --git a/app-emulation/libvirt/files/README.gentoo-r1 b/app-emulation/libvirt/files/README.gentoo-r1 new file mode 100644 index 000000000000..74d1e77930d8 --- /dev/null +++ b/app-emulation/libvirt/files/README.gentoo-r1 @@ -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. diff --git a/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild index b949b33fa685..f345b0604547 100644 --- a/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild +++ b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild @@ -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 =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 } diff --git a/app-emulation/libvirt/libvirt-1.2.20.ebuild b/app-emulation/libvirt/libvirt-1.2.20.ebuild index b949b33fa685..f345b0604547 100644 --- a/app-emulation/libvirt/libvirt-1.2.20.ebuild +++ b/app-emulation/libvirt/libvirt-1.2.20.ebuild @@ -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 =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 } diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index b949b33fa685..f345b0604547 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -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 =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 } -- 2.26.2