gentoo resync : 14.07.2018

5 files changed, 194 insertions, 0 deletions

diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
new file mode 100644
index 000000000000..42e09ba53b6a
--- /dev/null
+++ b/dev-util/trace-cmd/Manifest
@@ -0,0 +1,6 @@
+AUX trace-cmd-2.5.1-makefile.patch 1152 BLAKE2B fc44b06f2d59d2c02ba7c1f9145d06c4b256177cf9cf2f1b9928b2f08d49a719e675a543ffcbdbe5c08e00d9f27eec01052d278d90fedb294296be68d61b1bf4 SHA512 e74742d3c050f9e7bdb566a82a5212e6474b34ee6fc46e9ffa313ad3f2c323f55b63521ec857ae44f39ef168135fcdf733314fb3e04709e51f03ef7aed99c416
+DIST trace-cmd-2.5.1.tar.xz 1577148 BLAKE2B 25436354315bcfe886cca26678017846ac95c8f19877bf9fc7ab24ed543406b61516ad56185e78c3a8d79bbbc672419fca468b205f178cdc01baaf0dfd140702 SHA512 2280eefa130a3914c34798f8bd4097a55f7f4fa4632b3d26ee1317bba54625d259ac61c6576dd3051fb2be48fb593fa54a4203d1828b7fec5fd196de00491ea2
+DIST trace-cmd-2.6.tar.xz 1584768 BLAKE2B 42b2b4ac37246d610a2747bf0cb025d0f0ef5954a40c57acb8df8245f71fb516e0c124034b44addfee119ea453f1e732f6a2a73fa5e3bfb18da5ea7e1f920ed5 SHA512 cf479a940825935aa89b282c7a617d56fa5dd1f82e3322a969c4e0a08343ceca16c40058ead5f5878260ce0a003102550808c5475110706580769dffb1897c54
+EBUILD trace-cmd-2.5.1.ebuild 1519 BLAKE2B 85aa750902bd3d6ba16431f78c2ed2a829b3ec03e257a466e91f3a4e824256c32b41ae246dec989abab19fbbe92b4c3cfff14ee443c4262fcb5b1ff388e19a1d SHA512 564125aa45004c07e27a83d2e78fbbfd9670c4079c7d8afc679c9c3445ceca54370bd168dcccbf65101752bfb8a5b9b7f04264f172d7b12be917d1388d2e5c5b
+EBUILD trace-cmd-2.6.ebuild 1500 BLAKE2B 04764f54ccb207b141349af6a3d1c2e976eccb3eb80d24ce929c3964ebf3f9d4aa2a8be034e3f85284c96725de30eb901e999078e070fffe398c9d42b7121167 SHA512 866ac85fd69cac13215ca03f3044bf2214a46c0d711c6e4305acab224e7df6dd8258189a1c11155ab385c76d1592834b5ff79b1a6e8619c8940100c2c91c522d
+MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
new file mode 100644
index 000000000000..ec9fb1774a3a
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
@@ -0,0 +1,34 @@
+diff --git a/Makefile b/Makefile
+index 186e245..9127f23 100644
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,7 @@ plugin_dir = $(HOME)/.trace-cmd/plugins
+ python_dir = $(HOME)/.trace-cmd/python
+ else
+ plugin_dir = $(prefix)/$(libdir)/trace-cmd/plugins
+-python_dir = $(prefix)/$(libdir)/trace-cmd/python
++python_dir ?= $(prefix)/$(libdir)/trace-cmd/python
+ PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
+ PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
+ PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
+@@ -98,8 +98,11 @@ endif # NO_PYTHON
+ test-build = $(if $(shell sh -c 'echo "$(1)" | \
+ 	$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
+ 
++ifndef NO_UDIS86
+ # have udis86 disassembler library?
+-udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
++udis86-flags := -DHAVE_UDIS86
++udis86-ldflags := -ludis86
++endif # NO_UDIS86
+ 
+ define BLK_TC_FLUSH_SOURCE
+ #include <linux/blktrace_api.h>
+@@ -242,6 +245,7 @@ endif
+ # Append required CFLAGS
+ override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
+ override CFLAGS += $(udis86-flags) $(blk-flags)
++override LDFLAGS += $(udis86-ldflags)
+ 
+ ifeq ($(VERBOSE),1)
+   Q =
diff --git a/dev-util/trace-cmd/metadata.xml b/dev-util/trace-cmd/metadata.xml
new file mode 100644
index 000000000000..d0ed66266c6a
--- /dev/null
+++ b/dev-util/trace-cmd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<use>
+		<flag name="udis86">Enable support for dev-libs/udis86 disassembler library</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild b/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
new file mode 100644
index 000000000000..c6acbd767956
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils toolchain-funcs linux-info python-single-r1
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc gtk python udis86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )
+	gtk? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	python? (
+		virtual/pkgconfig
+		dev-lang/swig
+	)
+	gtk? ( virtual/pkgconfig )
+	doc? ( app-text/asciidoc )"
+
+CONFIG_CHECK="
+	~TRACING
+	~FTRACE
+	~BLK_DEV_IO_TRACE"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch_user
+}
+
+src_configure() {
+	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
+
+	if use python; then
+		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
+		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
+	else
+		MAKEOPTS+=" NO_PYTHON=1"
+	fi
+
+	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
+}
+
+src_compile() {
+	emake all_cmd
+	use doc && emake doc
+	use gtk && emake -j1 gui
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && emake DESTDIR="${D}" install_doc
+	use gtk && emake DESTDIR="${D}" install_gui
+}
diff --git a/dev-util/trace-cmd/trace-cmd-2.6.ebuild b/dev-util/trace-cmd/trace-cmd-2.6.ebuild
new file mode 100644
index 000000000000..4187d0fdd2f3
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-2.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils toolchain-funcs linux-info python-single-r1
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc gtk python udis86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )
+	gtk? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	python? (
+		virtual/pkgconfig
+		dev-lang/swig
+	)
+	gtk? ( virtual/pkgconfig )
+	doc? ( app-text/asciidoc )"
+
+CONFIG_CHECK="
+	~TRACING
+	~FTRACE
+	~BLK_DEV_IO_TRACE"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-makefile.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
+
+	if use python; then
+		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
+		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
+	else
+		MAKEOPTS+=" NO_PYTHON=1"
+	fi
+
+	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
+}
+
+src_compile() {
+	emake all_cmd
+	use doc && emake doc
+	use gtk && emake -j1 gui
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && emake DESTDIR="${D}" install_doc
+	use gtk && emake DESTDIR="${D}" install_gui
+}