[app-emulation/xen-tools] Fix build

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 29 insertions, 23 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 8c4d84b52997..114aee1dbed4 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.83 2011/09/11 15:03:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.84 2011/09/11 21:27:42 alexxy Exp $
+
+  11 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r3.ebuild,
+  xen-tools-9999.ebuild:
+  Fix build
 
 *xen-tools-4.1.1-r3 (11 Sep 2011)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 9e55edc82a55..13424de33691 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -19,24 +19,24 @@ AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 983
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
 EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14
-EBUILD xen-tools-4.1.1-r3.ebuild 9295 RMD160 ec18c7d445ca1ef4fbd7878f205f6f3e2a39d454 SHA1 5683fe9177c4968fd01ffbe07e7300a32c432e83 SHA256 7937bbf91982965e21a8b7a5c1d96ea617ccc5353128546b2c8ba2a87faf4466
-EBUILD xen-tools-9999.ebuild 9291 RMD160 5a7588c3ccff3987735322c340f0bfcff4f285c5 SHA1 6a72882388678e704e62f2636fcda9da29d6e869 SHA256 9d888b08d501c189503701dcf626f2847456c7676af12bb1e72683b0dd983aad
-MISC ChangeLog 20476 RMD160 96e6d019cc1773f6debae4d70bc3068b94d55278 SHA1 4c4dd6d590610b655ce7c7b17f1bbd13777599ae SHA256 4c6d2d4d3705d21d3a0cc3576a6dbac72b3f9aebcc19773f64ade96c68cd77ac
+EBUILD xen-tools-4.1.1-r3.ebuild 9303 RMD160 2d8a3d6492f6710745491eb368218924c6f86d22 SHA1 0e764394b5d6406a51bdd735095d36f71b6ed8f0 SHA256 c227238067d4726af4474bdde208bb90ba3951e7a6f4013254a2443c2e71fda0
+EBUILD xen-tools-9999.ebuild 9299 RMD160 0e8a81acf118f72b7533e23af9c736862697d0d3 SHA1 87c2f914c86fd54e3dc2af5a68ab4fd543010f7d SHA256 dce58d077d5b5e14a06b6471490a2b709ceb05862c5551f0ce4a4fa5e9288be1
+MISC ChangeLog 20592 RMD160 44a913bcf2caf641789c27792b2cea29878e021f SHA1 00fa36deaa306e9c8779890a61b12de2f703ffc9 SHA256 295918059ff1d3d25b85dee56e320adea56b2b1395e9039d5d71a789be3333a9
 MISC metadata.xml 865 RMD160 7188d730684d02d8bcf8dbce413c01ae50b84ad1 SHA1 4815bcf6d0c2c61c6186ecde52d984669c44ccfd SHA256 08f789d1d92184515d9360b20c7ec0f8554977c470c702c659e79aced68edf38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJObM2NAAoJEOf+E+/4L5Lm3fMQAIAABzlYM1cN8aqxAl/DpBNj
-TUbD8ANwEJ9BbbGW6LtcvfbAfHgFUIwZRmIkXom85RohKgLDSnlGHi6hrvFEjsH3
-zO3sT6l3619PjvuLWW8cGRbKCttO26xC8dJXvr/hNUY0QNCHYlRAJyMABtc7SYfs
-7/TUh/mb+zrpy3kHvKVfrQjfitlxYbzWEmrc0PccGXZYoA2KVB/ydoKDdd+yPIKg
-MypbBB730/1D67P45aa58kNLp9QcCw28eoNnWPTeUrunYOuvRbaR6hqipQP6xYHT
-S5KzMrGyS5vwFEyEGijnOl5Ud60tB6/dLJ4KVfIaw9qEGJo9qDND22Ehepwq6NXp
-Y1Mufv0yCxv3zjhCrFUNw4qYdZBhzXa7vsPIfyYBvNzvwVZAwC8gAb0FO5Fgt6EY
-F8pWyTsMFdA2gUKH8HZbf7GOLVJqTdCpJ/7FLz5XyHczIYtxBKfwHLnDLhWzvrSV
-TY8k9yTq18hpXCCJtwS8usbutQQMqkyw/96eTyzt0s/0UnXiX83H4hGlXCFffwxe
-7c5Aunn8YYMUT7EGAFkrREhAGnXZXcNPKjgNkhoUxVSA/X9F6+8pAiZ9LwILn6AK
-yhNID4vwqoTAdVtHf65ECwd6ep2gNua+v+0co/iEoqf0YU6br+YXIp0lSC8B6vYe
-yjkC6NfW8vc45kX1VnVA
-=jLui
+iQIcBAEBCAAGBQJObSefAAoJEOf+E+/4L5LmmqsQAK8/uxZavYqZ0i5Jaz7Cjdqm
+Sb0K024/auL3CAUZtxjSp+fPY9tzj58qvCpPwnup9m3tVeM2TP5M467K5XThy+9e
+x8BL2Zw96N83HjQ3vwdjRLS50QZ8HHpxOrhAKDNdnXWsSPZRprSfE6FzVU2lyMU7
+RLpii1XHoD2mY/SjF/XVQY5GqEZlc/EtHSNnEYB4ZRvUWn9/2gxv6mr8Pm2KGj0K
+tsHTKpnnt0o6+J6Byrx27SlB5OPKG+yQyi/pT/4Fri4qZpoti7pkF8ihi+07+FyQ
+R4VtnAHfqzwurlOJpUo79cZ/3XS8IRrqtvlnxj7DcIZYN/g1Hx3l7Led/9D42Fz+
+GOLOqRc8Gv8u6Jpof4cWY7NFa+wTb9OkxK9jTERMybmSo5eQvMSzz70QEINDuwfl
+DQ2WgrjlpHw7irpNhfySt6mliqsM4rF8xZikKuzM3NHclZpidpNcpS7zKQ3iA3Yx
+FTnES5r/imtOjMJCnHouMJifnzMhTHPU/V3QesLGg01/hfOm5nE3/h3liZVC2yif
+Cjl084yNQsU/6tWzF6EzrTMWWYl34Am6VpHF47dPKeKImQMibJbHpVOxcD9AkoeF
+a2BCwAaDB1CE8+9SuP+B5o5p9KuM+3l4v7Guwl3RjJHs9Ihtm0KPbfaO7tIhfLEr
+5X4Neqbv/c3BrhD9Dnw3
+=hj2p
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild
index 2c2308064a9e..2826cdb8c27a 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild,v 1.1 2011/09/11 15:03:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild,v 1.2 2011/09/11 21:27:42 alexxy Exp $
 
 EAPI="3"
 
@@ -223,8 +223,9 @@ src_install() {
 
 	doman docs/man?/*
 
-	use xend && newinitd "${FILESDIR}"/xend.initd-r2 xend \
-		|| die "Couldn't install xen.initd"
+	if use xend; then
+		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
+	fi
 	newconfd "${FILESDIR}"/xendomains.confd xendomains \
 		|| die "Couldn't install xendomains.confd"
 	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains \
diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild
index c0d6727a6c17..f6612de60924 100644
--- a/app-emulation/xen-tools/xen-tools-9999.ebuild
+++ b/app-emulation/xen-tools/xen-tools-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-9999.ebuild,v 1.4 2011/09/11 15:03:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-9999.ebuild,v 1.5 2011/09/11 21:27:42 alexxy Exp $
 
 EAPI="3"
 
@@ -223,8 +223,9 @@ src_install() {
 
 	doman docs/man?/*
 
-	use xend && newinitd "${FILESDIR}"/xend.initd-r2 xend \
-		|| die "Couldn't install xen.initd"
+	if use xend; then
+		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
+	fi
 	newconfd "${FILESDIR}"/xendomains.confd xendomains \
 		|| die "Couldn't install xendomains.confd"
 	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains \