summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2013-10-15 23:16:42 +0000
committerPatrick McLean <chutzpah@gentoo.org>2013-10-15 23:16:42 +0000
commit1eab28098dafbb0ab54b6692732d308299d4d0a4 (patch)
treecfd531109f3add40535b8c5df39e7e3a3d82005c /app-emulation/ganeti
parentVersion bump and add tcl use flag (bug #487038). (diff)
downloadgentoo-2-1eab28098dafbb0ab54b6692732d308299d4d0a4.tar.gz
gentoo-2-1eab28098dafbb0ab54b6692732d308299d4d0a4.tar.bz2
gentoo-2-1eab28098dafbb0ab54b6692732d308299d4d0a4.zip
Version bump, install logrotate script included in source (bug #433153). Remove version 2.7.1.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Diffstat (limited to 'app-emulation/ganeti')
-rw-r--r--app-emulation/ganeti/ChangeLog9
-rw-r--r--app-emulation/ganeti/ganeti-2.7.2.ebuild (renamed from app-emulation/ganeti/ganeti-2.7.1.ebuild)17
2 files changed, 19 insertions, 7 deletions
diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index a3d892fd84d0..37b7cea1b904 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-emulation/ganeti
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.74 2013/09/18 21:15:20 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.75 2013/10/15 23:16:42 chutzpah Exp $
+
+*ganeti-2.7.2 (15 Oct 2013)
+
+ 15 Oct 2013; Patrick McLean <chutzpah@gentoo.org> -ganeti-2.7.1.ebuild,
+ +ganeti-2.7.2.ebuild, metadata.xml:
+ Version bump, install logrotate script included in source (bug #433153).
+ Remove version 2.7.1.
*ganeti-2.7.1 (18 Sep 2013)
diff --git a/app-emulation/ganeti/ganeti-2.7.1.ebuild b/app-emulation/ganeti/ganeti-2.7.2.ebuild
index a8ff88b48fe0..630a7bfebe10 100644
--- a/app-emulation/ganeti/ganeti-2.7.1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.7.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.7.1.ebuild,v 1.1 2013/09/18 21:15:20 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.7.2.ebuild,v 1.1 2013/10/15 23:16:42 chutzpah Exp $
EAPI=5
PYTHON_COMPAT=(python2_{6,7})
@@ -99,8 +99,6 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.6-fix-args.patch"
epatch "${FILESDIR}/${PN}-2.6-add-pgrep.patch"
epatch "${FILESDIR}/${PN}-2.7-fix-tests.patch"
-
- python_fix_shebang tools daemons/import-export lib/ovf.py lib/tools
}
src_configure () {
@@ -113,7 +111,7 @@ src_configure () {
$(use_enable syslog) \
$(usex filestorage "--with-file-storage-dir=" "--with-file-storage-dir=" "/var/lib/ganeti-storage/file" "no") \
$(usex sharedstorage "--with-shared-file-storage-dir=" "--with-shared-file-storage-dir=" "/var/lib/ganeti-storage/shared" "no") \
- $(usex kvm "--with-kvm-path=/usr/bin/qemu-kvm" '' '' '') \
+ $(usex kvm '--with-kvm-path=' '' '/usr/bin/qemu-kvm' '') \
$(usex haskell-daemons "--enable-confd=haskell" '' '' '')
}
@@ -127,19 +125,26 @@ src_install () {
dodoc INSTALL UPGRADE NEWS README doc/*.rst
dohtml -r doc/html/*
rm -rf "${D}"/usr/share/doc/ganeti
+
docinto examples
- #dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup}
dodoc doc/examples/{ganeti.cron,gnt-config-backup}
+
docinto examples/hooks
dodoc doc/examples/hooks/{ipsec,ethers}
+
insinto /etc/cron.d
- newins doc/examples/ganeti.cron ganeti
+ newins doc/examples/ganeti.cron ${PN}
+
+ insinto /etc/logrotate.d
+ newins doc/examples/ganeti.logrotate ${PN}
python_fix_shebang "${D}"/usr/sbin/ "${D}"/usr/"$(get_libdir)"/ganeti/ensure-dirs
keepdir /var/{lib,log,run}/ganeti/
keepdir /usr/share/ganeti/os/
keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+ python_fix_shebang "${ED}"
}
src_test () {