gentoo resync : 03.11.2019

5 files changed, 26 insertions, 46 deletions

diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index d540298d6ece..4b176d2f5eb5 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,11 +1,9 @@
-DIST lttng-ust-2.10.1.tar.bz2 797819 BLAKE2B dbeb0ae30d81dc90b0cd8c7d9baabf60f2cb27de3089477a2915e33b1975e3ca781ae85c7112adf8275a1c7e755b7156c533cb39213a30673204520ad6a97711 SHA512 bd9b75ff359a8698ba4f7b6a27d9958c8bd9539fd43d8f1bc4bb40003271c9074f1bb4176d074bac290fad1636d5a3226063275006b781f3533567dea71fac96
-DIST lttng-ust-2.6.5.tar.bz2 619053 BLAKE2B babe2d0b8df6ca1d1942415d613a05d774714a9cffdfd7c5ff7d7c88540d78e4c6eb8b9c00a253dc2718255c9b3061f5b4a72d08393f7e515e128aa6be9047f8 SHA512 bf144c987b7ff62f70551db51a5605bc006b1d8a0e7f4197e1a2c7a7d79a1e4e786a658d0ec885f7d56c4d4f405da23717137c8b0d2be6289fc16ca84f06a230
+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.7.4.tar.bz2 648002 BLAKE2B aaacf4da1c1ff7c4909d9a8ba17b3d108175e8669dfcba151e2e73d094fa68096a0ec2c0bbaf89bec8370566e9b25147a0bbe7bfb0965b0e9fd70704e7a226df SHA512 f3164fd72724065d23b2b21aaa037b6e90f4eeb9dad75f16af4766374cd8a0a7a6eb2c815d93c17950a1048c5a32e6b334fa31b3d4b0f8314e352a9ddc8d4395
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
-EBUILD lttng-ust-2.10.1.ebuild 687 BLAKE2B e92c5051c63af6f75479fc703ea6167e96b034ab7e1557f637629496231f954e6fe3fbe0683fe6d46d63ff4d693b26a774dcaf6bc9aba2b47c604015882ccffe SHA512 852e72fc196dff6fa72b38a187c5de2c4c7d864e03cdef26d74aa44838cb165c6774150a713b26c0604f4541a15da38f03ca5d27ff2db572c86d916bc70f22d0
-EBUILD lttng-ust-2.6.5.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
+EBUILD lttng-ust-2.10.6.ebuild 687 BLAKE2B 9899e92ed7e601b134085ab745911b9c1db244c2cf1e9edfa01a74e49922e2bac175087a929f4affd077bece0f94f1b0dcfed422663d05fbc2ab2c710dc1615b SHA512 5e8ebc60c5a1602307dbbb3a881add54e2162f19f0c19b26c7bfff990d7de225fb2c96f37ed299c313a6a6d4316c79bb962b5731da296bfee8359f989af4100f
+EBUILD lttng-ust-2.11.0.ebuild 754 BLAKE2B fa1835f493f5c1b7536990eb325ab6f8066572961379eb0e92cd24ff7a50c9b0375de045b40ade9c23355f238c6f3f15eb2d41a48d171701a8f754fe47876841 SHA512 c3eac2ac01ef5886eea98ba5965980472940552c7144e82f29c80384965b1be5337581216ecf855a2ceccc1c8822ddfb0c1bebc8309ac011a472351432d9647c
 EBUILD lttng-ust-2.7.1.ebuild 631 BLAKE2B 3012f0943c2fa067ada1d93652b7bcefb4742c3a5f2407815827c0ae1648be4b78869d7d353fb5cd7db7676831df8804f56f5cfd5feb443fce8a5a99199bf6dd SHA512 c4c5260b4a5877d48c8bbfac051d7324e53866b46b6cab51d358e5ace976c1a972e929d7915331ca74be191f236f55330d5a0f0014c813d13fc08d945efcaa39
-EBUILD lttng-ust-2.7.4.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
 EBUILD lttng-ust-2.8.1.ebuild 659 BLAKE2B 1f7343faa9b7af2cb9971ec243c062d739ce07433d4c2b1761dda31d2b0af3f3a683bb5ca58f26aa5d31fe1ae586c5ba50f4d9ea05ab928d64a70198e72c39f2 SHA512 d9198a93561e7494c7685b76f974e537d1e08718149d58a77a3b160206fbee206d57db7159de99fc282f29748adf4cccf982845683037e68d8c5a692f2f9d3b0
-MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
+MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
diff --git a/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
index 07d839929318..ead5c2518d16 100644
--- a/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
index c20c8f8b88d4..ecc26c91c8ac 100644
--- a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools versionator
+inherit autotools
 
 MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
+MY_SLOT="$(ver_cut 1-2)"
 
 DESCRIPTION="Linux Trace Toolkit - UST library"
 HOMEPAGE="http://lttng.org"
@@ -14,17 +14,27 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="examples"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="examples numa"
 
-DEPEND="dev-libs/userspace-rcu:="
+DEPEND="
+	dev-libs/userspace-rcu:=
+	numa? ( sys-process/numactl )
+	"
 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
 }
+
+src_configure() {
+	econf \
+		$(use_enable numa) \
+		--docdir=/usr/share/doc/${PF}
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
deleted file mode 100644
index c20c8f8b88d4..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 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="http://lttng.org"
-SRC_URI="http://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
-}
diff --git a/dev-util/lttng-ust/metadata.xml b/dev-util/lttng-ust/metadata.xml
index 6c50e4708494..2b073ed00322 100644
--- a/dev-util/lttng-ust/metadata.xml
+++ b/dev-util/lttng-ust/metadata.xml
@@ -5,7 +5,9 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-
+	<use>
+		<flag name="numa">Enable numa support</flag>
+	</use>
 	<longdescription>
 		The userspace tracer is designed to provide detailed information about userspace activity. UST is a port of the LTTng kernel tracer to userspace. Like the LTTng kernel tracer, performance is the main goal. Tracing does not require system calls or traps. UST instrumentation points may be added in any userspace code including signal handlers and libraries.
 	</longdescription>