From 62611e90bed3cf5f156c5e7af30c86a4289a6047 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Sat, 14 Jun 2014 23:25:41 +0000 Subject: Revision bump, move the lock dir to /run/lock rather than /var/lock (bug #480534) (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF) --- app-emulation/ganeti/ChangeLog | 11 +- app-emulation/ganeti/files/ganeti-lockdir.patch | 15 ++ app-emulation/ganeti/ganeti-2.10.5-r1.ebuild | 174 --------------------- app-emulation/ganeti/ganeti-2.10.5-r2.ebuild | 175 +++++++++++++++++++++ app-emulation/ganeti/ganeti-2.11.1-r1.ebuild | 176 ---------------------- app-emulation/ganeti/ganeti-2.11.2-r1.ebuild | 192 ++++++++++++++++++++++++ app-emulation/ganeti/ganeti-2.11.2.ebuild | 191 ----------------------- 7 files changed, 392 insertions(+), 542 deletions(-) create mode 100644 app-emulation/ganeti/files/ganeti-lockdir.patch delete mode 100644 app-emulation/ganeti/ganeti-2.10.5-r1.ebuild create mode 100644 app-emulation/ganeti/ganeti-2.10.5-r2.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.11.1-r1.ebuild create mode 100644 app-emulation/ganeti/ganeti-2.11.2-r1.ebuild delete mode 100644 app-emulation/ganeti/ganeti-2.11.2.ebuild (limited to 'app-emulation/ganeti') diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog index a271cbec0c31..21d8bfbe9aa9 100644 --- a/app-emulation/ganeti/ChangeLog +++ b/app-emulation/ganeti/ChangeLog @@ -1,6 +1,15 @@ # 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.89 2014/06/14 00:11:44 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.90 2014/06/14 23:25:41 chutzpah Exp $ + +*ganeti-2.11.2-r1 (14 Jun 2014) +*ganeti-2.10.5-r2 (14 Jun 2014) + + 14 Jun 2014; Patrick McLean -ganeti-2.10.5-r1.ebuild, + +ganeti-2.10.5-r2.ebuild, -ganeti-2.11.1-r1.ebuild, -ganeti-2.11.2.ebuild, + +ganeti-2.11.2-r1.ebuild, +files/ganeti-lockdir.patch: + Revision bump, move the lock dir to /run/lock rather than /var/lock (bug + #480534) *ganeti-2.11.2 (14 Jun 2014) diff --git a/app-emulation/ganeti/files/ganeti-lockdir.patch b/app-emulation/ganeti/files/ganeti-lockdir.patch new file mode 100644 index 000000000000..dad084fa4306 --- /dev/null +++ b/app-emulation/ganeti/files/ganeti-lockdir.patch @@ -0,0 +1,15 @@ +diff --git a/lib/pathutils.py b/lib/pathutils.py +index db860ff..53a9cc4 100644 +--- a/lib/pathutils.py ++++ b/lib/pathutils.py +@@ -63,9 +63,9 @@ ETC_HOSTS = vcluster.ETC_HOSTS + + # Top-level paths + DATA_DIR = LOCALSTATEDIR + "/lib/ganeti" +-LOCK_DIR = LOCALSTATEDIR + "/lock" ++LOCK_DIR = "/run/lock" + LOG_DIR = LOCALSTATEDIR + "/log/ganeti" + RUN_DIR = "/run/ganeti" + + #: Script to configure master IP address + DEFAULT_MASTER_SETUP_SCRIPT = TOOLSDIR + "/master-ip-setup" diff --git a/app-emulation/ganeti/ganeti-2.10.5-r1.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r1.ebuild deleted file mode 100644 index 80960f902065..000000000000 --- a/app-emulation/ganeti/ganeti-2.10.5-r1.ebuild +++ /dev/null @@ -1,174 +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-r1.ebuild,v 1.1 2014/06/05 00:32:21 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" -) - -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-r2.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r2.ebuild new file mode 100644 index 000000000000..cff8533711be --- /dev/null +++ b/app-emulation/ganeti/ganeti-2.10.5-r2.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-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.11.1-r1.ebuild b/app-emulation/ganeti/ganeti-2.11.1-r1.ebuild deleted file mode 100644 index aafd4a21ab31..000000000000 --- a/app-emulation/ganeti/ganeti-2.11.1-r1.ebuild +++ /dev/null @@ -1,176 +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.1-r1.ebuild,v 1.1 2014/06/05 00:32:21 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" -) - -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 new file mode 100644 index 000000000000..fbc300f59398 --- /dev/null +++ b/app-emulation/ganeti/ganeti-2.11.2-r1.ebuild @@ -0,0 +1,192 @@ +# 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.ebuild b/app-emulation/ganeti/ganeti-2.11.2.ebuild deleted file mode 100644 index 4c58e4cb253b..000000000000 --- a/app-emulation/ganeti/ganeti-2.11.2.ebuild +++ /dev/null @@ -1,191 +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.ebuild,v 1.1 2014/06/14 00:11:44 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" -) - -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" -} -- cgit v1.2.3-65-gdbad