From 00ef8bb930ba16d986619a65b2676a1125cd9d48 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Mon, 10 Nov 2014 17:51:42 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF --- app-emulation/ganeti/ChangeLog | 7 +- app-emulation/ganeti/Manifest | 24 ++- app-emulation/ganeti/ganeti-2.11.6.ebuild | 219 ++++++++++++++++++++++ 3 files changed, 241 insertions(+), 9 deletions(-) create mode 100644 app-emulation/ganeti/ganeti-2.11.6.ebuild diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog index ffc9c9189bc0..cf830665959e 100644 --- a/app-emulation/ganeti/ChangeLog +++ b/app-emulation/ganeti/ChangeLog @@ -1,6 +1,11 @@ # 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.94 2014/10/27 09:51:37 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.95 2014/11/10 17:51:36 chutzpah Exp $ + +*ganeti-2.11.6 (10 Nov 2014) + + 10 Nov 2014; Patrick McLean +ganeti-2.11.6.ebuild: + Version bump. *ganeti-2.11.5-r1 (27 Oct 2014) diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest index c29e41a6f68d..08865e3a2256 100644 --- a/app-emulation/ganeti/Manifest +++ b/app-emulation/ganeti/Manifest @@ -36,25 +36,33 @@ AUX ganeti2.initd 1503 SHA256 6fd666648ac543ffcc3700821a36eba9a027eb04278e53f60e DIST ganeti-2.10.5.tar.gz 3855105 SHA256 7b66a0a13344f484bc1d1e90f84227438e2cdbb054f5667a9a4c216bce2b8532 SHA512 ab9fe4c18f975e13dcd403a086b725d4f5e4f84aaa5a2651cf4087b6abad59b38b470ed062f407e6783997f976eb217e755c9d7a3ebde1df63638c3ab63cd755 WHIRLPOOL 5bf83bae29f51cfd2980d3e57a03d25e598ae7495785646e8920d4ca7685d2e93cbac42624e86fbbf92236edd7311f724fa036580300f8ccc066818d3c9911a5 DIST ganeti-2.11.2.tar.gz 4102630 SHA256 1ff4eb669cae420c0f46862724ddc6cc8a329b5ab425b846c30dede5a12a6714 SHA512 26433226ed0c21c45d6ad3bddd43489c0b8cdd2f64af3e138c559df421d76859876ef7cfd7e00ab75c8041b3c3f10fbdf290782b23a3b3989d79589c44e8d6dd WHIRLPOOL adc9a3126968b5ecb17c1e9bbc0f17c7eb3f8af427efe60b19fb600728e63d4c87338bc226cae82a19c6309efe2567d8f4ee381387450c006a56033231f95eaa DIST ganeti-2.11.5.tar.gz 4110953 SHA256 b15c76e963936b1769a4732883fcdd24c4d0b74a07945881ce8d5b4092dfd44f SHA512 9cd17761a7e3125bb7640db2ddee246b77f347efcbe1e4ef54e2e9dfcb8ba9b87b7fd7b0a9093d7c0f9aedcabfa77eb661fecbeefdac3d60d8fe07ce122280ec WHIRLPOOL a33afd90e4ac6b4e8ef74fb6a24e2940c9c2145bff175e765371a280e51ea218a90b50211bf567464bbe5e444883100b083a5c5da294739764220462a5864846 +DIST ganeti-2.11.6.tar.gz 4145886 SHA256 db11659ae7aaab5933b55b35f703236edc91ec763e443ac80679a057ba57af5e SHA512 c68ba0661f7598b2fbd67a96fd897e9a8fe7c3a79e914200c08a8e6cb78ad7ea8a85ce7cfee157e22c07d5f46ae6ed61d946cf2cc3852624cd303deb96f1e449 WHIRLPOOL 9bd0acd85ed86b8d05164d6ee70ea960fd42128f9144739c148e70917675d53c1d808d22df981a1ea0d843dfc5fd14fd516d6d39330634beec7eb0ecae4cbe5b DIST ganeti-2.4.5.tar.gz 1828118 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89 SHA512 e3abc2fd7c031fbef41c6e993f4cb129fa1dd4cb8c44961a2574da23832fd8412b8b3664b2e05ba8236cb8e58e8d70c3c9081f3f1b6dba8ffdc28d298c8a5099 WHIRLPOOL 897c2b3cdf0c7b03232a4ec99314439dbd29afd65eb2502d21a9f197cc098323a4b9ec0671c24ef7aad44b5327316ee68731e7e5304c8730d03f8ca908b93b62 DIST ganeti-2.7.2.tar.gz 3222364 SHA256 ea4178817df0d1352c2c2da292f0fc0fc17f0818ce5a48816b020dda03608481 SHA512 c868408605aec0c6a39af7924baf3ea04e8c855f4a702ed2025aff6bb539ea824a69e25e65f855ab6b56d4b1b5426ed31355eda496897964d2314f7d5cd3e010 WHIRLPOOL 8b1b48bb9b9ead37fc5d0eea3de333d05d09777828e5d5c224f1ff9fb0611888718d90be67186881f8caa1fbb7887057ccb848f9a370d68cb76dd60c990db9ce DIST ganeti-2.9.5.tar.gz 3614501 SHA256 8fb94e526c862e851cc700bc2eb04387f2b33af5bdf451c3133c44bc3996b7bc SHA512 6b483aeedfb80501640adb222157f86098b7996b9e47a64eddbc7a5ab216fd67955ab23a0b52ea1c3afb8b2c15b1407b35faa4550822d6af2169898a5fc16332 WHIRLPOOL 6b60a90b45bc7a202bc4b7787ed1e7a0baf9eb12216b17390713d39c71deacb13a0d12ae63280b992074c0fe1b1a05501c0ffed01fbce2c82e2819d6c99966d1 EBUILD ganeti-2.10.5-r3.ebuild 4779 SHA256 69f63c3c44fd5aec39a32b2ce0949093d9c9f25e1eb0391666abc093798d6dbd SHA512 5a883661c4ff5f6e14c01480fca87bac44c96d54f1d63e34964ea217fd91c37b6a56b6a3b7df0a35b38e829c957592267d0893e6d39f56017d1f78c5ea9434c8 WHIRLPOOL d5fb0807ab81ca3afea2f74c16aace40578955f61ab555b067cc3d5739ef96dc13cf0f75c71e47ab8d31634a730714fc51eb405bf57b87810051b511b7519d29 EBUILD ganeti-2.11.2-r3.ebuild 5352 SHA256 853237ff17cd23a0302ee2bb959bf8eb605e94beed379f0813bce4b7fba39fb6 SHA512 c7ad635ae4d2951e4376ebb8a81ec07c71c0404b3bfa2fb4cac79196f1872dafe3c5aa48cc3f5b3ad436518b51e54d7667fa7a88d119bcbdcf7b72a1e186f13c WHIRLPOOL 975fc2c629253cad97de6574772d29b3bab364c02fa3a3a31229ba91e1b4bf5f9bd4a024bdda9bcbc84ec323d7c23e5287a70a557daaa9a680a4845e8a913f14 EBUILD ganeti-2.11.5-r1.ebuild 6187 SHA256 f71651ec8813ddfa370347795d526875976a6f47a1837487959c6018fd72505f SHA512 022d9dedd7a77967cc1ff6dbc76e9884adf36be6d81b5d63687c9afbf704e68a92d3b343a7c854583a16a9cb5f96d885e173416f24a017660343fbe7688af3fc WHIRLPOOL 5df06baba5ac90e51f48e3941c107a6b9a596ab104c0c2a800309cc957520aa1d82bdbf35d59d09bca9ed27fb5da2b9d0df46a9fd459df3c28602e16464cb232 +EBUILD ganeti-2.11.6.ebuild 6184 SHA256 678b0326b1c9715864ff5d8b40d61f34a24e234a99accb7a2b40926ba515c88e SHA512 eb057cbab622646a8376e9997b6c408c49fc7b01eea038a864637c3ebea28e36f455eb5de5807493034f8720509750523ae82bef91573cde7f445f96c2c8c981 WHIRLPOOL b9c2c80f2ac487d57ac21e5a2750dc3d2f2a66fe28271c4d33a3cf172b82d23ab23e5ddcd1459cd41ff30e5ad22a69cf2ef32b7f112948767190b7a857c1dedf EBUILD ganeti-2.4.5-r1.ebuild 2540 SHA256 8024d6ba63f08762ec42f6acf8d3ad7f7f51ca4d221f780e7b86229e694dbea3 SHA512 85cce9aa0ccbfbfb889962b407eda507adaa5cbbf0630ddea6b86dc923c8b23dc4e881a41d0a63cf927f0b93b9427c10f428b36f534658ed8edec272e2559677 WHIRLPOOL 7a65b8e03cdf3ca189ea0cfd2ceeba597d45843df7c8a25f4c7de8224a16421f1235e9e7689c84b566c9eaeab815ef939259915e02b884beb1996595951a35bb EBUILD ganeti-2.7.2.ebuild 4329 SHA256 ba3ee62061cca5e433436926cda872ace275ef379182ac2de6ef8a1c83cb7e48 SHA512 c98cd64f6315c8bb2eb12b885b0e610e2a933da0ce9288a929d9c00875139c95ecb89929c244c8ad81f672753b9dc66fc0cc889f25a3224d0e5cce196dce150c WHIRLPOOL 0eb0c43df9466f042a5361619218403ba440810218fa5740eb85ec8465bd1eef5ab67f8435faf400f904f86f8de3e3535e13a8eff56130f0ff2ee3a2424b9cf9 EBUILD ganeti-2.9.5.ebuild 4646 SHA256 4bb9608f805b88b42a2cc839d0e8f38c9c3fbe1a181b59e5bfda5a0b0b9672d5 SHA512 eb56a60c17fdac309fd141bfe7cf564abf7acb65cc3435fd458e5441f6e1e631cb29111be679ba2da2416446c9c6f28f7ecdb662a1d744af58c3148d2f61d27f WHIRLPOOL 36a5ee43cbca96cc2f99dfda27654a8ef6ba6dab61840f3e9b255ae232220bdd33306aeee816df114a52d49876861df6da39aa289745ba1f10179a7be47f82c2 -MISC ChangeLog 20555 SHA256 05cf648c959879b3cc58826dd514a93a9e11172fc242e67182c4f0b0f8a65fdd SHA512 b9cda84027d24661f811ebc3237f5f9ded136f5d2607d01efc6b19939f331266e9e7f848f029154acf2c02b7f4b14836cc8487fdb1e1fe3958fbcceea1eede39 WHIRLPOOL dd1ba2fa9f153e13a11d5caabccfd53ca29cba96aeb20d3fca4345504188452412017b710d5489972df5150c478fde374a30852aaf178ab6ddfc1798cce1de9f +MISC ChangeLog 20677 SHA256 970e354bbe156d3548c41fd1b93a79bdb305037d94e659e4b08b2afa47a3186e SHA512 d9008d8d3fa92be93c71c1c2f6abf0a412f0fae73fdb912c0f6dce508c695e277942ab3b46c6c0ce0ca681452f536b0e75718b3e11b6349610a135be4d33fac5 WHIRLPOOL e1a619f26f660291dc8ad7f5b55a4dbfb8ade9a9ef7d0b2173785e097a7b795185c8b5ce3d07eae9d48647bd6c9a92a56e90e2b3777f5a8bd8cf9307e456994d MISC metadata.xml 1732 SHA256 c8ba5eaf654ea1afc8a8cb035f6a69a2352036cbfee7c4f4b5da634d6161e019 SHA512 467ff38587cc9d7904780971d3be7d4dd97f177b4d8ee12d9a9dba9c8b80cb9d2eead3a941e56ea7d65d1a7a0b9130b01478477474760ecd5f881fcd70414573 WHIRLPOOL 34f3a542c3fbad35c03f1f9fee50e4018d0bec0cb917250153c35667f0f0b60b74137c9d8f5e02ec9332f6f91a33254a24e98743131525cb0d6a8c6bdba7f340 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUThWpAAoJECo/aRed92675wQIAMsDA6bIRhBTxNpJqlGFESLs -2T3wz9tTGw+9fzxX8XbmLSe+jUG0brN7OqIUudCj6o4n0W1ghUnZu5jFvob2Wagc -dU9EP6ZHnyG/5D99cY6zuHLHYzj2qkNEQZF05T+4Tdv0vueXbqzErccHC30v74DG -PWAn6X5XGVWsKhhXQW/li3/lVUuy8tlmnYZOtWBsgkldZNWdvWIinaVJB08L+Yu3 -wU9PO3Aq1DV21ghCdFdgi7AvtuWAOxOdl6hw8L4TTjydzBJZ/RCH/m41ex8asjqX -IaNYMKCzeNAiO30UAOjfNtiC8QDKUj4+zbw09siDWoDCdo/f5QZRLuJMZM71o80= -=c41b +iQIcBAEBCAAGBQJUYPspAAoJEHy/RO9cNQiDVpIQAJ4rl5zQliF/VgdYAbzz6jLQ +Vja6Ggr8GK8ZkFm3j0DyzE4qGR9sBIfRjxek9lyUDShXWN80Zt0pWJX9Z2FdkWR2 +MYaQ1XWrns7+hBp8o17bzzrJRVWQLNvRoMgD8NqS9SwhfN8oovmSebhnsHOLcd2m +L1CT6AkMKyTBbr1WM/+ft53dkWYsIcmaprmEphbJdai6BoZUGLZLz7+itI+pDyN2 +Z1rU1MyEAICnsUW74aGmJ64eKQi9AOC8SZylvRSnqqneBV0yIcRZnfojrxYeFTeX +7XGRSzPF3nFDqVqMAUJjkImTWlQEHWBDKplQ4qR4u9PyZPtb4oX83la9gEM+zcWR +++zR7PdnnEgY747Jbz7rgZPZAc478hEuRlukm5X6JVp8KcfoaCRVzf6Q4RL9LgwV +2eWEZaKgNJ1gGL8zoYls7eEfUGInTo0J6rxg8LAegbOOzphoHBwIUqoDO0R7tBh3 +k29kyQka/y6Jp8LsXSW1F3ByyjiAULMyTFlXm0H4/7ikdtab0JTMWqi1fCombRuf +LPb5tXCwHrBjx2HWLVeqtR8XjEVliyGkRbJbcmX3MPglBLFG0MWrLpPgHpOeEqB+ +0Pn0iRws2eNvKRcxId1USnseUJqKHWIwsWob2TESAFwnK1byCmmZn8khK1RwGw6I +8Xsp+pVduQGR/pn1Oa2t +=L3Gl -----END PGP SIGNATURE----- diff --git a/app-emulation/ganeti/ganeti-2.11.6.ebuild b/app-emulation/ganeti/ganeti-2.11.6.ebuild new file mode 100644 index 000000000000..d8b3b582a02e --- /dev/null +++ b/app-emulation/ganeti/ganeti-2.11.6.ebuild @@ -0,0 +1,219 @@ +# 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.6.ebuild,v 1.1 2014/11/10 17:51:36 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="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen" +REQUIRED_USE="|| ( kvm xen lxc )" + +USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" +GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" + +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= + monitoring? ( dev-haskell/snap-server: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/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 ) )" + +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} + + 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} +} + +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 () { + emake check || die "emake check failed" +} -- 2.26.2