Stabilize latest release, ebuild cleanup

(Portage version: 2.1.9.25/cvs/Linux x86_64)

5 files changed, 12 insertions, 142 deletions

diff --git a/app-emulation/ganeti-instance-debootstrap/ChangeLog b/app-emulation/ganeti-instance-debootstrap/ChangeLog
index e21a5d06ecd0..322669c3071a 100644
--- a/app-emulation/ganeti-instance-debootstrap/ChangeLog
+++ b/app-emulation/ganeti-instance-debootstrap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/ganeti-instance-debootstrap
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-instance-debootstrap/ChangeLog,v 1.3 2010/03/12 19:29:10 ramereth Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-instance-debootstrap/ChangeLog,v 1.4 2011/01/22 20:08:10 ramereth Exp $
+
+  22 Jan 2011; Lance Albertson <ramereth@gentoo.org>
+  -ganeti-instance-debootstrap-0.7.ebuild,
+  -files/ganeti-instance-debootstrap-0.7-no-etc-default.patch,
+  -ganeti-instance-debootstrap-0.8.ebuild,
+  ganeti-instance-debootstrap-0.9.ebuild:
+  Stabilize latest release, ebuild cleanup
 
 *ganeti-instance-debootstrap-0.9 (12 Mar 2010)
 
diff --git a/app-emulation/ganeti-instance-debootstrap/files/ganeti-instance-debootstrap-0.7-no-etc-default.patch b/app-emulation/ganeti-instance-debootstrap/files/ganeti-instance-debootstrap-0.7-no-etc-default.patch
deleted file mode 100644
index 4137684883da..000000000000
--- a/app-emulation/ganeti-instance-debootstrap/files/ganeti-instance-debootstrap-0.7-no-etc-default.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ruN ganeti-instance-debootstrap-0.7.orig/README ganeti-instance-debootstrap-0.7/README
---- ganeti-instance-debootstrap-0.7.orig/README	2009-09-22 21:43:35.000000000 -0700
-+++ ganeti-instance-debootstrap-0.7/README	2009-09-22 21:48:10.000000000 -0700
-@@ -41,9 +41,9 @@
- The kind of instance created can be customized via a settings file. This
- file is not installed by default, as the instance creation will work
- without it. The creation scripts will look for it in
--``$sysconfdir/default/ganeti-instance-debootstrap``, so if you have run
-+``$sysconfdir/ganeti/ganeti-instance-debootstrap``, so if you have run
- configure with the parameter ``--sysconfdir=/etc``, the final filename
--will be ``/etc/default/ganeti-instance-debootstrap``.
-+will be ``/etc/ganeti/ganeti-instance-debootstrap``.
- 
- The following settings will be examined in this file (see also the file
- named 'defaults' in the source distribution for more details):
-@@ -59,7 +59,7 @@
-   them work nicely under Xen; the example file containts a few
-   suggestions
- - CUSTOMIZE_DIR: a directory containing customization script for the instance.
--  (by default $sysconfdir/ganeti/instance-debootstrap.d) See "Customization of
-+  (by default $sysconfdir/ganeti/ganeti-instance-debootstrap.d) See "Customization of
-   the instance" below.
- - GENERATE_CACHE: if 'yes' (the default), the installation process will
-   save and reuse a cache file to speed reinstalls (located under
-@@ -83,13 +83,14 @@
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 
- If run-parts is in the os create script, and the CUSTOMIZE_DIR (by default
--$sysconfdir/ganeti/instance-debootstrap.d, /etc/ganeti/instance-debootstrap.d
--if you configured the os with --sysconfdir=/etc) directory exists any
--executable whose name matches the run-parts execution rules (quoting
--run-parts(8): the  names  must consist entirely of upper and lower case
--letters, digits, underscores, and hyphens) is executed to allow further
--personalization of the installation. The following environment variables are
--passed, in addition to the ones ganeti passes to the OS scripts:
-+$sysconfdir/ganeti/ganeti-instance-debootstrap.d,
-+/etc/ganeti/ganeti-instance-debootstrap.d if you configured the os with
-+--sysconfdir=/etc) directory exists any executable whose name matches the
-+run-parts execution rules (quoting run-parts(8): the  names  must consist
-+entirely of upper and lower case letters, digits, underscores, and hyphens) is
-+executed to allow further personalization of the installation. The following
-+environment variables are passed, in addition to the ones ganeti passes to the
-+OS scripts:
- 
- TARGET: directory in which the filesystem is mounted
- SUITE: suite installed by debootstrap (eg: lenny)
-diff -ruN ganeti-instance-debootstrap-0.7.orig/common.sh.in ganeti-instance-debootstrap-0.7/common.sh.in
---- ganeti-instance-debootstrap-0.7.orig/common.sh.in	2009-09-22 21:43:35.000000000 -0700
-+++ ganeti-instance-debootstrap-0.7/common.sh.in	2009-09-22 21:46:05.000000000 -0700
-@@ -127,7 +127,7 @@
-   fi
- }
- 
--DEFAULT_FILE="@sysconfdir@/default/ganeti-instance-debootstrap"
-+DEFAULT_FILE="@sysconfdir@/ganeti/ganeti-instance-debootstrap"
- if [ -f "$DEFAULT_FILE" ]; then
-     . "$DEFAULT_FILE"
- fi
-@@ -142,7 +142,7 @@
- : ${SUITE:="lenny"}
- : ${ARCH:=""}
- : ${EXTRA_PKGS:=""}
--: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/instance-debootstrap.d"}
-+: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/ganeti-instance-debootstrap.d"}
- : ${GENERATE_CACHE:="yes"}
- : ${CLEAN_CACHE:="14"} # number of days to keep a cache file
- if [ -z "$OS_API_VERSION" -o "$OS_API_VERSION" = "5" ]; then
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.7.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.7.ebuild
deleted file mode 100644
index 1cb1bf1a422d..000000000000
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.7.ebuild,v 1.1 2009/10/02 22:41:27 ramereth Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Scripts to build Ganeti VMs with debootstrap"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-SRC_URI="http://ganeti.googlecode.com/files/ganeti-instance-debootstrap-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-arch/dpkg
-	app-arch/dump
-	app-emulation/ganeti
-	dev-util/debootstrap
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )
-	sys-apps/util-linux
-	sys-fs/e2fsprogs"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-no-etc-default.patch"
-}
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${P} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.8.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.8.ebuild
deleted file mode 100644
index 047a8aec4703..000000000000
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.8.ebuild
+++ /dev/null
@@ -1,33 +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-instance-debootstrap/ganeti-instance-debootstrap-0.8.ebuild,v 1.1 2010/03/07 21:03:00 ramereth Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Scripts to build Ganeti VMs with debootstrap"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-SRC_URI="http://ganeti.googlecode.com/files/ganeti-instance-debootstrap-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-arch/dpkg
-	app-arch/dump
-	app-emulation/ganeti
-	dev-util/debootstrap
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )
-	sys-apps/util-linux
-	sys-fs/e2fsprogs"
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${P} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild
index 1b3f680d3965..5b3cb904b4cb 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.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-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild,v 1.1 2010/03/12 19:29:10 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild,v 1.2 2011/01/22 20:08:10 ramereth Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://ganeti.googlecode.com/files/ganeti-instance-debootstrap-${PV}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""