Version bump to 2.1.1

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

5 files changed, 122 insertions, 6 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 402355d9631a..5f76685a39c2 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.19 2010/03/11 17:18:18 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.20 2010/03/12 19:21:58 ramereth Exp $
+
+*ganeti-2.1.1 (12 Mar 2010)
+
+  12 Mar 2010; Lance Albertson <ramereth@gentoo.org> +ganeti-2.1.1.ebuild,
+  +files/ganeti-2.1.1-disable-check-man.patch, metadata.xml:
+  Version bump to 2.1.1
+
+  * Added patch to remove use of check-man (ganeti issue 91)
+
+  * Removed old brctl patch since its now fixed upstream.
+
+  * Added filestorage useflag to give the option disabling it
+
+  * Added syslog useflag
 
   11 Mar 2010; Lance Albertson <ramereth@gentoo.org> -ganeti-1.2.1.ebuild,
   -ganeti-2.0.5.ebuild, -ganeti-2.1.0_rc3.ebuild, -ganeti-2.1.0_rc4.ebuild:
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index f5638599207f..d0f619578d60 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX ganeti-2.0.3-gentoo-brctl-path.patch 741 RMD160 2e97a68618467ba700fa97d3fc250e6734570c35 SHA1 90d414b327fa4a61850a8f11fab6ef9bd8cf437b SHA256 8362692d1af5b264a9681d63137bd010be29047419718b8daaa320dfb0979965
 AUX ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch 1041 RMD160 fc6a76737c923e25ac918a390b4b1881313f95b1 SHA1 4edc7135756f64111933bac23879b0cce50cb864 SHA256 ec597d86558bc8f5205afeb55f4fd1f7aa016f2482dd7f31935628ef0ae1e3c0
+AUX ganeti-2.1.1-disable-check-man.patch 547 RMD160 5b760903179418191da3dc9a17f4f1e8c65fde91 SHA1 5199d14b0b498a0ce096b1617a2b21e1bcfba5a7 SHA256 09396f4b321cd3b3b9f9cd15c9d8d3e2a68838bdbcaf071e4f6b71e7b6065b24
 AUX ganeti-2.1.initd 2014 RMD160 44996bf7d50b8ac70df572daafa5f5d04be021a8 SHA1 ceda61da3b3099292f4cd5ab41b5e02f2666dc6b SHA256 37fd18b914846e5fb8d984db7162b230ac3488ec530aaddda7b63bd72cc70117
 AUX ganeti.confd 248 RMD160 18662964365f102e77f593429bb0772d94c65267 SHA1 337999b3fbeb64518f3d39c41634e3f414aedb25 SHA256 7efc3a5052ad5c2085605a8c0bf9e9bb9cf20c0623263b7abcd0b7a0cb9a895b
 AUX ganeti.initd 1117 RMD160 763bc5795ac721d1616c435e1e087c3f5279c338 SHA1 ffeca91d3f4f26e775ea9de4c6b406e712aa317e SHA256 ae65bfb27f6cd6e261af0e130f5906185b9f9d6413c8319e989609a35d37172d
@@ -10,15 +11,17 @@ AUX ganeti2.initd 1503 RMD160 4af84c353f6638af31a94a5274e922237ae2fd00 SHA1 a462
 DIST ganeti-1.2.9.tar.gz 847644 RMD160 fcb803e6db851e020439a5c512d656bdd1712323 SHA1 2332038124c411085ffbdaf9539ac6a5cdccf443 SHA256 1de2432281f127a2b19106ba04fd1f630c7868113f0665063ff10a147676b92b
 DIST ganeti-2.0.6.tar.gz 684502 RMD160 3d521b48fad01d13c287457b421b3a60b926fe5c SHA1 167086e5285650a424891fcb4b6b3a298f104896 SHA256 f06433c567109ffa319ca23449eec670fb8b7bec7fa906edbf3c0cfc01f60043
 DIST ganeti-2.1.0.tar.gz 1237144 RMD160 340221421e5069bbbac0421d7486281ec5a56085 SHA1 c1be9a6d66c3cd38f716345b4677e823320791ae SHA256 09e433cd71a5c4a94ff80e2e2ea7b6c4e31a0eab9efa7b345d868c2aa761c612
+DIST ganeti-2.1.1.tar.gz 1267726 RMD160 b424545d33ee84bf8af508ee8e3727d8fe51aca7 SHA1 9e851ca239f20d3e56f649962a9d173195ebad78 SHA256 4dd6a26cb2464206fe1dbf40d077ba14f75bcef7515d14b461c7ffe27a0500e6
 EBUILD ganeti-1.2.9.ebuild 1184 RMD160 a5a134cb7dec0599845d544f3637cce9c36b9413 SHA1 a1209b771ec6bfd056186fa9d99819ab0d84a471 SHA256 437c0d62c4db77b71f8a97f95f8f4ffecf36624a9cd2988feb9df1ec406a627c
 EBUILD ganeti-2.0.6.ebuild 1762 RMD160 9408c5ce24e0a45be716ee7372a316c0f5a83e92 SHA1 129ffac81161c0e1598ed0cf2819c992b210e392 SHA256 acd454d76f642b5f388b2effb0cead5d0af44d6231a1dfa915feabc4671f334a
 EBUILD ganeti-2.1.0.ebuild 1973 RMD160 ff0e65eeb9a63531bcceb019a5ba6716c660ab8d SHA1 5c7894276b3f7167b18ef91c96c2d7d6d4271329 SHA256 eb46ba16a4f46b64b3d78d279b46280d86e10cfdea4808d91e844506ad9888ce
-MISC ChangeLog 3740 RMD160 565a5602dc6494c23d42fff9a435afbfc010b05a SHA1 63c5db950d2778400590f64d14b3e4552051b5c5 SHA256 bded3173000f6cf886c1429f8a4dd7920c1dbf3547380da0599447d906bf3acc
-MISC metadata.xml 1187 RMD160 c4f4fd250ec9b7b8fb4738a8d61c09f2af01d3a0 SHA1 921024500dae363c3e73ba565d3300a000f1772c SHA256 e6a405062ca4862abc506bd8fc0138403976c0769dd25ddcb4b737507bda9404
+EBUILD ganeti-2.1.1.ebuild 2102 RMD160 3021e65e1ac3e7c56f29354f30019e47367482de SHA1 47c383f4daf57a103712f331a65da3282389f571 SHA256 d90bee79b16cf6951ca849581bab2a5e36ab58d25411489da0a52b12e43735f9
+MISC ChangeLog 4140 RMD160 7d22e3b52d12f4f1ae0626d995f326de01051af1 SHA1 542447fe518359afc13f13bc17ad75b921c8c1d0 SHA256 2b8c1ef63cb413916510102e62aa8b086069abb64e4b88f38d8170f10452c0d3
+MISC metadata.xml 1241 RMD160 efeb38484aca2c00aed39b5baaa0a6b3be8aa3fd SHA1 572c2325f73be081e85a7b6dd8356e778b92ae8c SHA256 d3c4195c8a273087826535dbf371bd7c7c5f129a8fc5bb247fa52bbc39fd570c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFLmSVUQW+hXSf0t0IRAsAtAJ928R/kvNMyFfAHoJjZe9ChlR3cKQCdHPn4
-l4cesgf/UJWRkdE44BkFg18=
-=G5FF
+iD8DBQFLmpPOQW+hXSf0t0IRArpdAJ4+HFXY0G4SJJC4D1jqzXHcPo0J5wCg7zMi
+/81HPGEiAgTR3D0aWLuvIw0=
+=lgiB
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.1.1-disable-check-man.patch b/app-emulation/ganeti/files/ganeti-2.1.1-disable-check-man.patch
new file mode 100644
index 000000000000..5c2868d1a0fd
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.1.1-disable-check-man.patch
@@ -0,0 +1,17 @@
+diff -ur ganeti-2.1.1/Makefile.in ganeti-2.1.1.new/Makefile.in
+--- ganeti-2.1.1/Makefile.in	2010-03-12 03:04:33.000000000 -0800
++++ ganeti-2.1.1.new/Makefile.in	2010-03-12 11:07:47.000000000 -0800
+@@ -1320,11 +1320,11 @@
+ 
+ man/%.7: man/%.7.in $(REPLACE_VARS_SED)
+ 	sed -f $(REPLACE_VARS_SED) < $< > $@
+-	$(CHECK_MAN) $@
++	#$(CHECK_MAN) $@
+ 
+ man/%.8: man/%.8.in $(REPLACE_VARS_SED)
+ 	sed -f $(REPLACE_VARS_SED) < $< > $@
+-	$(CHECK_MAN) $@
++	#$(CHECK_MAN) $@
+ 
+ man/%.html: man/%.html.in $(REPLACE_VARS_SED)
+ 	sed -f $(REPLACE_VARS_SED) < $< > $@
diff --git a/app-emulation/ganeti/ganeti-2.1.1.ebuild b/app-emulation/ganeti/ganeti-2.1.1.ebuild
new file mode 100644
index 000000000000..989660e85fc8
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.1.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.1.ebuild,v 1.1 2010/03/12 19:21:58 ramereth Exp $
+
+EAPI=2
+
+inherit eutils confutils bash-completion
+
+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-kvm )
+	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}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-disable-check-man.patch
+}
+
+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
+	dobashcompletion 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/metadata.xml b/app-emulation/ganeti/metadata.xml
index 3d6ff6e967aa..563823b64931 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -24,6 +24,7 @@
 		<flag name='kvm'>Enable KVM support</flag>
 		<flag name='xen'>Enable Xen support</flag>
 		<flag name='drbd'>Enable DRBD support</flag>
+		<flag name='filestorage'>Enable File Storage</flag>
 	</use>
 </pkgmetadata>