Stabilize various 2.x releases finally, ebuild cleanup

(Portage version: 2.1.9.25/cvs/Linux x86_64)

7 files changed, 15 insertions, 254 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index c5fe7c30d8bd..01f31ca98273 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.38 2011/01/22 02:07:43 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.39 2011/01/22 20:05:06 ramereth Exp $
+
+  22 Jan 2011; Lance Albertson <ramereth@gentoo.org> ganeti-2.0.6.ebuild,
+  ganeti-2.1.8.ebuild, -ganeti-2.2.0.ebuild, -ganeti-2.2.1.ebuild,
+  ganeti-2.2.2.ebuild, -ganeti-2.3.0.ebuild:
+  Stabilize various 2.x releases finally, ebuild cleanup
 
 *ganeti-2.4.0_beta1 (22 Jan 2011)
 
diff --git a/app-emulation/ganeti/ganeti-2.0.6.ebuild b/app-emulation/ganeti/ganeti-2.0.6.ebuild
index a42ace39f741..e0fbaf2d6393 100644
--- a/app-emulation/ganeti/ganeti-2.0.6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.0.6.ebuild,v 1.1 2010/02/06 22:51:21 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.0.6.ebuild,v 1.2 2011/01/22 20:05:06 ramereth Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://ganeti.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kvm xen drbd"
 
 DEPEND="xen? ( >=app-emulation/xen-3.0 )
diff --git a/app-emulation/ganeti/ganeti-2.1.8.ebuild b/app-emulation/ganeti/ganeti-2.1.8.ebuild
index 9228a77ebdaf..70503ce7cd2d 100644
--- a/app-emulation/ganeti/ganeti-2.1.8.ebuild
+++ b/app-emulation/ganeti/ganeti-2.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.8.ebuild,v 1.1 2010/11/16 17:25:11 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.8.ebuild,v 1.2 2011/01/22 20:05:06 ramereth Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kvm xen drbd +filestorage syslog"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/ganeti/ganeti-2.2.0.ebuild b/app-emulation/ganeti/ganeti-2.2.0.ebuild
deleted file mode 100644
index d02fa301fa9d..000000000000
--- a/app-emulation/ganeti/ganeti-2.2.0.ebuild
+++ /dev/null
@@ -1,81 +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.2.0.ebuild,v 1.2 2010/11/23 15:43:30 ramereth Exp $
-
-EAPI=2
-
-inherit eutils confutils bash-completion
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-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 +filestorage syslog"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu-kvm )
-	drbd? ( >=sys-cluster/drbd-8.3 )
-	dev-libs/openssl
-	dev-python/paramiko
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pycurl
-	dev-python/pyinotify
-	dev-python/simplejson
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2"
-RDEPEND="${DEPEND}"
-
-pkg_setup () {
-	confutils_require_any kvm xen
-}
-
-src_configure () {
-	local myconf
-	if use filestorage ; then
-		myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
-	else
-		myconf="--with-file-storage-dir=no"
-	fi
-	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 \
-		$(use_enable syslog) \
-		${myconf}
-}
-
-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
-	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.2.1.ebuild b/app-emulation/ganeti/ganeti-2.2.1.ebuild
deleted file mode 100644
index e0e44ccf9898..000000000000
--- a/app-emulation/ganeti/ganeti-2.2.1.ebuild
+++ /dev/null
@@ -1,81 +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.2.1.ebuild,v 1.2 2010/11/23 15:43:30 ramereth Exp $
-
-EAPI=2
-
-inherit eutils confutils bash-completion
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-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 +filestorage syslog"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu-kvm )
-	drbd? ( >=sys-cluster/drbd-8.3 )
-	dev-libs/openssl
-	dev-python/paramiko
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pycurl
-	dev-python/pyinotify
-	dev-python/simplejson
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2"
-RDEPEND="${DEPEND}"
-
-pkg_setup () {
-	confutils_require_any kvm xen
-}
-
-src_configure () {
-	local myconf
-	if use filestorage ; then
-		myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
-	else
-		myconf="--with-file-storage-dir=no"
-	fi
-	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 \
-		$(use_enable syslog) \
-		${myconf}
-}
-
-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
-	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.2.2.ebuild b/app-emulation/ganeti/ganeti-2.2.2.ebuild
index 1845c85a5458..966b73b81c5e 100644
--- a/app-emulation/ganeti/ganeti-2.2.2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.2.2.ebuild,v 1.2 2010/11/23 15:43:30 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.2.2.ebuild,v 1.3 2011/01/22 20:05:06 ramereth Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kvm xen drbd +filestorage syslog"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/ganeti/ganeti-2.3.0.ebuild b/app-emulation/ganeti/ganeti-2.3.0.ebuild
deleted file mode 100644
index 8da83ceadfb5..000000000000
--- a/app-emulation/ganeti/ganeti-2.3.0.ebuild
+++ /dev/null
@@ -1,82 +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.3.0.ebuild,v 1.1 2010/12/01 17:26:57 ramereth Exp $
-
-EAPI=2
-
-inherit eutils confutils bash-completion
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-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 +filestorage syslog ipv6"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu-kvm )
-	drbd? ( >=sys-cluster/drbd-8.3 )
-	ipv6? ( net-misc/ndisc6 )
-	dev-libs/openssl
-	dev-python/paramiko
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pycurl
-	dev-python/pyinotify
-	dev-python/simplejson
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2"
-RDEPEND="${DEPEND}"
-
-pkg_setup () {
-	confutils_require_any kvm xen
-}
-
-src_configure () {
-	local myconf
-	if use filestorage ; then
-		myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
-	else
-		myconf="--with-file-storage-dir=no"
-	fi
-	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 \
-		$(use_enable syslog) \
-		${myconf}
-}
-
-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
-	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
-}