gentoo Easter resync : 12.04.2020

4 files changed, 83 insertions, 0 deletions

diff --git a/dev-python/cgroup-utils/Manifest b/dev-python/cgroup-utils/Manifest
index 773f7a49c5f9..db9882815e54 100644
--- a/dev-python/cgroup-utils/Manifest
+++ b/dev-python/cgroup-utils/Manifest
@@ -1,3 +1,7 @@
+AUX cgroup-utils-0.8-tests-builddir.patch 644 BLAKE2B f2ff44542b2883f33aebb43bea4178cc8bfb55c4544f456fb657e901c00847ea0f53cb140c4acaa0b6cec1d8f0bfed993fb842c1d9bb7d08ab9459e2187fd31b SHA512 930c1513b79fd1bf81085bbfbb0bd1031fa61bf7e5cd227347f8976b930c441585c91003ff9345d43cd1fe7a7b8ba0d12b07536a7127fe0d9790ebfea7cbc7e3
+AUX cgroup-utils-0.8-tests-mountpoint.patch 713 BLAKE2B 1f92579b823ad8f0fd26df19226017d5c81a781e4eb368bcb7efcf1cc7aa0930e150f26d237fb3134e583079f8db42642ae366f3e4d9630d90c137f395bc20e9 SHA512 477c8a48bb82a1470ed5afe8b6d48963247ef6b7617e1b316547372fe785661fbd59dfb713d9e1dc88bd55a3e9b8b2593b92eb2ccc3dfbebda83649cb611b9c3
 DIST cgroup-utils-0.6.tar.gz 33845 BLAKE2B 1e7688f9dc32cc976acbd0a89e561b6f5537972c286765370cd2d9e090ca95cc122442d82e617b6d7132d35459b7ddd3413060945651593ba7498da22af26ae6 SHA512 5751ad7979812117cd75fc74282fb24f3ee041cc08eaac986544a5f12b7e83c806f0d1bb4c92c32314c5c8af4995dc4f36e023037ed7617907c8f42f97dbf6b5
+DIST cgroup-utils-0.8.tar.gz 35260 BLAKE2B 11187a917d5159699eb46fb67f5057eb16317f86c32e6471d8543955e1d40107663517395226ae75e3b0739fb59c7521590a3d04a5d818b151970cbea559dee7 SHA512 fcc31fb6d2bdfa761c248553d056ea1bdcf697ae9ab8ccdc895feefdec7bc4e560bf2352968866b3064548545d98527d2a4092d4c8d2f335ef76e3c4b721bcf0
 EBUILD cgroup-utils-0.6.ebuild 467 BLAKE2B e7603493ef261bc0fe94c2d3e4f6fa44851cb53515be0b233c4cefe2c4246b5349c00584ab8dbf76efacdf360286c3bdc85ec8699250e7fad0fe723d60894aae SHA512 44d23e7dc316a48df2ff90f23f50709e6c12e17243dd881540bab8b9e739564027bf4122ec853f0b7450a00e4ce3c71b7fdbc324871cbce82072631a0d15d5a9
+EBUILD cgroup-utils-0.8.ebuild 644 BLAKE2B 5f623dfe7253bcdbcb96325172ae5cf97bcfe8f25b3e1bfae2f3edb7686a806e2bf120864233aec7f461d209180a0ccf44f28d287c5bf5e72d05798d33ceaadd SHA512 b68b403f2db8bd5f01b91e2eb98c57374e27a35e26c08c308e97c15e73d329d1c4b2ede634070a969a9073196808e80c049c49326f7c39d12ac0b2b579f22719
 MISC metadata.xml 451 BLAKE2B 062e0315750415c2f65864206c4a9fb474131476a22f13248bf052f89fe275cb8d2deb3701b13944876490610fb15d6772749e04fa853475ea86eb0a775a48c9 SHA512 79e6b6e146a3cb3ad322dffe5a299ed92c800988b943d9fb2080ba2c0572d5adf376948f7f88c529b7d98db3952e295fb2528f235025c841f0df7ed7d01e4484
diff --git a/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild b/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
new file mode 100644
index 000000000000..f2de2609d505
--- /dev/null
+++ b/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools and libraries for control groups of Linux"
+HOMEPAGE="https://github.com/peo3/cgroup-utils"
+SRC_URI="https://github.com/peo3/cgroup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8-tests-builddir.patch
+
+	# Upstream: https://github.com/peo3/cgroup-utils/pull/12
+	"${FILESDIR}"/${PN}-0.8-tests-mountpoint.patch
+)
+
+python_test() {
+	sh ./test_all.sh || die
+}
diff --git a/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-builddir.patch b/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-builddir.patch
new file mode 100644
index 000000000000..2ec6c4f4fbb0
--- /dev/null
+++ b/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-builddir.patch
@@ -0,0 +1,25 @@
+From cf44c226f26a3d753402d36c66fcb8f81b4748f5 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 27 Mar 2020 15:35:46 +0100
+Subject: [PATCH] Make tests find the build
+
+---
+ test_all.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test_all.sh b/test_all.sh
+index d158f76..4fbbf2e 100644
+--- a/test_all.sh
++++ b/test_all.sh
+@@ -85,7 +85,7 @@ test_support()
+     fi
+ }
+ 
+-buildpath=$(find ./build/lib.linux* -maxdepth 0 -type d)
++buildpath="${BUILD_DIR}"/lib  # passed by distutils-r1 eclass
+ export PYTHONPATH=$buildpath:.
+ 
+ echo "## Testing each commands for each subsystems"
+-- 
+2.24.1
+
diff --git a/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-mountpoint.patch b/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-mountpoint.patch
new file mode 100644
index 000000000000..bff7b04868d3
--- /dev/null
+++ b/dev-python/cgroup-utils/files/cgroup-utils-0.8-tests-mountpoint.patch
@@ -0,0 +1,25 @@
+From 0697af646a8235f80856c472e623117719c7186e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 27 Mar 2020 15:48:25 +0100
+Subject: [PATCH] test_all.sh: Fix detection of memory cgroup mountpoint
+
+---
+ test_all.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test_all.sh b/test_all.sh
+index d158f76..4d10e19 100644
+--- a/test_all.sh
++++ b/test_all.sh
+@@ -97,7 +97,7 @@ done
+ 
+ test_run bin/cgutil top -b -n 1
+ 
+-root=$(awk '/^cgroup.*memory/ {print $2;}' /proc/mounts)
++root=$(awk '/^(cgroup.*)?memory/ {print $2;}' /proc/mounts)
+ path=$root/memory.usage_in_bytes
+ test_run_event bin/cgutil event -t 0.1 $path +1M
+ path=$root/memory.oom_control
+-- 
+2.24.1
+