summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2013-09-18 21:15:20 +0000
committerPatrick McLean <chutzpah@gentoo.org>2013-09-18 21:15:20 +0000
commit3312e479ed439446bc9cb5b6f43951bcbbab1f3f (patch)
treefe8828c5815acbf9d1d742650723f17e4c1261c1 /app-emulation
parentVersion bump. (diff)
downloadgentoo-2-3312e479ed439446bc9cb5b6f43951bcbbab1f3f.tar.gz
gentoo-2-3312e479ed439446bc9cb5b6f43951bcbbab1f3f.tar.bz2
gentoo-2-3312e479ed439446bc9cb5b6f43951bcbbab1f3f.zip
Version bump. Add myself to maintainers list.
(Portage version: 2.2.4/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/ganeti/ChangeLog8
-rw-r--r--app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch30
-rw-r--r--app-emulation/ganeti/ganeti-2.7.1.ebuild147
-rw-r--r--app-emulation/ganeti/metadata.xml4
4 files changed, 188 insertions, 1 deletions
diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index b3067e7946c3..a3d892fd84d0 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,12 @@
# 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.73 2013/09/12 22:29:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.74 2013/09/18 21:15:20 chutzpah Exp $
+
+*ganeti-2.7.1 (18 Sep 2013)
+
+ 18 Sep 2013; Patrick McLean <chutzpah@gentoo.org> +ganeti-2.7.1.ebuild,
+ +files/ganeti-2.7-fix-tests.patch:
+ Version bump. Add myself to maintainers list.
12 Sep 2013; Michał Górny <mgorny@gentoo.org> ganeti-1.2.9.ebuild,
ganeti-2.0.6.ebuild, ganeti-2.1.8.ebuild, ganeti-2.2.2.ebuild,
diff --git a/app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch b/app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch
new file mode 100644
index 000000000000..b3b5ad17f2b1
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.7-fix-tests.patch
@@ -0,0 +1,30 @@
+diff --git a/test/py/ganeti.hooks_unittest.py b/test/py/ganeti.hooks_unittest.py
+index 30e00d8..50f91fc 100755
+--- a/test/py/ganeti.hooks_unittest.py
++++ b/test/py/ganeti.hooks_unittest.py
+@@ -192,7 +192,7 @@ class TestHooksRunner(unittest.TestCase):
+ os.symlink("/usr/bin/env", fname)
+ self.torm.append((fname, False))
+ env_snt = {"PHASE": phase}
+- env_exp = "PHASE=%s" % phase
++ env_exp = "LD_PRELOAD=libsandbox.so\\nPHASE=%s" % phase
+ self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, env_snt),
+ [(self._rname(fname), HKR_SUCCESS, env_exp)])
+
+diff --git a/test/py/ganeti.utils.process_unittest.py b/test/py/ganeti.utils.process_unittest.py
+index 2e36cfa..e0392b2 100755
+--- a/test/py/ganeti.utils.process_unittest.py
++++ b/test/py/ganeti.utils.process_unittest.py
+@@ -341,10 +341,10 @@ class TestRunCmd(testutils.GanetiTestCase):
+ def testResetEnv(self):
+ """Test environment reset functionality"""
+ self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True).stdout.strip(),
+- "")
++ "LD_PRELOAD=libsandbox.so")
+ self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True,
+ env={"FOO": "bar",}).stdout.strip(),
+- "FOO=bar")
++ "LD_PRELOAD=libsandbox.so\nFOO=bar")
+
+ def testNoFork(self):
+ """Test that nofork raise an error"""
diff --git a/app-emulation/ganeti/ganeti-2.7.1.ebuild b/app-emulation/ganeti/ganeti-2.7.1.ebuild
new file mode 100644
index 000000000000..a8ff88b48fe0
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.7.1.ebuild
@@ -0,0 +1,147 @@
+# 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 $
+
+EAPI=5
+PYTHON_COMPAT=(python2_{6,7})
+use test && PYTHON_REQ_USE="ipv6"
+
+inherit eutils confutils bash-completion-r1 python-single-r1
+
+MY_PV="${PV/_rc/~rc}"
+#MY_PV="${PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+
+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://ganeti.googlecode.com/files/${MY_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 +filestorage sharedstorage htools syslog ipv6
+ haskell-daemons rbd test"
+REQUIRED_USE="|| ( kvm xen lxc )"
+
+S="${WORKDIR}/${MY_P}"
+
+HASKELL_DEPS=">=dev-lang/ghc-6.12
+ dev-haskell/json
+ dev-haskell/curl
+ dev-haskell/network
+ dev-haskell/parallel
+ dev-haskell/utf8-string
+ dev-haskell/deepseq"
+
+DEPEND="xen? ( >=app-emulation/xen-3.0 )
+ kvm? ( app-emulation/qemu )
+ lxc? ( app-emulation/lxc )
+ drbd? ( =sys-cluster/drbd-8.3* )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ haskell-daemons? (
+ ${HASKELL_DEPS}
+ dev-haskell/hslogger
+ dev-haskell/crypto
+ dev-haskell/text
+ dev-haskell/hinotify
+ dev-haskell/regex-pcre-builtin
+ dev-haskell/attoparsec
+ dev-haskell/vector
+ )
+ 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}"
+
+pkg_setup () {
+ confutils_use_depend_all haskell-daemons htools
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]] ; then
+ ./autogen.sh
+ fi
+ 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 () {
+ 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 \
+ --enable-htools-rapi \
+ $(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 haskell-daemons "--enable-confd=haskell" '' '' '')
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install || die "emake install failed"
+ newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
+ newconfd "${FILESDIR}"/ganeti.confd ganeti
+ 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/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
+
+ 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}/
+}
+
+src_test () {
+ emake check || die "emake check failed"
+}
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index b73d307c0d32..f5cbe05db1a2 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -3,6 +3,10 @@
<pkgmetadata>
<herd>virtualization</herd>
<maintainer>
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+ <maintainer>
<email>ramereth@gentoo.org</email>
<name>Lance Albertson</name>
</maintainer>