11 files changed, 19 insertions, 121 deletions
diff --git a/dev-util/ccls/ccls-0.20201219.ebuild b/dev-util/ccls/ccls-0.20201219.ebuild
index ac5830184a31..377cc36c8068 100644
--- a/dev-util/ccls/ccls-0.20201219.ebuild
+++ b/dev-util/ccls/ccls-0.20201219.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DCCLS_VERSION=${PV}
 		-DUSE_SYSTEM_RAPIDJSON=ON
 		-DCLANG_LINK_CLANG_DYLIB=1
 	)
diff --git a/dev-util/ccls/ccls-9999.ebuild b/dev-util/ccls/ccls-9999.ebuild
index ac5830184a31..377cc36c8068 100644
--- a/dev-util/ccls/ccls-9999.ebuild
+++ b/dev-util/ccls/ccls-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DCCLS_VERSION=${PV}
 		-DUSE_SYSTEM_RAPIDJSON=ON
 		-DCLANG_LINK_CLANG_DYLIB=1
 	)
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
index 1d567b48dc59..32be772e7f94 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/diffstat/diffstat-1.63.ebuild b/dev-util/diffstat/diffstat-1.63.ebuild
index e44b5de05990..23b9b29dce5d 100644
--- a/dev-util/diffstat/diffstat-1.63.ebuild
+++ b/dev-util/diffstat/diffstat-1.63.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 7e230f463099..33ae296a49ad 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,3 +1,2 @@
-DIST lttng-tools-2.10.9.tar.bz2 1254174 BLAKE2B 1666aab83bbdeb48a0c5764b359760346cfd9b55ee1677eac87a5d16f00c6c9e0f0952bf84486e0cbf9052ac1b485b276e230b36097b5366040db4e3112a3086 SHA512 2e390eb53bfbc874afd1c0c8273f9546fbe08da79fd2c9430eee8e348c05afba34bb6fe365165bf7468b284f7d88dcc16c37803d807109042c51cac1d8c2df1a
-DIST lttng-tools-2.11.0.tar.bz2 1479411 BLAKE2B 5abe2613c8a35b18587c75d75be8af85a37b52daa9ff36bf0126385e5f736f7084cac7815e858e48c26c1e3fe4bc9b00b8ebaf0ce339689bd9a0e177a518d51e SHA512 2b183296201cc62faa1f5afef3fdb67f089996479987d9e6e52e6286301f57a1015f017cc8b743496c30500579fcabde2945db3b7879ae5bd0a6723cfbdf99fb
+DIST lttng-tools-2.12.0.tar.bz2 1544515 BLAKE2B 642047348ef7bfe72c5ec718b4029c628fe2e23fd0a82517a8d5bb15a8cc3b84965d21b2f528a20530fb6ca8213e320d0dd6f36de09b34a53863c46ee272a470 SHA512 87613de34141c75b7ff0eb7b4292d26eea5381a7f298130cf5e802255aa7b0e55f43268dffed71b51d1e5dcd96b92cd517e13557fe64ee121bf1b419b2935a24
 DIST lttng-tools-2.7.1.tar.bz2 984351 BLAKE2B 51d61857c56c3bffcaec80d8b57c18c96c3125d56f7feaa70e3ad44d108987a663734c17cf2553b1979061ae400c1e5bd0a30de4bf3bf5af28846403a3e055c1 SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d
diff --git a/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
deleted file mode 100644
index fb1f24e3f845..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu:=
-	dev-libs/popt
-	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
-}
-
-src_configure() {
-	econf $(usex ust "" --without-lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild b/dev-util/lttng-tools/lttng-tools-2.12.0.ebuild
index fb1f24e3f845..be88227c25ae 100644
--- a/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.12.0.ebuild
@@ -20,20 +20,17 @@ IUSE="+ust"
 DEPEND="dev-libs/userspace-rcu:=
 	dev-libs/popt
 	dev-libs/libxml2
-	ust? ( dev-util/lttng-ust:= )
+	ust? ( >=dev-util/lttng-ust-2.12.0:= )
 "
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_pretend() {
-	if kernel_is -lt 2 6 27; then
-		ewarn "${PN} require Linux kernel >= 2.6.27"
-		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
-		ewarn "   the session daemon. There were introduce in the 2.6.27"
-	fi
+src_configure() {
+	econf $(usex ust "" --without-lttng-ust) --disable-static
 }
 
-src_configure() {
-	econf $(usex ust "" --without-lttng-ust)
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 855e45f3d722..edc6ca21cf31 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,4 +1,2 @@
-DIST lttng-ust-2.10.6.tar.bz2 804912 BLAKE2B e320cad821f143392a95e98cf99f5a23597c25f7d570ac5ce3206cb5b4b7bd931e5eb765a133e421e78307fbd882e33ba291cc2c19e37250a87844308d1af2f3 SHA512 a689838a621e99408bea0e5b6ccd4a930dc2103ecb05c8b472974eda9387b813b1b9e59d3aeb4d04434754cfab170723baf961cd5063116916da471c04165c50
-DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e2002d8f03aa2266b5add36d06552f5620b912eeecff1173f43eec107b385f1b93783905f36a42baf5a63c37ea35fc SHA512 fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09
-DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
+DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
diff --git a/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild b/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
deleted file mode 100644
index 576350634db5..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
index bbe2663203dd..a0aab3946489 100644
--- a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
@@ -14,17 +14,14 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples numa"
 
 DEPEND="
 	dev-libs/userspace-rcu:=
-	numa? ( sys-process/numactl )
-	"
+	numa? ( sys-process/numactl )"
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}"/${P}-fno-common.patch)
-
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
@@ -38,3 +35,8 @@ src_prepare() {
 src_configure() {
 	econf $(use_enable numa)
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
deleted file mode 100644
index c440ff6af2ce..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}