gentoo auto-resync : 25:08:2023 - 03:53:16

7 files changed, 4 insertions, 46 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0a2572a96ee4..f653e61d2a37 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
index 02b69427cd87..c49ff9d67e23 100644
--- a/sys-apps/earlyoom/Manifest
+++ b/sys-apps/earlyoom/Manifest
@@ -1,5 +1,3 @@
-AUX earlyoom 122 BLAKE2B 1e3e121135740b4f56f6929d1389cce42374db03713e7c5c6281a422f0f6ba02db3f04f8d9a72f19c8853795b4debcdf2ccffcdd4f095f425b620e931d51a8c4 SHA512 7dfd1c8aff690d2ed7137b250deac4135c48ca5fd04390468b3ea1569df81316f009e5c70175734c9f8dd21e46a13015905d3daaffe76d67eef936cda670e305
-AUX earlyoom-1.3-test-fixed.patch 1425 BLAKE2B 47231739b8bbb5a4a290266b85900dc18e8ef72d3dba8c20c8d617b06cc30c95d4c913e07e0e9a9e6fc6f095591538b8b37d7c72e7ac90f9b49f6a4706051280 SHA512 e906c6c4f7d835fb43f09d3c701a1d78b8c2d1e9642d1b7512a2e90094fe41b8f9a811da94af38f5442a976351d6cfd35557ef40a685466ea6ba80dcef5293a1
 AUX earlyoom-r1 138 BLAKE2B a95a6db627133ed3d9e4fa02505a1fb8abfc17c345a16df9956d7842c5cb9b7cefd1c68b82d7cc42ad101dcf65c06ac526e0e1241989d4aed0fc87b62d8e7bc9 SHA512 f7223b7ad2780ae121ef91d19b177d6fda50eb8d4f3995ac47b34f843448917a5a5290b8e657a9d7ed7fb8a958b362172d8a6453c5d5e43ff8c78cc25456d6f8
 DIST earlyoom-1.6.2.tar.gz 49006 BLAKE2B 85a02d4171ba1bb94d5ddf573b8f5ac58d28a0cf9766f4fb2c96be5b45eee7aab853008c36f9e3aac76685b70008051faa2fe339797ecf9137469f089935a6b3 SHA512 d622a5347591d2017f6e62255940482af431e647acf1b35ab035e0dbfd44da7fc52633e6dd6433e42a1348fd294d766550ba092260f3ec59bd51e545f08e466b
 DIST earlyoom-1.7-deps.tar.xz 1974036 BLAKE2B ff378ae64b6b293e3b9d9fa05607209a515edadd18edcb70e204de1e0808b06dfaca7e6dcddeffbda9dae8abbadf7ac6074df725997b96be8a8d8cc35ac4d8c8 SHA512 67072000f8695935f77494faca84c74c67de4b9a4b3b889b310ad674f28c7ed85a0d59e91f4d5caa06cc1d7c1e7ef31aa3a373851361b905dc29e6d4d04eeeb9
diff --git a/sys-apps/earlyoom/files/earlyoom b/sys-apps/earlyoom/files/earlyoom
deleted file mode 100644
index 374c0d1af231..000000000000
--- a/sys-apps/earlyoom/files/earlyoom
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/sbin/openrc-run
-name=earlyoom
-command=/usr/bin/earlyoom
-command_args=-k
-command_background=1
-pidfile=/run/earlyoom.pid
diff --git a/sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch b/sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch
deleted file mode 100644
index 8c6fc3ab6df5..000000000000
--- a/sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3648b351e88331f3f2e46af4ae0ddd19e27bc7c2 Mon Sep 17 00:00:00 2001
-From: Jakob Unterwurzacher <jakobunt@gmail.com>
-Date: Mon, 8 Jul 2019 21:07:04 +0200
-Subject: [PATCH] tests: fix TestCli failure when all processes have badness 0
-
-On a machine with a lot of RAM and no big processes running,
-all processes may have badness 0, and we will get
-
-	^ new victim (higher vm_rss)
-
-in the debug output, but not
-
-	^ new victim (higher badness)
-
-. This is not a failure.
-
-Fixes https://github.com/rfjakob/earlyoom/issues/137
----
- tests/cli_test.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/cli_test.go b/tests/cli_test.go
-index 7085290..ef4abee 100644
---- a/tests/cli_test.go
-+++ b/tests/cli_test.go
-@@ -72,7 +72,7 @@ func TestCli(t *testing.T) {
- 		{args: nil, code: -1, stderrContains: startupMsg, stdoutContains: memReport},
- 		{args: []string{"-p"}, code: -1, stdoutContains: memReport},
- 		{args: []string{"-v"}, code: 0, stderrContains: "earlyoom v", stdoutEmpty: true},
--		{args: []string{"-d"}, code: -1, stdoutContains: "^ new victim (higher badness)"},
-+		{args: []string{"-d"}, code: -1, stdoutContains: "^ new victim"},
- 		{args: []string{"-m", "1"}, code: -1, stderrContains: " 1 %", stdoutContains: memReport},
- 		{args: []string{"-m", "0"}, code: 15, stderrContains: "fatal", stdoutEmpty: true},
- 		{args: []string{"-m", "-10"}, code: 15, stderrContains: "fatal", stdoutEmpty: true},
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 927db19cc7b6..c349ead3a52c 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-functions-0.19.tar.bz2 12079 BLAKE2B be0a3a54d4dee1755866047b670a69cd6fec368239123c3f0c08180b79a33c20147bca0e35e568faef6877513551e731bdf0c181aeb0460f6574d2d708219373 SHA512 2674d3fe5724cc6d685ae58bf0ee33f4a1bdba2c5e5809cfb193fd0a710d4678c2d9392c2c62d2321cf455f524950266dc1629ab684fe46632d179e539d5a39e
-EBUILD gentoo-functions-0.19.ebuild 891 BLAKE2B c808e1a082b6159fc6d40a66fd0693ce13d0d498f9eca4c46f7882dc570af142387e0e7dce23e4bf8481dc47e5e943028f38c1440114b518746c7eba29bcd962 SHA512 0e362644e8a582e109b2ab198f76d6e1783f3a305be9e4a39cf9771810e6076cb86c646376189fc67a01103dc176605effa33d21e36b49aaaeb981d70146338f
-EBUILD gentoo-functions-9999.ebuild 1011 BLAKE2B cf8c057f158e46b8c3eca48663d82ae42dcb4ebdd213e7f37bbddfe908dc7bbc0b209fa25831d485f15914fadf943468b2d605a564644b2acbde1d5987ced1d6 SHA512 a69705a6b57437e5e29b244c7d43e58c186a85053fe7b809e2758064df7518bbe056aa78fa2e1113413713552787e93aecd527f53c87682f4d2c9e28ec02643e
+EBUILD gentoo-functions-0.19.ebuild 877 BLAKE2B 457e5c405c05e9e928c4f8e9e764fe07b7ace335750bebb01d7226e9b7b1f7ceac0fcb49148087439c8a6b42c034aa1f7590b4203e9d42f06031f2b3acee58d4 SHA512 c846b3451c764b64ec601e9d579542a47d68775e94eac97b8680a08891076226279f0611a19a72ba1b75b0cb35941b22ff3c734831e6c8665c2ca5b65cd1f5b4
+EBUILD gentoo-functions-9999.ebuild 1025 BLAKE2B fdfa38a3fa0dbd7bceff4f1a211924f5efa890b6f4ee75e1a46d182a508eb89e153994a6d2805147f1c8cf0556460927479e598cb053ff716b6c81a45f1fca53 SHA512 31dd91c713f4172825d28c2d018baaf46b7e0e408cd2c0f1f9cfafaba6932d1a8ea80e9a9b9402b7d483295524a384de2320adae70ed63820e3334acfab1bc7b
 MISC metadata.xml 416 BLAKE2B 08b6d649521646ff28c4738fbc3b9a292740bceb2430dab5ee4391bded078bd0c05dff69a28f722a1c23bbbb86af546935a055f93720ea759b141902f367394a SHA512 88409b09c14a2eb4859166e88f4a59ffc2e84e18a246b942f50ebd58bf83f0e6710f0405f08d102853cbd94562140a267cb60db29b4170893b7c3b3e24ec1ae3
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild
index 51827ac19e65..39769eaa9170 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild
@@ -16,7 +16,7 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Base functions required by all Gentoo systems"
 HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
 
-LICENSE="GPL-2 public-domain"
+LICENSE="GPL-2"
 SLOT="0"
 
 # Specifically needs GNU find, as well.
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index b43489741598..54a24d65f0a1 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -16,7 +16,7 @@ inherit meson
 DESCRIPTION="Base functions required by all Gentoo systems"
 HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 public-domain"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"