From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 84395138331 for ; Wed, 5 Oct 2016 03:02:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D726EE0B2F; Wed, 5 Oct 2016 03:02:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA425E0B2F for ; Wed, 5 Oct 2016 03:02:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A41234102A for ; Wed, 5 Oct 2016 03:02:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2212224A8 for ; Wed, 5 Oct 2016 03:02:03 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1475636268.e60bfec050c5711b27af8fc6218b03ea2a0c5f1a.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-2.1.0-r2.ebuild app-emulation/libvirt/libvirt-2.2.0-r1.ebuild app-emulation/libvirt/libvirt-2.3.0.ebuild app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: e60bfec050c5711b27af8fc6218b03ea2a0c5f1a X-VCS-Branch: master Date: Wed, 5 Oct 2016 03:02:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d0db6463-6cc5-4132-8da2-b13117ffb677 X-Archives-Hash: 20e635ae5c382b097dd41d90ab380d0b commit: e60bfec050c5711b27af8fc6218b03ea2a0c5f1a Author: Matthias Maier gentoo org> AuthorDate: Wed Oct 5 02:57:23 2016 +0000 Commit: Matthias Maier gentoo 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