version bump, ebuild & patch cleanup

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 10 insertions, 122 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index c0ce54b618fa..19066fa6c4b1 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.21 2010/05/07 18:57:43 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.22 2010/06/07 22:26:03 ramereth Exp $
+
+*ganeti-2.1.3 (07 Jun 2010)
+
+  07 Jun 2010; Lance Albertson <ramereth@gentoo.org> -ganeti-2.1.0.ebuild,
+  -files/ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch,
+  -ganeti-2.1.1.ebuild, -files/ganeti-2.1.1-disable-check-man.patch,
+  +ganeti-2.1.3.ebuild:
+  version bump, ebuild & patch cleanup
 
 *ganeti-2.1.2.1 (07 May 2010)
 
diff --git a/app-emulation/ganeti/files/ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch b/app-emulation/ganeti/files/ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch
deleted file mode 100644
index b44ec57116e2..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4c41d9025ddbc5d093d58b81bf9b31d735a4a162 Mon Sep 17 00:00:00 2001
-From: Lance Albertson <lance@osuosl.org>
-Date: Wed, 9 Dec 2009 00:42:53 -0800
-Subject: Fix brctl path for Gentoo
-
----
- lib/hypervisor/hv_kvm.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
-index a153d36..5700034 100644
---- a/lib/hypervisor/hv_kvm.py
-+++ b/lib/hypervisor/hv_kvm.py
-@@ -181,7 +181,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
-     script.write("  /sbin/ifconfig $INTERFACE 0.0.0.0 up\n")
-     if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
-       script.write("  # Connect the interface to the bridge\n")
--      script.write("  /usr/sbin/brctl addif $BRIDGE $INTERFACE\n")
-+      script.write("  /sbin/brctl addif $BRIDGE $INTERFACE\n")
-     elif nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_ROUTED:
-       script.write("  # Route traffic targeted at the IP to the interface\n")
-       if nic.nicparams[constants.NIC_LINK]:
--- 
-1.6.2.5
-
diff --git a/app-emulation/ganeti/files/ganeti-2.1.1-disable-check-man.patch b/app-emulation/ganeti/files/ganeti-2.1.1-disable-check-man.patch
deleted file mode 100644
index 5c2868d1a0fd..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.1.1-disable-check-man.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur ganeti-2.1.1/Makefile.in ganeti-2.1.1.new/Makefile.in
---- ganeti-2.1.1/Makefile.in	2010-03-12 03:04:33.000000000 -0800
-+++ ganeti-2.1.1.new/Makefile.in	2010-03-12 11:07:47.000000000 -0800
-@@ -1320,11 +1320,11 @@
- 
- man/%.7: man/%.7.in $(REPLACE_VARS_SED)
- 	sed -f $(REPLACE_VARS_SED) < $< > $@
--	$(CHECK_MAN) $@
-+	#$(CHECK_MAN) $@
- 
- man/%.8: man/%.8.in $(REPLACE_VARS_SED)
- 	sed -f $(REPLACE_VARS_SED) < $< > $@
--	$(CHECK_MAN) $@
-+	#$(CHECK_MAN) $@
- 
- man/%.html: man/%.html.in $(REPLACE_VARS_SED)
- 	sed -f $(REPLACE_VARS_SED) < $< > $@
diff --git a/app-emulation/ganeti/ganeti-2.1.0.ebuild b/app-emulation/ganeti/ganeti-2.1.0.ebuild
deleted file mode 100644
index 9aa8db147b71..000000000000
--- a/app-emulation/ganeti/ganeti-2.1.0.ebuild
+++ /dev/null
@@ -1,74 +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/ganeti/ganeti-2.1.0.ebuild,v 1.1 2010/03/07 20:56:03 ramereth Exp $
-
-EAPI=2
-
-inherit eutils confutils bash-completion
-
-MY_PV="${PV/_rc/~rc}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kvm xen drbd"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu-kvm )
-	drbd? ( >=sys-cluster/drbd-8.0 )
-	dev-libs/openssl
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pyinotify
-	dev-python/simplejson
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2"
-RDEPEND="${DEPEND}"
-
-src_prepare () {
-	epatch "${FILESDIR}/${PN}-2.1.0_rc1-fix-brctl-path-for-gentoo.patch"
-}
-
-pkg_setup () {
-	confutils_require_any kvm xen
-}
-
-src_configure () {
-	econf --localstatedir=/var \
-		--docdir=/usr/share/doc/${P} \
-		--with-ssh-initscript=/etc/init.d/sshd \
-		--with-export-dir=/var/lib/ganeti-storage/export \
-		--with-os-search-path=/usr/share/ganeti/os \
-		--with-file-storage-dir=/var/lib/ganeti-storage/file
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
-	newconfd "${FILESDIR}"/ganeti.confd ganeti
-	dobashcompletion doc/examples/bash_completion ganeti
-	dodoc INSTALL NEWS README doc/*.{rst,png}
-	rm -rf "${D}"/usr/share/doc/ganeti
-	docinto examples
-	dodoc doc/examples/{dumb-allocator,ganeti.cron,gnt-config-backup}
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /usr/share/ganeti/os/
-	keepdir /var/lib/ganeti-storage/{export,file}/
-}
-
-pkg_postinst () {
-	bash-completion_pkg_postinst
-}
diff --git a/app-emulation/ganeti/ganeti-2.1.1.ebuild b/app-emulation/ganeti/ganeti-2.1.3.ebuild
index 989660e85fc8..cf92fd43b0bc 100644
--- a/app-emulation/ganeti/ganeti-2.1.1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.1.3.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/ganeti/ganeti-2.1.1.ebuild,v 1.1 2010/03/12 19:21:58 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.3.ebuild,v 1.1 2010/06/07 22:26:03 ramereth Exp $
 
 EAPI=2
 
@@ -35,10 +35,6 @@ DEPEND="xen? ( >=app-emulation/xen-3.0 )
 	sys-fs/lvm2"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-disable-check-man.patch
-}
-
 pkg_setup () {
 	confutils_require_any kvm xen
 }