From 954219b208b0a7ae22c144ece5f309e3c8d4bfd6 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Wed, 2 Jul 2014 23:57:25 +0000 Subject: Revision bump, make failure to start ganeti-kvmd not fatal since it fails if user shutdowns are disabled. Clean out older versions. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF) --- app-emulation/ganeti/ChangeLog | 13 +- app-emulation/ganeti/files/ganeti.initd-r3 | 27 ++-- app-emulation/ganeti/ganeti-1.2.9.ebuild | 54 -------- app-emulation/ganeti/ganeti-2.0.6.ebuild | 66 --------- app-emulation/ganeti/ganeti-2.1.8.ebuild | 77 ----------- app-emulation/ganeti/ganeti-2.10.5-r2.ebuild | 175 ----------------------- app-emulation/ganeti/ganeti-2.10.5-r3.ebuild | 175 +++++++++++++++++++++++ app-emulation/ganeti/ganeti-2.11.2-r1.ebuild | 192 -------------------------- app-emulation/ganeti/ganeti-2.11.2-r2.ebuild | 198 --------------------------- app-emulation/ganeti/ganeti-2.11.2-r3.ebuild | 198 +++++++++++++++++++++++++++ app-emulation/ganeti/ganeti-2.2.2.ebuild | 81 ----------- app-emulation/ganeti/ganeti-2.3.1.ebuild | 82 ----------- app-emulation/ganeti/ganeti-2.4.5-r1.ebuild | 4 +- app-emulation/ganeti/ganeti-2.5.2-r2.ebuild | 137 ------------------ app-emulation/ganeti/ganeti-2.6.2.ebuild | 159 --------------------- 15 files changed, 403 insertions(+), 1235 deletions(-) delete mode 100644 app-emulation/ganeti/ganeti-1.2.9.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.0.6.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.1.8.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.10.5-r2.ebuild create mode 100644 app-emulation/ganeti/ganeti-2.10.5-r3.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.11.2-r1.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.11.2-r2.ebuild create mode 100644 app-emulation/ganeti/ganeti-2.11.2-r3.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.2.2.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.3.1.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.5.2-r2.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.6.2.ebuild (limited to 'app-emulation/ganeti') diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog index 0e2a9870bbeb..0b8b5f70b00f 100644 --- a/app-emulation/ganeti/ChangeLog +++ b/app-emulation/ganeti/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-emulation/ganeti # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.91 2014/06/18 18:50:58 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.92 2014/07/02 23:57:25 chutzpah Exp $ + +*ganeti-2.11.2-r3 (02 Jul 2014) +*ganeti-2.10.5-r3 (02 Jul 2014) + + 02 Jul 2014; Patrick McLean -ganeti-1.2.9.ebuild, + -ganeti-2.0.6.ebuild, -ganeti-2.1.8.ebuild, -ganeti-2.2.2.ebuild, + -ganeti-2.3.1.ebuild, -ganeti-2.5.2-r2.ebuild, -ganeti-2.6.2.ebuild, + -ganeti-2.10.5-r2.ebuild, +ganeti-2.10.5-r3.ebuild, -ganeti-2.11.2-r1.ebuild, + -ganeti-2.11.2-r2.ebuild, +ganeti-2.11.2-r3.ebuild, files/ganeti.initd-r3: + Revision bump, make failure to start ganeti-kvmd not fatal since it fails if + user shutdowns are disabled. Clean out older versions. *ganeti-2.11.2-r2 (18 Jun 2014) diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3 index 81b0e4165a09..9e0fc170695f 100644 --- a/app-emulation/ganeti/files/ganeti.initd-r3 +++ b/app-emulation/ganeti/files/ganeti.initd-r3 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v 1.1 2014/06/05 00:32:23 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti.initd-r3,v 1.2 2014/07/02 23:57:25 chutzpah Exp $ depend() { need localmount logger @@ -42,17 +42,22 @@ start() { ${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts} || retval=${?} if [ ${retval} != 0 ] && [ -n "${started_daemons}" ]; then - eerror "Stopping already started daemons" - eindent - eend ${code} "$(${DAEMON_UTIL} check-exitcode ${code})" + case ${daemon} in + *-kvmd) retval=0; ewarn "Failed to start kvmd, continuing anyway";; + *) + eerror "Stopping already started daemons" + eindent + eend ${code} "$(${DAEMON_UTIL} check-exitcode ${code})" - for daemon in ${started_daemons}; do - ebegin "Stopping ${daemon}" - ${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS} - eend ${?} - done - eoutdent; eoutdent - return ${retval} + for daemon in ${started_daemons}; do + ebegin "Stopping ${daemon}" + ${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS} + eend ${?} + done + eoutdent; eoutdent + return ${retval} + ;; + esac fi eoutdent started_daemons="${started_daemons} ${daemon}" diff --git a/app-emulation/ganeti/ganeti-1.2.9.ebuild b/app-emulation/ganeti/ganeti-1.2.9.ebuild deleted file mode 100644 index f99bb8f76973..000000000000 --- a/app-emulation/ganeti/ganeti-1.2.9.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-1.2.9.ebuild,v 1.5 2013/09/12 22:29:37 mgorny Exp $ - -PYTHON_DEPEND="2" - -inherit python autotools eutils - -MY_P=${P/_beta/b} -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Ganeti is a virtual server management software tool built upon Xen" -HOMEPAGE="http://code.google.com/p/ganeti/" -SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND=">=app-emulation/xen-3.0 - dev-libs/openssl - dev-python/pyopenssl - dev-python/pyparsing - dev-python/simplejson - dev-python/twisted-core - net-analyzer/arping - net-misc/bridge-utils - net-misc/openssh - sys-apps/iproute2 - sys-cluster/drbd - sys-fs/lvm2 - sys-fs/mdadm" - -src_unpack() { - unpack ${A} - cd "${S}" - - eautoreconf -} - -src_compile() { - econf --localstatedir=/var --with-ssh-initscript=/etc/init.d/sshd - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}/ganeti.initd" ganeti - - keepdir /var/{lib,log,run}/ganeti/ - keepdir /srv/ganeti/{os,export}/ -} diff --git a/app-emulation/ganeti/ganeti-2.0.6.ebuild b/app-emulation/ganeti/ganeti-2.0.6.ebuild deleted file mode 100644 index 977c667483e6..000000000000 --- a/app-emulation/ganeti/ganeti-2.0.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.0.6.ebuild,v 1.6 2013/09/12 22:29:37 mgorny Exp $ - -EAPI=2 - -inherit eutils confutils bash-completion-r1 - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://code.google.com/p/ganeti/" -SRC_URI="http://ganeti.googlecode.com/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="kvm xen drbd" - -DEPEND="xen? ( >=app-emulation/xen-3.0 ) - kvm? ( app-emulation/qemu ) - drbd? ( >=sys-cluster/drbd-8.0 ) - dev-libs/openssl - dev-python/pyopenssl - dev-python/pyparsing - dev-python/simplejson - net-analyzer/arping - net-misc/bridge-utils - net-misc/openssh - net-misc/socat - sys-apps/iproute2 - sys-fs/lvm2" -RDEPEND="${DEPEND}" - -src_prepare () { - epatch "${FILESDIR}/${PN}-2.0.3-gentoo-brctl-path.patch" -} - -pkg_setup () { - confutils_require_any kvm xen -} - -src_configure () { - econf --localstatedir=/var \ - --docdir=/usr/share/doc/${P} \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/ganeti/os \ - --with-file-storage-dir=/var/lib/ganeti-storage/file -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - newinitd "${FILESDIR}"/ganeti2.initd ganeti - newbashcomp doc/examples/bash_completion ganeti - dodoc DEVNOTES INSTALL NEWS README doc/*.rst doc/*.txt - rm -rf "${D}"/usr/share/doc/ganeti - docinto examples - dodoc doc/examples/dumb-allocator doc/examples/ganeti.cron - - keepdir /var/{lib,log,run}/ganeti/ - keepdir /usr/share/ganeti/os/ - keepdir /var/lib/ganeti-storage/{export,file}/ -} - -pkg_postinst () { - bash-completion_pkg_postinst -} diff --git a/app-emulation/ganeti/ganeti-2.1.8.ebuild b/app-emulation/ganeti/ganeti-2.1.8.ebuild deleted file mode 100644 index 2450c0a3459e..000000000000 --- a/app-emulation/ganeti/ganeti-2.1.8.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.8.ebuild,v 1.6 2013/09/12 22:29:37 mgorny Exp $ - -EAPI=2 - -inherit eutils confutils bash-completion-r1 - -MY_PV="${PV/_rc/~rc}" -MY_P="${PN}-${MY_PV}" -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://code.google.com/p/ganeti/" -SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="kvm xen drbd +filestorage syslog" - -S="${WORKDIR}/${MY_P}" - -DEPEND="xen? ( >=app-emulation/xen-3.0 ) - kvm? ( app-emulation/qemu ) - drbd? ( >=sys-cluster/drbd-8.0 ) - dev-libs/openssl - dev-python/pyopenssl - dev-python/pyparsing - dev-python/pyinotify - dev-python/simplejson - net-analyzer/arping - net-misc/bridge-utils - net-misc/openssh - net-misc/socat - sys-apps/iproute2 - sys-fs/lvm2" -RDEPEND="${DEPEND}" - -pkg_setup () { - confutils_require_any kvm xen -} - -src_configure () { - local myconf - if use filestorage ; then - myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file" - else - myconf="--with-file-storage-dir=no" - fi - econf --localstatedir=/var \ - --docdir=/usr/share/doc/${P} \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/ganeti/os \ - $(use_enable syslog) \ - ${myconf} -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti - newconfd "${FILESDIR}"/ganeti.confd ganeti - newbashcomp doc/examples/bash_completion ganeti - dodoc INSTALL NEWS README doc/*.rst - rm -rf "${D}"/usr/share/doc/ganeti - docinto examples - dodoc doc/examples/{dumb-allocator,ganeti.cron,gnt-config-backup} - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - keepdir /var/{lib,log,run}/ganeti/ - keepdir /usr/share/ganeti/os/ - keepdir /var/lib/ganeti-storage/{export,file}/ -} - -pkg_postinst () { - bash-completion_pkg_postinst -} diff --git a/app-emulation/ganeti/ganeti-2.10.5-r2.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r2.ebuild deleted file mode 100644 index cff8533711be..000000000000 --- a/app-emulation/ganeti/ganeti-2.10.5-r2.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.5-r2.ebuild,v 1.1 2014/06/14 23:25:41 chutzpah Exp $ - -EAPI=5 -PYTHON_COMPAT=(python2_{6,7}) -use test && PYTHON_REQ_USE="ipv6" - -inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator - -MY_PV="${PV/_rc/~rc}" -#MY_PV="${PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" -SERIES="$(get_version_component_range 1-2)" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" - inherit git-2 - KEYWORDS="" - # you will need to pull in the haskell overlay for pandoc - GIT_DEPEND="app-text/pandoc - dev-python/docutils - dev-python/sphinx - media-libs/gd[fontconfig,jpeg,png,truetype] - media-gfx/graphviz - media-fonts/urw-fonts" -else - SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://code.google.com/p/ganeti/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test" -REQUIRED_USE="|| ( kvm xen lxc )" - -S="${WORKDIR}/${MY_P}" - -HASKELL_DEPS=">=dev-lang/ghc-6.12:0= - dev-haskell/json:0= - dev-haskell/curl:0= - dev-haskell/network:0= - dev-haskell/parallel - dev-haskell/hslogger:0= - dev-haskell/utf8-string:0= - dev-haskell/deepseq:0= - dev-haskell/attoparsec:0= - dev-haskell/crypto:0=" - -DEPEND="xen? ( >=app-emulation/xen-3.0 ) - kvm? ( app-emulation/qemu ) - lxc? ( app-emulation/lxc ) - drbd? ( =sys-apps/baselayout-2.0 - ${PYTHON_DEPS} - ${GIT_DEPEND}" -RDEPEND="${DEPEND} - !app-emulation/ganeti-htools" -DEPEND+="${HASKELL_DEPS} - sys-devel/m4 - test? ( - dev-python/mock - dev-python/pyyaml - dev-haskell/test-framework:0= - dev-haskell/test-framework-hunit:0= - dev-haskell/test-framework-quickcheck2:0= - dev-haskell/temporary:0= - sys-apps/fakeroot - )" - -PATCHES=( - "${FILESDIR}/${PN}-2.6-fix-args.patch" - "${FILESDIR}/${PN}-2.6-add-pgrep.patch" - "${FILESDIR}/${PN}-2.7-fix-tests.patch" - "${FILESDIR}/${PN}-2.9-disable-root-tests.patch" - "${FILESDIR}/${PN}-2.9-regex-builtin.patch" - "${FILESDIR}/${PN}-2.9-skip-cli-test.patch" - "${FILESDIR}/${PN}-2.10-rundir.patch" - "${FILESDIR}/${PN}-lockdir.patch" -) - -pkg_setup () { - confutils_use_depend_all haskell-daemons htools - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${PATCHES[@]}" - [[ ${PV} == "9999" ]] && ./autogen.sh - rm autotools/missing - eautoreconf -} - -src_configure () { - econf --localstatedir=/var \ - --sharedstatedir=/var \ - --disable-symlinks \ - --docdir=/usr/share/doc/${P} \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/${PN}/os \ - $(use_enable syslog) \ - $(usex kvm '--with-kvm-path=' '' '/usr/bin/qemu-kvm' '') \ - $(usex haskell-daemons "--enable-confd=haskell" '' '' '') -} - -src_install () { - emake V=1 DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} - newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} - - use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff - use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff - newbashcomp doc/examples/bash_completion ganeti - dodoc INSTALL UPGRADE NEWS README doc/*.rst - dohtml -r doc/html/* - rm -rf "${D}"/{usr/share/doc/${PN},run} - - docinto examples - dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf - - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - insinto /etc/cron.d - newins doc/examples/ganeti.cron ${PN} - - insinto /etc/logrotate.d - newins doc/examples/ganeti.logrotate ${PN} - - python_fix_shebang "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} - - keepdir /var/{lib,log}/${PN}/ - keepdir /usr/share/${PN}/${SERIES}/os/ - keepdir /var/lib/ganeti-storage/{export,file,shared}/ - - dosym ${SERIES} "/usr/share/${PN}/default" - dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" - - python_fix_shebang "${ED}" -} - -src_test () { - emake check || die "emake check failed" -} diff --git a/app-emulation/ganeti/ganeti-2.10.5-r3.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r3.ebuild new file mode 100644 index 000000000000..33fe840accbd --- /dev/null +++ b/app-emulation/ganeti/ganeti-2.10.5-r3.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.5-r3.ebuild,v 1.1 2014/07/02 23:57:25 chutzpah Exp $ + +EAPI=5 +PYTHON_COMPAT=(python2_{6,7}) +use test && PYTHON_REQ_USE="ipv6" + +inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator + +MY_PV="${PV/_rc/~rc}" +#MY_PV="${PV/_beta/~beta}" +MY_P="${PN}-${MY_PV}" +SERIES="$(get_version_component_range 1-2)" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" + inherit git-2 + KEYWORDS="" + # you will need to pull in the haskell overlay for pandoc + GIT_DEPEND="app-text/pandoc + dev-python/docutils + dev-python/sphinx + media-libs/gd[fontconfig,jpeg,png,truetype] + media-gfx/graphviz + media-fonts/urw-fonts" +else + SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Ganeti is a virtual server management software tool" +HOMEPAGE="http://code.google.com/p/ganeti/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test" +REQUIRED_USE="|| ( kvm xen lxc )" + +S="${WORKDIR}/${MY_P}" + +HASKELL_DEPS=">=dev-lang/ghc-6.12:0= + dev-haskell/json:0= + dev-haskell/curl:0= + dev-haskell/network:0= + dev-haskell/parallel + dev-haskell/hslogger:0= + dev-haskell/utf8-string:0= + dev-haskell/deepseq:0= + dev-haskell/attoparsec:0= + dev-haskell/crypto:0=" + +DEPEND="xen? ( >=app-emulation/xen-3.0 ) + kvm? ( app-emulation/qemu ) + lxc? ( app-emulation/lxc ) + drbd? ( =sys-apps/baselayout-2.0 + ${PYTHON_DEPS} + ${GIT_DEPEND}" +RDEPEND="${DEPEND} + !app-emulation/ganeti-htools" +DEPEND+="${HASKELL_DEPS} + sys-devel/m4 + test? ( + dev-python/mock + dev-python/pyyaml + dev-haskell/test-framework:0= + dev-haskell/test-framework-hunit:0= + dev-haskell/test-framework-quickcheck2:0= + dev-haskell/temporary:0= + sys-apps/fakeroot + )" + +PATCHES=( + "${FILESDIR}/${PN}-2.6-fix-args.patch" + "${FILESDIR}/${PN}-2.6-add-pgrep.patch" + "${FILESDIR}/${PN}-2.7-fix-tests.patch" + "${FILESDIR}/${PN}-2.9-disable-root-tests.patch" + "${FILESDIR}/${PN}-2.9-regex-builtin.patch" + "${FILESDIR}/${PN}-2.9-skip-cli-test.patch" + "${FILESDIR}/${PN}-2.10-rundir.patch" + "${FILESDIR}/${PN}-lockdir.patch" +) + +pkg_setup () { + confutils_use_depend_all haskell-daemons htools + python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${PATCHES[@]}" + [[ ${PV} == "9999" ]] && ./autogen.sh + rm autotools/missing + eautoreconf +} + +src_configure () { + econf --localstatedir=/var \ + --sharedstatedir=/var \ + --disable-symlinks \ + --docdir=/usr/share/doc/${P} \ + --with-ssh-initscript=/etc/init.d/sshd \ + --with-export-dir=/var/lib/ganeti-storage/export \ + --with-os-search-path=/usr/share/${PN}/os \ + $(use_enable syslog) \ + $(usex kvm '--with-kvm-path=' '' '/usr/bin/qemu-kvm' '') \ + $(usex haskell-daemons "--enable-confd=haskell" '' '' '') +} + +src_install () { + emake V=1 DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} + newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} + + use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff + use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff + newbashcomp doc/examples/bash_completion ganeti + dodoc INSTALL UPGRADE NEWS README doc/*.rst + dohtml -r doc/html/* + rm -rf "${D}"/{usr/share/doc/${PN},run} + + docinto examples + dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf + + docinto examples/hooks + dodoc doc/examples/hooks/{ipsec,ethers} + + insinto /etc/cron.d + newins doc/examples/ganeti.cron ${PN} + + insinto /etc/logrotate.d + newins doc/examples/ganeti.logrotate ${PN} + + python_fix_shebang "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} + + keepdir /var/{lib,log}/${PN}/ + keepdir /usr/share/${PN}/${SERIES}/os/ + keepdir /var/lib/ganeti-storage/{export,file,shared}/ + + dosym ${SERIES} "/usr/share/${PN}/default" + dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" + + python_fix_shebang "${ED}" +} + +src_test () { + emake check || die "emake check failed" +} diff --git a/app-emulation/ganeti/ganeti-2.11.2-r1.ebuild b/app-emulation/ganeti/ganeti-2.11.2-r1.ebuild deleted file mode 100644 index fbc300f59398..000000000000 --- a/app-emulation/ganeti/ganeti-2.11.2-r1.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.2-r1.ebuild,v 1.1 2014/06/14 23:25:41 chutzpah Exp $ - -EAPI=5 -PYTHON_COMPAT=(python2_{6,7}) -use test && PYTHON_REQ_USE="ipv6" - -inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator - -MY_PV="${PV/_rc/~rc}" -#MY_PV="${PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" -SERIES="$(get_version_component_range 1-2)" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" - inherit git-2 - KEYWORDS="" - # you will need to pull in the haskell overlay for pandoc - GIT_DEPEND="app-text/pandoc - dev-python/docutils - dev-python/sphinx - media-libs/gd[fontconfig,jpeg,png,truetype] - media-gfx/graphviz - media-fonts/urw-fonts" -else - SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://code.google.com/p/ganeti/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test" -REQUIRED_USE="|| ( kvm xen lxc )" - -S="${WORKDIR}/${MY_P}" - -HASKELL_DEPS=">=dev-lang/ghc-6.12:0= - dev-haskell/json:0= - dev-haskell/curl:0= - dev-haskell/network:0= - dev-haskell/parallel - dev-haskell/hslogger:0= - dev-haskell/utf8-string:0= - dev-haskell/deepseq:0= - dev-haskell/attoparsec:0= - dev-haskell/crypto:0= - dev-haskell/vector:0= - dev-haskell/hinotify:0= - dev-haskell/regex-pcre-builtin:0= - dev-haskell/zlib:0= - dev-haskell/base64-bytestring:0=" - -DEPEND="xen? ( >=app-emulation/xen-3.0 ) - kvm? ( app-emulation/qemu ) - lxc? ( app-emulation/lxc ) - drbd? ( =sys-apps/baselayout-2.0 - ${PYTHON_DEPS} - ${GIT_DEPEND}" -RDEPEND="${DEPEND} - !app-emulation/ganeti-htools" -DEPEND+="${HASKELL_DEPS} - sys-devel/m4 - test? ( - dev-python/mock - dev-python/pyyaml - dev-haskell/test-framework:0= - dev-haskell/test-framework-hunit:0= - dev-haskell/test-framework-quickcheck2:0= - dev-haskell/temporary:0= - sys-apps/fakeroot - )" - -PATCHES=( - "${FILESDIR}/${PN}-2.6-fix-args.patch" - "${FILESDIR}/${PN}-2.6-add-pgrep.patch" - "${FILESDIR}/${PN}-2.7-fix-tests.patch" - "${FILESDIR}/${PN}-2.9-disable-root-tests.patch" - "${FILESDIR}/${PN}-2.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" -) - -REQUIRED_USE="kvm? ( || ( amd64 x86 ) )" - -pkg_setup () { - confutils_use_depend_all haskell-daemons htools - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${PATCHES[@]}" - [[ ${PV} == "9999" ]] && ./autogen.sh - rm autotools/missing - eautoreconf -} - -src_configure () { - # this is kind of a hack to work around the removal of the qemu-kvm wrapper - local kvm_arch - - if use amd64; then - kvm_arch=x86_64 - elif use x86; then - kvm_arch=i386 - elif use kvm; then - die "Could not determine qemu system to use for kvm" - fi - - econf --localstatedir=/var \ - --sharedstatedir=/var \ - --disable-symlinks \ - --docdir=/usr/share/doc/${P} \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/${PN}/os \ - $(use_enable syslog) \ - $(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} - - use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff - use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff - newbashcomp doc/examples/bash_completion ganeti - dodoc INSTALL UPGRADE NEWS README doc/*.rst - dohtml -r doc/html/* - rm -rf "${D}"/{usr/share/doc/${PN},run} - - docinto examples - dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf - - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - insinto /etc/cron.d - newins doc/examples/ganeti.cron ${PN} - - insinto /etc/logrotate.d - newins doc/examples/ganeti.logrotate ${PN} - - python_fix_shebang "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} - - keepdir /var/{lib,log}/${PN}/ - keepdir /usr/share/${PN}/${SERIES}/os/ - keepdir /var/lib/ganeti-storage/{export,file,shared}/ - - dosym ${SERIES} "/usr/share/${PN}/default" - dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" - - python_fix_shebang "${ED}" -} - -src_test () { - emake check || die "emake check failed" -} diff --git a/app-emulation/ganeti/ganeti-2.11.2-r2.ebuild b/app-emulation/ganeti/ganeti-2.11.2-r2.ebuild deleted file mode 100644 index b3d7b66de9d2..000000000000 --- a/app-emulation/ganeti/ganeti-2.11.2-r2.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.2-r2.ebuild,v 1.1 2014/06/18 18:50:58 chutzpah Exp $ - -EAPI=5 -PYTHON_COMPAT=(python2_{6,7}) -use test && PYTHON_REQ_USE="ipv6" - -inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator pax-utils - -MY_PV="${PV/_rc/~rc}" -#MY_PV="${PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" -SERIES="$(get_version_component_range 1-2)" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" - inherit git-2 - KEYWORDS="" - # you will need to pull in the haskell overlay for pandoc - GIT_DEPEND="app-text/pandoc - dev-python/docutils - dev-python/sphinx - media-libs/gd[fontconfig,jpeg,png,truetype] - media-gfx/graphviz - media-fonts/urw-fonts" -else - SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://code.google.com/p/ganeti/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test" -REQUIRED_USE="|| ( kvm xen lxc )" - -S="${WORKDIR}/${MY_P}" - -HASKELL_DEPS=">=dev-lang/ghc-6.12:0= - dev-haskell/json:0= - dev-haskell/curl:0= - dev-haskell/network:0= - dev-haskell/parallel - dev-haskell/hslogger:0= - dev-haskell/utf8-string:0= - dev-haskell/deepseq:0= - dev-haskell/attoparsec:0= - dev-haskell/crypto:0= - dev-haskell/vector:0= - dev-haskell/hinotify:0= - dev-haskell/regex-pcre-builtin:0= - dev-haskell/zlib:0= - dev-haskell/base64-bytestring:0=" - -DEPEND="xen? ( >=app-emulation/xen-3.0 ) - kvm? ( app-emulation/qemu ) - lxc? ( app-emulation/lxc ) - drbd? ( =sys-apps/baselayout-2.0 - ${PYTHON_DEPS} - ${GIT_DEPEND}" -RDEPEND="${DEPEND} - !app-emulation/ganeti-htools" -DEPEND+="${HASKELL_DEPS} - sys-devel/m4 - test? ( - dev-python/mock - dev-python/pyyaml - dev-haskell/test-framework:0= - dev-haskell/test-framework-hunit:0= - dev-haskell/test-framework-quickcheck2:0= - dev-haskell/temporary:0= - sys-apps/fakeroot - )" - -PATCHES=( - "${FILESDIR}/${PN}-2.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" -) - -REQUIRED_USE="kvm? ( || ( amd64 x86 ) )" - -pkg_setup () { - confutils_use_depend_all haskell-daemons htools - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${PATCHES[@]}" - - [[ ${PV} == "9999" ]] && ./autogen.sh - rm autotools/missing - eautoreconf -} - -src_configure () { - # this is kind of a hack to work around the removal of the qemu-kvm wrapper - local kvm_arch - - if use amd64; then - kvm_arch=x86_64 - elif use x86; then - kvm_arch=i386 - elif use kvm; then - die "Could not determine qemu system to use for kvm" - fi - - econf --localstatedir=/var \ - --sharedstatedir=/var \ - --disable-symlinks \ - --docdir=/usr/share/doc/${P} \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/${PN}/os \ - $(use_enable syslog) \ - $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ - $(usex haskell-daemons "--enable-confd=haskell" '' '' '') -} - -src_install () { - emake V=1 DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} - newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} - - if use kvm; then - newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff - newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff - fi - - # ganeti installs it's own docs in a generic location - rm -rf "${D}"/{usr/share/doc/${PN},run} - - newbashcomp doc/examples/bash_completion ganeti - - dodoc INSTALL UPGRADE NEWS README doc/*.rst - dohtml -r doc/html/* doc/css/*.css - - docinto examples - dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf - - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - insinto /etc/cron.d - newins doc/examples/ganeti.cron ${PN} - - insinto /etc/logrotate.d - newins doc/examples/ganeti.logrotate ${PN} - - keepdir /var/{lib,log}/${PN}/ - keepdir /usr/share/${PN}/${SERIES}/os/ - keepdir /var/lib/ganeti-storage/{export,file,shared}/ - - dosym ${SERIES} "/usr/share/${PN}/default" - dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" - - python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} -} - -src_test () { - emake check || die "emake check failed" -} diff --git a/app-emulation/ganeti/ganeti-2.11.2-r3.ebuild b/app-emulation/ganeti/ganeti-2.11.2-r3.ebuild new file mode 100644 index 000000000000..124b66e59990 --- /dev/null +++ b/app-emulation/ganeti/ganeti-2.11.2-r3.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.2-r3.ebuild,v 1.1 2014/07/02 23:57:25 chutzpah Exp $ + +EAPI=5 +PYTHON_COMPAT=(python2_{6,7}) +use test && PYTHON_REQ_USE="ipv6" + +inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator pax-utils + +MY_PV="${PV/_rc/~rc}" +#MY_PV="${PV/_beta/~beta}" +MY_P="${PN}-${MY_PV}" +SERIES="$(get_version_component_range 1-2)" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" + inherit git-2 + KEYWORDS="" + # you will need to pull in the haskell overlay for pandoc + GIT_DEPEND="app-text/pandoc + dev-python/docutils + dev-python/sphinx + media-libs/gd[fontconfig,jpeg,png,truetype] + media-gfx/graphviz + media-fonts/urw-fonts" +else + SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Ganeti is a virtual server management software tool" +HOMEPAGE="http://code.google.com/p/ganeti/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test" +REQUIRED_USE="|| ( kvm xen lxc )" + +S="${WORKDIR}/${MY_P}" + +HASKELL_DEPS=">=dev-lang/ghc-6.12:0= + dev-haskell/json:0= + dev-haskell/curl:0= + dev-haskell/network:0= + dev-haskell/parallel + dev-haskell/hslogger:0= + dev-haskell/utf8-string:0= + dev-haskell/deepseq:0= + dev-haskell/attoparsec:0= + dev-haskell/crypto:0= + dev-haskell/vector:0= + dev-haskell/hinotify:0= + dev-haskell/regex-pcre-builtin:0= + dev-haskell/zlib:0= + dev-haskell/base64-bytestring:0=" + +DEPEND="xen? ( >=app-emulation/xen-3.0 ) + kvm? ( app-emulation/qemu ) + lxc? ( app-emulation/lxc ) + drbd? ( =sys-apps/baselayout-2.0 + ${PYTHON_DEPS} + ${GIT_DEPEND}" +RDEPEND="${DEPEND} + !app-emulation/ganeti-htools" +DEPEND+="${HASKELL_DEPS} + sys-devel/m4 + test? ( + dev-python/mock + dev-python/pyyaml + dev-haskell/test-framework:0= + dev-haskell/test-framework-hunit:0= + dev-haskell/test-framework-quickcheck2:0= + dev-haskell/temporary:0= + sys-apps/fakeroot + )" + +PATCHES=( + "${FILESDIR}/${PN}-2.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" +) + +REQUIRED_USE="kvm? ( || ( amd64 x86 ) )" + +pkg_setup () { + confutils_use_depend_all haskell-daemons htools + python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${PATCHES[@]}" + + [[ ${PV} == "9999" ]] && ./autogen.sh + rm autotools/missing + eautoreconf +} + +src_configure () { + # this is kind of a hack to work around the removal of the qemu-kvm wrapper + local kvm_arch + + if use amd64; then + kvm_arch=x86_64 + elif use x86; then + kvm_arch=i386 + elif use kvm; then + die "Could not determine qemu system to use for kvm" + fi + + econf --localstatedir=/var \ + --sharedstatedir=/var \ + --disable-symlinks \ + --docdir=/usr/share/doc/${P} \ + --with-ssh-initscript=/etc/init.d/sshd \ + --with-export-dir=/var/lib/ganeti-storage/export \ + --with-os-search-path=/usr/share/${PN}/os \ + $(use_enable syslog) \ + $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ + $(usex haskell-daemons "--enable-confd=haskell" '' '' '') +} + +src_install () { + emake V=1 DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} + newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} + + if use kvm; then + newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff + newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff + fi + + # ganeti installs it's own docs in a generic location + rm -rf "${D}"/{usr/share/doc/${PN},run} + + newbashcomp doc/examples/bash_completion ganeti + + dodoc INSTALL UPGRADE NEWS README doc/*.rst + dohtml -r doc/html/* doc/css/*.css + + docinto examples + dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf + + docinto examples/hooks + dodoc doc/examples/hooks/{ipsec,ethers} + + insinto /etc/cron.d + newins doc/examples/ganeti.cron ${PN} + + insinto /etc/logrotate.d + newins doc/examples/ganeti.logrotate ${PN} + + keepdir /var/{lib,log}/${PN}/ + keepdir /usr/share/${PN}/${SERIES}/os/ + keepdir /var/lib/ganeti-storage/{export,file,shared}/ + + dosym ${SERIES} "/usr/share/${PN}/default" + dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" + + python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} +} + +src_test () { + emake check || die "emake check failed" +} diff --git a/app-emulation/ganeti/ganeti-2.2.2.ebuild b/app-emulation/ganeti/ganeti-2.2.2.ebuild deleted file mode 100644 index f8f1b7a05122..000000000000 --- a/app-emulation/ganeti/ganeti-2.2.2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.2.2.ebuild,v 1.7 2013/09/12 22:29:37 mgorny Exp $ - -EAPI=2 - -inherit eutils confutils bash-completion-r1 - -MY_PV="${PV/_rc/~rc}" -#MY_PV="${PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://code.google.com/p/ganeti/" -SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="kvm xen drbd +filestorage syslog" - -S="${WORKDIR}/${MY_P}" - -DEPEND="xen? ( >=app-emulation/xen-3.0 ) - kvm? ( app-emulation/qemu ) - drbd? ( >=sys-cluster/drbd-8.3 ) - dev-libs/openssl - dev-python/paramiko - dev-python/pyopenssl - dev-python/pyparsing - dev-python/pycurl - dev-python/pyinotify - dev-python/simplejson - net-analyzer/arping - net-misc/bridge-utils - net-misc/curl[ssl] - net-misc/openssh - net-misc/socat - sys-apps/iproute2 - sys-fs/lvm2" -RDEPEND="${DEPEND}" - -pkg_setup () { - confutils_require_any kvm xen -} - -src_configure () { - local myconf - if use filestorage ; then - myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file" - else - myconf="--with-file-storage-dir=no" - fi - econf --localstatedir=/var \ - --docdir=/usr/share/doc/${P} \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/ganeti/os \ - $(use_enable syslog) \ - ${myconf} -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti - newconfd "${FILESDIR}"/ganeti.confd ganeti - newbashcomp doc/examples/bash_completion ganeti - dodoc INSTALL NEWS README doc/*.rst - rm -rf "${D}"/usr/share/doc/ganeti - docinto examples - dodoc doc/examples/{dumb-allocator,ganeti.cron,gnt-config-backup} - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - keepdir /var/{lib,log,run}/ganeti/ - keepdir /usr/share/ganeti/os/ - keepdir /var/lib/ganeti-storage/{export,file}/ -} - -pkg_postinst () { - bash-completion_pkg_postinst -} diff --git a/app-emulation/ganeti/ganeti-2.3.1.ebuild b/app-emulation/ganeti/ganeti-2.3.1.ebuild deleted file mode 100644 index 0c0ae409598d..000000000000 --- a/app-emulation/ganeti/ganeti-2.3.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.3.1.ebuild,v 1.6 2013/09/12 22:29:37 mgorny Exp $ - -EAPI=2 - -inherit eutils confutils bash-completion-r1 - -MY_PV="${PV/_rc/~rc}" -#MY_PV="${PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://code.google.com/p/ganeti/" -SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="kvm xen drbd +filestorage syslog ipv6" - -S="${WORKDIR}/${MY_P}" - -DEPEND="xen? ( >=app-emulation/xen-3.0 ) - kvm? ( app-emulation/qemu ) - drbd? ( >=sys-cluster/drbd-8.3 ) - ipv6? ( net-misc/ndisc6 ) - dev-libs/openssl - dev-python/paramiko - dev-python/pyopenssl - dev-python/pyparsing - dev-python/pycurl - dev-python/pyinotify - dev-python/simplejson - net-analyzer/arping - net-misc/bridge-utils - net-misc/curl[ssl] - net-misc/openssh - net-misc/socat - sys-apps/iproute2 - sys-fs/lvm2" -RDEPEND="${DEPEND}" - -pkg_setup () { - confutils_require_any kvm xen -} - -src_configure () { - local myconf - if use filestorage ; then - myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file" - else - myconf="--with-file-storage-dir=no" - fi - econf --localstatedir=/var \ - --docdir=/usr/share/doc/${P} \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/ganeti/os \ - $(use_enable syslog) \ - ${myconf} -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti - newconfd "${FILESDIR}"/ganeti.confd ganeti - newbashcomp doc/examples/bash_completion ganeti - dodoc INSTALL NEWS README doc/*.rst - rm -rf "${D}"/usr/share/doc/ganeti - docinto examples - dodoc doc/examples/{dumb-allocator,ganeti.cron,gnt-config-backup} - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - keepdir /var/{lib,log,run}/ganeti/ - keepdir /usr/share/ganeti/os/ - keepdir /var/lib/ganeti-storage/{export,file}/ -} - -pkg_postinst () { - bash-completion_pkg_postinst -} diff --git a/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild b/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild index 974b6ad47164..20a0019dedf0 100644 --- a/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild +++ b/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild,v 1.6 2013/09/12 22:29:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild,v 1.7 2014/07/02 23:57:25 chutzpah Exp $ EAPI=4 diff --git a/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild b/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild deleted file mode 100644 index 94f113ffee61..000000000000 --- a/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild,v 1.4 2013/09/12 22:29:37 mgorny Exp $ - -EAPI="4" -PYTHON_DEPEND="2" - -inherit eutils confutils bash-completion-r1 python - -MY_PV="${PV/_rc/~rc}" -#MY_PV="${PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" - inherit git-2 - KEYWORDS="" - # you will need to pull in the haskell overlay for pandoc - GIT_DEPEND="app-text/pandoc - dev-python/docutils - dev-python/sphinx - media-libs/gd[fontconfig,jpeg,png,truetype] - media-gfx/graphviz - media-fonts/urw-fonts" -else - SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://code.google.com/p/ganeti/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6" -REQUIRED_USE="|| ( kvm xen lxc )" - -S="${WORKDIR}/${MY_P}" - -DEPEND="xen? ( >=app-emulation/xen-3.0 ) - kvm? ( app-emulation/qemu ) - lxc? ( app-emulation/lxc ) - drbd? ( >=sys-cluster/drbd-8.3 ) - ipv6? ( net-misc/ndisc6 ) - htools? ( - >=dev-lang/ghc-6.10 - dev-haskell/json - dev-haskell/curl - dev-haskell/network - dev-haskell/parallel ) - dev-libs/openssl - dev-python/paramiko - dev-python/pyopenssl - dev-python/pyparsing - dev-python/pycurl - dev-python/pyinotify - dev-python/simplejson - net-analyzer/arping - 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/python-2.6 - ${GIT_DEPEND}" -RDEPEND="${DEPEND} - !app-emulation/ganeti-htools" - -pkg_setup () { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - ./autogen.sh - fi - epatch "${FILESDIR}/${PN}-fix-start-stop.patch" - epatch "${FILESDIR}/${PN}-2.5-gentoo-start-stop-daemon.patch" - - # Force Ganeti to use python2 - python_convert_shebangs -r 2 tools - python_convert_shebangs 2 daemons/import-export -} - -src_configure () { - local myconf - if use filestorage ; then - myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file" - else - myconf="--with-file-storage-dir=no" - fi - if use sharedstorage ; then - myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared" - else - myconf="--with-shared-file-storage-dir=no" - fi - if use kvm && [ -f /usr/bin/qemu-kvm ] ; then - myconf="--with-kvm-path=/usr/bin/qemu-kvm" - fi - econf --localstatedir=/var \ - --docdir=/usr/share/doc/${P} \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/ganeti/os \ - $(use_enable syslog) \ - $(use_enable htools) \ - $(use_enable htools htools-rapi) \ - ${myconf} -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti - newconfd "${FILESDIR}"/ganeti.confd ganeti - use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff - use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff - newbashcomp doc/examples/bash_completion ganeti - dodoc INSTALL UPGRADE NEWS README doc/*.rst - rm -rf "${D}"/usr/share/doc/ganeti - docinto examples - #dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup} - dodoc doc/examples/{ganeti.cron,gnt-config-backup} - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - insinto /etc/cron.d - newins doc/examples/ganeti.cron ganeti - # Force Ganeti to use python2 - python_convert_shebangs -r 2 "${D}"/usr/sbin/ - python_convert_shebangs 2 "${D}"/usr/"$(get_libdir)"/ganeti/ensure-dirs - - keepdir /var/{lib,log,run}/ganeti/ - keepdir /usr/share/ganeti/os/ - keepdir /var/lib/ganeti-storage/{export,file,shared}/ -} diff --git a/app-emulation/ganeti/ganeti-2.6.2.ebuild b/app-emulation/ganeti/ganeti-2.6.2.ebuild deleted file mode 100644 index ad1a562979d5..000000000000 --- a/app-emulation/ganeti/ganeti-2.6.2.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.2.ebuild,v 1.5 2013/09/12 22:29:37 mgorny Exp $ - -EAPI="4" -PYTHON_DEPEND="2:2.6" - -inherit eutils confutils bash-completion-r1 python - -MY_PV="${PV/_rc/~rc}" -#MY_PV="${PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" - inherit git-2 - KEYWORDS="" - # you will need to pull in the haskell overlay for pandoc - GIT_DEPEND="app-text/pandoc - dev-python/docutils - dev-python/sphinx - media-libs/gd[fontconfig,jpeg,png,truetype] - media-gfx/graphviz - media-fonts/urw-fonts" -else - SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://code.google.com/p/ganeti/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6 - haskell-daemons rbd test" -REQUIRED_USE="|| ( kvm xen lxc )" - -S="${WORKDIR}/${MY_P}" - -DEPEND="xen? ( >=app-emulation/xen-3.0 ) - kvm? ( app-emulation/qemu ) - lxc? ( app-emulation/lxc ) - drbd? ( >=sys-cluster/drbd-8.3 ) - rbd? ( sys-cluster/ceph ) - ipv6? ( net-misc/ndisc6 ) - htools? ( - >=dev-lang/ghc-6.10 - dev-haskell/json - dev-haskell/curl - dev-haskell/network - dev-haskell/parallel ) - haskell-daemons? ( - dev-haskell/hslogger - dev-haskell/crypto - dev-haskell/text - dev-haskell/hinotify ) - dev-libs/openssl - dev-python/paramiko - dev-python/pyopenssl - dev-python/pyparsing - dev-python/pycurl - dev-python/pyinotify - dev-python/simplejson - 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 - ${GIT_DEPEND}" -RDEPEND="${DEPEND} - !app-emulation/ganeti-htools" -DEPEND+=" test? ( || ( dev-lang/python:2.7[ipv6] dev-lang/python:2.6[ipv6] ) )" - -pkg_setup () { - confutils_use_depend_all haskell-daemons htools - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - ./autogen.sh - fi - epatch "${FILESDIR}/${PN}-2.6-fix-args.patch" - epatch "${FILESDIR}/${PN}-2.6-add-pgrep.patch" - - if use !test ; then - # Force Ganeti to use python2 - python_convert_shebangs -r 2 tools - python_convert_shebangs 2 daemons/import-export lib/ovf.py - fi -} - -src_configure () { - local myconf - if use filestorage ; then - myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file" - else - myconf="--with-file-storage-dir=no" - fi - if use sharedstorage ; then - myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared" - else - myconf="--with-shared-file-storage-dir=no" - fi - if use kvm && [ -f /usr/bin/qemu-kvm ] ; then - myconf="--with-kvm-path=/usr/bin/qemu-kvm" - fi - if use haskell-daemons ; then - myconf="--enable-confd=haskell" - fi - econf --localstatedir=/var \ - --docdir=/usr/share/doc/${P} \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/ganeti/os \ - $(use_enable syslog) \ - $(use_enable htools) \ - $(use_enable htools htools-rapi) \ - ${myconf} -} - -src_install () { - emake V=1 DESTDIR="${D}" install || die "emake install failed" - newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti - newconfd "${FILESDIR}"/ganeti.confd ganeti - use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff - use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff - newbashcomp doc/examples/bash_completion ganeti - dodoc INSTALL UPGRADE NEWS README doc/*.rst doc/*.png - dohtml -r doc/html/* - rm -rf "${D}"/usr/share/doc/ganeti - docinto examples - #dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup} - dodoc doc/examples/{ganeti.cron,gnt-config-backup} - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - insinto /etc/cron.d - newins doc/examples/ganeti.cron ganeti - - # Force Ganeti to use python2 - python_convert_shebangs -r 2 "${D}"/usr/sbin/ - python_convert_shebangs 2 "${D}"/usr/"$(get_libdir)"/ganeti/ensure-dirs - - keepdir /var/{lib,log,run}/ganeti/ - keepdir /usr/share/ganeti/os/ - keepdir /var/lib/ganeti-storage/{export,file,shared}/ -} - -src_test () { - # work around patches to make tests work - epatch "${FILESDIR}/${PN}-2.6-fix-tests.patch" - emake check || die "emake check failed" -} -- cgit v1.2.3-65-gdbad