Version bump.

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

2 files changed, 225 insertions, 1 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index ffc9c9189bc0..cf830665959e 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,11 @@
 # 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.94 2014/10/27 09:51:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.95 2014/11/10 17:51:36 chutzpah Exp $
+
+*ganeti-2.11.6 (10 Nov 2014)
+
+  10 Nov 2014; Patrick McLean <chutzpah@gentoo.org> +ganeti-2.11.6.ebuild:
+  Version bump.
 
 *ganeti-2.11.5-r1 (27 Oct 2014)
 
diff --git a/app-emulation/ganeti/ganeti-2.11.6.ebuild b/app-emulation/ganeti/ganeti-2.11.6.ebuild
new file mode 100644
index 000000000000..d8b3b582a02e
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.11.6.ebuild
@@ -0,0 +1,219 @@
+# 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.6.ebuild,v 1.1 2014/11/10 17:51:36 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 pax-utils
+
+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="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
+REQUIRED_USE="|| ( kvm xen lxc )"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+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=
+		dev-haskell/vector:0=
+		dev-haskell/hinotify:0=
+		dev-haskell/regex-pcre-builtin:0=
+		dev-haskell/zlib:0=
+		dev-haskell/base64-bytestring:0=
+		monitoring? ( dev-haskell/snap-server: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-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/haddock:0=
+		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.11-start-stop-daemon-args.patch"
+	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+	"${FILESDIR}/${PN}-2.11-daemon-util.patch"
+	"${FILESDIR}/${PN}-2.7-fix-tests.patch"
+	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+	"${FILESDIR}/${PN}-2.11-regex-builtin.patch"
+	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+	"${FILESDIR}/${PN}-2.10-rundir.patch"
+	"${FILESDIR}/${PN}-2.11-qemu-enable-kvm.patch"
+	"${FILESDIR}/${PN}-2.11-tests.patch"
+	"${FILESDIR}/${PN}-lockdir.patch"
+	"${FILESDIR}/${PN}-2.11-useradd.patch"
+	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+)
+
+REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
+
+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 () {
+	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
+	local kvm_arch
+
+	if use amd64; then
+		kvm_arch=x86_64
+	elif use x86; then
+		kvm_arch=i386
+	elif use kvm; then
+		die "Could not determine qemu system to use for kvm"
+	fi
+
+	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 \
+		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+		$(use_enable syslog) \
+		$(use_enable monitoring) \
+		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+		$(usex haskell-daemons "--enable-confd=haskell" '' '' '')
+}
+
+src_install () {
+	emake V=1 DESTDIR="${D}" install || die "emake install failed"
+
+	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+	if use kvm; then
+		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+	fi
+
+	# ganeti installs it's own docs in a generic location
+	rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+	newbashcomp doc/examples/bash_completion ganeti
+
+	dodoc INSTALL UPGRADE NEWS README doc/*.rst
+	dohtml -r doc/html/* doc/css/*.css
+
+	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}
+
+	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}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+	if use multiple-users; then
+		elog "You have enable multiple user support, the users for this must"
+		elog "be created. You can use the provided tool for this, which is"
+		elog "located at:"
+		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
+	fi
+}
+
+src_test () {
+	emake check || die "emake check failed"
+}