diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2010-08-05 15:53:01 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2010-08-05 15:53:01 +0000 |
commit | d7c33f7f18961885c3470403ec401f98d66f6a4e (patch) | |
tree | 6cb2265434c5a304844c0b2e527f853b5b5b590d /app-emulation | |
parent | netbeans-6.9.1: version bump (diff) | |
download | gentoo-2-d7c33f7f18961885c3470403ec401f98d66f6a4e.tar.gz gentoo-2-d7c33f7f18961885c3470403ec401f98d66f6a4e.tar.bz2 gentoo-2-d7c33f7f18961885c3470403ec401f98d66f6a4e.zip |
Remove old version that wasn't properly applying patches and fix patch application for the future
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/libvirt/ChangeLog | 7 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-0.8.1-r1.ebuild | 212 | ||||
-rw-r--r-- | app-emulation/libvirt/libvirt-0.8.2-r1.ebuild | 5 |
3 files changed, 9 insertions, 215 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index e43132820366..b5f2aba09383 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/libvirt # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.62 2010/08/01 19:32:02 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.63 2010/08/05 15:53:01 cardoe Exp $ + + 05 Aug 2010; Doug Goldstein <cardoe@gentoo.org> -libvirt-0.8.1-r1.ebuild, + libvirt-0.8.2-r1.ebuild: + Remove old version that wasn't properly applying patches and fix patch + application for the future 01 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> files/libvirtd.init-r1: diff --git a/app-emulation/libvirt/libvirt-0.8.1-r1.ebuild b/app-emulation/libvirt/libvirt-0.8.1-r1.ebuild deleted file mode 100644 index 92a7c6e67dd3..000000000000 --- a/app-emulation/libvirt/libvirt-0.8.1-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.1-r1.ebuild,v 1.2 2010/07/29 21:31:58 cardoe Exp $ - -BACKPORTS=1 - -EAPI="2" - -PYTHON_DEPEND="python? 2:2.4" -#RESTRICT_PYTHON_ABIS="3.*" -#SUPPORT_PYTHON_ABIS="1" - -inherit eutils python - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" -SRC_URI="http://libvirt.org/sources/${P}.tar.gz - ${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="avahi caps iscsi +libvirtd lvm +lxc +network nfs nls numa openvz \ - parted phyp policykit python qemu sasl selinux uml virtualbox xen udev" -# IUSE=one : bug #293416 & bug# 299011 - -# Some tests are simply broken in the released tarball, ignore them -# for now. -RESTRICT=test - -RDEPEND="sys-libs/readline - sys-libs/ncurses - >=net-misc/curl-7.18.0 - >=dev-libs/libxml2-2.7.6 - >=net-libs/gnutls-1.0.25 - sys-fs/sysfsutils - sys-apps/util-linux - >=net-analyzer/netcat6-1.0-r2 - avahi? ( >=net-dns/avahi-0.6[dbus] ) - caps? ( sys-libs/libcap-ng ) - iscsi? ( sys-block/open-iscsi ) - libvirtd? ( net-misc/bridge-utils ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) - nfs? ( net-fs/nfs-utils ) - numa? ( sys-process/numactl ) - openvz? ( sys-kernel/openvz-sources ) - parted? ( >=sys-apps/parted-1.8 ) - phyp? ( net-libs/libssh2 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) ) - xen? ( app-emulation/xen-tools app-emulation/xen ) - udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )" -# one? ( dev-libs/xmlrpc-c ) -DEPEND="${RDEPEND} - dev-util/pkgconfig - nls? ( sys-devel/gettext )" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - [[ -n ${BACKPORTS} ]] && \ - EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" epatch -} - -src_configure() { - local myconf="" - - ## enable/disable daemon, otherwise client only utils - myconf="${myconf} $(use_with libvirtd)" - - ## enable/disable the daemon using avahi to find VMs - myconf="${myconf} $(use_with avahi)" - - ## hypervisors on the local host - myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)" - if ! use policykit && use xen; then - myconf="${myconf} --with-xen-proxy" - fi - myconf="${myconf} $(use_with openvz)" - myconf="${myconf} $(use_with lxc)" - myconf="${myconf} $(use_with virtualbox vbox)" - myconf="${myconf} $(use_with uml)" - myconf="${myconf} $(use_with qemu)" - # doesn't belong with hypervisors but links to libvirtd for some reason - #myconf="${myconf} $(use_with one)" - - ## hypervisor protocols - myconf="${myconf} $(use_with phyp)" - myconf="${myconf} --with-esx" - - ## additional host drivers - myconf="${myconf} $(use_with network)" - myconf="${myconf} --with-storage-fs" - myconf="${myconf} $(use_with lvm storage-lvm)" - myconf="${myconf} $(use_with iscsi storage-iscsi)" - myconf="${myconf} $(use_with parted storage-disk)" - myconf="${myconf} $(use_with lvm storage-mpath)" - myconf="${myconf} $(use_with numa numactl)" - myconf="${myconf} $(use_with selinux)" - - # udev for device support details - myconf="${myconf} $(use_with udev)" - - # linux capability support so we don't need privileged accounts - myconf="${myconf} $(use_with caps capng)" - - ## auth stuff - myconf="${myconf} $(use_with policykit polkit)" - myconf="${myconf} $(use_with sasl)" - - ## other - myconf="${myconf} $(use_enable nls)" - myconf="${myconf} $(use_with python)" - - ## stuff we don't yet support - myconf="${myconf} --without-netcf" - - # we use udev over hal - myconf="${myconf} --without-hal" - - # this is a nasty trick to work around the problem in bug - # #275073. The reason why we don't solve this properly is that - # it'll require us to rebuild autotools (and we don't really want - # to do that right now). The proper solution has been sent - # upstream and should hopefully land in 0.7.7, in the mean time, - # mime the same functionality with this. - case ${CHOST} in - *cygwin* | *mingw* ) - ;; - *) - ac_cv_prog_WINDRES=no - ;; - esac - - econf \ - ${myconf} \ - --disable-static \ - --docdir=/usr/share/doc/${PF} \ - --with-remote \ - --localstatedir=/var \ - --with-remote-pid-file=/var/run/libvirtd.pid -} - -src_test() { - # Explicitly allow parallel build of tests - emake check || die "tests failed" -} - -src_install() { - emake install \ - DESTDIR="${D}" \ - HTML_DIR=/usr/share/doc/${PF}/html \ - DOCS_DIR=/usr/share/doc/${PF}/python \ - EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \ - || die "emake install failed" - - newinitd "${FILESDIR}/libvirtd.init" libvirtd || die - newconfd "${FILESDIR}/libvirtd.confd" libvirtd || die - - keepdir /var/lib/libvirt/images - - find "${D}" -name '*.la' -delete || die -} - -pkg_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml - fi -} - -pkg_postinst() { - use python && python_mod_optimize $(python_get_sitedir)/libvirt.py - - elog - if use policykit; then - elog "You must have run the following at least once:" - elog - elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\"" - elog - elog "to grant USERNAME access to libvirt when using USE=policykit" - else - elog "To allow normal users to connect to libvirtd you must change the" - elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf" - fi - elog - elog "For the basic networking support (bridged and routed networks)" - elog "you don't need any extra software. For more complex network modes" - elog "including but not limited to NATed network, you'll need the" - elog "following packages": - elog - elog " net-dns/dnsmasq" - elog " net-firewall/iptables" - elog " net-firewall/ebtables" - elog - if has_version net-dns/dnsmasq; then - ewarn "If you have a DNS server setup on your machine, you will have" - ewarn "to configure /etc/dnsmasq.conf to enable the following settings: " - ewarn " bind-interfaces" - ewarn " interface or except-interface" - ewarn - ewarn "Otherwise you might have issues with your existing DNS server." - fi -} - -pkg_postrm() { - use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py -} diff --git a/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild b/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild index c25014f58989..76a57a1c06df 100644 --- a/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild +++ b/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild,v 1.3 2010/07/29 21:31:58 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild,v 1.4 2010/08/05 15:53:00 cardoe Exp $ #BACKPORTS=1 @@ -65,7 +65,8 @@ pkg_setup() { src_prepare() { [[ -n ${BACKPORTS} ]] && \ - EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" epatch + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ + epatch } src_configure() { |