[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2015-11-23 23:41 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2015-11-23 23:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c7acc51306cfdeaa230a4d82f4193977a441cd22
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 23:41:16 2015 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 23:41:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7acc513

app-emulation/ganeti: revision bump, rework test dep on python ipv6

Fixes gentoo bug #566524

Package-Manager: portage-2.2.25

 app-emulation/ganeti/ganeti-2.15.1-r1.ebuild | 309 +++++++++++++++++++++++++++
 1 file changed, 309 insertions(+)

diff --git a/app-emulation/ganeti/ganeti-2.15.1-r1.ebuild b/app-emulation/ganeti/ganeti-2.15.1-r1.ebuild
new file mode 100644
index 0000000..d3adc43
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.1-r1.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2015 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=""
+	GIT_DEPEND="dev-python/docutils
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		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}"}"
+
+DOC_DEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/docutils
+	media-fonts/urw-fonts
+	media-gfx/graphviz"
+
+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}]
+	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
+	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}
+	${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+DEPEND+="sys-devel/m4
+	app-text/pandoc
+	>=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
+		${DOC_DEPEND}
+	)"
+
+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.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"
+	"${FILESDIR}/${PN}-2.15-python-mock.patch"
+)
+
+REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
+
+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
+	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"
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-02-15  9:48 Sergey Popov
  0 siblings, 0 replies; 36+ messages in thread
From: Sergey Popov @ 2016-02-15  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     2d95c3f775c2be357a725fb40afad5c79cb67ff1
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 09:44:28 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 09:48:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d95c3f7

app-emulation/ganeti: old versions does not build with GHC 7.8 and above

Package-Manager: portage-2.2.26

 app-emulation/ganeti/ganeti-2.10.5-r4.ebuild | 3 ++-
 app-emulation/ganeti/ganeti-2.11.6-r2.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild
index 527e576..eea792e 100644
--- a/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild
+++ b/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,6 +38,7 @@ IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test"
 REQUIRED_USE="|| ( kvm xen lxc )"
 
 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=

diff --git a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
index d3c3812..cec269b 100644
--- a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -41,6 +41,7 @@ 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=


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-02-15 18:30 Sergey Popov
  0 siblings, 0 replies; 36+ messages in thread
From: Sergey Popov @ 2016-02-15 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     d138e884ff9f06fa9bd22dfa6c4a421519fdd5e8
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 18:29:11 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 18:30:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d138e884

app-emulation/ganeti: amd64/x86 stable

Gentoo-Bug: 519730

Package-Manager: portage-2.2.27

 app-emulation/ganeti/ganeti-2.11.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
index cec269b..c7362d2 100644
--- a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} == "9999" ]] ; then
 		media-fonts/urw-fonts"
 else
 	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Ganeti is a virtual server management software tool"


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-04-01 23:57 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2016-04-01 23:57 UTC (permalink / raw
  To: gentoo-commits

commit:     4d9418bb5cb44567b63c15103f2e44466748ab1c
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 23:56:40 2016 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 23:56:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d9418bb

app-emulation/ganeti: drop 2.15.2-r1

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r1.ebuild | 310 ---------------------------
 1 file changed, 310 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r1.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r1.ebuild
deleted file mode 100644
index b220af7..0000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r1.ebuild
+++ /dev/null
@@ -1,310 +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=""
-	GIT_DEPEND="dev-python/docutils
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		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}"}"
-
-DOC_DEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	media-fonts/urw-fonts
-	media-gfx/graphviz"
-
-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
-	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}
-	${GIT_DEPEND}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
-	app-text/pandoc
-	>=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
-		${DOC_DEPEND}
-	)"
-
-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"
-)
-
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
-
-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
-	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"
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-04-04 23:43 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2016-04-04 23:43 UTC (permalink / raw
  To: gentoo-commits

commit:     db95598c18d39ae2ffec4ee20e967090106c75a1
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 23:43:07 2016 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 23:43:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db95598c

app-emulation/ganeti: add call to epatch_user in 2.15.2-r2

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild
index 9e7840c..e1eb4ba 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild
@@ -209,6 +209,8 @@ src_prepare() {
 	# take the sledgehammer approach to bug #526270
 	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
 
+	epatch_user
+
 	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
 	rm autotools/missing
 	eautoreconf


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-04-05 18:42 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2016-04-05 18:42 UTC (permalink / raw
  To: gentoo-commits

commit:     83fa4cbff1bc4a7ea7d7dc8ec5aa6757894cbf54
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 18:37:38 2016 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 18:42:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83fa4cbf

app-emulation/ganeti: Don't use keepdir to create /var/lib/ganeti in older versions

Gentoo-Bug: 552482

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.11.6-r2.ebuild | 5 ++++-
 app-emulation/ganeti/ganeti-2.12.3-r2.ebuild | 5 ++++-
 app-emulation/ganeti/ganeti-2.13.0-r2.ebuild | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
index c7362d2..86677b7 100644
--- a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
@@ -195,7 +195,10 @@ src_install () {
 	insinto /etc/logrotate.d
 	newins doc/examples/ganeti.logrotate ${PN}
 
-	keepdir /var/{lib,log}/${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}/
 

diff --git a/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild b/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild
index c1eb25d..7707e09 100644
--- a/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild
@@ -235,7 +235,10 @@ src_install () {
 	insinto /etc/logrotate.d
 	newins doc/examples/ganeti.logrotate ${PN}
 
-	keepdir /var/{lib,log}/${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}/
 

diff --git a/app-emulation/ganeti/ganeti-2.13.0-r2.ebuild b/app-emulation/ganeti/ganeti-2.13.0-r2.ebuild
index 45a4009..42b24ed 100644
--- a/app-emulation/ganeti/ganeti-2.13.0-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.13.0-r2.ebuild
@@ -231,7 +231,10 @@ src_install () {
 	insinto /etc/logrotate.d
 	newins doc/examples/ganeti.logrotate ${PN}
 
-	keepdir /var/{lib,log}/${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}/
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-04-05 18:42 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2016-04-05 18:42 UTC (permalink / raw
  To: gentoo-commits

commit:     51350944b28b74246b75e212baa52972754fbc01
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 18:42:10 2016 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 18:42:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51350944

app-emulation/ganeti: Always pull in sphinx in 2.13 and 2.14

Gentoo-Bug: 548972

Package-Manager: portage-2.2.28

 ...aneti-2.13.0-r2.ebuild => ganeti-2.13.0-r3.ebuild} | 19 ++++++++-----------
 ...aneti-2.14.1-r1.ebuild => ganeti-2.14.1-r2.ebuild} | 16 +++++++---------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.13.0-r2.ebuild b/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
similarity index 96%
rename from app-emulation/ganeti/ganeti-2.13.0-r2.ebuild
rename to app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
index 42b24ed..0eeaec9 100644
--- a/app-emulation/ganeti/ganeti-2.13.0-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,12 +17,6 @@ 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"
@@ -90,12 +84,15 @@ DEPEND="
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	haskell-daemons? ( dev-haskell/text:0= )
-	${PYTHON_DEPS}
-	${GIT_DEPEND}"
+	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
-	app-text/pandoc
+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

diff --git a/app-emulation/ganeti/ganeti-2.14.1-r1.ebuild b/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
similarity index 96%
rename from app-emulation/ganeti/ganeti-2.14.1-r1.ebuild
rename to app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
index 17bb19c..0e62c0a 100644
--- a/app-emulation/ganeti/ganeti-2.14.1-r1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,11 +17,6 @@ if [[ ${PV} =~ [9]{4,} ]] ; then
 	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
 	inherit git-2
 	KEYWORDS=""
-	GIT_DEPEND="dev-python/docutils
-		=dev-python/sphinx-1.2*[${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"
@@ -118,11 +113,14 @@ DEPEND="
 	drbd? ( <sys-cluster/drbd-8.5 )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
-	${PYTHON_DEPS}
-	${GIT_DEPEND}"
+	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
+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=


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-04-05 23:18 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2016-04-05 23:18 UTC (permalink / raw
  To: gentoo-commits

commit:     be3d8461a76b956d152f172d300159955fb6f354
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 23:17:59 2016 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 23:18:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3d8461

app-emulation/ganeti: Clean out 2.15.2-r3

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r3.ebuild | 312 ---------------------------
 1 file changed, 312 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r3.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r3.ebuild
deleted file mode 100644
index c5dac05..0000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r3.ebuild
+++ /dev/null
@@ -1,312 +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"
-)
-
-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"
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-05-12 23:25 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2016-05-12 23:25 UTC (permalink / raw
  To: gentoo-commits

commit:     95bea832acf85cc697689d9afad274c96e164635
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 23:24:52 2016 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu May 12 23:24:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bea832

app-emulation/ganeti: Remove use in global scope (bug #566524)

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.11.6-r2.ebuild | 5 +++--
 app-emulation/ganeti/ganeti-2.12.3-r2.ebuild | 8 +++++---
 app-emulation/ganeti/ganeti-2.13.0-r3.ebuild | 6 ++++--
 app-emulation/ganeti/ganeti-2.14.1-r2.ebuild | 9 ++++++---
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
index 86677b7..09b4625 100644
--- a/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.11.6-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
-use test && PYTHON_REQ_USE="ipv6"
+PYTHON_REQ_USE="ipv6(+)?"
 
 inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator pax-utils
 
@@ -35,7 +35,8 @@ 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 )"
+REQUIRED_USE="|| ( kvm xen lxc )
+	test? ( ipv6 )"
 
 USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
 GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"

diff --git a/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild b/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild
index 7707e09..7c960a5 100644
--- a/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.12.3-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
-use test && PYTHON_REQ_USE="ipv6"
+PYTHON_REQ_USE="ipv6(+)?"
 
 inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
 
@@ -34,7 +34,9 @@ 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 ) ${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="|| ( kvm xen lxc )
+	test? ( ipv6 )
+	${PYTHON_REQUIRED_USE}"
 
 USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
 GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"

diff --git a/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild b/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
index 0eeaec9..c1e02bc 100644
--- a/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
+++ b/app-emulation/ganeti/ganeti-2.13.0-r3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
-use test && PYTHON_REQ_USE="ipv6"
+PYTHON_REQ_USE="ipv6(+)?"
 
 inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
 
@@ -28,7 +28,9 @@ 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 ) ${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="|| ( kvm xen lxc )
+	test? ( ipv6 )
+	${PYTHON_REQUIRED_USE}"
 
 USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
 GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"

diff --git a/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild b/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
index 0e62c0a..bc2ba9e 100644
--- a/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.14.1-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
-use test && PYTHON_REQ_USE="ipv6"
+PYTHON_REQ_USE="ipv6(+)?"
 
 inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
 
@@ -28,7 +28,9 @@ 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 ) ${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="|| ( kvm xen lxc )
+	test? ( ipv6 )
+	${PYTHON_REQUIRED_USE}"
 
 USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
 GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
@@ -158,7 +160,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
 )
 
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
+REQUIRED_USE="kvm? ( || ( amd64 x86 ) )
+	test? ( ipv6 )"
 
 S="${WORKDIR}/${MY_P}"
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-07-05 21:55 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2016-07-05 21:55 UTC (permalink / raw
  To: gentoo-commits

commit:     7ea446f8b1b02298bc946bb2bce50c6a075f563d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 21:53:59 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 21:55:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea446f8

app-emulation/ganeti: add upstream stable tweak

Upstream commit b3c0fb0b allows slightly more versions of json & lens.

X-URL: http://git.ganeti.org/?p=ganeti.git;a=commit;h=b3c0fb0b
Package-Manager: portage-2.2.28
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-emulation/ganeti/ganeti-2.15.2-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
index 704f938..3b69501 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
@@ -79,9 +79,9 @@ DEPEND="
 	>=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/json-1.0:0=
 	>=dev-haskell/lens-3.10:0=
-	<dev-haskell/lens-4.8:0=
+	<=dev-haskell/lens-4.13.1: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=


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-07-11 22:50 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2016-07-11 22:50 UTC (permalink / raw
  To: gentoo-commits

commit:     21fab50691a4c7db934df52d8b6473a84f605a65
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 22:09:03 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 22:50:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fab506

Revert "app-emulation/ganeti: add upstream stable tweak"

This reverts commit 7ea446f8b1b02298bc946bb2bce50c6a075f563d; applying
an Ubuntu patch in a revbump instead.

 app-emulation/ganeti/ganeti-2.15.2-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
index 3b69501..704f938 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r4.ebuild
@@ -79,9 +79,9 @@ DEPEND="
 	>=dev-haskell/hslogger-1.1.4:0=
 	<dev-haskell/hslogger-1.3:0=
 	>=dev-haskell/json-0.5:0=
-	<dev-haskell/json-1.0:0=
+	<dev-haskell/json-0.9:0=
 	>=dev-haskell/lens-3.10:0=
-	<=dev-haskell/lens-4.13.1: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=


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-07-11 22:50 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2016-07-11 22:50 UTC (permalink / raw
  To: gentoo-commits

commit:     bb887914ca73cb1cfa062d2e60f862fd66fb921c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 22:49:48 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 22:50:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb887914

app-emulation/ganeti: add Debian patch series, including haskell dep tweaks

Package-Manager: portage-2.2.28

 app-emulation/ganeti/Manifest                |   1 +
 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 324 +++++++++++++++++++++++++++
 2 files changed, 325 insertions(+)

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 1f02394..7936b35 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -3,3 +3,4 @@ DIST ganeti-2.12.3.tar.gz 4373350 SHA256 e66fc4c3dde1e90d85749ceb5c1c90bd6eaed1d
 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.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
new file mode 100644
index 0000000..74f768e
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -0,0 +1,324 @@
+# 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=""
+	PATCHES=()
+else
+	DEBIAN_PATCH=4
+	SRC_URI="
+	  http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+	  mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+	"
+	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+	  "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+	  "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+	  "${WORKDIR}"/debian/patches/relax-deps
+	  "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+	  "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+	  "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+	  "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+	)
+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.14: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/lens-3.10: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/zlib-0.5.3.3:0=
+	<dev-haskell/zlib-0.7: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"
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-07-12  0:13 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2016-07-12  0:13 UTC (permalink / raw
  To: gentoo-commits

commit:     3f3cc0194f8d0f598ef2e6152da5d1c12550bc94
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 00:12:45 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 00:13:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3cc019

app-emulation/ganeti: match dependencies used in Ubuntu.

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index 74f768e..e1c3ee4 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -78,7 +78,7 @@ DEPEND="
 	>=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/transformers-0.4.3.0:0=
 
 	>=dev-haskell/attoparsec-0.10.1.1:0=
 	<dev-haskell/attoparsec-0.14:0
@@ -121,9 +121,6 @@ DEPEND="
 	>=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
@@ -144,7 +141,7 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
@@ -160,7 +157,7 @@ DEPEND+="
 		>=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=
+		<dev-haskell/quickcheck-2.8.3:2=
 		sys-apps/fakeroot
 		net-misc/socat
 		dev-util/shelltestrunner
@@ -209,6 +206,16 @@ pkg_setup () {
 src_prepare() {
 	local testfile
 	eapply "${PATCHES[@]}"
+	# Upstream commits:
+	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+	# 24618882737fd7c189adf99f4acc767d48f572c3
+	sed -i \
+		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+		cabal/ganeti.template.cabal
+	# Neuter -Werror
+	sed -i \
+		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+		Makefile.am
 
 	# not sure why these tests are failing
 	# should remove this on next version bump if possible


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-07-12  0:53 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2016-07-12  0:53 UTC (permalink / raw
  To: gentoo-commits

commit:     b3e02158edf8174dcc898f0118d0fe75064e0758
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 00:40:13 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 00:53:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e02158

app-emulation/ganeti: support USE=restricted-commands, tweak haskell flags and socat.

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 10 +++++++---
 app-emulation/ganeti/metadata.xml            |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index e1c3ee4..a144974 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -41,7 +41,7 @@ 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"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
 
 REQUIRED_USE="|| ( kvm xen lxc )
 	test? ( ipv6 )
@@ -159,7 +159,7 @@ DEPEND+="
 		>=dev-haskell/quickcheck-2.4.2:2=
 		<dev-haskell/quickcheck-2.8.3:2=
 		sys-apps/fakeroot
-		net-misc/socat
+		>=net-misc/socat-1.7
 		dev-util/shelltestrunner
 	)"
 
@@ -251,6 +251,7 @@ src_configure () {
 		--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 restricted-commands) \
 		$(use_enable test haskell-tests) \
 		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
 		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
@@ -259,7 +260,10 @@ src_configure () {
 		$(use_enable syslog) \
 		$(use_enable monitoring) \
 		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
-		$(usex haskell-daemons "--enable-confd=haskell" '' '' '')
+		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+		--enable-socat-escape \
+		--enable-socat-compress
 }
 
 src_install () {

diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index 6fbe4e9..2693e91 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -31,6 +31,7 @@
 		<flag name="lxc">Enable Linux Countainers support</flag>
 		<flag name="multiple-users">Enable support for running VMs as different users</flag>
 		<flag name="monitoring">Enable the ganeti monitoring daemon</flag>
+		<flag name="restricted-commands">Enable restricted commands in the node daemon</flag>
 		<flag name="rbd">Enable rados block device support via sys-cluster/ceph</flag>
 		<flag name="xen">Enable Xen support</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-07-12 17:13 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2016-07-12 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     9d47fce824c7f2c2615b2f46638ab259c71cff55
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 17:12:49 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 17:13:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d47fce8

app-emulation/ganeti: tweak one dep back down for easier merge.

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index a144974..600f1bd 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -78,7 +78,7 @@ DEPEND="
 	>=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.4.3.0:0=
+	>=dev-haskell/transformers-0.3.0.0:0=
 
 	>=dev-haskell/attoparsec-0.10.1.1:0=
 	<dev-haskell/attoparsec-0.14:0


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-07-12 22:54 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2016-07-12 22:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3222ba8c78fd841601a2c7fe4d8520db3e36097a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 22:54:22 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 22:54:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3222ba8c

app-emulation/ganeti: only use GHC 7.10 patch when present, causes failures on older GHC.

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index 600f1bd..2e696eb 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -29,7 +29,6 @@ else
 	  "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
 	  "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
 	  "${WORKDIR}"/debian/patches/relax-deps
-	  "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
 	  "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
 	  "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
 	  "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
@@ -205,6 +204,12 @@ pkg_setup () {
 
 src_prepare() {
 	local testfile
+	if has_version '>=dev-lang/ghc-7.10'; then
+		# Breaks the build on 7.8
+		PATCHES+=( 
+			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch 
+		)
+	fi
 	eapply "${PATCHES[@]}"
 	# Upstream commits:
 	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-07-13 17:22 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2016-07-13 17:22 UTC (permalink / raw
  To: gentoo-commits

commit:     4a5624c7fdc81f7b55dcffb7f60841be1ca383b6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 00:16:00 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 17:22:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5624c7

app-emulation/ganeti: hotplug requires missing dep dev-python/fdsend.

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index 2e696eb..6266c07 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -61,6 +61,7 @@ DEPEND="
 	dev-python/ipaddr[${PYTHON_USEDEP}]
 	dev-python/bitarray[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/fdsend[${PYTHON_USEDEP}]
 	net-analyzer/arping
 	net-analyzer/fping
 	net-misc/bridge-utils


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-07-13 21:37 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2016-07-13 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     19fdc1e3c58c2b4232587920517390eb399d76c5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 21:37:32 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:37:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fdc1e3

app-emulation/ganeti: whitespace.

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index 6266c07..05d1d94 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -207,8 +207,8 @@ src_prepare() {
 	local testfile
 	if has_version '>=dev-lang/ghc-7.10'; then
 		# Breaks the build on 7.8
-		PATCHES+=( 
-			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch 
+		PATCHES+=(
+			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
 		)
 	fi
 	eapply "${PATCHES[@]}"


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-12-01 11:50 Agostino Sarubbo
  0 siblings, 0 replies; 36+ messages in thread
From: Agostino Sarubbo @ 2016-12-01 11:50 UTC (permalink / raw
  To: gentoo-commits

commit:     bae3b3f11e44a216798e5414a4f29dab278290e4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 11:50:16 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 11:50:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae3b3f1

app-emulation/ganeti: amd64 stable wrt bug #570240

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index 05d1d94..d94b0a1 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -24,7 +24,7 @@ else
 	  http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
 	  mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	PATCHES=(
 	  "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
 	  "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-12-01 11:51 Agostino Sarubbo
  0 siblings, 0 replies; 36+ messages in thread
From: Agostino Sarubbo @ 2016-12-01 11:51 UTC (permalink / raw
  To: gentoo-commits

commit:     45c05cab88244ec145216835043e462be2f96546
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 11:51:13 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 11:51:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c05cab

app-emulation/ganeti: x86 stable wrt bug #570240

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index d94b0a1..b1f65e3 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -24,7 +24,7 @@ else
 	  http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
 	  mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
 	"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	PATCHES=(
 	  "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
 	  "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2016-12-02  0:56 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2016-12-02  0:56 UTC (permalink / raw
  To: gentoo-commits

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"
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2017-12-10  9:27 Ulrich Müller
  0 siblings, 0 replies; 36+ messages in thread
From: Ulrich Müller @ 2017-12-10  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     1cca776f6a825643de03929a81337c657a0f9b4c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 08:34:57 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 09:26:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cca776f

app-emulation/ganeti: Update Manifest hashes.

 app-emulation/ganeti/Manifest | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index a27173fb40b..88ce5ff98b4 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,5 +1,5 @@
-DIST ganeti-2.15.2.tar.gz 4723007 SHA256 1e09d29cae5020142d20a96165b23f3b62b5511b875051b6374d09c4c13c0b83 SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85 WHIRLPOOL a09a13d64e7c6fa7823072d767fa6495cd814bb22e7a5fc708c8b339103a41da4e45f38574a2c665fe89c8774f220a2715c3aba180eb674eae603730dd2d25ad
-DIST ganeti-2.16.0~rc1.tar.gz 4794934 SHA256 014cbc02b05c681ef216791d23de33e3355adf2153fede91c4fb09f924efb5f1 SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be WHIRLPOOL e5a367ca728757a1a406519110b232875800ed5efe3dc4ba33ab2f0e97e0112d3eebf6235786e2074397c363a73991bf80ed21684a8b608eaba74b3ec102070b
-DIST ganeti-2.17.0~beta1.tar.gz 4880091 SHA256 57de10d300ee4a1b4f1a6625ef24ad4a459c6c5bf1ea83d73a95b0cf9cb6ddb9 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e WHIRLPOOL 3d2ba633e1a4b0c14ece75b1144920720497b533f83c93af3bdf6c2dcdefd3269b581ad4f75497866613ae3a51805ba855aa55b29c6271b9f660b96d48f56a64
-DIST ganeti_2.15.2-4.debian.tar.xz 42440 SHA256 d2b907ad54b6fad8bc9c023c718c6f1a35cbc487fa065291f465f1e518df6d02 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403 WHIRLPOOL 16acab23919541bfd1748ff9f5e243c483ed4b5b10bcd5c233821c06968671ce0fcdab86ec95a30f6162a308df1eca16424e94b80ea095dfc90931a4be930b26
-DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 SHA256 bb97edb134d45dffb2678604dff7f3b91904aa4b4e16c3c29e44e9919e45a737 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af WHIRLPOOL 11712b4232ec1e7401d2e8fbf2c66465ffacfb52129dc7d2736cfcb45140ef7734a43510688fd2b8dbac088b6547aacadd596d0def64f9a1cd1f3b88c053f39c
+DIST ganeti-2.15.2.tar.gz 4723007 BLAKE2B d49d2ed9df515514a99d42303799e5ffc751eb8e6b397f86174cb3d48ec846fd3d146737240eea9ec0ce6fd9d07e04a27831a45a4354d3d49597b9f5cff33d7b SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85
+DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be
+DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e
+DIST ganeti_2.15.2-4.debian.tar.xz 42440 BLAKE2B 5c329baa90bd801a3e4b550da0a4c8bb59f3d17801ff0d66a35ae0383f34a5c1cc7f3d6d67a5e07157085290019b22c6b5349224ed43b5ec40fbdc37ded77e88 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403
+DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2018-01-17  2:52 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2018-01-17  2:52 UTC (permalink / raw
  To: gentoo-commits

commit:     2bbe3ec2825e97faf62e6cc66e27588c5d210415
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 02:52:09 2018 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 02:52:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbe3ec2

app-emulation/ganeti: Allow arping from iputils as well as the separate package

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 42 +++++++++++++---------------
 app-emulation/ganeti/ganeti-2.15.2-r6.ebuild | 42 +++++++++++++---------------
 2 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index a91a6db5a25..002bd0085ca 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,27 +12,20 @@ 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=""
-	PATCHES=()
-else
-	DEBIAN_PATCH=4
-	SRC_URI="
-	  http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
-	  mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-	"
-	KEYWORDS="amd64 x86"
-	PATCHES=(
-	  "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
-	  "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
-	  "${WORKDIR}"/debian/patches/relax-deps
-	  "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
-	  "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
-	  "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
-	)
-fi
+DEBIAN_PATCH=4
+SRC_URI="
+	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+	mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+"
+KEYWORDS="amd64 x86"
+PATCHES=(
+	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+	"${WORKDIR}"/debian/patches/relax-deps
+	"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+	"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+	"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+)
 
 DESCRIPTION="Ganeti is a virtual server management software tool"
 HOMEPAGE="http://www.ganeti.org/"
@@ -61,7 +54,10 @@ DEPEND="
 	dev-python/bitarray[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/fdsend[${PYTHON_USEDEP}]
-	net-analyzer/arping
+	|| (
+		net-misc/iputils[arping]
+		net-analyzer/arping
+	)
 	net-analyzer/fping
 	net-misc/bridge-utils
 	net-misc/curl[ssl]

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index ec6c5e7a33f..739b9186e2d 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,27 +12,20 @@ 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=""
-	PATCHES=()
-else
-	DEBIAN_PATCH=4
-	SRC_URI="
-	  http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
-	  mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-	"
-	KEYWORDS="~amd64 ~x86"
-	PATCHES=(
-	  "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
-	  "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
-	  "${WORKDIR}"/debian/patches/relax-deps
-	  "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
-	  "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
-	  "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
-	)
-fi
+DEBIAN_PATCH=4
+SRC_URI="
+	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+	mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+"
+KEYWORDS="~amd64 ~x86"
+PATCHES=(
+	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+	"${WORKDIR}"/debian/patches/relax-deps
+	"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+	"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+	"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+)
 
 DESCRIPTION="Ganeti is a virtual server management software tool"
 HOMEPAGE="http://www.ganeti.org/"
@@ -61,7 +54,10 @@ DEPEND="
 	dev-python/bitarray[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/fdsend[${PYTHON_USEDEP}]
-	net-analyzer/arping
+	|| (
+		net-misc/iputils[arping]
+		net-analyzer/arping
+	)
 	net-analyzer/fping
 	net-misc/bridge-utils
 	net-misc/curl[ssl]


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2018-01-31  1:04 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2018-01-31  1:04 UTC (permalink / raw
  To: gentoo-commits

commit:     6f3d79acd554da6385348b94032f35730b1c64c6
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 01:04:17 2018 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 01:04:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3d79ac

app-emulation/ganeti: Allow newer versions of sphinx

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 app-emulation/ganeti/ganeti-2.15.2-r6.ebuild  | 2 +-
 app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index cb14808fba4..39a61a1f54f 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -136,7 +136,7 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=

diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 735e13c59f4..1ae893ae5ef 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -141,7 +141,7 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2018-08-25 20:20 Michał Górny
  0 siblings, 0 replies; 36+ messages in thread
From: Michał Górny @ 2018-08-25 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     8936fabfd37d6e7fafb7145c3c7bc3f2b79f1214
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 19:39:08 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 19:39:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8936fabf

app-emulation/ganeti: Remove dep on removed sys-cluster/drbd

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild    | 7 +------
 app-emulation/ganeti/ganeti-2.15.2-r6.ebuild    | 7 +------
 app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild   | 7 +------
 app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild | 7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index 002bd0085ca..c1a37b6d764 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -122,12 +122,7 @@ DEPEND="
 		app-emulation/qemu
 	)
 	lxc? ( app-emulation/lxc )
-	drbd? (
-		|| (
-			<sys-cluster/drbd-8.5
-			sys-cluster/drbd-utils
-		)
-	)
+	drbd? ( sys-cluster/drbd-utils )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	${PYTHON_DEPS}"

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index 39a61a1f54f..646ff4ff3a5 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -122,12 +122,7 @@ DEPEND="
 		app-emulation/qemu
 	)
 	lxc? ( app-emulation/lxc )
-	drbd? (
-		|| (
-			<sys-cluster/drbd-8.5
-			sys-cluster/drbd-utils
-		)
-	)
+	drbd? ( sys-cluster/drbd-utils )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	${PYTHON_DEPS}"

diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 1ae893ae5ef..e1a45367e93 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -127,12 +127,7 @@ DEPEND="
 		app-emulation/qemu
 	)
 	lxc? ( app-emulation/lxc )
-	drbd? (
-		|| (
-			<sys-cluster/drbd-8.5
-			sys-cluster/drbd-utils
-		)
-	)
+	drbd? ( sys-cluster/drbd-utils )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	${PYTHON_DEPS}"

diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index 61994d1d537..8e304597470 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -127,12 +127,7 @@ DEPEND="
 		app-emulation/qemu
 	)
 	lxc? ( app-emulation/lxc )
-	drbd? (
-		|| (
-			<sys-cluster/drbd-8.5
-			sys-cluster/drbd-utils
-		)
-	)
+	drbd? ( sys-cluster/drbd-utils )
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	${PYTHON_DEPS}"


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2019-04-08 17:11 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2019-04-08 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     5607cac4b6be8f24822b930f6d278431d1eb7e41
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 17:10:10 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 17:11:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5607cac4

app-emulation/ganeti: support net-misc/iputils[arping] in masked builds

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild   | 7 +++++--
 app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index e1a45367e93..7902fba92c3 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,7 +62,10 @@ DEPEND="
 	dev-python/bitarray[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/fdsend[${PYTHON_USEDEP}]
-	net-analyzer/arping
+	|| (
+		net-misc/iputils[arping]
+		net-analyzer/arping
+	)
 	net-analyzer/fping
 	net-misc/bridge-utils
 	net-misc/curl[ssl]

diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index 8e304597470..053c5aff28a 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,7 +62,10 @@ DEPEND="
 	dev-python/bitarray[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/fdsend[${PYTHON_USEDEP}]
-	net-analyzer/arping
+	|| (
+		net-misc/iputils[arping]
+		net-analyzer/arping
+	)
 	net-analyzer/fping
 	net-misc/bridge-utils
 	net-misc/curl[ssl]


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2019-04-14 11:12 Agostino Sarubbo
  0 siblings, 0 replies; 36+ messages in thread
From: Agostino Sarubbo @ 2019-04-14 11:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f9ff6bb4c592246cf0b204d410c2df6e4a9061a1
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 11:12:17 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 11:12:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ff6bb4

app-emulation/ganeti: amd64 stable wrt bug #667458

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-emulation/ganeti/ganeti-2.15.2-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
index 0d2eaac25e1..579f39cb371 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
 	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 PATCHES=(
 	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
 	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2020-05-06  1:02 Patrick McLean
  0 siblings, 0 replies; 36+ messages in thread
From: Patrick McLean @ 2020-05-06  1:02 UTC (permalink / raw
  To: gentoo-commits

commit:     835e0c9ecd4e407e6c917f87a09bde8757ae5e72
Author:     Austin English <austin.m.english <AT> sony <DOT> com>
AuthorDate: Sat May  2 05:06:11 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed May  6 01:02:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835e0c9e

app-emulation/ganeti: remove old

Closes: https://bugs.gentoo.org/719846
Signed-off-by: Austin English <austin.m.english <AT> sony.com>
Closes: https://github.com/gentoo/gentoo/pull/15608
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-emulation/ganeti/ganeti-2.15.2-r9.ebuild | 383 ---------------------------
 1 file changed, 383 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
deleted file mode 100644
index 385e6884858..00000000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(ver_cut 1-2)"
-
-DEBIAN_PATCH=11
-SRC_URI="
-	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
-	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-"
-KEYWORDS="~amd64 ~x86"
-PATCHES=(
-	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
-	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
-	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
-	"${WORKDIR}"/debian/patches/relax-deps
-	"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
-	"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
-	"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
-	"${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch
-	"${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
-	"${WORKDIR}"/debian/patches/0001-GHC-8-support.patch
-	"${WORKDIR}"/debian/patches/ghc8-fixes
-	"${WORKDIR}"/debian/patches/snap-server-1.0-compat
-	"${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch
-	"${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch
-	"${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch
-	"${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch
-	"${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch
-	"${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
-	"${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch
-	"${WORKDIR}"/debian/patches/fix-cpu-affinity.patch
-	"${WORKDIR}"/debian/patches/fix-fcntl-i386.patch
-	"${WORKDIR}"/debian/patches/fix-ovf-test-path.patch
-	"${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch
-	"${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch
-	#"${WORKDIR}"/debian/patches/THH-2.12.patch
-	"${WORKDIR}"/debian/patches/sphinx-1.7.patch
-	"${WORKDIR}"/debian/patches/ca-use-sha256-md.patch
-	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch
-	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch
-)
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-RESTRICT="!test? ( test )"
-
-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
-	$(python_gen_cond_dep '
-		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
-		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
-		dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
-		dev-python/docutils[${PYTHON_MULTI_USEDEP}]
-		dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
-	')
-	|| (
-		net-misc/iputils[arping]
-		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-2.02.181
-	>=sys-apps/baselayout-2.0
-	>=dev-lang/ghc-8.0:0=
-	<dev-lang/ghc-8.1:0=
-	dev-haskell/cabal:0=
-	dev-haskell/cabal-install:0=
-	!<app-emulation/ganeti-instance-image-0.6-r1
-	>=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.14: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/lens-3.10:0=
-	>=dev-haskell/lifted-base-0.2.0.3:0=
-	<dev-haskell/lifted-base-0.3:0=
-	>=dev-haskell/monad-control-1.0.1.0:0=
-	<dev-haskell/monad-control-1.0.2: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:0=
-	<dev-haskell/transformers-base-0.5:0=
-	>=dev-haskell/utf8-string-0.3.7:0=
-	>=dev-haskell/zlib-0.5.3.3:0=
-	<dev-haskell/zlib-0.7:0=
-
-	>=dev-haskell/psqueue-1.1:0=
-	<dev-haskell/psqueue-1.2:0=
-	>=dev-haskell/snap-core-1.0.1:0=
-	<dev-haskell/snap-core-1.1:0=
-	>=dev-haskell/snap-server-1.0.1:0=
-	<dev-haskell/snap-server-1.1:0=
-	>=dev-haskell/case-insensitive-0.4.0.1
-
-	dev-haskell/vector:0=
-	xen? ( >=app-emulation/xen-3.0 )
-	kvm? (
-		dev-python/psutil
-		app-emulation/qemu
-	)
-	lxc? ( app-emulation/lxc )
-	drbd? ( 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
-	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_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.3:2=
-		sys-apps/fakeroot
-		>=net-misc/socat-1.7
-		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"
-	"${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
-	"${FILESDIR}/ganeti-2.15.2-bdev_py.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-	usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-# haskell...
-QA_FLAGS_IGNORED="
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-metad
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-wconfd
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-confd
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-luxid
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-kvmd
-	/usr/lib64/ganeti/2.15/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
-	if has_version '>=dev-lang/ghc-7.10'; then
-		# Breaks the build on 7.8
-		PATCHES+=(
-			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
-		)
-	fi
-	if use experimental; then
-		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
-		PATCHES+=(
-			# QEMU Agent accepted upstream for 2.16, not yet in a tagged release
-			# backport available for 2.15, but refused upstream due to RPC breakage.
-			"${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
-		)
-	fi
-	eapply "${PATCHES[@]}"
-	# Upstream commits:
-	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
-	# 24618882737fd7c189adf99f4acc767d48f572c3
-	sed -i \
-		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
-	# Neuter -Werror
-	sed -i \
-		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
-
-	# 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'
-
-	sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \
-		> "${T}/ganeti.initd"
-
-	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 restricted-commands) \
-		$(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" '' '' '') \
-		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
-		--enable-socat-escape \
-		--enable-socat-compress
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	newinitd "${T}"/ganeti.initd ${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
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2020-07-27 10:02 Michał Górny
  0 siblings, 0 replies; 36+ messages in thread
From: Michał Górny @ 2020-07-27 10:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9a6e838ff48291e59404cccb08da4d4e82ef6002
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 09:09:20 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 10:02:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6e838f

app-emulation/ganeti: Disable dep on py2 sphinx & pandoc

Disable rebuilding manpages in order to unblock Python 2 removal
from dev-python/sphinx.  Also remove the dependency on app-text/pandoc
which becomes no longer necessary.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{ganeti-2.15.2-r10.ebuild => ganeti-2.15.2-r11.ebuild}   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
similarity index 98%
rename from app-emulation/ganeti/ganeti-2.15.2-r10.ebuild
rename to app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
index 40729b5f912..13b15c79546 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
@@ -77,7 +77,6 @@ DEPEND="
 		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
 		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
 		dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
-		dev-python/docutils[${PYTHON_MULTI_USEDEP}]
 		dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
 	')
 	|| (
@@ -158,10 +157,6 @@ RDEPEND="${DEPEND}
 	!app-emulation/ganeti-htools"
 DEPEND+="
 	sys-devel/m4
-	app-text/pandoc
-	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-	')
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
@@ -316,7 +311,12 @@ src_configure() {
 		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
 		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
 		--enable-socat-escape \
-		--enable-socat-compress
+		--enable-socat-compress \
+		SPHINX= \
+		PANDOC=
+
+	touch man/*.gen || die
+	touch man/*.in || die
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2020-07-27 10:02 Michał Górny
  0 siblings, 0 replies; 36+ messages in thread
From: Michał Górny @ 2020-07-27 10:02 UTC (permalink / raw
  To: gentoo-commits

commit:     edf1f6112c95190d1cb9eeae07e9954970b3ab4c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 09:11:40 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 10:02:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf1f611

app-emulation/ganeti: Add missing ||die

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-emulation/ganeti/ganeti-2.15.2-r10.ebuild | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild
index 4427da82567..40729b5f912 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild
@@ -259,28 +259,30 @@ src_prepare() {
 	# 24618882737fd7c189adf99f4acc767d48f572c3
 	sed -i \
 		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
+		cabal/ganeti.template.cabal || die
 	# Neuter -Werror
 	sed -i \
 		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
+		Makefile.am || die
 
 	# 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}"
+		printf '#!/bin/bash\ntrue\n' > "${testfile}" || die
 	done
 
 	# take the sledgehammer approach to bug #526270
-	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g' || die
 
 	sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \
-		> "${T}/ganeti.initd"
+		> "${T}/ganeti.initd" || die
 
 	eapply_user
 
-	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
-	rm autotools/missing
+	if [[ ${PV} =~ [9]{4,} ]]; then
+		./autogen.sh || die
+	fi
+	rm autotools/missing || die
 	eautoreconf
 }
 
@@ -329,9 +331,9 @@ src_install() {
 	fi
 
 	# ganeti installs it's own docs in a generic location
-	rm -rf "${D}"/{usr/share/doc/${PN},run}
+	rm -rf "${D}"/{usr/share/doc/${PN},run} || die
 
-	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion || die
 	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} \


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2022-07-23 16:39 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2022-07-23 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     95f319609f352948f30b552ea453811c14255900
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 16:26:40 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 16:39:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f31960

app-emulation/ganeti: remove unused multiple-users support

The metadata description said running VMs as different users, but that
was never correct. It was running the daemons as different users, but
QEMU still ran as root and dropped (some) privileges.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-emulation/ganeti/ganeti-3.0.2-r2.ebuild | 24 +++++++++++++-----------
 app-emulation/ganeti/metadata.xml           |  1 -
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
index 9487945d0a93..bf35bdba6614 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
@@ -35,7 +35,7 @@ HOMEPAGE="http://www.ganeti.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="drbd experimental ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+IUSE="drbd experimental ipv6 kvm lxc monitoring rbd syslog test xen restricted-commands"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( kvm xen lxc )
@@ -208,12 +208,14 @@ 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
+	# Unknown if this functionality was ever used. Maybe re-introduce if issues
+	# reported.
+	#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
 }
 
 # These flags get applied in src_prepare and src_configure
@@ -300,10 +302,10 @@ src_configure() {
 		--enable-metadata
 		$(use_enable restricted-commands)
 		$(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}" "")
+		#$(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}" '')

diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index 302c0dece0ae..d37ba927d87a 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -23,7 +23,6 @@
 		<flag name="drbd">Enable DRBD support</flag>
 		<flag name="kvm">Enable KVM support</flag>
 		<flag name="lxc">Enable Linux Containers support</flag>
-		<flag name="multiple-users">Enable support for running VMs as different users</flag>
 		<flag name="monitoring">Enable the ganeti monitoring daemon</flag>
 		<flag name="restricted-commands">Enable restricted commands in the node daemon</flag>
 		<flag name="rbd">Enable rados block device support via sys-cluster/ceph</flag>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2022-07-23 16:39 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2022-07-23 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     168aed309a8a063132b5c7afa20fbc5371b23410
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 16:39:19 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 16:39:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168aed30

app-emulation/ganeti: cleanup & update to EAPI8

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-emulation/ganeti/ganeti-3.0.2-r2.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
index bf35bdba6614..63cf7b305b44 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+# As of 3.0.2, Upstream does NOT yet support newer than python3.8
 PYTHON_COMPAT=(python3_{7..8})
 PYTHON_REQ_USE="ipv6(+)?"
 
-inherit user autotools bash-completion-r1 python-single-r1 tmpfiles versionator
+inherit autotools bash-completion-r1 python-single-r1 tmpfiles
 
 MY_PV="${PV/_rc/~rc}"
 MY_PV="${MY_PV/_beta/~beta}"
 MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
+SERIES="3.0"
 
 if [[ ${PV} =~ [9]{4,} ]] ; then
 	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
@@ -136,8 +137,7 @@ DEPEND="
 	rbd? ( sys-cluster/ceph )
 	ipv6? ( net-misc/ndisc6 )
 	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
+RDEPEND="${DEPEND}"
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2022-07-23 16:39 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2022-07-23 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     89f3b64d528e199d4813bba5c34cf0e2bf775b9d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 16:28:29 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 16:39:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f3b64d

app-emulation/ganeti: cleanup old ebuilds

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-emulation/ganeti/Manifest               |   2 -
 app-emulation/ganeti/ganeti-3.0.1.ebuild    | 408 ----------------------------
 app-emulation/ganeti/ganeti-3.0.2-r1.ebuild | 407 ---------------------------
 app-emulation/ganeti/ganeti-3.0.2.ebuild    | 406 ---------------------------
 4 files changed, 1223 deletions(-)

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 3fd7ba80686f..3fa0d08d946d 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,4 +1,2 @@
-DIST ganeti-3.0.1.tar.gz 4924135 BLAKE2B 8d1ffce082d8fa907ef298f2fb08183ac1691d87431d3c521c3ffcebe415496119edfcfe4679a45eb9f0c75b7faa01a6824f67272ea5b5feef7435cf5f5a1789 SHA512 26dc600356a65815d03c2ca88c33e41a211fd7aec9efea8be57d9871d4b288ad563dbf142267b933c8d1950d2449a21a63e341a2679dfa49e14aba78c2da5944
 DIST ganeti-3.0.2.tar.gz 4941978 BLAKE2B d2d11554e202895e93531254ffe68f1ac69943870c9bb91cccbda17bf1f43dba27dcb869aff9f35aca23b4b3f7100597f71ebe3a46e464ec5b24d2f34606935d SHA512 8724888251ba952eb2861f9322adf7d022bbe92fcee0c92c033d07397907737e7f54a5a8751c24beb6343392e7b6ddba4b61981ef5879e47d821ffeae34fa1c1
-DIST ganeti_3.0.1-2.debian.tar.xz 46932 BLAKE2B 34b81c9a73d79b86d5d8fbfda6f680f73dd5fcdb53078d4885922065c7ba1d9552bb0d1718d90b647513a85efb00840f8a6df37dbfb2a2b79d252e98d3a61427 SHA512 c3886b0090602c03322347853ec4e188386d23a896371782545589fb5c182f42afed450dd3851806d4ff6ebd567a96a4cfc3891ea60beae5bbcca9fd61eca81e
 DIST ganeti_3.0.2-1.debian.tar.xz 45700 BLAKE2B 5b2c2285102f46b8e4bceaf040880fe38f999c4abe483b415065fc9408eb713643b69c16d2a468d9e159dcf6fd9388732db03db53955fa603e902a13faa2979e SHA512 49e4698998b87a3c204558b60be59d2b9810783d9c8d94b64eeb72302b3ed62c41decb4d24b54cf9c45f13ad3549362e4b837addc7de4a0e5efc646fb6f6c52f

diff --git a/app-emulation/ganeti/ganeti-3.0.1.ebuild b/app-emulation/ganeti/ganeti-3.0.1.ebuild
deleted file mode 100644
index 2ae107281bf9..000000000000
--- a/app-emulation/ganeti/ganeti-3.0.1.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python3_{7..8})
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1 tmpfiles 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=""
-	PATCHES=()
-else
-	DEBIAN_PV="${PV}"
-	#http://deb.debian.org/debian/pool/main/g/ganeti/ganeti_3.0.1-2.debian.tar.xz
-	DEBIAN_PATCH=2
-	SRC_URI="https://github.com/ganeti/ganeti/releases/download/v${PV}/${P}.tar.gz"
-	[[ -n "${DEBIAN_PATCH}" ]] && SRC_URI+=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${DEBIAN_PV}-${DEBIAN_PATCH}.debian.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	PATCHES=(
-		"${WORKDIR}"/debian/patches/0001-verify-warn-about-weak-certs.patch
-		"${WORKDIR}"/debian/patches/0002-remove-hardcoded-libc-linux-constants.patch
-		"${WORKDIR}"/debian/patches/0003-Fix-lvcreate-for-newer-lvm-versions-1586.patch
-		"${WORKDIR}"/debian/patches/0004-Fix-live-migration-of-xen-instances-1582.patch
-	)
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-RESTRICT="!test? ( test )"
-
-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
-	$(python_gen_cond_dep '
-		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}]
-		dev-python/fdsend[${PYTHON_USEDEP}]
-	')
-	|| (
-		net-misc/iputils[arping]
-		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-8.0:0=
-	<dev-lang/ghc-9:0=
-	>=dev-haskell/cabal-3: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=
-	>=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.14:0
-	>=dev-haskell/base64-bytestring-1.0.0.1:0=
-	<dev-haskell/base64-bytestring-1.1:0=
-	>=dev-haskell/cryptonite-0.23: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.5:0=
-	>=dev-haskell/hslogger-1.1.4:0=
-	<dev-haskell/hslogger-1.4:0=
-	>=dev-haskell/json-0.5:0=
-	<dev-haskell/json-1.0:0=
-	>=dev-haskell/lens-3.10:0=
-	<dev-haskell/lens-5.0: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/parallel-3.2.0.2:3=
-	<dev-haskell/parallel-3.3:3=
-	>=dev-haskell/regex-pcre-0.94.2:0=
-	<dev-haskell/regex-pcre-0.96:0=
-	>=dev-haskell/temporary-1.1.2.3:0=
-	<dev-haskell/temporary-1.4: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/zlib-0.5.3.3:0=
-	<dev-haskell/zlib-0.7:0=
-
-	>=dev-haskell/network-2.9:0=
-	<dev-haskell/network-3.2:0=
-	>=dev-haskell/network-bsd-2.8:0=
-	<dev-haskell/network-bsd-2.9:0=
-
-	>=dev-haskell/psqueue-1.1:0=
-	<dev-haskell/psqueue-1.2:0=
-	>=dev-haskell/snap-core-1.0.0:0=
-	>=dev-haskell/snap-server-1.0.0:0=
-	>=dev-haskell/case-insensitive-0.4.0.1:0=
-	<dev-haskell/case-insensitive-1.3:0=
-
-	dev-haskell/vector:0=
-	xen? ( >=app-emulation/xen-3.0 )
-	kvm? (
-		dev-python/psutil
-		app-emulation/qemu
-	)
-	lxc? ( app-containers/lxc )
-	drbd? ( 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
-	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-	media-fonts/urw-fonts
-	media-gfx/graphviz
-	test? (
-		dev-python/mock
-		dev-python/pyyaml
-		dev-haskell/haddock:0=
-		>=dev-haskell/hunit-1.2.4.2:0=
-		<dev-haskell/hunit-1.7:0=
-		>=dev-haskell/quickcheck-2.8:2=
-		<dev-haskell/quickcheck-2.14:2=
-		>=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=
-		sys-apps/fakeroot
-		>=net-misc/socat-1.7
-		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.16-noded-must-run-as-root.patch"
-	"${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
-	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
-	#"${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
-	#"${FILESDIR}/${PN}-2.17-relax-deps.patch"
-	"${FILESDIR}"/${PN}-3.0.1-template_haskell.patch
-	"${FILESDIR}"/${PN}-3.0.1-docfixes.patch
-	"${FILESDIR}"/${PN}-3.0.1-sphinx.patch
-	"${FILESDIR}"/${PN}-3.0.1-buildfix.patch
-	"${FILESDIR}"/${PN}-3.0.1-gentoo-infra-hacks.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-	usr/lib*/${PN}/${SERIES}/ganeti/mon-collector
-	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
-}
-
-# These flags get applied in src_prepare and src_configure
-GNT_HASKELL_FLAGS="-optl -Wl,-z,relro -optl -Wl,--as-needed -Wno-unused-imports -Wno-deprecations -Wno-monomorphism-restriction"
-
-src_prepare() {
-	local testfile
-	if has_version '>=dev-lang/ghc-8.10'; then
-		# Breaks the build on 7.8
-		PATCHES+=(
-			#"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
-		)
-	fi
-	if use experimental; then
-		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
-		PATCHES+=(
-		)
-	fi
-	# Some debian patches have trailing whitespace, which trips upstream testing
-	sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed"
-
-	eapply "${PATCHES[@]}"
-	# Upstream commits:
-	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
-	# 24618882737fd7c189adf99f4acc767d48f572c3
-	sed -i \
-		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
-	# Neuter -Werror
-	sed -i \
-		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
-
-	# 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
-	# Disable warnings to make it easier to see failure
-	sed -i -e "/^GHC_BYVERSION_FLAGS = @GHC_BYVERSION_FLAGS@/s/$/ ${GNT_HASKELL_FLAGS}/g" "${S}"/Makefile.in
-}
-
-src_compile() {
-	export TMPDIR="${T}/tmp"
-	mkdir -p "${TMPDIR}"
-	default
-}
-
-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_opt=(
-		--localstatedir=/var
-		--sharedstatedir=/var
-		--disable-symlinks
-		--with-sshd-restart-command='/etc/init.d/sshd restart'
-		#--with-export-dir=/var/lib/ganeti-storage/export # Old gentoo
-		--with-export-dir=/srv/ganeti/export # Upstream recommended
-
-		#--with-extstorage-search-path=/var/lib/ganeti-storage/ # Old Gentoo
-		--with-extstorage-search-path=/srv/ganeti/extstorage,/var/lib/ganeti-storage/ext # Upstream + Gentoo
-
-		--with-os-search-path=/srv/ganeti/os,/usr/share/${PN}/os # Upstream + Gentoo
-
-		--disable-manpages-in-doc
-		--enable-metadata
-		$(use_enable restricted-commands)
-		$(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}" '')
-		--with-haskell-flags="${GNT_HASKELL_FLAGS}"
-		--enable-socat-escape
-		--enable-socat-compress
-		--disable-maintainer-mode
-		# Upstream ships some weird defaults for filenames
-		--with-xen-kernel=/boot/kernel
-		--with-kvm-kernel=/boot/kernel
-		--with-xen-initrd=/boot/initramfs
-		--with-kvm-initrd=/boot/initramfs
-
-		# Force this split haskell module
-		ENABLE_NETWORK_BSD=1
-	)
-	econf "${econf_opt[@]}"
-}
-
-src_compile() {
-	emake ENABLE_MANPAGES="" MAN_HAS_WARNINGS=""
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" ENABLE_MANPAGES="" MAN_HAS_WARNINGS="" install
-
-	newinitd "${FILESDIR}"/ganeti.initd-r5 ${PN}
-	newconfd "${FILESDIR}"/ganeti.confd-r5 ${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/*
-
-	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}
-
-	newtmpfiles "${FILESDIR}"/ganeti-tmpfilesd ${PN}.conf
-
-	keepdir /var/log/${PN}/
-	keepdir /usr/share/${PN}/${SERIES}/os/
-	# These are the older Gentoo paths
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
-	# This is handled by tmpfiles. You cannot use keepdir here as Ganeti refuses to have other files in it!
-	rmdir "${D}"/var/lib/ganeti || true
-
-	dosym ${SERIES} "/usr/share/${PN}/default"
-	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
-	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-
-	# Be opinionated, this is the paths that upstream suggests and uses as defaults in configure.
-	# ganeti-tmpfilesd will ensure they are created
-	touch "${D}"/etc/ganeti/file-storage-paths
-	echo /srv/ganeti/file-storage >>"${D}"/etc/ganeti/file-storage-paths
-	echo /srv/ganeti/shared-file-storage >>"${D}"/etc/ganeti/file-storage-paths
-}
-
-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() {
-	# locale is used in some of the doc checks
-	export LC_ALL=C
-	PATH="${S}/scripts:${S}/src:${PATH}" \
-	TMPDIR="/tmp" \
-	LC_ALL=C \
-	GANETI_MASTER="$(hostname -f)" \
-	emake check
-}

diff --git a/app-emulation/ganeti/ganeti-3.0.2-r1.ebuild b/app-emulation/ganeti/ganeti-3.0.2-r1.ebuild
deleted file mode 100644
index dd7f3fa73b89..000000000000
--- a/app-emulation/ganeti/ganeti-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python3_{7..8})
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1 tmpfiles 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=""
-	PATCHES=()
-else
-	DEBIAN_PV="${PV}"
-	#http://deb.debian.org/debian/pool/main/g/ganeti/ganeti_3.0.1-2.debian.tar.xz
-	DEBIAN_PATCH=1
-	SRC_URI="https://github.com/ganeti/ganeti/releases/download/v${PV}/${P}.tar.gz"
-	[[ -n "${DEBIAN_PATCH}" ]] && SRC_URI+=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${DEBIAN_PV}-${DEBIAN_PATCH}.debian.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	PATCHES=(
-		"${WORKDIR}"/debian/patches/0001-verify-warn-about-weak-certs.patch
-		"${WORKDIR}"/debian/patches/0002-remove-hardcoded-libc-linux-constants.patch
-	)
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-RESTRICT="!test? ( test )"
-
-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
-	$(python_gen_cond_dep '
-		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}]
-		dev-python/fdsend[${PYTHON_USEDEP}]
-	')
-	|| (
-		net-misc/iputils[arping]
-		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-8.0:0=
-	<dev-lang/ghc-9:0=
-	>=dev-haskell/cabal-3: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=
-	>=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.14:0
-	>=dev-haskell/base64-bytestring-1.0.0.1:0=
-	<dev-haskell/base64-bytestring-1.1:0=
-	>=dev-haskell/cryptonite-0.23: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.5:0=
-	>=dev-haskell/hslogger-1.1.4:0=
-	<dev-haskell/hslogger-1.4:0=
-	>=dev-haskell/json-0.5:0=
-	<dev-haskell/json-1.0:0=
-	>=dev-haskell/lens-3.10:0=
-	<dev-haskell/lens-5.0: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/parallel-3.2.0.2:3=
-	<dev-haskell/parallel-3.3:3=
-	>=dev-haskell/regex-pcre-0.94.2:0=
-	<dev-haskell/regex-pcre-0.96:0=
-	>=dev-haskell/temporary-1.1.2.3:0=
-	<dev-haskell/temporary-1.4: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/zlib-0.5.3.3:0=
-	<dev-haskell/zlib-0.7:0=
-
-	>=dev-haskell/network-2.9:0=
-	<dev-haskell/network-3.2:0=
-	>=dev-haskell/network-bsd-2.8:0=
-	<dev-haskell/network-bsd-2.9:0=
-
-	>=dev-haskell/psqueue-1.1:0=
-	<dev-haskell/psqueue-1.2:0=
-	>=dev-haskell/snap-core-1.0.0:0=
-	>=dev-haskell/snap-server-1.0.0:0=
-	>=dev-haskell/case-insensitive-0.4.0.1:0=
-	<dev-haskell/case-insensitive-1.3:0=
-
-	dev-haskell/vector:0=
-	xen? ( >=app-emulation/xen-3.0 )
-	kvm? (
-		dev-python/psutil
-		app-emulation/qemu
-	)
-	lxc? ( app-containers/lxc )
-	drbd? ( 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
-	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-	media-fonts/urw-fonts
-	media-gfx/graphviz
-	test? (
-		dev-python/mock
-		dev-python/pyyaml
-		dev-haskell/haddock:0=
-		>=dev-haskell/hunit-1.2.4.2:0=
-		<dev-haskell/hunit-1.7:0=
-		>=dev-haskell/quickcheck-2.8:2=
-		<dev-haskell/quickcheck-2.14:2=
-		>=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=
-		sys-apps/fakeroot
-		>=net-misc/socat-1.7
-		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.16-noded-must-run-as-root.patch"
-	"${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
-	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
-	#"${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
-	#"${FILESDIR}/${PN}-2.17-relax-deps.patch"
-	##"${FILESDIR}"/${PN}-3.0.1-template_haskell.patch
-	##"${FILESDIR}"/${PN}-3.0.1-docfixes.patch
-	##"${FILESDIR}"/${PN}-3.0.1-sphinx.patch
-	"${FILESDIR}"/${PN}-3.0.1-buildfix.patch
-	"${FILESDIR}"/${PN}-3.0.1-gentoo-infra-hacks.patch
-	"${FILESDIR}"/ganeti-3.0.2-less-sleep.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-	usr/lib*/${PN}/${SERIES}/ganeti/mon-collector
-	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
-}
-
-# These flags get applied in src_prepare and src_configure
-GNT_HASKELL_FLAGS="-optl -Wl,-z,relro -optl -Wl,--as-needed -Wno-unused-imports -Wno-deprecations -Wno-monomorphism-restriction"
-
-src_prepare() {
-	local testfile
-	if has_version '>=dev-lang/ghc-8.10'; then
-		# Breaks the build on 7.8
-		PATCHES+=(
-			#"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
-		)
-	fi
-	if use experimental; then
-		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
-		PATCHES+=(
-		)
-	fi
-	# Some debian patches have trailing whitespace, which trips upstream testing
-	sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed"
-
-	eapply "${PATCHES[@]}"
-	# Upstream commits:
-	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
-	# 24618882737fd7c189adf99f4acc767d48f572c3
-	sed -i \
-		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
-	# Neuter -Werror
-	sed -i \
-		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
-
-	# 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
-	# Disable warnings to make it easier to see failure
-	sed -i -e "/^GHC_BYVERSION_FLAGS = @GHC_BYVERSION_FLAGS@/s/$/ ${GNT_HASKELL_FLAGS}/g" "${S}"/Makefile.in
-}
-
-src_compile() {
-	export TMPDIR="${T}/tmp"
-	mkdir -p "${TMPDIR}"
-	default
-}
-
-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_opt=(
-		--localstatedir=/var
-		--sharedstatedir=/var
-		--disable-symlinks
-		--with-sshd-restart-command='/etc/init.d/sshd restart'
-		#--with-export-dir=/var/lib/ganeti-storage/export # Old gentoo
-		--with-export-dir=/srv/ganeti/export # Upstream recommended
-
-		#--with-extstorage-search-path=/var/lib/ganeti-storage/ # Old Gentoo
-		--with-extstorage-search-path=/srv/ganeti/extstorage,/var/lib/ganeti-storage/ext # Upstream + Gentoo
-
-		--with-os-search-path=/srv/ganeti/os,/usr/share/${PN}/os # Upstream + Gentoo
-
-		--disable-manpages-in-doc
-		--enable-metadata
-		$(use_enable restricted-commands)
-		$(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}" '')
-		--with-haskell-flags="${GNT_HASKELL_FLAGS}"
-		--enable-socat-escape
-		--enable-socat-compress
-		--disable-maintainer-mode
-		# Upstream ships some weird defaults for filenames
-		--with-xen-kernel=/boot/kernel
-		--with-kvm-kernel=/boot/kernel
-		--with-xen-initrd=/boot/initramfs
-		--with-kvm-initrd=/boot/initramfs
-
-		# Force this split haskell module
-		ENABLE_NETWORK_BSD=1
-	)
-	econf "${econf_opt[@]}"
-}
-
-src_compile() {
-	emake ENABLE_MANPAGES="" MAN_HAS_WARNINGS=""
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" ENABLE_MANPAGES="" MAN_HAS_WARNINGS="" install
-
-	newinitd "${FILESDIR}"/ganeti.initd-r5 ${PN}
-	newconfd "${FILESDIR}"/ganeti.confd-r5 ${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/*
-
-	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}
-
-	newtmpfiles "${FILESDIR}"/ganeti-tmpfilesd ${PN}.conf
-
-	keepdir /var/log/${PN}/
-	keepdir /usr/share/${PN}/${SERIES}/os/
-	# These are the older Gentoo paths
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
-	# This is handled by tmpfiles. You cannot use keepdir here as Ganeti refuses to have other files in it!
-	rmdir "${D}"/var/lib/ganeti || true
-
-	dosym ${SERIES} "/usr/share/${PN}/default"
-	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
-	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-
-	# Be opinionated, this is the paths that upstream suggests and uses as defaults in configure.
-	# ganeti-tmpfilesd will ensure they are created
-	touch "${D}"/etc/ganeti/file-storage-paths
-	echo /srv/ganeti/file-storage >>"${D}"/etc/ganeti/file-storage-paths
-	echo /srv/ganeti/shared-file-storage >>"${D}"/etc/ganeti/file-storage-paths
-}
-
-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() {
-	# locale is used in some of the doc checks
-	export LC_ALL=C
-	PATH="${S}/scripts:${S}/src:${PATH}" \
-	TMPDIR="/tmp" \
-	LC_ALL=C \
-	GANETI_MASTER="$(hostname -f)" \
-	emake check
-}

diff --git a/app-emulation/ganeti/ganeti-3.0.2.ebuild b/app-emulation/ganeti/ganeti-3.0.2.ebuild
deleted file mode 100644
index 8f316a8d76d4..000000000000
--- a/app-emulation/ganeti/ganeti-3.0.2.ebuild
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python3_{7..8})
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1 tmpfiles 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=""
-	PATCHES=()
-else
-	DEBIAN_PV="${PV}"
-	#http://deb.debian.org/debian/pool/main/g/ganeti/ganeti_3.0.1-2.debian.tar.xz
-	DEBIAN_PATCH=1
-	SRC_URI="https://github.com/ganeti/ganeti/releases/download/v${PV}/${P}.tar.gz"
-	[[ -n "${DEBIAN_PATCH}" ]] && SRC_URI+=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${DEBIAN_PV}-${DEBIAN_PATCH}.debian.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	PATCHES=(
-		"${WORKDIR}"/debian/patches/0001-verify-warn-about-weak-certs.patch
-		"${WORKDIR}"/debian/patches/0002-remove-hardcoded-libc-linux-constants.patch
-	)
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-RESTRICT="!test? ( test )"
-
-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
-	$(python_gen_cond_dep '
-		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}]
-		dev-python/fdsend[${PYTHON_USEDEP}]
-	')
-	|| (
-		net-misc/iputils[arping]
-		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-8.0:0=
-	<dev-lang/ghc-9:0=
-	>=dev-haskell/cabal-3: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=
-	>=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.14:0
-	>=dev-haskell/base64-bytestring-1.0.0.1:0=
-	<dev-haskell/base64-bytestring-1.1:0=
-	>=dev-haskell/cryptonite-0.23: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.5:0=
-	>=dev-haskell/hslogger-1.1.4:0=
-	<dev-haskell/hslogger-1.4:0=
-	>=dev-haskell/json-0.5:0=
-	<dev-haskell/json-1.0:0=
-	>=dev-haskell/lens-3.10:0=
-	<dev-haskell/lens-5.0: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/parallel-3.2.0.2:3=
-	<dev-haskell/parallel-3.3:3=
-	>=dev-haskell/regex-pcre-0.94.2:0=
-	<dev-haskell/regex-pcre-0.96:0=
-	>=dev-haskell/temporary-1.1.2.3:0=
-	<dev-haskell/temporary-1.4: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/zlib-0.5.3.3:0=
-	<dev-haskell/zlib-0.7:0=
-
-	>=dev-haskell/network-2.9:0=
-	<dev-haskell/network-3.2:0=
-	>=dev-haskell/network-bsd-2.8:0=
-	<dev-haskell/network-bsd-2.9:0=
-
-	>=dev-haskell/psqueue-1.1:0=
-	<dev-haskell/psqueue-1.2:0=
-	>=dev-haskell/snap-core-1.0.0:0=
-	>=dev-haskell/snap-server-1.0.0:0=
-	>=dev-haskell/case-insensitive-0.4.0.1:0=
-	<dev-haskell/case-insensitive-1.3:0=
-
-	dev-haskell/vector:0=
-	xen? ( >=app-emulation/xen-3.0 )
-	kvm? (
-		dev-python/psutil
-		app-emulation/qemu
-	)
-	lxc? ( app-containers/lxc )
-	drbd? ( 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
-	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-	media-fonts/urw-fonts
-	media-gfx/graphviz
-	test? (
-		dev-python/mock
-		dev-python/pyyaml
-		dev-haskell/haddock:0=
-		>=dev-haskell/hunit-1.2.4.2:0=
-		<dev-haskell/hunit-1.7:0=
-		>=dev-haskell/quickcheck-2.8:2=
-		<dev-haskell/quickcheck-2.14:2=
-		>=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=
-		sys-apps/fakeroot
-		>=net-misc/socat-1.7
-		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.16-noded-must-run-as-root.patch"
-	"${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
-	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
-	#"${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
-	#"${FILESDIR}/${PN}-2.17-relax-deps.patch"
-	##"${FILESDIR}"/${PN}-3.0.1-template_haskell.patch
-	##"${FILESDIR}"/${PN}-3.0.1-docfixes.patch
-	##"${FILESDIR}"/${PN}-3.0.1-sphinx.patch
-	"${FILESDIR}"/${PN}-3.0.1-buildfix.patch
-	"${FILESDIR}"/${PN}-3.0.1-gentoo-infra-hacks.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-	usr/lib*/${PN}/${SERIES}/ganeti/mon-collector
-	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
-}
-
-# These flags get applied in src_prepare and src_configure
-GNT_HASKELL_FLAGS="-optl -Wl,-z,relro -optl -Wl,--as-needed -Wno-unused-imports -Wno-deprecations -Wno-monomorphism-restriction"
-
-src_prepare() {
-	local testfile
-	if has_version '>=dev-lang/ghc-8.10'; then
-		# Breaks the build on 7.8
-		PATCHES+=(
-			#"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
-		)
-	fi
-	if use experimental; then
-		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
-		PATCHES+=(
-		)
-	fi
-	# Some debian patches have trailing whitespace, which trips upstream testing
-	sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed"
-
-	eapply "${PATCHES[@]}"
-	# Upstream commits:
-	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
-	# 24618882737fd7c189adf99f4acc767d48f572c3
-	sed -i \
-		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
-	# Neuter -Werror
-	sed -i \
-		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
-
-	# 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
-	# Disable warnings to make it easier to see failure
-	sed -i -e "/^GHC_BYVERSION_FLAGS = @GHC_BYVERSION_FLAGS@/s/$/ ${GNT_HASKELL_FLAGS}/g" "${S}"/Makefile.in
-}
-
-src_compile() {
-	export TMPDIR="${T}/tmp"
-	mkdir -p "${TMPDIR}"
-	default
-}
-
-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_opt=(
-		--localstatedir=/var
-		--sharedstatedir=/var
-		--disable-symlinks
-		--with-sshd-restart-command='/etc/init.d/sshd restart'
-		#--with-export-dir=/var/lib/ganeti-storage/export # Old gentoo
-		--with-export-dir=/srv/ganeti/export # Upstream recommended
-
-		#--with-extstorage-search-path=/var/lib/ganeti-storage/ # Old Gentoo
-		--with-extstorage-search-path=/srv/ganeti/extstorage,/var/lib/ganeti-storage/ext # Upstream + Gentoo
-
-		--with-os-search-path=/srv/ganeti/os,/usr/share/${PN}/os # Upstream + Gentoo
-
-		--disable-manpages-in-doc
-		--enable-metadata
-		$(use_enable restricted-commands)
-		$(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}" '')
-		--with-haskell-flags="${GNT_HASKELL_FLAGS}"
-		--enable-socat-escape
-		--enable-socat-compress
-		--disable-maintainer-mode
-		# Upstream ships some weird defaults for filenames
-		--with-xen-kernel=/boot/kernel
-		--with-kvm-kernel=/boot/kernel
-		--with-xen-initrd=/boot/initramfs
-		--with-kvm-initrd=/boot/initramfs
-
-		# Force this split haskell module
-		ENABLE_NETWORK_BSD=1
-	)
-	econf "${econf_opt[@]}"
-}
-
-src_compile() {
-	emake ENABLE_MANPAGES="" MAN_HAS_WARNINGS=""
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" ENABLE_MANPAGES="" MAN_HAS_WARNINGS="" install
-
-	newinitd "${FILESDIR}"/ganeti.initd-r5 ${PN}
-	newconfd "${FILESDIR}"/ganeti.confd-r5 ${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/*
-
-	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}
-
-	newtmpfiles "${FILESDIR}"/ganeti-tmpfilesd ${PN}.conf
-
-	keepdir /var/log/${PN}/
-	keepdir /usr/share/${PN}/${SERIES}/os/
-	# These are the older Gentoo paths
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
-	# This is handled by tmpfiles. You cannot use keepdir here as Ganeti refuses to have other files in it!
-	rmdir "${D}"/var/lib/ganeti || true
-
-	dosym ${SERIES} "/usr/share/${PN}/default"
-	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
-	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-
-	# Be opinionated, this is the paths that upstream suggests and uses as defaults in configure.
-	# ganeti-tmpfilesd will ensure they are created
-	touch "${D}"/etc/ganeti/file-storage-paths
-	echo /srv/ganeti/file-storage >>"${D}"/etc/ganeti/file-storage-paths
-	echo /srv/ganeti/shared-file-storage >>"${D}"/etc/ganeti/file-storage-paths
-}
-
-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() {
-	# locale is used in some of the doc checks
-	export LC_ALL=C
-	PATH="${S}/scripts:${S}/src:${PATH}" \
-	TMPDIR="/tmp" \
-	LC_ALL=C \
-	GANETI_MASTER="$(hostname -f)" \
-	emake check
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2022-07-23 17:11 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2022-07-23 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     503b08b33fa2c0d9bbab96fb7704c6348c6bad57
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 17:11:25 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 17:11:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503b08b3

app-emulation/ganeti: add live ebuilds

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-emulation/ganeti/ganeti-3.0.2-r2.ebuild                  | 10 +++++++---
 .../{ganeti-3.0.2-r2.ebuild => ganeti-3.0.9999.ebuild}       | 10 +++++++---
 .../{ganeti-3.0.2-r2.ebuild => ganeti-3.1.9999.ebuild}       | 12 ++++++++----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
index e6ac4895670c..ea66aef7fbf0 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
@@ -14,8 +14,9 @@ MY_P="${PN}-${MY_PV}"
 SERIES="3.0"
 
 if [[ ${PV} =~ [9]{4,} ]] ; then
-	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/ganeti/ganeti"
+	EGIT_BRANCH="stable-$SERIES"
+	inherit git-r3
 	PATCHES=()
 else
 	DEBIAN_PV="${PV}"
@@ -233,8 +234,11 @@ src_prepare() {
 		PATCHES+=(
 		)
 	fi
+
 	# Some debian patches have trailing whitespace, which trips upstream testing
-	sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed"
+	if test -d "${WORKDIR}"/debian/patches ; then
+		sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed"
+	fi
 
 	eapply "${PATCHES[@]}"
 	# Upstream commits:

diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild b/app-emulation/ganeti/ganeti-3.0.9999.ebuild
similarity index 98%
copy from app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
copy to app-emulation/ganeti/ganeti-3.0.9999.ebuild
index e6ac4895670c..ea66aef7fbf0 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.9999.ebuild
@@ -14,8 +14,9 @@ MY_P="${PN}-${MY_PV}"
 SERIES="3.0"
 
 if [[ ${PV} =~ [9]{4,} ]] ; then
-	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/ganeti/ganeti"
+	EGIT_BRANCH="stable-$SERIES"
+	inherit git-r3
 	PATCHES=()
 else
 	DEBIAN_PV="${PV}"
@@ -233,8 +234,11 @@ src_prepare() {
 		PATCHES+=(
 		)
 	fi
+
 	# Some debian patches have trailing whitespace, which trips upstream testing
-	sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed"
+	if test -d "${WORKDIR}"/debian/patches ; then
+		sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed"
+	fi
 
 	eapply "${PATCHES[@]}"
 	# Upstream commits:

diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild b/app-emulation/ganeti/ganeti-3.1.9999.ebuild
similarity index 97%
copy from app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
copy to app-emulation/ganeti/ganeti-3.1.9999.ebuild
index e6ac4895670c..10ff7a522300 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.1.9999.ebuild
@@ -11,11 +11,12 @@ inherit autotools bash-completion-r1 python-single-r1 tmpfiles
 MY_PV="${PV/_rc/~rc}"
 MY_PV="${MY_PV/_beta/~beta}"
 MY_P="${PN}-${MY_PV}"
-SERIES="3.0"
+SERIES="3.1"
 
 if [[ ${PV} =~ [9]{4,} ]] ; then
-	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/ganeti/ganeti"
+	EGIT_BRANCH="master" # not branched yet
+	inherit git-r3
 	PATCHES=()
 else
 	DEBIAN_PV="${PV}"
@@ -233,8 +234,11 @@ src_prepare() {
 		PATCHES+=(
 		)
 	fi
+
 	# Some debian patches have trailing whitespace, which trips upstream testing
-	sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed"
+	if test -d "${WORKDIR}"/debian/patches ; then
+		sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed"
+	fi
 
 	eapply "${PATCHES[@]}"
 	# Upstream commits:


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2022-07-23 17:11 Robin H. Johnson
  0 siblings, 0 replies; 36+ messages in thread
From: Robin H. Johnson @ 2022-07-23 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     fda210935dfcccb1177c3f638b20a9277e06a083
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 17:02:48 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 17:11:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda21093

app-emulation/ganeti: drop KEYWORDS for live build

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-emulation/ganeti/ganeti-3.0.2-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
index 63cf7b305b44..e6ac4895670c 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
@@ -16,7 +16,6 @@ SERIES="3.0"
 if [[ ${PV} =~ [9]{4,} ]] ; then
 	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
 	inherit git-2
-	KEYWORDS=""
 	PATCHES=()
 else
 	DEBIAN_PV="${PV}"


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
@ 2022-07-23 18:51 Ionen Wolkens
  0 siblings, 0 replies; 36+ messages in thread
From: Ionen Wolkens @ 2022-07-23 18:51 UTC (permalink / raw
  To: gentoo-commits

commit:     32179e665745194f6a35f4c652dfdf3259e52c62
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 18:50:57 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 18:50:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32179e66

app-emulation/ganeti: fix dtd url (http->https)

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/ganeti/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index d37ba927d87a..24d79b34bc32 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>infra@gentoo.org</email>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2022-07-23 18:51 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-05 21:55 [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/ Robin H. Johnson
  -- strict thread matches above, loose matches on Subject: below --
2022-07-23 18:51 Ionen Wolkens
2022-07-23 17:11 Robin H. Johnson
2022-07-23 17:11 Robin H. Johnson
2022-07-23 16:39 Robin H. Johnson
2022-07-23 16:39 Robin H. Johnson
2022-07-23 16:39 Robin H. Johnson
2020-07-27 10:02 Michał Górny
2020-07-27 10:02 Michał Górny
2020-05-06  1:02 Patrick McLean
2019-04-14 11:12 Agostino Sarubbo
2019-04-08 17:11 Robin H. Johnson
2018-08-25 20:20 Michał Górny
2018-01-31  1:04 Patrick McLean
2018-01-17  2:52 Patrick McLean
2017-12-10  9:27 Ulrich Müller
2016-12-02  0:56 Patrick McLean
2016-12-01 11:51 Agostino Sarubbo
2016-12-01 11:50 Agostino Sarubbo
2016-07-13 21:37 Robin H. Johnson
2016-07-13 17:22 Robin H. Johnson
2016-07-12 22:54 Robin H. Johnson
2016-07-12 17:13 Robin H. Johnson
2016-07-12  0:53 Robin H. Johnson
2016-07-12  0:13 Robin H. Johnson
2016-07-11 22:50 Robin H. Johnson
2016-07-11 22:50 Robin H. Johnson
2016-05-12 23:25 Patrick McLean
2016-04-05 23:18 Patrick McLean
2016-04-05 18:42 Patrick McLean
2016-04-05 18:42 Patrick McLean
2016-04-04 23:43 Patrick McLean
2016-04-01 23:57 Patrick McLean
2016-02-15 18:30 Sergey Popov
2016-02-15  9:48 Sergey Popov
2015-11-23 23:41 Patrick McLean

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox