gentoo resync : 02.08.2019

9 files changed, 72 insertions, 276 deletions

diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 414e5ec23ca6..1fb8f64baee8 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,11 +1,7 @@
-AUX trace-cmd-2.7-makefile.patch 1162 BLAKE2B e53e6f5c93445cb4bfbe8dd15bcd01972968fb27d1ca6ed45944f383fabf08cc1850686ca5526fb1de78103e5a49dc756279da91fd75136c56d3cd55c59aa013 SHA512 af6c8c11b13737c6e4e8926bbcc250c19fae22268b05727b2d9cd4e853b43735106b6e4439ccea89f038641f8c4a93494428c41756adc411526030c74d8f3aad
-AUX trace-cmd-2.7-soname.patch 339 BLAKE2B b89d513caa361cfcab00d821e09ae47ce84527add57ce94199262f660f8df5ff436b8ca1d47707d5939c7df760cdfda71c6163d8c4e71ad983328aee5b6f2a20 SHA512 a64a8f6ec1745a1221380b35e779b22d9044df007798eaed5617ea81a391ed0e1baba1f74af9bed280805f748c829b7ca3cc0f7fb773adf791c33373dde3c662
 AUX trace-cmd-2.8-python-pkgconfig-name.patch 987 BLAKE2B b7fcb2f8813f924692647f16252c5b576ec1a25089e5f03f5ab5d4240f8d7cb8a8cec49cb674f1a75ee562dee0112d17fbe5527b27e72445d8c246a8f535869d SHA512 9677cb02d336accc136911240c16723ca676d5f245f34dc657d6662ff20df47db14f7370becd1bb2c118a38f83c80a13d062597a0e1a8af9dc96dc6d88804991
-AUX trace-cmd-2.8-python3-warnings.patch 3392 BLAKE2B 15cab32142d6196bc7fb310f27f82e7a892bb5ab0d911a9e2ba6ea7cd6367d811aef8fbdda01452a9f3a7adad118074c270229be05822d87b3380965e02e6b60 SHA512 3df7449b7f49c101770c342b44229602565af2c2f0f9e702cd9f496a0b4202c084149cd01d3103365480be7773a901a39f8011749459953bee6948ea799ac947
-AUX trace-cmd-2.8-soname.patch 374 BLAKE2B 0717fb54fcbb208cb5124a0954e2170d1104d83ec31d05ace74979c1ab5f98673737c833fc8a21b18f2fa76ef31e5a75bdcb67b703d3b16abbc1b7788341c11d SHA512 010459dc4a4f7406587c5314b1f47c320afbd0190501266fa04a0a20bf3f589cd831287b35877c6173803122b1c9a49c03944bf9e874617a797ade16e62b58a7
-DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9 SHA512 e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4
-DIST trace-cmd-v2.8.tar.gz 1996407 BLAKE2B 6a9a0b221418d448f5af5508bf8acf0baca08e0cdd8c1a835a06d26f5f729608d6988f7ed83ccdc9e117ade19893fa32c2400a61c2d396804cd042bc25cd498a SHA512 0675c057e78878a0f56ee69edfe7ab4b771fd5346920fcd3ad4af777180fae311cc369dc3faa6cd49d30664401497d20e45a0cf1914805139116e3be8587e0a7
-EBUILD trace-cmd-2.7-r2.ebuild 1777 BLAKE2B a77c5ae330fa91888f0140184012f7c52220fff7c09f15a533d972c5c95c6c690085f7a9fab6c7a0d3a97b80ec24a9816baff058a12bd7e048dd614f7d25eb70 SHA512 3c4bf7a879bb2a8efa5cb7077927bf996b6fa2590b2decfacbf1f2f6a0c69a03805324f82238048874835854fb52d2ddaa1a58e3e07cafa5faa79edde8bf992a
-EBUILD trace-cmd-2.8.ebuild 2453 BLAKE2B 13204ca5ff52a5b956306010bd836fabdaf0b00e515ce1f207e102b6d6d1df8a370fc8e31b78647d46e5387feb65242fa93634dd16296a4ffda8eaffb7fe1a08 SHA512 94a545505925fd92f3302af42a8f2a1bae39a0c8f7488281215a7a1b5b44c9aac5fa253f7ccd29cd501d88055fb5d49bc7e40f43b1628d4bcf16335fd31a4a84
-EBUILD trace-cmd-9999.ebuild 2453 BLAKE2B 13204ca5ff52a5b956306010bd836fabdaf0b00e515ce1f207e102b6d6d1df8a370fc8e31b78647d46e5387feb65242fa93634dd16296a4ffda8eaffb7fe1a08 SHA512 94a545505925fd92f3302af42a8f2a1bae39a0c8f7488281215a7a1b5b44c9aac5fa253f7ccd29cd501d88055fb5d49bc7e40f43b1628d4bcf16335fd31a4a84
+AUX trace-cmd-2.8.3-python3-warnings.patch 1281 BLAKE2B 66540f016d1ca3a7f5a803bd0753ac9c458fcee43056ec05e420fbeaee8b21cd0c4d38e67286d86ddeb6e478fa1e82d45203f538921bd066aa4ef2ad1222e4d7 SHA512 5446a13e82c9be3c6ed2bdc17b91495499b9f28eaa4045869bbf847ca14953cf36411e86136133b22bba05dae46325b522c00939c33943d5135c17e845fad94a
+AUX trace-cmd-2.8.3-soname.patch 392 BLAKE2B 334e2289dd1132798b1b704b071868715b38ad9308e1ab13abc7417ef55d06f9c07dd62fa3380e55d07020ffafe7d1adea10be6013b731c46583ed21d2cc1f33 SHA512 37096da570d3a926f06ef08731ff4adecc5cdaa2d3035668aa62d813db9facaa5b78189a2a7c9066c4291a90460978886e7f24759a865514335cd3ba1680b6f2
+DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
+EBUILD trace-cmd-2.8.3.ebuild 2473 BLAKE2B 6c68ed92d821004814532e05052e8a2b883b03177d649460a22f1b9d703a893d0b2fca0fccd9d394d176857050edbc6c35098411719d6d23f3bce382f46414ee SHA512 0604c47e022cb8f24bb23cddf9844f06d354a14aaabc1ef6298af83d0640bacefdd76d586a4a78def495da7ee35efe8702b7e8712690138f1e41ed28095fe9f6
+EBUILD trace-cmd-9999.ebuild 2226 BLAKE2B f45c9cde1aeda622e0c6786a65bd8c92f4c2372e2b73cbb9518467e0a7b90b15e41f7df71bbd2ed8f2246d8eaed684db5af9236ccb102e9a3d2d15b5ae6ca1fe SHA512 51e521dcc22ffca22d9f348d2ff9f14ac5473302200cf526d7eff092dd0ec39e2fed52bb6f654aa3615b1b295c527e6089122930216249eaa4848bc96ecbdc53
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
deleted file mode 100644
index a9d7584dc625..000000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a5d2c38..a99e5a4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -63,7 +63,7 @@ python_dir = $(HOME)/.trace-cmd/python
- var_dir = $(HOME)/.trace-cmd/
- else
- plugin_dir = $(libdir)/trace-cmd/plugins
--python_dir = $(libdir)/trace-cmd/python
-+python_dir ?= $(libdir)/trace-cmd/python
- PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
- PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
- PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
-@@ -119,8 +119,13 @@ 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
-+else
-+udis86-flags := -UHAVE_UDIS86
-+endif # NO_UDIS86
- 
- define BLK_TC_FLUSH_SOURCE
- #include <linux/blktrace_api.h>
-@@ -276,6 +281,7 @@ endif
- # Append required CFLAGS
- override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR)
- override CFLAGS += $(udis86-flags) $(blk-flags)
-+override LDFLAGS += $(udis86-ldflags)
- 
- ifeq ($(VERBOSE),1)
-   Q =
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
deleted file mode 100644
index 937f0617a4a4..000000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a5d2c38..588809e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -308,7 +308,7 @@ do_app_build =						\
- 
- do_compile_shared_library =			\
- 	($(print_shared_lib_compile)		\
--	$(CC) --shared $^ -o $@)
-+	$(CC) --shared $^ -Wl,-soname,$@ -o $@)
- 
- do_compile_plugin_obj =				\
- 	($(print_plugin_obj_compile)		\
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch b/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch
deleted file mode 100644
index d66ee35accf9..000000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/plugins/plugin_python.c b/plugins/plugin_python.c
-index e725ad8..196b825 100644
---- a/plugins/plugin_python.c
-+++ b/plugins/plugin_python.c
-@@ -81,7 +81,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
- 	} else
- 		Py_DECREF(res);
- 
--	str = PyString_FromString("pevent");
-+	str = PyUnicode_FromString("pevent");
- 	if (!str)
- 		return -ENOMEM;
- 
-diff --git a/python/ctracecmd.i b/python/ctracecmd.i
-index 65a3d51..031e462 100644
---- a/python/ctracecmd.i
-+++ b/python/ctracecmd.i
-@@ -16,6 +16,7 @@
- %{
- #include "trace-cmd.h"
- #include "event-utils.h"
-+#include <Python.h>
- %}
- 
- 
-@@ -108,7 +109,7 @@ static PyObject *py_field_get_stack(struct tep_handle *pevent,
- 		    ((int)addr == -1))
- 			break;
- 		func = tep_find_function(event->tep, addr);
--		if (PyList_Append(list, PyString_FromString(func))) {
-+		if (PyList_Append(list, PyUnicode_FromString(func))) {
- 			Py_DECREF(list);
- 			return NULL;
- 		}
-@@ -137,10 +138,10 @@ static PyObject *py_field_get_data(struct tep_format_field *f, struct tep_record
- 		offset = val & 0xffff;
- 		len = val >> 16;
- 
--		return PyBuffer_FromMemory((char *)r->data + offset, len);
-+		return PyMemoryView_FromMemory((char *)r->data + offset, len, PyBUF_READ);
- 	}
- 
--	return PyBuffer_FromMemory((char *)r->data + f->offset, f->size);
-+	return PyMemoryView_FromMemory((char *)r->data + f->offset, f->size, PyBUF_READ);
- }
- 
- static PyObject *py_field_get_str(struct tep_format_field *f, struct tep_record *r)
-@@ -162,10 +163,10 @@ static PyObject *py_field_get_str(struct tep_format_field *f, struct tep_record
- 		 */
- 		offset = val & 0xffff;
- 
--		return PyString_FromString((char *)r->data + offset);
-+		return PyUnicode_FromString((char *)r->data + offset);
- 	}
- 
--	return PyString_FromStringAndSize((char *)r->data + f->offset,
-+	return PyUnicode_FromStringAndSize((char *)r->data + f->offset,
- 				strnlen((char *)r->data + f->offset, f->size));
- }
- 
-@@ -177,7 +178,7 @@ static PyObject *py_format_get_keys(struct tep_event *ef)
- 	list = PyList_New(0);
- 
- 	for (f = ef->format.fields; f; f = f->next) {
--		if (PyList_Append(list, PyString_FromString(f->name))) {
-+		if (PyList_Append(list, PyUnicode_FromString(f->name))) {
- 			Py_DECREF(list);
- 			return NULL;
- 		}
-@@ -210,14 +211,14 @@ static int python_callback(struct trace_seq *s,
- 	result = PyEval_CallObject(context, arglist);
- 	Py_XDECREF(arglist);
- 	if (result && result != Py_None) {
--		if (!PyInt_Check(result)) {
-+		if (!PyLong_Check(result)) {
- 			PyErr_SetString(PyExc_TypeError,
- 					"callback must return int");
- 			PyErr_Print();
- 			Py_XDECREF(result);
- 			return 0;
- 		}
--		r = PyInt_AS_LONG(result);
-+		r = PyLong_AsLong(result);
- 	} else if (result == Py_None)
- 		r = 0;
- 	else
-diff --git a/python/ctracecmdgui.i b/python/ctracecmdgui.i
-index 1dcdab0..8ca38f7 100644
---- a/python/ctracecmdgui.i
-+++ b/python/ctracecmdgui.i
-@@ -7,6 +7,7 @@
- #include <pygobject.h>
- #include <pyglib.h>
- #include <Python.h>
-+#include <memoryobject.h>
- 
- extern GtkTreeModel *trace_view_store_as_gtk_tree_model(struct trace_view_store *store);
- 
-@@ -37,10 +38,10 @@ pytype_from_gtype(GType gtype)
- 
- /* help swig cope with g* types */
- %typemap(in) gint {
--    $1 = PyInt_AsLong($input);
-+    $1 = PyLong_AsLong($input);
- }
- %typemap(out) gint {
--    $result = PyInt_FromLong($1);
-+    $result = PyLong_FromLong($1);
- }
- %typemap(in) guint {
-     $1 = PyLong_AsUnsignedLong($input);
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch
new file mode 100644
index 000000000000..72dd3de64f90
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch
@@ -0,0 +1,50 @@
+diff --git a/plugins/plugin_python.c b/plugins/plugin_python.c
+index e725ad8..196b825 100644
+--- a/plugins/plugin_python.c
++++ b/plugins/plugin_python.c
+@@ -81,7 +81,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
+ 	} else
+ 		Py_DECREF(res);
+ 
+-	str = PyString_FromString("pevent");
++	str = PyUnicode_FromString("pevent");
+ 	if (!str)
+ 		return -ENOMEM;
+ 
+diff --git a/python/ctracecmd.i b/python/ctracecmd.i
+index 2601d39..01cd0d5 100644
+--- a/python/ctracecmd.i
++++ b/python/ctracecmd.i
+@@ -16,6 +16,7 @@
+ %{
+ #include "trace-cmd.h"
+ #include "event-utils.h"
++#include <Python.h>
+ %}
+ 
+ 
+diff --git a/python/ctracecmdgui.i b/python/ctracecmdgui.i
+index 1dcdab0..8ca38f7 100644
+--- a/python/ctracecmdgui.i
++++ b/python/ctracecmdgui.i
+@@ -7,6 +7,7 @@
+ #include <pygobject.h>
+ #include <pyglib.h>
+ #include <Python.h>
++#include <memoryobject.h>
+ 
+ extern GtkTreeModel *trace_view_store_as_gtk_tree_model(struct trace_view_store *store);
+ 
+@@ -37,10 +38,10 @@ pytype_from_gtype(GType gtype)
+ 
+ /* help swig cope with g* types */
+ %typemap(in) gint {
+-    $1 = PyInt_AsLong($input);
++    $1 = PyLong_AsLong($input);
+ }
+ %typemap(out) gint {
+-    $result = PyInt_FromLong($1);
++    $result = PyLong_FromLong($1);
+ }
+ %typemap(in) guint {
+     $1 = PyLong_AsUnsignedLong($input);
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch
index 523f2d44467e..10aaf076161d 100644
--- a/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch
+++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch
@@ -1,13 +1,13 @@
 diff --git a/scripts/utils.mk b/scripts/utils.mk
-index 260023a..9eb127d 100644
+index 9eb127d..98d7b3c 100644
 --- a/scripts/utils.mk
 +++ b/scripts/utils.mk
 @@ -54,7 +54,7 @@ do_build_static_lib =				\
  
  do_compile_shared_library =			\
  	($(print_shared_lib_compile)		\
--	$(CC) --shared $^ -o $@)
-+	$(CC) --shared $^ -Wl,-soname,$@ -o $@)
+-	$(CC) --shared $^ -Wl,-soname,$@ -o $@)
++	$(CC) --shared $^ -Wl,-soname,$(@F) -o $@)
  
  do_compile_plugin_obj =				\
  	($(print_plugin_obj_compile)		\
diff --git a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
deleted file mode 100644
index 27b25b7f1212..000000000000
--- a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python2_7)
-
-inherit linux-info python-single-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="+audit doc python udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? (
-		virtual/pkgconfig
-		dev-lang/swig
-	)
-
-	doc? ( app-text/asciidoc )"
-
-CONFIG_CHECK="
-	~TRACING
-	~FTRACE
-	~BLK_DEV_IO_TRACE"
-
-PATCHES=(
-	"${FILESDIR}"/trace-cmd-2.7-makefile.patch
-	"${FILESDIR}"/trace-cmd-2.7-soname.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		"prefix=/usr"
-		"libdir=/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		$(usex audit '' '' '' 'NO_AUDIT=1')
-		$(usex udis86 '' '' '' 'NO_UDIS86=1')
-	)
-
-	if use python; then
-		EMAKE_FLAGS+=(
-			"PYTHON_VERS=${EPYTHON//python/python-}"
-			"python_dir=$(python_get_sitedir)/${PN}"
-		)
-	else
-		EMAKE_FLAGS+=("NO_PYTHON=1")
-	fi
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" all_cmd libs
-	use doc && emake doc
-
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" V=1 install install_libs
-	use doc && emake DESTDIR="${D}" install_doc
-
-}
diff --git a/dev-util/trace-cmd/trace-cmd-2.8.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
index 33ae834f1ac4..81b74d429056 100644
--- a/dev-util/trace-cmd/trace-cmd-2.8.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE="+audit doc python udis86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -42,9 +42,8 @@ CONFIG_CHECK="
 	~BLK_DEV_IO_TRACE"
 
 PATCHES=(
-	"${FILESDIR}/trace-cmd-2.7-makefile.patch"
 	"${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch"
-	"${FILESDIR}/trace-cmd-2.8-soname.patch"
+	"${FILESDIR}/trace-cmd-2.8.3-soname.patch"
 )
 
 pkg_setup() {
@@ -53,8 +52,9 @@ pkg_setup() {
 
 src_configure() {
 	EMAKE_FLAGS=(
-		"prefix=/usr"
-		"libdir=/usr/$(get_libdir)"
+		BUILD_OUTPUT="${WORKDIR}/${P}_build"
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
 		"CC=$(tc-getCC)"
 		"AR=$(tc-getAR)"
 		$(usex audit '' '' '' 'NO_AUDIT=1')
@@ -65,7 +65,7 @@ src_configure() {
 
 src_compile() {
 	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd libs
+		trace-cmd
 
 	if use python; then
 		python_copy_sources
@@ -77,7 +77,7 @@ src_compile() {
 
 python_compile() {
 	pushd "${BUILD_DIR}" > /dev/null || die
-	python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-python3-warnings.patch"
+	python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8.3-python3-warnings.patch"
 
 	emake "${EMAKE_FLAGS[@]}" \
 		PYTHON_VERS="${EPYTHON}" \
diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild
index 33ae834f1ac4..cd3944c250c3 100644
--- a/dev-util/trace-cmd/trace-cmd-9999.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild
@@ -8,10 +8,10 @@ DISTUTILS_OPTIONAL=1
 inherit linux-info python-r1 toolchain-funcs
 
 DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
+HOMEPAGE="http://trace-cmd.org/"
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE="+audit doc python udis86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND}
 		virtual/pkgconfig
 		dev-lang/swig
 	)
-
 	doc? ( app-text/asciidoc )"
 
 CONFIG_CHECK="
@@ -41,20 +40,15 @@ CONFIG_CHECK="
 	~FTRACE
 	~BLK_DEV_IO_TRACE"
 
-PATCHES=(
-	"${FILESDIR}/trace-cmd-2.7-makefile.patch"
-	"${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch"
-	"${FILESDIR}/trace-cmd-2.8-soname.patch"
-)
-
 pkg_setup() {
 	linux-info_pkg_setup
 }
 
 src_configure() {
 	EMAKE_FLAGS=(
-		"prefix=/usr"
-		"libdir=/usr/$(get_libdir)"
+		BUILD_OUTPUT="${WORKDIR}/${P}_build"
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
 		"CC=$(tc-getCC)"
 		"AR=$(tc-getAR)"
 		$(usex audit '' '' '' 'NO_AUDIT=1')
@@ -65,7 +59,7 @@ src_configure() {
 
 src_compile() {
 	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd libs
+		trace-cmd
 
 	if use python; then
 		python_copy_sources
@@ -77,7 +71,6 @@ src_compile() {
 
 python_compile() {
 	pushd "${BUILD_DIR}" > /dev/null || die
-	python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-python3-warnings.patch"
 
 	emake "${EMAKE_FLAGS[@]}" \
 		PYTHON_VERS="${EPYTHON}" \