Revision bump, fix ganeti-rapi reference in init script (bug #512444).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)

5 files changed, 17 insertions, 185 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 73fd8e4eea7a..df8c15a8757f 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.87 2014/06/02 18:57:28 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.88 2014/06/05 00:32:21 chutzpah Exp $
+
+*ganeti-2.11.1-r1 (05 Jun 2014)
+*ganeti-2.10.5-r1 (05 Jun 2014)
+
+  05 Jun 2014; Patrick McLean <chutzpah@gentoo.org> -ganeti-2.10.4.ebuild,
+  -ganeti-2.10.5.ebuild, +ganeti-2.10.5-r1.ebuild, -ganeti-2.11.1.ebuild,
+  +ganeti-2.11.1-r1.ebuild, -files/ganeti.initd-r2, +files/ganeti.initd-r3:
+  Revision bump, fix ganeti-rapi reference in init script (bug #512444).
 
 *ganeti-2.10.5 (02 Jun 2014)
 
diff --git a/app-emulation/ganeti/files/ganeti.initd-r2 b/app-emulation/ganeti/files/ganeti.initd-r3
index 53a198187635..81b0e4165a09 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r2
+++ b/app-emulation/ganeti/files/ganeti.initd-r3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r2,v 1.1 2014/05/30 22:07:23 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v 1.1 2014/06/05 00:32:23 chutzpah Exp $
 
 depend() {
 	need localmount logger
@@ -32,7 +32,7 @@ start() {
 		optsvar="${daemon//-/_}"
 
 		case "${daemon#ganeti-}" in
-			masterd|rapid|luxid) is_master || continue;;
+			masterd|rapi|luxid) is_master || continue;;
 		esac
 
 		eval daemon_opts=\"\$\{${optsvar^^*}_OPTS\}\"
@@ -68,10 +68,8 @@ stop() {
 	local daemon
 
 	for daemon in $(${DAEMON_UTIL} list-stop-daemons) ; do \
-		case "${daemon}" in
-			ganeti-masterd|ganeti-rapi|ganeti-luxid)
-				is_master || continue
-			;;
+		case "${daemon#ganeti-}" in
+			masterd|rapi|luxid) is_master || continue;;
 		esac
 		${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
 	done
diff --git a/app-emulation/ganeti/ganeti-2.10.4.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r1.ebuild
index 73b04301f206..80960f902065 100644
--- a/app-emulation/ganeti/ganeti-2.10.4.ebuild
+++ b/app-emulation/ganeti/ganeti-2.10.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.4.ebuild,v 1.1 2014/05/30 22:12:57 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.5-r1.ebuild,v 1.1 2014/06/05 00:32:21 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_{6,7})
@@ -135,7 +135,7 @@ src_configure () {
 src_install () {
 	emake V=1 DESTDIR="${D}" install || die "emake install failed"
 
-	newinitd "${FILESDIR}"/ganeti.initd-r2 ${PN}
+	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
 	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
 
 	use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
diff --git a/app-emulation/ganeti/ganeti-2.10.5.ebuild b/app-emulation/ganeti/ganeti-2.10.5.ebuild
deleted file mode 100644
index d2f0fc60b233..000000000000
--- a/app-emulation/ganeti/ganeti-2.10.5.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.5.ebuild,v 1.1 2014/06/02 18:57:28 chutzpah Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python2_{6,7})
-use test && PYTHON_REQ_USE="ipv6"
-
-inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
-	inherit git-2
-	KEYWORDS=""
-	# you will need to pull in the haskell overlay for pandoc
-	GIT_DEPEND="app-text/pandoc
-		dev-python/docutils
-		dev-python/sphinx
-		media-libs/gd[fontconfig,jpeg,png,truetype]
-		media-gfx/graphviz
-		media-fonts/urw-fonts"
-else
-	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test"
-REQUIRED_USE="|| ( kvm xen lxc )"
-
-S="${WORKDIR}/${MY_P}"
-
-HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
-		dev-haskell/json:0=
-		dev-haskell/curl:0=
-		dev-haskell/network:0=
-		dev-haskell/parallel
-		dev-haskell/hslogger:0=
-		dev-haskell/utf8-string:0=
-		dev-haskell/deepseq:0=
-		dev-haskell/attoparsec:0=
-		dev-haskell/crypto:0="
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu )
-	lxc? ( app-emulation/lxc )
-	drbd? ( <sys-cluster/drbd-8.5 )
-	rbd? ( sys-cluster/ceph )
-	ipv6? ( net-misc/ndisc6 )
-	haskell-daemons? (
-		${HASKELL_DEPS}
-		dev-haskell/text:0=
-		dev-haskell/hinotify:0=
-		dev-haskell/regex-pcre-builtin:0=
-		dev-haskell/vector:0=
-	)
-	dev-libs/openssl
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	net-analyzer/arping
-	net-analyzer/fping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2
-	>=sys-apps/baselayout-2.0
-	${PYTHON_DEPS}
-	${GIT_DEPEND}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-DEPEND+="${HASKELL_DEPS}
-	sys-devel/m4
-	test? (
-		dev-python/mock
-		dev-python/pyyaml
-		dev-haskell/test-framework:0=
-		dev-haskell/test-framework-hunit:0=
-		dev-haskell/test-framework-quickcheck2:0=
-		dev-haskell/temporary:0=
-		sys-apps/fakeroot
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6-fix-args.patch"
-	"${FILESDIR}/${PN}-2.6-add-pgrep.patch"
-	"${FILESDIR}/${PN}-2.7-fix-tests.patch"
-	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-	"${FILESDIR}/${PN}-2.9-regex-builtin.patch"
-	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-	"${FILESDIR}/${PN}-2.10-rundir.patch"
-)
-
-pkg_setup () {
-	confutils_use_depend_all haskell-daemons htools
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	[[ ${PV} == "9999" ]] && ./autogen.sh
-	rm autotools/missing
-	eautoreconf
-}
-
-src_configure () {
-	econf --localstatedir=/var \
-		--sharedstatedir=/var \
-		--disable-symlinks \
-		--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/${PN}/os \
-		$(use_enable syslog) \
-		$(usex kvm '--with-kvm-path=' '' '/usr/bin/qemu-kvm' '') \
-		$(usex haskell-daemons "--enable-confd=haskell" '' '' '')
-}
-
-src_install () {
-	emake V=1 DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/ganeti.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
-	use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
-	use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
-	newbashcomp doc/examples/bash_completion ganeti
-	dodoc INSTALL UPGRADE NEWS README doc/*.rst
-	dohtml -r doc/html/*
-	rm -rf "${D}"/{usr/share/doc/${PN},run}
-
-	docinto examples
-	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	insinto /etc/cron.d
-	newins doc/examples/ganeti.cron ${PN}
-
-	insinto /etc/logrotate.d
-	newins doc/examples/ganeti.logrotate ${PN}
-
-	python_fix_shebang "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-
-	keepdir /var/{lib,log}/${PN}/
-	keepdir /usr/share/${PN}/${SERIES}/os/
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
-	dosym ${SERIES} "/usr/share/${PN}/default"
-	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
-	python_fix_shebang "${ED}"
-}
-
-src_test () {
-	emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.11.1.ebuild b/app-emulation/ganeti/ganeti-2.11.1-r1.ebuild
index 6b41ec3679b3..aafd4a21ab31 100644
--- a/app-emulation/ganeti/ganeti-2.11.1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.1.ebuild,v 1.1 2014/05/30 22:07:23 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.1-r1.ebuild,v 1.1 2014/06/05 00:32:21 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_{6,7})
@@ -137,7 +137,7 @@ src_configure () {
 src_install () {
 	emake V=1 DESTDIR="${D}" install || die "emake install failed"
 
-	newinitd "${FILESDIR}"/ganeti.initd-r2 ${PN}
+	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
 	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
 
 	use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff