diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 4c4cec3..7b96b57 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1 +1 @@
-DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
+DIST trace-cmd-v2.9.1.tar.gz 4298008 BLAKE2B f7aa2f12b2c90f35390857ed6f5818b74c42be36ce70835d86410f9f4931d27410123baaad007fa2795c1ba1f5bafc739db620f467ccc48021d774ee7be8a68d SHA512 186bfdd8ff1e88e9e6d3ae87b123f049892deaaa8d6a42944b6f8abee6b828946b88774029aa96daf4423a3dfc01b42835508f44f636dd02579ef9a8ef425131
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-python-pkgconfig-name.patch b/dev-util/trace-cmd/files/trace-cmd-2.8-python-pkgconfig-name.patch
deleted file mode 100644
index 17c2e69..0000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.8-python-pkgconfig-name.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d34c615..7931c88 100644
---- a/Makefile
-+++ b/Makefile
-@@ -115,9 +115,10 @@ PYTHON		:= ctracecmd.so
- PYTHON_GUI	:= ctracecmd.so ctracecmdgui.so
- 
- PYTHON_VERS ?= python
-+PYTHON_PKGCONFIG_VERS ?= $(PYTHON_VERS)
- 
- # Can build python?
--ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_VERS) > /dev/null 2>&1 && echo y"), y)
-+ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_PKGCONFIG_VERS) > /dev/null 2>&1 && echo y"), y)
- 	PYTHON_PLUGINS := plugin_python.so
- 	BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS)
- 	BUILD_PYTHON_WORKS := 1
-@@ -372,8 +373,8 @@ report_nopythondev: force
- 	$(Q)echo
- 
- ifndef NO_PYTHON
--PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_VERS)`
--PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_VERS)` \
-+PYTHON_INCLUDES = `pkg-config --cflags $(PYTHON_PKGCONFIG_VERS)`
-+PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_PKGCONFIG_VERS)` \
- 		$(shell $(PYTHON_VERS)-config --ldflags)
- PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0`
- else
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
deleted file mode 100644
index 72dd3de..0000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch
+++ /dev/null
@@ -1,50 +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 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.3-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch
deleted file mode 100644
index 10aaf07..0000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/scripts/utils.mk b/scripts/utils.mk
-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 $^ -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.8.3.ebuild b/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild
similarity index 67%
rename from dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
rename to dev-util/trace-cmd/trace-cmd-2.9.1.ebuild
index 0d94529..cbea2ab 100644
--- a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL=1
 
-inherit linux-info python-r1 toolchain-funcs
+inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
 
 DESCRIPTION="User-space front-end for Ftrace"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
@@ -21,35 +21,45 @@
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/${PV}"
-IUSE="+audit doc python udis86"
+IUSE="+audit doc python test udis86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
-RDEPEND="audit? ( sys-process/audit )
+RDEPEND="
+	audit? ( sys-process/audit )
 	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )"
+	udis86? ( dev-libs/udis86 )
+"
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers
+	test? ( dev-util/cunit )
+"
+BDEPEND="
 	python? (
 		virtual/pkgconfig
 		dev-lang/swig
 	)
+	doc? ( app-text/asciidoc )
+"
 
-	doc? ( app-text/asciidoc )"
-
-CONFIG_CHECK="
-	~TRACING
-	~FTRACE
-	~BLK_DEV_IO_TRACE"
-
-PATCHES=(
-	"${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch"
-	"${FILESDIR}/trace-cmd-2.8.3-soname.patch"
-)
+# having trouble getting tests to compile
+RESTRICT+=" test"
 
 pkg_setup() {
+	local CONFIG_CHECK="
+		~TRACING
+		~FTRACE
+		~BLK_DEV_IO_TRACE"
+
 	linux-info_pkg_setup
 }
 
+src_prepare() {
+	default
+	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
+		-i Makefile || die "sed failed"
+}
+
 src_configure() {
 	EMAKE_FLAGS=(
 		BUILD_OUTPUT="${WORKDIR}/${P}_build"
@@ -57,8 +67,11 @@
 		"libdir=${EPREFIX}/usr/$(get_libdir)"
 		"CC=$(tc-getCC)"
 		"AR=$(tc-getAR)"
-		$(usex audit '' '' '' 'NO_AUDIT=1')
-		$(usex udis86 '' '' '' 'NO_UDIS86=1')
+		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
+		"etcdir=/etc"
+		$(usex audit '' 'NO_AUDIT=' '' '1')
+		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
+		$(usex udis86 '' 'NO_UDIS86=' '' '1')
 		VERBOSE=1
 	)
 }
@@ -77,22 +90,27 @@
 
 python_compile() {
 	pushd "${BUILD_DIR}" > /dev/null || die
-	python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8.3-python3-warnings.patch"
 
 	emake "${EMAKE_FLAGS[@]}" \
 		PYTHON_VERS="${EPYTHON}" \
 		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
 		python_dir=$(python_get_sitedir)/${PN} \
-		python python-plugin
+		python ctracecmd.so
 
 	popd > /dev/null || die
 }
 
+src_test() {
+	emake "${EMAKE_FLAGS[@]}" test
+}
+
 src_install() {
 	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
 		DESTDIR="${D}" \
 		install install_libs
 
+	newbashcomp tracecmd/trace-cmd.bash "${PN}"
+
 	use doc && emake DESTDIR="${D}" install_doc
 	use python && python_foreach_impl python_install
 }
@@ -107,4 +125,6 @@
 		install_python
 
 	popd > /dev/null || die
+
+	python_optimize
 }
diff --git a/metadata/md5-cache/dev-util/trace-cmd-2.8.3 b/metadata/md5-cache/dev-util/trace-cmd-2.8.3
deleted file mode 100644
index c7cea37..0000000
--- a/metadata/md5-cache/dev-util/trace-cmd-2.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=audit? ( sys-process/audit ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) udis86? ( dev-libs/udis86 ) sys-kernel/linux-headers python? ( virtual/pkgconfig dev-lang/swig ) doc? ( app-text/asciidoc )
-DESCRIPTION=User-space front-end for Ftrace
-EAPI=7
-HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
-IUSE=+audit doc python udis86 kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=*
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=audit? ( sys-process/audit ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) udis86? ( dev-libs/udis86 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
-SLOT=0/2.8.3
-SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.8.3.tar.gz
-_eclasses_=linux-info	327865b9921771330775d971263dc234	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8011609857f188c2d9e989b07bcca1a9
diff --git a/metadata/md5-cache/dev-util/trace-cmd-2.9.1 b/metadata/md5-cache/dev-util/trace-cmd-2.9.1
new file mode 100644
index 0000000..c4c144f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/trace-cmd-2.9.1
@@ -0,0 +1,16 @@
+BDEPEND=python? ( virtual/pkgconfig dev-lang/swig ) doc? ( app-text/asciidoc )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) udis86? ( dev-libs/udis86 ) sys-kernel/linux-headers test? ( dev-util/cunit )
+DESCRIPTION=User-space front-end for Ftrace
+EAPI=7
+HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
+IUSE=+audit doc python test udis86 kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) udis86? ( dev-libs/udis86 )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test ) test
+SLOT=0/2.9.1
+SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.9.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	327865b9921771330775d971263dc234	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a866170edb19ca374dd762c7e4cb1487