Drop one kernel config check for a kernel config that's been dropped; drop the vanilla USE flag; fix a mistake in the setarch call in the init script for 32-bit guests.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 35 insertions, 35 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 945192a804ed..329ba13dd0fa 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,14 @@
 # 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.43 2012/11/11 05:53:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.44 2012/11/14 02:15:10 flameeyes Exp $
+
+*lxc-0.8.0-r1 (14 Nov 2012)
+
+  14 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> +lxc-0.8.0-r1.ebuild,
+  -lxc-0.8.0.ebuild, files/lxc.initd.2:
+  Drop one kernel config check for a kernel config that's been dropped; drop the
+  vanilla USE flag; fix a mistake in the setarch call in the init script for
+  32-bit guests.
 
 *lxc-0.8.0 (11 Nov 2012)
 
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index b628a3bd01af..fd646e39a285 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX lxc.initd.2 3673 SHA256 59af465354877331fd876872b15f4f658933612217d3a7538beef4514fe12096 SHA512 e39ee233c6ed600a5a0509649fbeefcfb2ad5dc632adf9f29ce4ba94b3054bda5e1290f6c68cdf30cd378802ad12d94ab9e55d9b597e23cc1a31210840f897db WHIRLPOOL 8d3223e642cebb04d27b6e93ad91ebbca0966ab5b034e8386de4df0c4d276e773032f326a9639fca07eecfcbf25f9048cd83d43c32bfb11d6af59e4ccb97911c
+AUX lxc.initd.2 3673 SHA256 bb7780168695e934549909c5c7baa7d6cdc92b0e19093a3d04a1313081a832e1 SHA512 25b0474d6f16fcede89a8e17518a658f810cb554eaef10aae3ce1fdd8c8640118aa6375cbee443f0b26e8086eb7c25375ceaaaf29a4110bd779f94b2f4b0d300 WHIRLPOOL 28f56d71b95b26c7f6ad5402a37413a973bc7bdf08fd3963ad192888ae1b49809a56c16009bc6049061d419ecffb1279e153e6ef5acbe06956efca154eae6a01
 DIST lxc-0.8.0-backports-1.tar.xz 2424 SHA256 5b68b96b9fbc2d0f5b2ad2e7fb996a3d837114237a306de39d9939f31756a522 SHA512 9898d78836cc546e80015a18070e3976118d2efb006584ecfb2887a4474598766e023eb6c120c16dae2e94dddc33c8a4e928fd44bc6fb2260a1913c06f5d374e WHIRLPOOL ef11f25ec8891f431be7aed32b38c0cc51e1096a37ea71c38aed4448ab0305784b510e2b55bdc73e5ef2128344a6c88adb3add798323f77e276b5185e53f5ef9
 DIST lxc-0.8.0-rc2-backports-2.tar.xz 4616 SHA256 c371817b5be47ed70dea410a32dc434a060073992d5299d2c88853de79aa2111 SHA512 ca646ae325a4cf94632c443397834a8a7dc004874b528d2d685b698b3eda1e72e09ecfd68899b9c0cd17d5d7bf1a62230dd6d17d26f73d2d4ecbf1932c31b996 WHIRLPOOL 76deca3e2b7fe306c0e2f538759fb33656f08c52d1b59570edc6f3d2444d387a0f7944f759baf41402e747eb055ab403a82a40b95ba0c7d42d0644a5f990e851
 DIST lxc-0.8.0-rc2.tar.gz 302999 SHA256 1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef SHA512 e6608f980489f67d412c9a50f8c3f65c1afbba520dfdfe2b695c597c2706544291f31c8cfca2d86cfbab09029f8a5706fae5ab72f1c45dccca5f7e2ae8851181 WHIRLPOOL b41fe7e14315b9e6702070535edfee68379c01fba23d143c5f11afa20f6d392c8bc32953da46ec3f74d7a2affe9f828d918f23a8a16c430e3b8ffcc9b2c10057
 DIST lxc-0.8.0.tar.gz 309973 SHA256 eac833730b94e423d4bef6834bc4a716437d2abd6ab8b24334c506aaaa08692c SHA512 47333e2010d0f4488b8876ba933f2d26304874bec0371a7ab3b6e5bd1a50a7d2312ff8507e273f1ee2341a7f2e3b79cd71e5e19ac31006a4e429ee96b01733f6 WHIRLPOOL 693b7d354dec7c6102d5ce3a42a9b618e213fd9ee8c592068ebadb7f25094606abce6c3da77b483fab0938410215010f71d487f336856c87327d6a98f20b65dd
-EBUILD lxc-0.8.0.ebuild 4687 SHA256 d26778ee3bd7eb304011ab0ddf5bc938f030641c4a8dde616ac49de7855403bb SHA512 dbcfe4064fc646c4a0c9d952f80e81f8251aea359a9945b27c5087876e46abadbb15d115c423a6456579859286a794b30932ebca111fe19a4c71d77459376d99 WHIRLPOOL 732a5529ed0f39465df3bc2b3a20b2a2e3532cafc890d93358315800e49dfb05021ca9788a8da3828c5cfb54298db77a6ecbea785c7184bf6016aaee2b541ea0
+EBUILD lxc-0.8.0-r1.ebuild 4504 SHA256 2199fc1bce5cabcf082519476fd0b3bed090767c0b72ab607f230b7a1d50da0a SHA512 62074bb7f4f976e544f5bfe3cbaffdc6748982e68ba65bac14c16d64c8bb1520f3976d4016756be9f60d6a5307d0afa8975b27fded4db296c6705eb748c3bc90 WHIRLPOOL 2b64f73490bff91801afe86907c90dfba4a20b0627fa49c3f96bc3315a01527affabbefa64c606b1cb401a66327f361cca7c74155ecb427713b3d98fa85693e4
 EBUILD lxc-0.8.0_rc2-r1.ebuild 4671 SHA256 516d8f213a7b7a723e58ebe2223f953b97564f66c0f3285f48c1339c559199c9 SHA512 d1011c6a2985d88842ee41b57a44e884afdb0404d5bcb5ca4c803c4d0d04972c73fd046b488e966d9d42de43b56f00e0e5a05fec79c67c6e67a0b3047dc814f1 WHIRLPOOL df3bc703c5ff2e15e9ec8d38e728b17e8be03ad461ff024cce3a94876f4944036f09b92bd84b1c727ed35b7cd2215ff2d4a34b55f6072c3872ccd454ff1210e0
-MISC ChangeLog 9933 SHA256 5829b2809433438e90fa960b406839e354d7d22a9f28675e41e6ba9d1de05271 SHA512 a23997372801fdfa77a6fa560897e856ffbead295b584efdd819a6c7b622730843054f8d11f5555e55e7f852f9e0a40e82776ee7d80b9a1abbb3a60ee283f0b0 WHIRLPOOL d8a47edc6db22360eb47004a0d7c41e0b58af3921120651c77fee9be67905be3eb465300ab8f4b7e6c6add12466d244c7cc51a7132c1dfb59f544167dae2c7b3
+MISC ChangeLog 10256 SHA256 17319c5e186d2e2a0debdf7e7aa2551a43a1276342eb6b49e4b8d5dca003895a SHA512 8cad663a2d5c57c76125c09b9d3ce2cd7d9662e3bc2b759d3b607f50c62110f0db9eec2e07bf4657d1fe2677e31cfa1d9c11e458b2e70815ff7a37c280dff08c WHIRLPOOL 4e79e29cb6d81b70837a39bbca33e8f13b154180289e9cbca9369699dbff30ca3d54e4ce7a8a84158259a8cf4ad2d08b38391c0568e9581edfe3e8d73f0852ea
 MISC metadata.xml 653 SHA256 35f64761067f47ff7abd0e3f3cb57f4bab888a2546bf3267d59987505101a190 SHA512 d227bc432c37518190c224b280116439dde42678f93925ae3a8eb2d2e91918377b33171d8e72ae4ab12f3e5d9faead4223a60e53bb4916d7770982deb64b0b70 WHIRLPOOL 4067036bca1ad2906cdba69c42c0ca5b14042ad7eab2ac8e9a2fbe4eb61e8a3972e4d40b6d9d6e7109a0d2f84a8598a8a9560dbddd43b35633f44ad5362937b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQnz1mAAoJEBzRPIrUMBNCQFEH/jGpAShBn+Lwbrol8lV6tGTU
-yCBo0PWSmnuprKhkteO6kHzD8+X5WXi7MXA1U/xnDseWHmTn84I3JC0UX7I767wY
-oDjm2lnsZrMIE3//qxO2+g0dRWpsOEDRD6gMlzdtdyj/CEUPrXTm9wY4Afc6W7c5
-pCpzUaRYEd0QeJqp+7sRP1ycPjIBuUFobbM8sY2sWf/zOMoqo7A6UMVRyV1h6/M/
-rgZ0tTV4LyRFbEY23ukaHfIrywhcX8aeH/T5dkchtLYnkGp45GXAE4EGtn54XfYk
-Uyz3rg35m6MNzGsDM+rSQr1DeKu03JcSaBXYmHTL8Dl61v1xbQ4rXvGfS9bUHJU=
-=9i3A
+iQEcBAEBCAAGBQJQov9IAAoJEBzRPIrUMBNCdasH/3qjjjotBIDg5ILfktFpUA47
+RE9Vy90N0aNX0ywRVBmJn8a88X7zibArVn2cBMzvC1VTxa/LyV6upcU77c4q0T9+
+brZF7v7BxqTa9Bdu3WqIrXlKT0LH3j9WgT7IHRQSNV5Kae8k4Rs4GuKFkvux1k0q
+KIHNycPdKBRTEhbRI2DzazgJaKzHpIxoNBHtin8vxu/ViV1P1OjvPic+6FJhl5M4
+DAs7w+bqpRk4VZWe0OwKpSP+Mm6LOIBsMB7StfFJsDR4WF1H0a7+O+oy8KEMECy0
+7+98cLqy9RjqvhVDBDjUej/nr+p1hTWA34MJ7vc5P948reG4nB8pFf1D0eBtxVw=
+=UqJx
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/files/lxc.initd.2 b/app-emulation/lxc/files/lxc.initd.2
index 9f38dc8e0006..72680d8f9476 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.5 2012/07/21 05:07:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v 1.6 2012/11/14 02:15:10 flameeyes Exp $
 
 CONTAINER=${SVCNAME#*.}
 
@@ -82,7 +82,7 @@ start() {
 	# x32-based containers.
 	case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
 		EM_X86_64)	setarch=linux64;;
-		EM_I386)	setarch=linux32;;
+		EM_386)		setarch=linux32;;
 	esac
 
 	ebegin "Starting ${CONTAINER}"
diff --git a/app-emulation/lxc/lxc-0.8.0.ebuild b/app-emulation/lxc/lxc-0.8.0-r1.ebuild
index a37b7e84008d..96dfa31e22f9 100644
--- a/app-emulation/lxc/lxc-0.8.0.ebuild
+++ b/app-emulation/lxc/lxc-0.8.0-r1.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.ebuild,v 1.1 2012/11/11 05:53:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.8.0-r1.ebuild,v 1.1 2012/11/14 02:15:10 flameeyes Exp $
 
 EAPI="4"
 
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="examples vanilla"
+IUSE="examples"
 
 RDEPEND="sys-libs/libcap"
 
@@ -32,19 +32,15 @@ DEPEND="${RDEPEND}
 	app-text/docbook-sgml-utils
 	>=sys-kernel/linux-headers-3.2"
 
-# For init script, so protect with vanilla, they are not strictly
-# needed.
 RDEPEND="${RDEPEND}
-	!vanilla? (
-		sys-apps/util-linux
-		app-misc/pax-utils
-		>=sys-apps/openrc-0.9.9.1
-		virtual/awk
-	)"
+	sys-apps/util-linux
+	app-misc/pax-utils
+	>=sys-apps/openrc-0.9.9.1
+	virtual/awk"
 
 CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
 	~CPUSETS ~CGROUP_CPUACCT
-	~RESOURCE_COUNTERS ~CGROUP_MEM_RES_CTLR
+	~RESOURCE_COUNTERS
 	~CGROUP_SCHED
 
 	~NAMESPACES
@@ -118,23 +114,19 @@ src_install() {
 
 	find "${D}" -name '*.la' -delete
 
-	use vanilla && return 0
-
 	# Gentoo-specific additions!
 	newinitd "${FILESDIR}/${PN}.initd.2" ${PN}
 	keepdir /var/log/lxc
 }
 
 pkg_postinst() {
-	if ! use vanilla; then
-		elog "There is an init script provided with the package now; no documentation"
-		elog "is currently available though, so please check out /etc/init.d/lxc ."
-		elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
-		elog "to start the container defined into /etc/lxc/configname.conf ."
-		elog "For further information about LXC development see"
-		elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
-		elog ""
-	fi
+	elog "There is an init script provided with the package now; no documentation"
+	elog "is currently available though, so please check out /etc/init.d/lxc ."
+	elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
+	elog "to start the container defined into /etc/lxc/configname.conf ."
+	elog "For further information about LXC development see"
+	elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
+	elog ""
 	ewarn "With version 0.7.4, the mountpoint syntax came back to the one used by 0.7.2"
 	ewarn "and previous versions. This means you'll have to use syntax like the following"
 	ewarn ""