summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-09-28 13:50:56 +0200
committerJustin Lecher <jlec@gentoo.org>2015-09-28 13:50:56 +0200
commit89cc9a24c081d549428038d570c1100a584baf2a (patch)
tree93330d92bae581b09d33d658679b184662258f29
parentdev-python/python-ldap: Version Bump (diff)
downloadgentoo-89cc9a24c081d549428038d570c1100a584baf2a.tar.gz
gentoo-89cc9a24c081d549428038d570c1100a584baf2a.tar.bz2
gentoo-89cc9a24c081d549428038d570c1100a584baf2a.zip
dev-util/sysdig: Make CONFIG_TRACEPOINTS check non-fatal
Package-Manager: portage-2.2.22 Signed-off-by: Justin Lecher <jlec@gentoo.org>
-rw-r--r--dev-util/sysdig/metadata.xml2
-rw-r--r--dev-util/sysdig/sysdig-0.1.104.ebuild5
-rw-r--r--dev-util/sysdig/sysdig-0.1.92.ebuild7
-rw-r--r--dev-util/sysdig/sysdig-0.1.98.ebuild5
4 files changed, 11 insertions, 8 deletions
diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
index 33c7008e71d7..059917e98ca0 100644
--- a/dev-util/sysdig/metadata.xml
+++ b/dev-util/sysdig/metadata.xml
@@ -6,7 +6,7 @@
<name>Michał Górny</name>
</maintainer>
<use>
- <flag name='modules'>Build kernel modules needed for tracing local
+ <flag name="modules">Build kernel modules needed for tracing local
events. Disable this only if you intend to use sysdig purely
to work with dumpfiles.</flag>
</use>
diff --git a/dev-util/sysdig/sysdig-0.1.104.ebuild b/dev-util/sysdig/sysdig-0.1.104.ebuild
index dbd0e94bf4aa..0c4d00a5cf57 100644
--- a/dev-util/sysdig/sysdig-0.1.104.ebuild
+++ b/dev-util/sysdig/sysdig-0.1.104.ebuild
@@ -15,7 +15,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+modules"
-RDEPEND="dev-lang/luajit:2=
+RDEPEND="
+ dev-lang/luajit:2=
>=dev-libs/jsoncpp-0.6_pre:0=
sys-libs/ncurses:0=
sys-libs/zlib:0="
@@ -24,7 +25,7 @@ DEPEND="${RDEPEND}
virtual/os-headers"
# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS TRACEPOINTS"
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
pkg_pretend() {
use modules && linux-mod_pkg_setup
diff --git a/dev-util/sysdig/sysdig-0.1.92.ebuild b/dev-util/sysdig/sysdig-0.1.92.ebuild
index 2ee127782d62..b4771410baf6 100644
--- a/dev-util/sysdig/sysdig-0.1.92.ebuild
+++ b/dev-util/sysdig/sysdig-0.1.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+modules"
-RDEPEND="dev-lang/luajit:2=
+RDEPEND="
+ dev-lang/luajit:2=
dev-libs/jsoncpp:0=
sys-libs/zlib:0="
DEPEND="${RDEPEND}
@@ -24,7 +25,7 @@ DEPEND="${RDEPEND}
virtual/os-headers"
# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS TRACEPOINTS"
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
pkg_pretend() {
use modules && linux-mod_pkg_setup
diff --git a/dev-util/sysdig/sysdig-0.1.98.ebuild b/dev-util/sysdig/sysdig-0.1.98.ebuild
index 01698892aab5..bf9e04be27dd 100644
--- a/dev-util/sysdig/sysdig-0.1.98.ebuild
+++ b/dev-util/sysdig/sysdig-0.1.98.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+modules"
-RDEPEND="dev-lang/luajit:2=
+RDEPEND="
+ dev-lang/luajit:2=
>=dev-libs/jsoncpp-0.6_pre:0=
sys-libs/zlib:0="
DEPEND="${RDEPEND}
@@ -24,7 +25,7 @@ DEPEND="${RDEPEND}
virtual/os-headers"
# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS TRACEPOINTS"
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
pkg_pretend() {
use modules && linux-mod_pkg_setup