app-emulation/libvirt: ebuild maintenance

Package-Manager: portage-2.3.0

diff --git a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
index 363d808e0d6754a7e58fecda08541766f6baed3f..d8eecf69c7c8fc2d52f003b6eabcd2fc95892960 100644 (file)
--- 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 363d808e0d6754a7e58fecda08541766f6baed3f..12eed00f08e58f8df454a99a45df00850b540eb6 100644 (file)
--- 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 a8eacecd67a4af82725b4c991623467458983255..12eed00f08e58f8df454a99a45df00850b540eb6 100644 (file)
--- 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 d8eecf69c7c8fc2d52f003b6eabcd2fc95892960..12eed00f08e58f8df454a99a45df00850b540eb6 100644 (file)
--- 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