From 4a88c2fb5177f604c68f23f0f4ef4d2b809a1bb4 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Mon, 24 Dec 2012 17:52:16 +0000 Subject: Fix metadata invariance reported in bug #448432 Package-Manager: portage-2.1.11.31/cvs/Linux x86_64 Manifest-Sign-Key: 0x27F4B742 --- app-emulation/ganeti/ChangeLog | 5 ++++- app-emulation/ganeti/Manifest | 10 +++++----- app-emulation/ganeti/ganeti-2.6.2.ebuild | 14 ++++---------- 3 files changed, 13 insertions(+), 16 deletions(-) (limited to 'app-emulation') diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog index 3b53ac4e2e7e..46ff317fa9aa 100644 --- a/app-emulation/ganeti/ChangeLog +++ b/app-emulation/ganeti/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emulation/ganeti # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.67 2012/12/24 07:34:07 ramereth Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.68 2012/12/24 17:52:08 ramereth Exp $ + + 24 Dec 2012; Lance Albertson ganeti-2.6.2.ebuild: + Fix metadata invariance reported in bug #448432 *ganeti-2.6.2 (24 Dec 2012) *ganeti-2.5.2-r2 (24 Dec 2012) diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest index fb61f4fee1b4..a9eebcfedc19 100644 --- a/app-emulation/ganeti/Manifest +++ b/app-emulation/ganeti/Manifest @@ -37,13 +37,13 @@ EBUILD ganeti-2.5.2-r2.ebuild 3843 SHA256 4cd0453bf3fea2ed56eab11f242fc405c072e7 EBUILD ganeti-2.5.2.ebuild 3375 SHA256 585aab7452710cbf6189c28adce9d2a0fc51842dfcea8479b8cbe150515f2e41 SHA512 7bd0198e3da6250854d4982ee14074cc38436b0326e5c7bc0c010ee79267d221589d1e35314d8d51bd8eb8012dfb0e18d51f902152089484308c00e45ebaccd0 WHIRLPOOL 844e64260cb0474d1e7cba6dea38b8382fa52170adf6f0bea302ce84eaac560c1a96d670fe24d7a2c06bb525d331ea8ab26cb845ad4d09acee855532a13873f2 EBUILD ganeti-2.6.0.ebuild 3771 SHA256 07e1ef50e63fc117e822daa35589b053bb1f16cdfc0fcc6f145faa03ca12312a SHA512 975ffc912bca1ab35cc62852043fe13676baf03c09d6f40b8e5800eb95f468d6a9ca4f76780594c8bfa9b05a9704d175f9d47070da118bd6a8a973e40fd8a3be WHIRLPOOL 0e7c02891426a965782469c7de2eb290ef8504ed5a766b2a5074bcc306a4f29cf5cbb7d354930e63bd445b08cbb4a0d4804e8f567473594d3373e884b8dcd612 EBUILD ganeti-2.6.1.ebuild 3773 SHA256 0c583feec4c4fe9b1a674a0971299e18d1e39274e14acbcfec9d438ed8029732 SHA512 d31c79f79c2d5ff352f0bca2a2dfca60b795194fa9afdb82c5085e0660d305bfaf89f25b1e2ea9dd47ed8ef0869bf120c2e040cfa2e7f1922ab82470fd96318d WHIRLPOOL a0714b7d92009b79a5f7131a64272302869cd4d47e03d44ecd55c28fba8a896a85b62cfa250ccad1fe137ca3fa22a9b53bb446716efe1333317f83f8d87fff63 -EBUILD ganeti-2.6.2.ebuild 4472 SHA256 c800707d99ff74ea4f95afd3553614f326061d63e37b3f1cb17b22e0e4def36d SHA512 deaba8050bdf0ca05e1b98591b47f8fe14624c3f836f37f907c1f190e77e00381a2211c285ecd590a59d181f1c8935c5a09d9bbc400ae03ec37dd70811b6cc58 WHIRLPOOL 1e03d7481c1b16a1515228c8e21af6352774dcda92bc880269edb54d5cca64a6dede8e585a17e5caa88a79956853d10ae0907546609215d6707c0ff0b7a41566 -MISC ChangeLog 13350 SHA256 5354be30ff7156d977d5acc9e1c2ce6db8afbe6719f26781e33bbfbfc38e377e SHA512 4e4d98bf26c513cfb02457bbffbb30b6eabbdf50aa9082bbfb9049741d1667869b09a35dae654e54f31864f9d3f8c157867f154975112ca1691993ab3a0ed064 WHIRLPOOL 20bdc0998e16933d8cdaae0c87b3d7b7235f88b3927a4637bd17c3ed5302f0cb589c943bd9b605097ef3c67c87d7a739ee958c7e1a46269a14128a41ae751716 +EBUILD ganeti-2.6.2.ebuild 4431 SHA256 9fe6a7e43f8fe5ed619192e34c0c38a3829389d8bb0322c4d87eb1dd37f190a4 SHA512 a823333ebd51fe0a024faade1dfd0e08f36edccd1da08fe6f965d8d66a99085cc6fe6d44b67bc2c99d44fb25f59bdf24f7d208a20274da2f7e780bc34d47159a WHIRLPOOL fa1f00700a71357e39bd8fee6606c82df860f7732665a57fb9e74a411d740273497d5f6486b44c1818d6b140dd114ce78b9d87a82e50d6aa3730bdceb2268dbb +MISC ChangeLog 13475 SHA256 e07a74868266de34b93cb93bab0b8fa796a75d9f49f2e00f91218960dc67f13c SHA512 620cafc39d5c1fd65b45d493b141c11e110b5eb3271da811552afb0b4b134b422986909661f9df73339261a912baca7857e9ed8bcbbef0a1cdca645fa8843d61 WHIRLPOOL a32dbe17a4dd2e9978d3c0843609adcf751dae4c3ae0eb212236daa6509bca9e2604755fb9c81315c59e5a0b4a8e778e9178de2541db3db9742c8e5086896eeb MISC metadata.xml 1576 SHA256 6658d9da18761ed1a7709e087692355cdeb98f0cb7a67e124900335b8d48cbae SHA512 a4dd8876e15e98aa08ec4e9d4859b0a81acf427ec5e9be4067bad6579044601601af39d4cd5509f5b7d3e158040c3e2a6f14ed902aea7d1d5ec06dcafc4bdfa8 WHIRLPOOL 9b8894c29fb219420bd45701ba1eb1d374154cf2f9185055d5bfdfcae4aa7afe2d69e7b6823fd60b05601e030ffcb570f470bae287137dfdaafd0b5c4bd085b2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iD8DBQFQ2AVxQW+hXSf0t0IRCDoFAJ9/Z8bwbzpbYI2I3DyCa1BYMZZsEQCdF2Io -mAmNVqYLEZOs1mACjfL+lTg= -=A6mb +iD8DBQFQ2JZLQW+hXSf0t0IRCH/PAKC5X19P+zC1K5ThCgDQ2jqLApXhzgCghxeL +q/Ix4GVaYQCjWzgw1kbjomI= +=Aa8h -----END PGP SIGNATURE----- diff --git a/app-emulation/ganeti/ganeti-2.6.2.ebuild b/app-emulation/ganeti/ganeti-2.6.2.ebuild index 8fcdc02978c0..efbf52846ffb 100644 --- a/app-emulation/ganeti/ganeti-2.6.2.ebuild +++ b/app-emulation/ganeti/ganeti-2.6.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 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.1 2012/12/24 07:34:07 ramereth Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.2.ebuild,v 1.2 2012/12/24 17:52:08 ramereth Exp $ EAPI="4" -PYTHON_DEPEND="2" +PYTHON_DEPEND="2:2.6" inherit eutils confutils bash-completion-r1 python @@ -33,17 +33,11 @@ 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" + haskell-daemons rbd test" REQUIRED_USE="|| ( kvm xen lxc )" S="${WORKDIR}/${MY_P}" -if use test ; then - PYTHON_DEPEND=">=dev-lang/python-2.6[ipv6]" -else - PYTHON_DEPEND=">=dev-lang/python-2.6" -fi - DEPEND="xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) @@ -78,10 +72,10 @@ DEPEND="xen? ( >=app-emulation/xen-3.0 ) sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 - ${PYTHON_DEPEND} ${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 -- cgit v1.2.3-65-gdbad