Fix up libnl depend when both slots are installed. Add kernel param checks for all the various components of LXC and the virt-network USE flag.

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

3 files changed, 52 insertions, 6 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 53853a2281cc..74ca4b965931 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.183 2012/06/04 19:46:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.184 2012/06/11 02:01:38 cardoe Exp $
+
+  10 Jun 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.12.ebuild:
+  Fix up libnl depend when both slots are installed. Add kernel param checks
+  for all the various components of LXC and the virt-network USE flag.
 
   04 Jun 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.12.ebuild:
   Add the qemu user to the kvm group so it can use KVM.
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index e63ffdde0cbf..3343301841a4 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -9,8 +9,8 @@ DIST libvirt-0.9.12.tar.gz 20054618 RMD160 16b38dc2e2f5df9b427ca89ab8c1fb25b63e1
 DIST libvirt-0.9.8.tar.gz 18403525 RMD160 51bfb25dbd11a7cb5529c692d843f8ac2b1c9101 SHA1 09df699513af63b73444d776c2d02945dc9cee43 SHA256 31b20864e44bb18a2d01b7ac6569f114cbe1007689219bf24a07ddb7528abe0e
 EBUILD libvirt-0.9.10-r4.ebuild 8658 RMD160 7691ed9211245ed2462630ec8e381e6642155469 SHA1 fef44256645b351171db8c23990757f20d3ef8eb SHA256 bd7bb56f8da698a427c18eac46f58d1588766870164aa384516b182b6a38fded
 EBUILD libvirt-0.9.11.3.ebuild 8690 RMD160 29002e3e506c15c96c83ba023c1e51399c8742e6 SHA1 4a03ed3abea899fd5b1f67204e6d89679033959c SHA256 27f8be21525191a791e783d80a7f59ee212f992f95e2dab4088594de0980ed16
-EBUILD libvirt-0.9.12.ebuild 9387 RMD160 1aa02d6b998f99fb9f9aec2faf58edeffc7d01d3 SHA1 bdef043c0c7817421a595a1665beef0f463e834f SHA256 d4341047e59e76781a74837d75937df5efd89d34ce3133fd343f034dc0343a2a
+EBUILD libvirt-0.9.12.ebuild 10210 RMD160 a0721dfeb2294af2d866189760d4c1e762aea8e2 SHA1 a81924a4d768a3833d0bfb8527df27526e56fe8c SHA256 527d771b5b4ee89e62212f83a2465659ff3bb61f780cff68747a55c7814e997d
 EBUILD libvirt-0.9.8.ebuild 8137 RMD160 2f7227550ec9d17fecf1e0ff0d33482e7dad2068 SHA1 698e1d44160d8ecffd3dafc1a10bdc8f48f19282 SHA256 2892e8b77eab033b317847974b67212bede163a77449b2be5097abd9ae9dfd44
 EBUILD libvirt-9999.ebuild 8670 RMD160 c337a70db3f2c8f18191fddc132c2818af391384 SHA1 e50e5ef31cc4a08f210b84d88654966134f9c89f SHA256 55309620dcbfa89f97511bbde97e9cc60293b1d55503dcc179c655f7d2ef716b
-MISC ChangeLog 36589 RMD160 39ab57e6415d4c8f5f97599c0e908029439e96d4 SHA1 3af8f0f1b270ce5e4f0ccf2bb58fd3123ea36c34 SHA256 79a198b3688c4172e74d90f58d2359193429f72effee7440be4642f018dfffb2
+MISC ChangeLog 36811 RMD160 b30e361c40d9cf86d77b88e16cff4f4df25875ec SHA1 c17dd0d898a10decb8fce310499177455094f7c6 SHA256 3b52c50003ed1b1c37e84aa7eb01f4bbbe5fc9e18ced86c1f45606f67ce314a7
 MISC metadata.xml 3132 RMD160 066870c02fd835f9a633b69328367737d4cc0b71 SHA1 940cc910ef4d1a75947afef95d73a3026bb91527 SHA256 e0eb882799f41f51c9930a1142cf5427061bdacf629a028ac4e8b65c1cf67ea4
diff --git a/app-emulation/libvirt/libvirt-0.9.12.ebuild b/app-emulation/libvirt/libvirt-0.9.12.ebuild
index d06738b1576b..83c5c00c55e2 100644
--- a/app-emulation/libvirt/libvirt-0.9.12.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.12.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/libvirt/libvirt-0.9.12.ebuild,v 1.3 2012/06/04 19:46:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.12.ebuild,v 1.4 2012/06/11 02:01:38 cardoe Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ PYTHON_DEPEND="python? 2:2.5"
 #RESTRICT_PYTHON_ABIS="3.*"
 #SUPPORT_PYTHON_ABIS="1"
 
-inherit eutils python user autotools
+inherit eutils python user autotools linux-info
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-2
@@ -47,12 +47,14 @@ REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
 
 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 1.1 by default
 RDEPEND="sys-libs/readline
 	sys-libs/ncurses
 	>=net-misc/curl-7.18.0
 	dev-libs/libgcrypt
 	>=dev-libs/libxml2-2.7.6
-	dev-libs/libnl:3
+	dev-libs/libnl:1.1
 	>=net-libs/gnutls-1.0.25
 	sys-apps/dmidecode
 	>=sys-apps/util-linux-2.17
@@ -94,12 +96,52 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	app-text/xhtml1"
 
+LXC_CONFIG_CHECK="
+	~CGROUPS
+	~CGROUP_FREEZER
+	~CGROUP_DEVICE
+	~CPUSETS
+	~CGROUP_CPUACCT
+	~RESOURCE_COUNTERS
+	~CGROUP_MEM_RES_CTLR
+	~CGROUP_SCHED
+	~BLK_CGROUP
+	~NAMESPACES
+	~UTS_NS
+	~IPC_NS
+	~USER_NS
+	~PID_NS
+	~NET_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~VETH
+	~MACVLAN
+	~POSIX_MQUEUE
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+VIRTNET_CONFIG_CHECK="
+	~BRIDGE_NF_EBTABLES
+	~NETFILTER_ADVANCED
+	~NETFILTER_XT_TARGET_CHECKSUM
+"
+
 pkg_setup() {
 	use python && python_set_active_version 2
 	python_pkg_setup
 
 	enewgroup qemu 77
 	enewuser qemu 77 -1 -1 qemu kvm
+
+	CONFIG_CHECK=""
+	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
+	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
 }
 
 src_prepare() {