[app-emulation/xen-tools] Clean up and fix init script deps

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

7 files changed, 42 insertions, 151 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 765397a1e8b9..679262c55740 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.72 2011/04/05 19:23:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.73 2011/04/05 21:25:03 alexxy Exp $
+
+  05 Apr 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.0-r1.ebuild,
+  +files/xend.initd-r2, +files/xendomains.initd-r2, -files/xend.initd,
+  -files/xendomains.initd, -files/xendomains.initd-xl, files/xenstored.initd:
+  Clean up and fix init script deps
 
 *xen-tools-4.1.0-r1 (05 Apr 2011)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index ebd532aa9f75..0ecdfa0b908d 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -8,35 +8,34 @@ AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 RMD160 3a8c57fe70837861f6
 AUX xen-tools-3.4.2-as-needed.patch 765 RMD160 dbb5ad2ec52e96c40f109e28c91b566e88cb6220 SHA1 9e38f5c06153b5293daa55abe00106404ff6555f SHA256 91f9bf0723462a70d025c8b7ce0dee50e170b68f1a22092f28d92b140a4e5772
 AUX xenconsoled.confd 44 RMD160 0134f85258cf524807c4e2eae94739a70808c20d SHA1 6435bba449e9cffd3f99c5afdeb3cc37ecbd744d SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060
 AUX xenconsoled.initd 652 RMD160 5aa785e9c73c5eb8460863af2c1bc50d2a07faf4 SHA1 dceffade1f3f5f2503fc6c3ccb4b9f9788365d00 SHA256 1a5594e4e924b94490c5c942b1b63e5fe857b8ad8061060e5d8a3bdfc9f0f1b7
-AUX xend.initd 1291 RMD160 96659d237688d0c42e5c30491ad883d4af0f1c0f SHA1 2ffe2b29df7014d1dbf69f850a23a95e1b294288 SHA256 41ae7f38565a477abc1fb8ac5af9d6285bf90d171b922c6413aa8aefe5b00889
 AUX xend.initd-r1 1664 RMD160 8d7ea19e96c49631a8f432dd93ae91ca4f37d26b SHA1 bd3a8f083288cd89624d31f3c7932e1a831d99a3 SHA256 6ea8848ca1203c5ef8490014ded86ec67100385c217660d393b25dc6519d254d
+AUX xend.initd-r2 1071 RMD160 41b30381e221364b761ff4e66b77291b97068ec6 SHA1 85b0c5de5de5c08e497c2a33e5d7659a8ff9240d SHA256 00757921b40336d9d338c4dd4e68b8e8301cfa6c0129d958e0106839c8528890
 AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
 AUX xendomains.confd 291 RMD160 75d55db5360da12fc3d721c37001ccbfbb844e52 SHA1 e7be8973a4bcbfc7680258e369b07e2ed097ef49 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc
-AUX xendomains.initd 2609 RMD160 d606f752d3b1f9451bf9e1895f3a28350e8bdc87 SHA1 8e57c4ea216cede1898d960650008fd65ae4037f SHA256 16cac2533e045dba45cac60abde9184bc3aa41e9c319a1ac286dd4036222ff00
 AUX xendomains.initd-r1 2921 RMD160 dd45bbc63a2c497990e193eb80b24b47226a8da2 SHA1 ea3c35c3829371b10ad023f222cf9c360adf0871 SHA256 4c63f354ac076c30ae4cd414224561f50252e9141e3bda95703bd3fb14ea7a59
-AUX xendomains.initd-xl 2936 RMD160 fbc13c01d4d28d16ddd8d3fe6e609995cfe7743d SHA1 945c5dd28023f107c37a51b3b22ee97be3acb815 SHA256 20de47f62000a435f4e0bd113ae4c3f60c1c1fc53541fd17d7d2419765e164d8
+AUX xendomains.initd-r2 2941 RMD160 7fb127725fe5a9d6a8a5c373796996c5716d40bd SHA1 4483807c7f3fd1b36af2a88875477043fdaacb45 SHA256 2edecd5efc69baab1ae59e71947c229b0b905fe2173a04a220afe30f407be55b
 AUX xenstored.confd 42 RMD160 3407e1ff0958d5797e257da284798a21fe31a5db SHA1 c18f64d2a41de25695b7dfb924478e3fa64ed0c3 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831
-AUX xenstored.initd 796 RMD160 b4006d0c2189e3b3bb8f0fa127904cd18ab8f05a SHA1 bcec6ef05211d8772855988cb542e8f38a46a8d7 SHA256 c685ea21650d5ed7edae0038d2b0ae000804722bab45d38ae08410b1e563d8b2
+AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 9837c052afac31ee623ef02280a43114866869c8 SHA256 8f9df8ad835e45f9c995244e9e80d1a9ee630787bf2da88b7c4a73354d056fd8
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.0.tar.gz 10348539 RMD160 e9ef987b24503d6c993bccfd203be5af9f104f48 SHA1 4295e67524746ce155ff991db5fd2a611be27f67 SHA256 5df61e1b687acdd3d8f54a85be54990518f6679982499f19b28546f03b2909fa
 EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14
-EBUILD xen-tools-4.1.0-r1.ebuild 8275 RMD160 adbc89b067cb3928ee182ec0bf6b83962e373da5 SHA1 3751033bf22a3491b50910a716b10081fee0a8e5 SHA256 72a73f231b91ffa507b8ef8ba1b8c77ab0a2ae5596d0aa779b518b8021d66f43
-MISC ChangeLog 18609 RMD160 d69a2cbb6cd6ca9565dc5e56ad90dae912cc00ee SHA1 330f5262bb18098cf3ff43b81ca7759a77172cad SHA256 9bf66792bd1cbe25a5e4e7d144baa2124d79e279b86c179077e76a1533819a8f
+EBUILD xen-tools-4.1.0-r1.ebuild 8359 RMD160 8604fae1dccf3516f258ab7077338d68c1a98277 SHA1 594abeaf580d0645b74c664dd2f16d6e2fd2509f SHA256 a87811466b91e714d4cd8e7b969590ced2be571ec0d43c5a084674953d1e39e4
+MISC ChangeLog 18873 RMD160 08a11fcf2a3b9a0d3e834cea2bf4cbaf5e4caa09 SHA1 e4aedbccad2918f498eb18a8d2b0b5d0fca70cfb SHA256 3a2c35ce181b23c57ef70b0cd2f1349cb28f3e1360df4719b2330bd23e1fe1df
 MISC metadata.xml 721 RMD160 af4a7d279110ca38f4252f2723a86c628d413b23 SHA1 77cf6f5f1a56f928e4d9b0ebe373372d75f314d1 SHA256 670188614bc7d1e2b4c027ac559559cf2228b28f1b1289acef62206e784e6a53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNm2weAAoJEOf+E+/4L5Lm0a4QAJ0tdEfZkIq1ALxcqIjghrQU
-4z8fRqe3tAy6gmuDtpgYQ90w9b/9FWMa2W3wy9jpSOnNTE1nKVj6b9hvNpWkiL44
-Nd+On/f9rFWLY4yAL1EXEXYAJUH/CfHtEoT/bkRXtMQuVuyaJTngOJMM5AMCzgqQ
-fsA8U4G7Fgs/o7zhhZp4nh9YhbYRTz8uibieNtiLVcfjxdpOEPpmdbapkaPTzbof
-aSlbMrIhIBBXRW687m1n7HuOA1nWGmETaW387Np4I9MGr1HLRSrzyN9ank/Kc/sU
-i0l9FE6NerLW4teEBqurlocTAU+Q7ZGL31jlY5GSsEQxVEhF503IXMDzMWb54QYw
-riCNDiTqZzHmDgu/mj6vSDHk3cTFzM/Xqd6Gig9sEKMexd9rHWSzcIJ3rkR5tDca
-zgLP4RQevbcbFDceIEjFY/dSl7QZWfz0CSepqWNTusaJkQTm1r8w74tObNqpdkIn
-sgMBDkeJtU8bpRHkDwsSewpYgNPGWt37xNMj/aK0yHTh6cw01rd/WBua+0H3ATC6
-S1xgMPEJvURyOveiTV2OarLiTW6ix0XTcuFE5ewbcjhP3536MBsF0X9rMpbLknLs
-Hd2NTGr3HC+Uqn6v1doISvbo04t3bFVwIkW1VtZvJkojaeD7NQzqVDeh/EflwrgY
-/Ye0cV8tTlCXGB7p21Ci
-=4zHl
+iQIcBAEBCAAGBQJNm4itAAoJEOf+E+/4L5LmepoQAJv12DEYDF7G3LB9r09/8NYQ
+tquVkKZ+EUsSLRH1loVtdslY2MJAc0tQzeTBIvvr+8IXxA5sa1bxVwxTa0860xgF
+GFW77xIUtvCwlPmu0gpxMiuCDGZZGhz5DMFvXcDz4LQxMIXEoLRrAcv6v6kgjV44
+nPj7j046P7kX4mkkGEJ0vm33C54yjU15fZwxbEeWh4wgW3gguAEk82G3Yf3qlrPr
+TrSiX50a86ETh/o6OkS15jfcqaYjvt578f2xxb8q0urvqSEUjlSkt4RrBxNCaUvV
+Rr4a2C+yAXzqptsiOQZKml9mM1MR3D9Z9DAGZFQv5xO3qHkHUmiLgCn27PUb759e
+DH8TbW6YE8H/2xhTp2VXvCbe/o9W8rCFbyL2vcQKesiRZ6+pbwa5Uz+D5/DCMut2
+m5Xq1+8AKa3jA0TRzRAzctBr0e4vKmE1Q2wTtiqc+vRDs7zGaC+9m/Aalp6cpHbN
+91f3SNBTx2gAzB2Km00z4iOssKHk9MOfQ7IHUTy3srcq6WzJN9KpYcF/kxuz4Dw1
+3xenUhEKL+kNqjawb9iqCIV46foR9A8CWDOnZEeifoLJmai2IDD1H+ii3y5SvQ/w
+QU4ikP9xrSFHGDv7B+GqsgHSyFHpHoKBiRpSgKlO0snSZk7IVNslLt8jmGmG0OlX
+R+59aPm8k+JQBrV67SQ/
+=B63y
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xend.initd b/app-emulation/xen-tools/files/xend.initd-r2
index a28c6b4eb966..b377182f8f2c 100644
--- a/app-emulation/xen-tools/files/xend.initd
+++ b/app-emulation/xen-tools/files/xend.initd-r2
@@ -1,13 +1,13 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# 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/files/xend.initd,v 1.1 2007/05/02 04:10:04 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r2,v 1.1 2011/04/05 21:25:03 alexxy Exp $
 
 opts="start stop status restart"
 
 depend() {
-	need net
-	before xendomains sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+	need net xenconsoled xenstored
+	before xendomains sshd
 }
 
 await_daemons_up() {
@@ -38,22 +38,13 @@ start() {
 stop() {
 	if [ "$(xm list | wc -l)" -gt 2 ]; then
 		ebegin "  Stopping all domains"
-		/usr/sbin/xm shutdown --all --wait >/dev/null
+		/usr/sbin/xl shutdown --all --wait >/dev/null
 		eend $?
 	fi
 
 	ebegin "Stopping Xen control daemon"
 	/usr/sbin/xend stop
 	eend $?
-
-	# This needs more testing (bug #149321)
-	#ebegin "Stopping xenconsoled"
-	#kill $(</var/run/xenconsoled.pid)
-	#eend $?
-
-	#ebegin "Stopping xenstored"
-	#kill $(</var/run/xenstore.pid)
-	#eend $?
 }
 
 status() {
diff --git a/app-emulation/xen-tools/files/xendomains.initd b/app-emulation/xen-tools/files/xendomains.initd
deleted file mode 100755
index 9d8a06392485..000000000000
--- a/app-emulation/xen-tools/files/xendomains.initd
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd,v 1.3 2008/09/01 00:41:08 rbu Exp $
-
-opts="start stop status restart"
-
-depend() {
-	need xend
-	after dhcp
-}
-
-get_domname() {
-	local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
-
-	if [[ -z ${name_from_file} ]] ; then
-		basename "${1}"
-	else
-		echo ${name_from_file}	
-	fi
-}
-
-is_running() {
-	/usr/sbin/xm list "${1}" >/dev/null 2>&1
-}
-
-using_screen() {
-	[[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]]	
-}
-
-set_screen_cmd() {
-	screen_cmd="screen -q -r ${SCREEN_NAME:=xen} -X"
-}
-
-start() {
-	set_screen_cmd
-
-	einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
-	if using_screen ; then
-		ebegin "Creating screen session to hold domain consoles"
-		(  screen -d -m -S ${SCREEN_NAME} -t dom0 \
-		&& ${screen_cmd} zombie dr \
-		&& logrotate -f /etc/xen/xen-consoles.logrotate \
-		&& ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \
-		&& ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \
-		&& ${screen_cmd} log on \
-		&& ${screen_cmd} deflog on ) >/dev/null
-		if [[ $? -ne 0 ]] ; then
-			eend 1
-			return 1
-		else
-			eend
-		fi
-	fi
-	# Create all domains with config files in AUTODIR.
-	for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do
-		name=$(get_domname ${dom})
-		if ! is_running ${name} ; then
-			ebegin "  Starting domain ${name}"
-			if using_screen ; then
-				${screen_cmd} screen -t ${name} xm create ${dom} -c
-			else
-				xm create --quiet ${dom}
-			fi
-			eend $?
-		else
-			einfo "  Not starting domain ${name} - already running"
-		fi
-	done
-}
-
-stop() {
-	set_screen_cmd
-
-	einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}"
-	# Stop all domains with config files in AUTODIR.
-	DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)"
-
-	if [[ "$PARALLEL_SHUTDOWN" = "yes" ]] ; then
-		for dom in $DOMAINS ; do
-			name=$(get_domname ${dom})
-			if is_running ${name} ; then
-				ebegin "  Asking domain ${name} to shutdown..."
-					xm shutdown ${name} >/dev/null
-				eend $?
-			fi
-		done
-	fi
-	for dom in $DOMAINS ; do
-		name=$(get_domname ${dom})
-		if is_running ${name} ; then
-			ebegin "  Waiting for domain ${name} to shutdown"
-				xm shutdown --wait ${name} >/dev/null
-			eend $?
-		else
-			einfo "  Not stopping domain ${name} - not running"
-		fi
-	done
-	if using_screen ; then
-		ebegin "Closing screen session ${SCREEN_NAME}"
-		${screen_cmd} quit
-		eend $?
-	fi
-}
-
-status() {
-	/usr/sbin/xm list
-}
diff --git a/app-emulation/xen-tools/files/xendomains.initd-xl b/app-emulation/xen-tools/files/xendomains.initd-r2
index 1470a77feecb..04eee2297b24 100644
--- a/app-emulation/xen-tools/files/xendomains.initd-xl
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@@ -1,12 +1,12 @@
 #!/sbin/runscript
 # 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/files/xendomains.initd-xl,v 1.1 2011/04/05 19:23:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.1 2011/04/05 21:25:03 alexxy Exp $
 
 opts="start stop status restart"
 
 depend() {
-	need xenstored xenconsoled
+	need xenstored xenconsoled xend
 	after dhcp
 }
 
diff --git a/app-emulation/xen-tools/files/xenstored.initd b/app-emulation/xen-tools/files/xenstored.initd
index 9167f3393591..f85aa4fe464c 100755
--- a/app-emulation/xen-tools/files/xenstored.initd
+++ b/app-emulation/xen-tools/files/xenstored.initd
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # 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/files/xenstored.initd,v 1.1 2011/04/05 19:23:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xenstored.initd,v 1.2 2011/04/05 21:25:03 alexxy Exp $
 
 depend() {
 	need net
-	before xendomains sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+	before xendomains xend sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp 
 }
 
 start() {
@@ -14,9 +14,10 @@ start() {
 		--pidfile /var/run/xenstored.pid \
 		-- --pid-file=/var/run/xenstored.pid \
 		$XENSTORED_OPTS
-	eend $?
+	sleep 15
 	einfo "Setting domain0 name record"
 	/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0"
+	eend $*
 }
 
 stop() {
diff --git a/app-emulation/xen-tools/xen-tools-4.1.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.1.0-r1.ebuild
index b845d4eb1d8d..659df97d0e01 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.0-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.0-r1.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.0-r1.ebuild,v 1.1 2011/04/05 19:23:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.0-r1.ebuild,v 1.2 2011/04/05 21:25:03 alexxy Exp $
 
 EAPI="3"
 
@@ -140,6 +140,9 @@ src_prepare() {
 		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" \
 			-i Makefile
 	fi
+
+	# Fix build for gcc-4.6
+	sed -e "s:-Werror::g" -i  tools/xenstat/xentop/Makefile
 	# Fix network broadcast on bridged networks
 	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
 
@@ -174,7 +177,7 @@ src_install() {
 		|| die "install failed"
 
 	# Remove RedHat-specific stuff
-	rm -r "${D}"/etc/sysconfig "${D}"/etc/init.d/xen* || die
+	rm -r "${D}"/etc/default "${D}"/etc/init.d/xen* || die
 
 	dodoc README docs/README.xen-bugtool docs/ChangeLog
 	if use doc; then
@@ -191,11 +194,11 @@ src_install() {
 
 	doman docs/man?/*
 
-	newinitd "${FILESDIR}"/xend.initd xend \
+	newinitd "${FILESDIR}"/xend.initd-r2 xend \
 		|| die "Couldn't install xen.initd"
 	newconfd "${FILESDIR}"/xendomains.confd xendomains \
 		|| die "Couldn't install xendomains.confd"
-	newinitd "${FILESDIR}"/xendomains.initd-xl xendomains \
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains \
 		|| die "Couldn't install xendomains.initd"
 	newinitd "${FILESDIR}"/xenstored.initd xenstored \
 		|| die "Couldn't install xenstored.initd"