commit:     260a9b7b4570e9993ca3a957be6f4b24a288d9e2
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 00:56:30 2016 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 00:56:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260a9b7b

app-emulation/ganeti: Remove all versions except 2.15.2-r5

Gentoo-Bug: 570240

Package-Manager: portage-2.3.2

 app-emulation/ganeti/Manifest                |   4 -
 app-emulation/ganeti/ganeti-2.11.6-r2.ebuild | 225 -------------------
 app-emulation/ganeti/ganeti-2.12.3-r2.ebuild | 267 -----------------------
 app-emulation/ganeti/ganeti-2.13.0-r3.ebuild | 260 ----------------------
 app-emulation/ganeti/ganeti-2.14.1-r2.ebuild | 296 -------------------------
 app-emulation/ganeti/ganeti-2.15.2-r4.ebuild | 313 ---------------------------
 6 files changed, 1365 deletions(-)

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 7936b35..d0025a3 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,6 +1,2 @@
-DIST ganeti-2.11.6.tar.gz 4145886 SHA256 
db11659ae7aaab5933b55b35f703236edc91ec763e443ac80679a057ba57af5e SHA512 
c68ba0661f7598b2fbd67a96fd897e9a8fe7c3a79e914200c08a8e6cb78ad7ea8a85ce7cfee157e22c07d5f46ae6ed61d946cf2cc3852624cd303deb96f1e449
 WHIRLPOOL 
9bd0acd85ed86b8d05164d6ee70ea960fd42128f9144739c148e70917675d53c1d808d22df981a1ea0d843dfc5fd14fd516d6d39330634beec7eb0ecae4cbe5b
-DIST ganeti-2.12.3.tar.gz 4373350 SHA256 
e66fc4c3dde1e90d85749ceb5c1c90bd6eaed1d139796829833b74337d2d4148 SHA512 
7715db8e472e4ac99bf184028cd9853495153485c6638bcddba2d05ce958b6b44d3be07290780bb27b22337ae646881d6b0a30bbe87b7249106ac34d22bdd6c2
 WHIRLPOOL 
e24d695d5acc582905ae7ba003e3fe6e6aa6ea4f9135daf76b953864c392803cd1c6ed81eb0e96652038f289bf450f3ac1a428c46d7a2573bc39a9451a47694e
-DIST ganeti-2.13.0.tar.gz 4573781 SHA256 
30ccfa971b15d49b45a4bfb75bb9631c0993adbd7feac0562c11305ae8c13753 SHA512 
bd847ae7e12cb978fae59a458a4d0e33fee470c51748964453b5d0ea6615e6d959519c84922e92229e942a88f1ad88a6d1cb655f58391d033d5f5dfc249ef941
 WHIRLPOOL 
925159e36fde1cd36214b4fe54b4e06958cc8bd3ded28e32bc4f99842aafcb4c53c701c8a651421559dc13b4d18ae2cc11f1b9d1d2da1e862561cca81d009bda
-DIST ganeti-2.14.1.tar.gz 4655994 SHA256 
ae90c69f0c02d2ee558363a1c021dfaaaf4ccb59b662a72fa6485b406766e133 SHA512 
2d3927bf888ea56df6b6275a869979c53d4b01e2e527e2dddea2a4835c90e85831e9e7691162999e5c58e9d214e03a37690e84f8fde9f1a0631897b06db348c3
 WHIRLPOOL 
3554161afd646af41e587fffa9dc85788f6ef13102121c636802946b64161cdeaeea326103171b70577b06635eebf6988b2f3942024a944612642aefd92b89bb
 DIST ganeti-2.15.2.tar.gz 4723007 SHA256 
1e09d29cae5020142d20a96165b23f3b62b5511b875051b6374d09c4c13c0b83 SHA512 
e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85
 WHIRLPOOL 
a09a13d64e7c6fa7823072d767fa6495cd814bb22e7a5fc708c8b339103a41da4e45f38574a2c665fe89c8774f220a2715c3aba180eb674eae603730dd2d25ad
 DIST ganeti_2.15.2-4.debian.tar.xz 42440 SHA256 
d2b907ad54b6fad8bc9c023c718c6f1a35cbc487fa065291f465f1e518df6d02 SHA512 
e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403
 WHIRLPOOL 
16acab23919541bfd1748ff9f5e243c483ed4b5b10bcd5c233821c06968671ce0fcdab86ec95a30f6162a308df1eca16424e94b80ea095dfc90931a4be930b26

diff --git a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild 
b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
deleted file mode 100644
index 09b4625..00000000
--- a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-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="https://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 )
-       test? ( ipv6 )"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
-       <dev-lang/ghc-7.8
-       dev-haskell/json:0=
-       dev-haskell/curl:0=
-       dev-haskell/network:0=
-       dev-haskell/parallel:3=
-       dev-haskell/hslogger:0=
-       dev-haskell/utf8-string: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:0
-       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 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-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}
-
-       # need to dodir rather than keepdir here (bug #552482)
-       dodir /var/lib/${PN}
-
-       keepdir /var/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 () {
-       PATH="${S}/scripts:${S}/src:${PATH}" \
-               TMPDIR="/tmp" \
-               emake check || die "emake check failed"
-}

diff --git a/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild 
b/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild
deleted file mode 100644
index 7c960a5..00000000
--- a/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_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=""
-       GIT_DEPEND="app-text/pandoc
-               dev-python/docutils
-               dev-python/sphinx[${PYTHON_USEDEP}]
-               media-libs/gd[fontconfig,jpeg,png,truetype]
-               media-gfx/graphviz
-               media-fonts/urw-fonts"
-else
-       SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz";
-       KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/";
-
-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 )
-       test? ( ipv6 )
-       ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-# the haskell less-than atoms list are resolver hints, they aren't actual
-# direct dependencies, just hints to help the resolver fufill the dependency
-# on an older transformer.
-# these need to stay until 2.14.0
-DEPEND="
-       dev-libs/openssl:0
-       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
-       =dev-lang/ghc-7.6*:0=
-       >=dev-haskell/json-0.9:0=
-       <dev-haskell/monad-control-1.0.0.0:0=
-       <dev-haskell/transformers-0.4.0:0=
-       dev-haskell/curl:0=
-       dev-haskell/network:0=
-       dev-haskell/parallel:3=
-       >=dev-haskell/hslogger-1.2.6:0=
-       dev-haskell/snap-server:0=
-       dev-haskell/utf8-string: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/lifted-base-0.2.3.3:0=
-       <dev-haskell/lens-3.10:0=
-       dev-haskell/base64-bytestring:0=
-       <dev-haskell/mtl-2.2
-       <dev-haskell/contravariant-0.6
-       <dev-haskell/profunctors-4.3
-       <dev-haskell/distributive-0.4.4
-       <dev-haskell/comonad-4.2.2
-       <dev-haskell/transformers-compat-0.3
-       <dev-haskell/transformers-base-0.4.4
-       <dev-haskell/semigroupoids-4.0
-       <dev-haskell/semigroupoid-extras-4.0
-       <dev-haskell/groupoids-4.0
-       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? ( dev-haskell/text:0= )
-       ${PYTHON_DEPS}
-       ${GIT_DEPEND}"
-RDEPEND="${DEPEND}
-       !app-emulation/ganeti-htools"
-DEPEND+="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
-               net-misc/socat
-               dev-util/shelltestrunner
-       )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
-       "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
-       "${FILESDIR}/${PN}-2.12.3-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.12-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"
-       "${FILESDIR}/${PN}-2.12-tests.patch"
-)
-
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="usr/$(get_libdir)/${PN}/${SERIES}/usr/sbin/ganeti-*d
-       usr/$(get_libdir)/${PN}/${SERIES}/usr/bin/htools"
-
-pkg_setup () {
-       local user
-       confutils_use_depend_all haskell-daemons htools
-       python-single-r1_pkg_setup
-
-       if use multiple-users; then
-               for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
-                       enewgroup ${user}
-                       enewuser ${user} -1 -1 -1 ${user}
-               done
-       fi
-}
-
-src_prepare() {
-       local testfile
-       epatch "${PATCHES[@]}"
-
-       # not sure why these tests are failing
-       # should remove this on next version bump if possible
-       for testfile in test/py/import-export_unittest.bash; do
-               printf '#!/bin/bash\ntrue\n' > "${testfile}"
-       done
-
-       # take the sledgehammer approach to bug #526270
-       grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
-       [[ ${PV} =~ [9]{4,} ]] && ./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}
-
-       sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" 
doc/examples/bash_completion
-       newbashcomp doc/examples/bash_completion gnt-instance
-       bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
-               h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
-               
gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
-       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}
-
-       # need to dodir rather than keepdir here (bug #552482)
-       dodir /var/lib/${PN}
-
-       keepdir /var/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 () {
-       PATH="${S}/scripts:${S}/src:${PATH}" \
-               TMPDIR="/tmp" \
-               GANETI_MASTER="$(hostname -f)" \
-               emake check || die "emake check failed"
-}

diff --git a/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild 
b/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
deleted file mode 100644
index c1e02bc..00000000
--- a/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_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=""
-else
-       SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz";
-       KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/";
-
-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 )
-       test? ( ipv6 )
-       ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
-       dev-libs/openssl:0
-       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
-       =dev-lang/ghc-7.6*:0=
-       >=dev-haskell/json-0.9:0=
-       dev-haskell/curl:0=
-       dev-haskell/network:0=
-       dev-haskell/parallel:3=
-       >=dev-haskell/hslogger-1.2.6:0=
-       dev-haskell/snap-server:0=
-       dev-haskell/utf8-string: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/lifted-base-0.2.3.3:0=
-       <dev-haskell/lens-4:0=
-       dev-haskell/psqueue:0=
-       dev-haskell/base64-bytestring:0=
-       <dev-haskell/semigroupoids-4.1:0=
-       <dev-haskell/mtl-2.2:0=
-       <dev-haskell/monad-control-1.0.0.0:0=
-       <dev-haskell/transformers-0.4.0:0=
-       <dev-haskell/contravariant-0.6
-       <dev-haskell/transformers-compat-0.4[three]
-       <dev-haskell/transformers-base-0.4.4
-       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? ( dev-haskell/text:0= )
-       ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-       !app-emulation/ganeti-htools"
-DEPEND+="
-       sys-devel/m4
-       <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-       media-fonts/urw-fonts
-       media-gfx/graphviz
-       =app-text/pandoc-1.12*
-       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
-               net-misc/socat
-               dev-util/shelltestrunner
-       )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
-       "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
-       "${FILESDIR}/${PN}-2.13-daemon-util.patch"
-       "${FILESDIR}/${PN}-2.7-fix-tests.patch"
-       "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-       "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-       "${FILESDIR}/${PN}-2.10-rundir.patch"
-       "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
-       "${FILESDIR}/${PN}-2.11-tests.patch"
-       "${FILESDIR}/${PN}-lockdir.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"
-       "${FILESDIR}/${PN}-2.13-regex-pcre-builtin.patch"
-       "${FILESDIR}/${PN}-2.13-process_unittest.patch"
-       "${FILESDIR}/${PN}-2.13-disable-usersgroups-test.patch"
-)
-
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="usr/$(get_libdir)/${PN}/${SERIES}/usr/sbin/ganeti-*d
-       usr/$(get_libdir)/${PN}/${SERIES}/usr/bin/htools"
-
-pkg_setup () {
-       local user
-       confutils_use_depend_all haskell-daemons htools
-       python-single-r1_pkg_setup
-
-       if use multiple-users; then
-               for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
-                       enewgroup ${user}
-                       enewuser ${user} -1 -1 -1 ${user}
-               done
-       fi
-}
-
-src_prepare() {
-       local testfile
-       epatch "${PATCHES[@]}"
-
-       # not sure why these tests are failing
-       # should remove this on next version bump if possible
-       for testfile in test/py/import-export_unittest.bash; do
-               printf '#!/bin/bash\ntrue\n' > "${testfile}"
-       done
-
-       # take the sledgehammer approach to bug #526270
-       grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
-       [[ ${PV} =~ [9]{4,} ]] && ./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 \
-               $(use_enable test haskell-tests) \
-               $(usex multiple-users "--with-default-user=" "" "gnt-daemons" 
"") \
-               $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" 
"") \
-               $(usex multiple-users "--with-default-group=" "" "gnt-daemons" 
"") \
-               $(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}
-
-       sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" 
doc/examples/bash_completion
-       newbashcomp doc/examples/bash_completion gnt-instance
-       bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
-               h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
-               
gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
-       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}
-
-       # need to dodir rather than keepdir here (bug #552482)
-       dodir /var/lib/${PN}
-
-       keepdir /var/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 () {
-       PATH="${S}/scripts:${S}/src:${PATH}" \
-               TMPDIR="/tmp" \
-               GANETI_MASTER="$(hostname -f)" \
-               emake check || die "emake check failed"
-}

diff --git a/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild 
b/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
deleted file mode 100644
index bc2ba9e..00000000
--- a/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} =~ [9]{4,} ]] ; then
-       EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
-       inherit git-2
-       KEYWORDS=""
-else
-       SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz";
-       KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/";
-
-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 )
-       test? ( ipv6 )
-       ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
-       dev-libs/openssl:0
-       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
-       =dev-lang/ghc-7.6*:0=
-       dev-haskell/cabal:0=
-       dev-haskell/cabal-install:0=
-       >=dev-haskell/mtl-2.1.1:0=
-       >=dev-haskell/old-time-1.1.0.0:0=
-       >=dev-haskell/random-1.0.1.1:0=
-       haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
-       >=dev-haskell/transformers-0.3.0.0:0=
-
-       >=dev-haskell/attoparsec-0.10.1.1:0=
-       <dev-haskell/attoparsec-0.13:0
-       >=dev-haskell/base64-bytestring-1.0.0.1:0=
-       <dev-haskell/base64-bytestring-1.1:0=
-       >=dev-haskell/crypto-4.2.4:0=
-       <dev-haskell/crypto-4.3:0=
-       >=dev-haskell/curl-1.3.7:0=
-       <dev-haskell/curl-1.4:0=
-       >=dev-haskell/hinotify-0.3.2:0=
-       <dev-haskell/hinotify-0.4:0=
-       >=dev-haskell/hslogger-1.1.4:0=
-       <dev-haskell/hslogger-1.3:0=
-       >=dev-haskell/json-0.5:0=
-       <dev-haskell/json-0.9:0=
-       >=dev-haskell/lens-3.10:0=
-       <dev-haskell/lens-4.8:0=
-       >=dev-haskell/lifted-base-0.2.0.3:0=
-       <dev-haskell/lifted-base-0.3:0=
-       >=dev-haskell/monad-control-0.3.1.3:0=
-       <dev-haskell/monad-control-1.1:0=
-       >=dev-haskell/network-2.3.0.13:0=
-       <dev-haskell/network-2.7:0=
-       >=dev-haskell/parallel-3.2.0.2:3=
-       <dev-haskell/parallel-3.3:3=
-       >=dev-haskell/temporary-1.1.2.3:0=
-       <dev-haskell/temporary-1.3:0=
-       >=dev-haskell/regex-pcre-0.94.2:0=
-       <dev-haskell/regex-pcre-0.95:0=
-       >=dev-haskell/transformers-base-0.4.1:0=
-       <dev-haskell/transformers-base-0.5:0=
-       >=dev-haskell/utf8-string-0.3.7:0=
-       <dev-haskell/utf8-string-0.4:0=
-       >=dev-haskell/zlib-0.5.3.3:0=
-       <dev-haskell/zlib-0.6:0=
-
-       >=dev-haskell/psqueue-1.1:0=
-       <dev-haskell/psqueue-1.2:0=
-       >=dev-haskell/snap-core-0.8.1:0=
-       <dev-haskell/snap-core-0.10:0=
-       >=dev-haskell/snap-server-0.8.1:0=
-       <dev-haskell/snap-server-0.10:0=
-
-       dev-haskell/vector:0=
-       <dev-haskell/semigroupoids-4.1:0=
-       <dev-haskell/contravariant-0.6
-       <dev-haskell/transformers-compat-0.4[three]
-       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 )
-       ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-       !app-emulation/ganeti-htools"
-DEPEND+="
-       sys-devel/m4
-       <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-       media-fonts/urw-fonts
-       media-gfx/graphviz
-       =app-text/pandoc-1.12*
-       >=dev-haskell/test-framework-0.6:0=
-       <dev-haskell/test-framework-0.9:0=
-       >=dev-haskell/test-framework-hunit-0.2.7:0=
-       <dev-haskell/test-framework-hunit-0.4:0=
-       >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
-       <dev-haskell/test-framework-quickcheck2-0.4:0=
-       test? (
-               dev-python/mock
-               dev-python/pyyaml
-               dev-haskell/haddock:0=
-               >=dev-haskell/hunit-1.2.4.2:0=
-               <dev-haskell/hunit-1.3:0=
-               >=dev-haskell/quickcheck-2.4.2:2=
-               <dev-haskell/quickcheck-2.8:2=
-               sys-apps/fakeroot
-               net-misc/socat
-               dev-util/shelltestrunner
-       )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
-       "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
-       "${FILESDIR}/${PN}-2.13-daemon-util.patch"
-       "${FILESDIR}/${PN}-2.7-fix-tests.patch"
-       "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-       "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-       "${FILESDIR}/${PN}-2.10-rundir.patch"
-       "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
-       "${FILESDIR}/${PN}-2.11-tests.patch"
-       "${FILESDIR}/${PN}-lockdir.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"
-       "${FILESDIR}/${PN}-2.13-process_unittest.patch"
-)
-
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )
-       test? ( ipv6 )"
-
-S="${WORKDIR}/${MY_P}"
-
-# apparently currently broken
-QA_WX_LOAD="
-       usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-       usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
-       local user
-       python-single-r1_pkg_setup
-
-       if use multiple-users; then
-               for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
-                       enewgroup ${user}
-                       enewuser ${user} -1 -1 -1 ${user}
-               done
-       fi
-}
-
-src_prepare() {
-       local testfile
-       epatch "${PATCHES[@]}"
-
-       # not sure why these tests are failing
-       # should remove this on next version bump if possible
-       for testfile in test/py/import-export_unittest.bash; do
-               printf '#!/bin/bash\ntrue\n' > "${testfile}"
-       done
-
-       # take the sledgehammer approach to bug #526270
-       grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
-       [[ ${PV} =~ [9]{4,} ]] && ./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 \
-               $(use_enable test haskell-tests) \
-               $(usex multiple-users "--with-default-user=" "" "gnt-daemons" 
"") \
-               $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" 
"") \
-               $(usex multiple-users "--with-default-group=" "" "gnt-daemons" 
"") \
-               $(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}
-
-       sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" 
doc/examples/bash_completion
-       newbashcomp doc/examples/bash_completion gnt-instance
-       bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
-               h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
-               
gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
-       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}
-
-       # need to dodir rather than keepdir here (bug #552482)
-       dodir /var/lib/${PN}
-
-       keepdir /var/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 () {
-       PATH="${S}/scripts:${S}/src:${PATH}" \
-               TMPDIR="/tmp" \
-               GANETI_MASTER="$(hostname -f)" \
-               emake check || die "emake check failed"
-}

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild 
b/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
deleted file mode 100644
index 704f938..00000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} =~ [9]{4,} ]] ; then
-       EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
-       inherit git-2
-       KEYWORDS=""
-else
-       SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz";
-       KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/";
-
-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 )
-       test? ( ipv6 )
-       kvm? ( || ( amd64 x86 ) )
-       ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
-       dev-libs/openssl:0
-       dev-python/paramiko[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
-       dev-python/simplejson[${PYTHON_USEDEP}]
-       dev-python/pyparsing[${PYTHON_USEDEP}]
-       dev-python/pyinotify[${PYTHON_USEDEP}]
-       dev-python/pycurl[${PYTHON_USEDEP}]
-       dev-python/ipaddr[${PYTHON_USEDEP}]
-       dev-python/bitarray[${PYTHON_USEDEP}]
-       dev-python/docutils[${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
-       dev-lang/ghc:0=
-       dev-haskell/cabal:0=
-       dev-haskell/cabal-install:0=
-       >=dev-haskell/mtl-2.1.1:0=
-       >=dev-haskell/old-time-1.1.0.0:0=
-       >=dev-haskell/random-1.0.1.1:0=
-       haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
-       >=dev-haskell/transformers-0.3.0.0:0=
-
-       >=dev-haskell/attoparsec-0.10.1.1:0=
-       <dev-haskell/attoparsec-0.13:0
-       >=dev-haskell/base64-bytestring-1.0.0.1:0=
-       <dev-haskell/base64-bytestring-1.1:0=
-       >=dev-haskell/crypto-4.2.4:0=
-       <dev-haskell/crypto-4.3:0=
-       >=dev-haskell/curl-1.3.7:0=
-       <dev-haskell/curl-1.4:0=
-       >=dev-haskell/hinotify-0.3.2:0=
-       <dev-haskell/hinotify-0.4:0=
-       >=dev-haskell/hslogger-1.1.4:0=
-       <dev-haskell/hslogger-1.3:0=
-       >=dev-haskell/json-0.5:0=
-       <dev-haskell/json-0.9:0=
-       >=dev-haskell/lens-3.10:0=
-       <dev-haskell/lens-4.8:0=
-       >=dev-haskell/lifted-base-0.2.0.3:0=
-       <dev-haskell/lifted-base-0.3:0=
-       >=dev-haskell/monad-control-0.3.1.3:0=
-       <dev-haskell/monad-control-1.1:0=
-       >=dev-haskell/network-2.3.0.13:0=
-       <dev-haskell/network-2.7:0=
-       >=dev-haskell/parallel-3.2.0.2:3=
-       <dev-haskell/parallel-3.3:3=
-       >=dev-haskell/temporary-1.1.2.3:0=
-       <dev-haskell/temporary-1.3:0=
-       >=dev-haskell/regex-pcre-0.94.2:0=
-       <dev-haskell/regex-pcre-0.95:0=
-       >=dev-haskell/transformers-base-0.4.1:0=
-       <dev-haskell/transformers-base-0.5:0=
-       >=dev-haskell/utf8-string-0.3.7:0=
-       <dev-haskell/utf8-string-0.4:0=
-       >=dev-haskell/zlib-0.5.3.3:0=
-       <dev-haskell/zlib-0.6:0=
-
-       >=dev-haskell/psqueue-1.1:0=
-       <dev-haskell/psqueue-1.2:0=
-       >=dev-haskell/snap-core-0.8.1:0=
-       <dev-haskell/snap-core-0.10:0=
-       >=dev-haskell/snap-server-0.8.1:0=
-       <dev-haskell/snap-server-0.10:0=
-       >=dev-haskell/case-insensitive-0.4.0.1
-
-       dev-haskell/vector:0=
-       <dev-haskell/semigroupoids-4.1:0=
-       <dev-haskell/contravariant-0.6
-       <dev-haskell/transformers-compat-0.4[three]
-       xen? ( >=app-emulation/xen-3.0 )
-       kvm? (
-               dev-python/psutil
-               app-emulation/qemu
-       )
-       lxc? ( app-emulation/lxc )
-       drbd? (
-               || (
-                       <sys-cluster/drbd-8.5
-                       sys-cluster/drbd-utils
-               )
-       )
-       rbd? ( sys-cluster/ceph )
-       ipv6? ( net-misc/ndisc6 )
-       ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-       !app-emulation/ganeti-htools"
-DEPEND+="
-       sys-devel/m4
-       app-text/pandoc
-       <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-       media-fonts/urw-fonts
-       media-gfx/graphviz
-       >=dev-haskell/test-framework-0.6:0=
-       <dev-haskell/test-framework-0.9:0=
-       >=dev-haskell/test-framework-hunit-0.2.7:0=
-       <dev-haskell/test-framework-hunit-0.4:0=
-       >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
-       <dev-haskell/test-framework-quickcheck2-0.4:0=
-       test? (
-               dev-python/mock
-               dev-python/pyyaml
-               dev-haskell/haddock:0=
-               >=dev-haskell/hunit-1.2.4.2:0=
-               <dev-haskell/hunit-1.3:0=
-               >=dev-haskell/quickcheck-2.4.2:2=
-               <dev-haskell/quickcheck-2.8:2=
-               sys-apps/fakeroot
-               net-misc/socat
-               dev-util/shelltestrunner
-       )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
-       "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
-       "${FILESDIR}/${PN}-2.15-daemon-util.patch"
-       "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-       "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-       "${FILESDIR}/${PN}-2.10-rundir.patch"
-       "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
-       "${FILESDIR}/${PN}-2.11-tests.patch"
-       "${FILESDIR}/${PN}-lockdir.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"
-       "${FILESDIR}/${PN}-2.13-process_unittest.patch"
-       "${FILESDIR}/${PN}-2.15-python-mock.patch"
-       "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
-       "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
-       "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
-       
"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-       usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-       usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
-       local user
-       python-single-r1_pkg_setup
-
-       if use multiple-users; then
-               for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
-                       enewgroup ${user}
-                       enewuser ${user} -1 -1 -1 ${user}
-               done
-       fi
-}
-
-src_prepare() {
-       local testfile
-       eapply "${PATCHES[@]}"
-
-       # not sure why these tests are failing
-       # should remove this on next version bump if possible
-       for testfile in test/py/import-export_unittest.bash; do
-               printf '#!/bin/bash\ntrue\n' > "${testfile}"
-       done
-
-       # take the sledgehammer approach to bug #526270
-       grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
-       eapply_user
-
-       [[ ${PV} =~ [9]{4,} ]] && ./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 \
-               --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 test haskell-tests) \
-               $(usex multiple-users "--with-default-user=" "" "gnt-daemons" 
"") \
-               $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" 
"") \
-               $(usex multiple-users "--with-default-group=" "" "gnt-daemons" 
"") \
-               $(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
-
-       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}
-
-       sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" 
doc/examples/bash_completion
-       newbashcomp doc/examples/bash_completion gnt-instance
-       bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
-               h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
-               
gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
-       use monitoring && bashcomp_alias gnt-instance mon-collector
-
-       dodoc INSTALL UPGRADE NEWS README doc/*.rst
-
-       docinto html
-       dodoc -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}
-
-       # need to dodir rather than keepdir here (bug #552482)
-       dodir /var/lib/${PN}
-
-       keepdir /var/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 () {
-       PATH="${S}/scripts:${S}/src:${PATH}" \
-               TMPDIR="/tmp" \
-               GANETI_MASTER="$(hostname -f)" \
-               emake check || die "emake check failed"
-}

Reply via email to