| 1 |
chutzpah 14/05/30 22:12:57 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: ganeti-2.10.4.ebuild |
| 5 |
Removed: ganeti-2.10.1.ebuild ganeti-2.6.1.ebuild |
| 6 |
ganeti-2.9.1.ebuild ganeti-2.10.2.ebuild |
| 7 |
ganeti-2.6.0.ebuild |
| 8 |
Log: |
| 9 |
Version bump to 2.10 series, move to reworked init script. Clean out some old versions. |
| 10 |
|
| 11 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.86 app-emulation/ganeti/ChangeLog |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?rev=1.86&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?rev=1.86&content-type=text/plain |
| 18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?r1=1.85&r2=1.86 |
| 19 |
|
| 20 |
Index: ChangeLog |
| 21 |
=================================================================== |
| 22 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v |
| 23 |
retrieving revision 1.85 |
| 24 |
retrieving revision 1.86 |
| 25 |
diff -u -r1.85 -r1.86 |
| 26 |
--- ChangeLog 30 May 2014 22:07:23 -0000 1.85 |
| 27 |
+++ ChangeLog 30 May 2014 22:12:57 -0000 1.86 |
| 28 |
@@ -1,6 +1,14 @@ |
| 29 |
# ChangeLog for app-emulation/ganeti |
| 30 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 31 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.85 2014/05/30 22:07:23 chutzpah Exp $ |
| 32 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.86 2014/05/30 22:12:57 chutzpah Exp $ |
| 33 |
+ |
| 34 |
+*ganeti-2.10.4 (30 May 2014) |
| 35 |
+ |
| 36 |
+ 30 May 2014; Patrick McLean <chutzpah@g.o> -ganeti-2.6.0.ebuild, |
| 37 |
+ -ganeti-2.6.1.ebuild, -ganeti-2.9.1.ebuild, -ganeti-2.10.1.ebuild, |
| 38 |
+ -ganeti-2.10.2.ebuild, +ganeti-2.10.4.ebuild: |
| 39 |
+ Version bump to 2.10 series, move to reworked init script. Clean out some old |
| 40 |
+ versions. |
| 41 |
|
| 42 |
*ganeti-2.11.1 (30 May 2014) |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 app-emulation/ganeti/ganeti-2.10.4.ebuild |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.10.4.ebuild?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.10.4.ebuild?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: ganeti-2.10.4.ebuild |
| 53 |
=================================================================== |
| 54 |
# Copyright 1999-2014 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.4.ebuild,v 1.1 2014/05/30 22:12:57 chutzpah Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
PYTHON_COMPAT=(python2_{6,7}) |
| 60 |
use test && PYTHON_REQ_USE="ipv6" |
| 61 |
|
| 62 |
inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator |
| 63 |
|
| 64 |
MY_PV="${PV/_rc/~rc}" |
| 65 |
#MY_PV="${PV/_beta/~beta}" |
| 66 |
MY_P="${PN}-${MY_PV}" |
| 67 |
SERIES="$(get_version_component_range 1-2)" |
| 68 |
|
| 69 |
if [[ ${PV} == "9999" ]] ; then |
| 70 |
EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" |
| 71 |
inherit git-2 |
| 72 |
KEYWORDS="" |
| 73 |
# you will need to pull in the haskell overlay for pandoc |
| 74 |
GIT_DEPEND="app-text/pandoc |
| 75 |
dev-python/docutils |
| 76 |
dev-python/sphinx |
| 77 |
media-libs/gd[fontconfig,jpeg,png,truetype] |
| 78 |
media-gfx/graphviz |
| 79 |
media-fonts/urw-fonts" |
| 80 |
else |
| 81 |
SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz" |
| 82 |
KEYWORDS="~amd64 ~x86" |
| 83 |
fi |
| 84 |
|
| 85 |
DESCRIPTION="Ganeti is a virtual server management software tool" |
| 86 |
HOMEPAGE="http://code.google.com/p/ganeti/" |
| 87 |
|
| 88 |
LICENSE="GPL-2" |
| 89 |
SLOT="0" |
| 90 |
IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test" |
| 91 |
REQUIRED_USE="|| ( kvm xen lxc )" |
| 92 |
|
| 93 |
S="${WORKDIR}/${MY_P}" |
| 94 |
|
| 95 |
HASKELL_DEPS=">=dev-lang/ghc-6.12:0= |
| 96 |
dev-haskell/json:0= |
| 97 |
dev-haskell/curl:0= |
| 98 |
dev-haskell/network:0= |
| 99 |
dev-haskell/parallel |
| 100 |
dev-haskell/hslogger:0= |
| 101 |
dev-haskell/utf8-string:0= |
| 102 |
dev-haskell/deepseq:0= |
| 103 |
dev-haskell/attoparsec:0= |
| 104 |
dev-haskell/crypto:0=" |
| 105 |
|
| 106 |
DEPEND="xen? ( >=app-emulation/xen-3.0 ) |
| 107 |
kvm? ( app-emulation/qemu ) |
| 108 |
lxc? ( app-emulation/lxc ) |
| 109 |
drbd? ( <sys-cluster/drbd-8.5 ) |
| 110 |
rbd? ( sys-cluster/ceph ) |
| 111 |
ipv6? ( net-misc/ndisc6 ) |
| 112 |
haskell-daemons? ( |
| 113 |
${HASKELL_DEPS} |
| 114 |
dev-haskell/text:0= |
| 115 |
dev-haskell/hinotify:0= |
| 116 |
dev-haskell/regex-pcre-builtin:0= |
| 117 |
dev-haskell/vector:0= |
| 118 |
) |
| 119 |
dev-libs/openssl |
| 120 |
dev-python/paramiko[${PYTHON_USEDEP}] |
| 121 |
dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 122 |
dev-python/pyparsing[${PYTHON_USEDEP}] |
| 123 |
dev-python/pycurl[${PYTHON_USEDEP}] |
| 124 |
dev-python/pyinotify[${PYTHON_USEDEP}] |
| 125 |
dev-python/simplejson[${PYTHON_USEDEP}] |
| 126 |
dev-python/ipaddr[${PYTHON_USEDEP}] |
| 127 |
dev-python/bitarray[${PYTHON_USEDEP}] |
| 128 |
net-analyzer/arping |
| 129 |
net-analyzer/fping |
| 130 |
net-misc/bridge-utils |
| 131 |
net-misc/curl[ssl] |
| 132 |
net-misc/openssh |
| 133 |
net-misc/socat |
| 134 |
sys-apps/iproute2 |
| 135 |
sys-fs/lvm2 |
| 136 |
>=sys-apps/baselayout-2.0 |
| 137 |
${PYTHON_DEPS} |
| 138 |
${GIT_DEPEND}" |
| 139 |
RDEPEND="${DEPEND} |
| 140 |
!app-emulation/ganeti-htools" |
| 141 |
DEPEND+="${HASKELL_DEPS} |
| 142 |
sys-devel/m4 |
| 143 |
test? ( |
| 144 |
dev-python/mock |
| 145 |
dev-python/pyyaml |
| 146 |
dev-haskell/test-framework:0= |
| 147 |
dev-haskell/test-framework-hunit:0= |
| 148 |
dev-haskell/test-framework-quickcheck2:0= |
| 149 |
dev-haskell/temporary:0= |
| 150 |
sys-apps/fakeroot |
| 151 |
)" |
| 152 |
|
| 153 |
PATCHES=( |
| 154 |
"${FILESDIR}/${PN}-2.6-fix-args.patch" |
| 155 |
"${FILESDIR}/${PN}-2.6-add-pgrep.patch" |
| 156 |
"${FILESDIR}/${PN}-2.7-fix-tests.patch" |
| 157 |
"${FILESDIR}/${PN}-2.9-disable-root-tests.patch" |
| 158 |
"${FILESDIR}/${PN}-2.9-regex-builtin.patch" |
| 159 |
"${FILESDIR}/${PN}-2.9-skip-cli-test.patch" |
| 160 |
"${FILESDIR}/${PN}-2.10-rundir.patch" |
| 161 |
) |
| 162 |
|
| 163 |
pkg_setup () { |
| 164 |
confutils_use_depend_all haskell-daemons htools |
| 165 |
python-single-r1_pkg_setup |
| 166 |
} |
| 167 |
|
| 168 |
src_prepare() { |
| 169 |
epatch "${PATCHES[@]}" |
| 170 |
[[ ${PV} == "9999" ]] && ./autogen.sh |
| 171 |
rm autotools/missing |
| 172 |
eautoreconf |
| 173 |
} |
| 174 |
|
| 175 |
src_configure () { |
| 176 |
econf --localstatedir=/var \ |
| 177 |
--sharedstatedir=/var \ |
| 178 |
--disable-symlinks \ |
| 179 |
--docdir=/usr/share/doc/${P} \ |
| 180 |
--with-ssh-initscript=/etc/init.d/sshd \ |
| 181 |
--with-export-dir=/var/lib/ganeti-storage/export \ |
| 182 |
--with-os-search-path=/usr/share/${PN}/os \ |
| 183 |
$(use_enable syslog) \ |
| 184 |
$(usex kvm '--with-kvm-path=' '' '/usr/bin/qemu-kvm' '') \ |
| 185 |
$(usex haskell-daemons "--enable-confd=haskell" '' '' '') |
| 186 |
} |
| 187 |
|
| 188 |
src_install () { |
| 189 |
emake V=1 DESTDIR="${D}" install || die "emake install failed" |
| 190 |
|
| 191 |
newinitd "${FILESDIR}"/ganeti.initd-r2 ${PN} |
| 192 |
newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} |
| 193 |
|
| 194 |
use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff |
| 195 |
use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff |
| 196 |
newbashcomp doc/examples/bash_completion ganeti |
| 197 |
dodoc INSTALL UPGRADE NEWS README doc/*.rst |
| 198 |
dohtml -r doc/html/* |
| 199 |
rm -rf "${D}"/{usr/share/doc/${PN},run} |
| 200 |
|
| 201 |
docinto examples |
| 202 |
dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf |
| 203 |
|
| 204 |
docinto examples/hooks |
| 205 |
dodoc doc/examples/hooks/{ipsec,ethers} |
| 206 |
|
| 207 |
insinto /etc/cron.d |
| 208 |
newins doc/examples/ganeti.cron ${PN} |
| 209 |
|
| 210 |
insinto /etc/logrotate.d |
| 211 |
newins doc/examples/ganeti.logrotate ${PN} |
| 212 |
|
| 213 |
python_fix_shebang "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} |
| 214 |
|
| 215 |
keepdir /var/{lib,log}/${PN}/ |
| 216 |
keepdir /usr/share/${PN}/${SERIES}/os/ |
| 217 |
keepdir /var/lib/ganeti-storage/{export,file,shared}/ |
| 218 |
|
| 219 |
dosym ${SERIES} "/usr/share/${PN}/default" |
| 220 |
dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" |
| 221 |
|
| 222 |
python_fix_shebang "${ED}" |
| 223 |
} |
| 224 |
|
| 225 |
src_test () { |
| 226 |
emake check || die "emake check failed" |
| 227 |
} |
Archives