Version bump; also fixes bug #427078 and #427086, thanks to Alexander Zubkov for the report.

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

4 files changed, 33 insertions, 12 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index d6fb50c1f250..a095af53b534 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/lxc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.40 2012/06/07 12:59:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.41 2012/07/21 05:07:14 flameeyes Exp $
+
+*lxc-0.8.0_rc2 (21 Jul 2012)
+
+  21 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +lxc-0.8.0_rc2.ebuild,
+  -lxc-0.8.0_rc1-r5.ebuild, files/lxc.initd.2:
+  Version bump; also fixes bug #427078 and #427086, thanks to Alexander Zubkov
+  for the report.
 
 *lxc-0.8.0_rc1-r5 (07 Jun 2012)
 
@@ -235,4 +242,3 @@
   Initial import of lxc; based upon dev-zero's ebuild, modified by me. It
   diverges a bit from upstream, in the path used, to stay more
   Gentoo-styled. Init scripts will likely be added separately.
-
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 104e7b62f93d..743f9fb278a4 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,6 +1,20 @@
-AUX lxc.initd.2 3667 SHA256 b8ff33045489bab0801de30ced8462ad4bcf6ffe8f34084367dec342da857c93 SHA512 2837984c465c93e819d401f58df32c14a427b3d27558991fc6f866989038e70ce55490f63e3b1b07075a90507684a73e3aa6005641fd7d58e8007b0aec935e28 WHIRLPOOL ccda5460d867254b4d01de3800301f755568e0f26db1b493335277fab9c69f16ffea5d5ec81fb03c450a93119ae8f548acf8a4a5462d40ea3d5153319aa23910
-DIST lxc-0.8.0-rc1-backports-1.tar.xz 4340 SHA256 201520be455f631a2ffcc21cfeb0bf50005feed48e3533b228ebd93170a912a7 SHA512 dc8f64a2314f774e7e44b184915dd4de45216bdd416d49792163a5ddd5eef6ab1f0156f3cc5e4338e4e6040cf4e67b51c125c541c0cb69afd4b9458482497c44 WHIRLPOOL 411ea6d08a2f9907f5bb8014bb3de47f1b2e5f06e0924ea289412b202ba4c2138e6d1bfb98117b2575b547bcf9b6bb93378bccb498a5be5f2db3bd47301816dc
-DIST lxc-0.8.0-rc1.tar.gz 301029 SHA256 32bf83902c07387646c55de440d6d12cf61bd54c97417109c2d1ac47d17cb911 SHA512 27c783616b8d14e8fa771b6ee7c94bf832321135235c2d3a988dbbc8111184489d20f0234e3dd150d5d89b2c3b4430171d5479802aeba516ffbe5ea821b8f2ac WHIRLPOOL ecb354e88838ad86d06467848330eb5a31031004d2115bceda425a0e5f195582fb05968d9c6bd5dc5e8edf3003b5ab44e06a23f79b186f81dcc89b4bd3f8de62
-EBUILD lxc-0.8.0_rc1-r5.ebuild 4703 SHA256 781ab0d16142b73db72c890e5aaa26707a5c7d05e36903891c180aaced82d716 SHA512 f29dcd5ae5e622a693312f8a4d548c9eb2ab6f37219ff83447ea74d36098d2c13b9569d3d1ed95d3e6021860c69f7ada3c8fb49901887c2ed6e16229f758b049 WHIRLPOOL eeb39ee9aa420c6bb1f00fe35eb89fa0f173e467b7973146ba76addfc4e9a542941877ef5d7045cee027948bf611a3e8bc0e0da53f3d5d22cb580f9af427f7cc
-MISC ChangeLog 9375 SHA256 64ced779436d697c57c56b0e7ff02a8e016a02bfcdddc7aa193a1d2d135fc227 SHA512 4050f1d3836dc9c5bbd3e3924d87e4d6abe2d4655f1185db9fe6a39055128f975611da8df5da418ab20d2688119040f5de695a9b0057dd59e780adcc6f666416 WHIRLPOOL d1d23999a6200a9906a93323a58dc77ef2b9d3199f21323cd3bbabe4b6d1614d6fbcb42cec05ba389d1057a144a6461f22abf9f025e9d840144d6280d2621fb6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX lxc.initd.2 3673 SHA256 59af465354877331fd876872b15f4f658933612217d3a7538beef4514fe12096 SHA512 e39ee233c6ed600a5a0509649fbeefcfb2ad5dc632adf9f29ce4ba94b3054bda5e1290f6c68cdf30cd378802ad12d94ab9e55d9b597e23cc1a31210840f897db WHIRLPOOL 8d3223e642cebb04d27b6e93ad91ebbca0966ab5b034e8386de4df0c4d276e773032f326a9639fca07eecfcbf25f9048cd83d43c32bfb11d6af59e4ccb97911c
+DIST lxc-0.8.0-rc2-backports-1.tar.xz 4312 SHA256 3bface361045819cb99827fef3dcb4662282567ed2a1eb9aaa0befa613a6461c SHA512 45943f763e218925e78f05a86cd26e5d7aaf749bea5ce7b457d4592fc4fc2b17723afa923892716cbb60f0ce1fc20ecced452af2128b3bfa1d072d3d31af1e07 WHIRLPOOL 833554e53a69a903a2b948c202e9d60714f504abe27751d6feda274a248184c06b3108916d3f80018fb3bf3584faa9cec51054751a661c269b44a46ef58a71ba
+DIST lxc-0.8.0-rc2.tar.gz 302999 SHA256 1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef SHA512 e6608f980489f67d412c9a50f8c3f65c1afbba520dfdfe2b695c597c2706544291f31c8cfca2d86cfbab09029f8a5706fae5ab72f1c45dccca5f7e2ae8851181 WHIRLPOOL b41fe7e14315b9e6702070535edfee68379c01fba23d143c5f11afa20f6d392c8bc32953da46ec3f74d7a2affe9f828d918f23a8a16c430e3b8ffcc9b2c10057
+EBUILD lxc-0.8.0_rc2.ebuild 4720 SHA256 f0160be142dae8e8516a41ca3b447709acb19cfae3286606ebbe24453817794a SHA512 763949662f43dfc0f7e69642726d30c13c49acb7e3c374df5815e8ae62eea7682b4fcc366375e7afae22bf41437252d1d35a9272e0211dd6d37c660d2c7e8ac2 WHIRLPOOL 93c4ec884c3ae4f51abff81281d96e998aa1db470089a99ad2e8831864fd73e4a68d52b6566b548e3243ac96aa664114db690eae78141b247acf643734f279b5
+MISC ChangeLog 9628 SHA256 3eb1c0a24bb4a058b0c791842c6191b65a5ed054c8344775f44d1c5d07ef5a37 SHA512 f630fb50dcb13e0b886e31e65e8619c6140888ea893c40de134cc2b38923678fbcdb70f1254138ffb1cb4205e11d43285959f6228d6eaa4b1139bf57cf7a14ea WHIRLPOOL c703058666998cef52fdc50fc337906eac31e90cd1cc65064ca5356cc1bf9814ffd9c13164e6bd953496af85a9e6c4be1c0e06b831dd5f82183d404eda81fd91
 MISC metadata.xml 653 SHA256 35f64761067f47ff7abd0e3f3cb57f4bab888a2546bf3267d59987505101a190 SHA512 d227bc432c37518190c224b280116439dde42678f93925ae3a8eb2d2e91918377b33171d8e72ae4ab12f3e5d9faead4223a60e53bb4916d7770982deb64b0b70 WHIRLPOOL 4067036bca1ad2906cdba69c42c0ca5b14042ad7eab2ac8e9a2fbe4eb61e8a3972e4d40b6d9d6e7109a0d2f84a8598a8a9560dbddd43b35633f44ad5362937b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQCjlGAAoJEBzRPIrUMBNCxQcH/1NUMuzpXRnpk99Eg6ouePAu
+uEJHko3Vvd9aGwXcedKNe3rjmKWIXBebxfsoWz4IBp6urgQcSf+k3/HQA1sXqjSs
+fn9/Rlzgg7MIgTVorE5Hpe6FDH2+E9TRGidLBdF5uJL4CSvK6v90ChpjW0DAFzAn
+XkaIaDltEsH1UYLvjqMIxnze4oYp4JcxWp5oO8MdySog0USQfOf7aQm17dNDKARj
+fQVRhHrqN2wJAhKRrHSrkXj/DwHE/3OgH+xiFK8pWY8OjEXL2k73Xh3qMeXSnDD+
+R1hpmNLrHqTU0uh3WvL6Jiv5jWeiZYMv9uEx4LLPON4LH/ytpkdPw3oUq1Z1gdk=
+=gkfc
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/files/lxc.initd.2 b/app-emulation/lxc/files/lxc.initd.2
index 0977eb6f958f..9f38dc8e0006 100644
--- a/app-emulation/lxc/files/lxc.initd.2
+++ b/app-emulation/lxc/files/lxc.initd.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v 1.4 2012/06/07 12:59:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v 1.5 2012/07/21 05:07:15 flameeyes Exp $
 
 CONTAINER=${SVCNAME#*.}
 
@@ -104,7 +104,7 @@ stop() {
 	    return 0
 	fi
 
-	init_pid=$(lxc-info -n ${CONTAINER} --pid | cut -d: -f 2)
+	init_pid=$(lxc-info -n ${CONTAINER} --pid | awk '{ print $2 }')
 
 	if [ "${init_pid}" = "-1" ]; then
 	    ewarn "${CONTAINER} doesn't seem to be running."
@@ -112,7 +112,7 @@ stop() {
 	fi
 
 	ebegin "Shutting down system in ${CONTAINER}"
-	kill -INT ${init_pid}
+	kill -PWR ${init_pid}
 	eend $?
 
 	TIMEOUT=${TIMEOUT:-30}
diff --git a/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild b/app-emulation/lxc/lxc-0.8.0_rc2.ebuild
index e8db0254570f..180ba88291c0 100644
--- a/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild
+++ b/app-emulation/lxc/lxc-0.8.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild,v 1.1 2012/06/07 12:59:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.8.0_rc2.ebuild,v 1.1 2012/07/21 05:07:14 flameeyes Exp $
 
 EAPI="4"
 
@@ -39,6 +39,7 @@ RDEPEND="${RDEPEND}
 		sys-apps/util-linux
 		app-misc/pax-utils
 		>=sys-apps/openrc-0.9.9.1
+		virtual/awk
 	)"
 
 CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
@@ -88,7 +89,7 @@ DOCS=(AUTHORS CONTRIBUTING MAINTAINERS TODO README doc/FAQ.txt)
 
 src_prepare() {
 	if [[ -n ${BACKPORTS} ]]; then
-		epatch "${S}"/patches/*
+		epatch "${WORKDIR}"/patches/*
 		eautoreconf
 	fi
 }