commit: e60bfec050c5711b27af8fc6218b03ea2a0c5f1a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 5 02:57:23 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Oct 5 02:57:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60bfec0
app-emulation/libvirt: ebuild maintenance
Package-Manager: portage-2.3.0
app-emulation/libvirt/libvirt-2.1.0-r2.ebuild | 4 ----
app-emulation/libvirt/libvirt-2.2.0-r1.ebuild | 23 ++++++++++-------------
app-emulation/libvirt/libvirt-2.3.0.ebuild | 6 +-----
app-emulation/libvirt/libvirt-9999.ebuild | 19 ++++++++++---------
4 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
index 363d808..d8eecf6 100644
--- a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
@@ -318,10 +318,6 @@ src_configure() {
# bug #377279
(cd .gnulib && git reset --hard > /dev/null)
fi
-
- # Workaround: Sometimes this subdirectory is missing and leads to a
- # build failure.
- mkdir -p "${BUILD_DIR}"/docs/internals
}
src_test() {
diff --git a/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
b/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
index 363d808..12eed00 100644
--- a/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
@@ -155,7 +155,6 @@ pkg_setup() {
~CGROUPS
~CGROUP_SCHED
~CPUSETS
- ~DEVPTS_MULTIPLE_INSTANCES
~IPC_NS
~MACVLAN
~NAMESPACES
@@ -172,14 +171,9 @@ pkg_setup() {
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS"
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- if $(kernel_is ge 3 6); then
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
- if $(kernel_is lt 4 5); then
- CONFIG_CHECK+=" ~MEMCG_KMEM "
- fi
- fi
+
+ kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+ ~DEVPTS_MULTIPLE_INSTANCES"
use macvtap && CONFIG_CHECK+="
~MACVTAP"
@@ -201,6 +195,13 @@ pkg_setup() {
~NET_SCH_INGRESS
~NET_SCH_SFQ"
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ if kernel_is ge 3 6; then
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+ kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+ fi
+
ERROR_USER_NS="Optional depending on LXC configuration."
if [[ -n ${CONFIG_CHECK} ]]; then
@@ -318,10 +319,6 @@ src_configure() {
# bug #377279
(cd .gnulib && git reset --hard > /dev/null)
fi
-
- # Workaround: Sometimes this subdirectory is missing and leads to a
- # build failure.
- mkdir -p "${BUILD_DIR}"/docs/internals
}
src_test() {
diff --git a/app-emulation/libvirt/libvirt-2.3.0.ebuild
b/app-emulation/libvirt/libvirt-2.3.0.ebuild
index a8eacec..12eed00 100644
--- a/app-emulation/libvirt/libvirt-2.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-2.3.0.ebuild
@@ -172,7 +172,7 @@ pkg_setup() {
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS"
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+ kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
~DEVPTS_MULTIPLE_INSTANCES"
use macvtap && CONFIG_CHECK+="
@@ -319,10 +319,6 @@ src_configure() {
# bug #377279
(cd .gnulib && git reset --hard > /dev/null)
fi
-
- # Workaround: Sometimes this subdirectory is missing and leads to a
- # build failure.
- mkdir -p "${BUILD_DIR}"/docs/internals
}
src_test() {
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild
b/app-emulation/libvirt/libvirt-9999.ebuild
index d8eecf6..12eed00 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -155,7 +155,6 @@ pkg_setup() {
~CGROUPS
~CGROUP_SCHED
~CPUSETS
- ~DEVPTS_MULTIPLE_INSTANCES
~IPC_NS
~MACVLAN
~NAMESPACES
@@ -172,14 +171,9 @@ pkg_setup() {
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS"
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- if $(kernel_is ge 3 6); then
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
- if $(kernel_is lt 4 5); then
- CONFIG_CHECK+=" ~MEMCG_KMEM "
- fi
- fi
+
+ kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+ ~DEVPTS_MULTIPLE_INSTANCES"
use macvtap && CONFIG_CHECK+="
~MACVTAP"
@@ -201,6 +195,13 @@ pkg_setup() {
~NET_SCH_INGRESS
~NET_SCH_SFQ"
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ if kernel_is ge 3 6; then
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+ kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+ fi
+
ERROR_USER_NS="Optional depending on LXC configuration."
if [[ -n ${CONFIG_CHECK} ]]; then
