gentoo auto-resync : 23:08:2023 - 21:49:58

3 files changed, 7 insertions, 57 deletions

diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
index 59355f6403a6..02b69427cd87 100644
--- a/sys-apps/earlyoom/Manifest
+++ b/sys-apps/earlyoom/Manifest
@@ -1,12 +1,10 @@
 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.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a
 DIST earlyoom-1.6.2.tar.gz 49006 BLAKE2B 85a02d4171ba1bb94d5ddf573b8f5ac58d28a0cf9766f4fb2c96be5b45eee7aab853008c36f9e3aac76685b70008051faa2fe339797ecf9137469f089935a6b3 SHA512 d622a5347591d2017f6e62255940482af431e647acf1b35ab035e0dbfd44da7fc52633e6dd6433e42a1348fd294d766550ba092260f3ec59bd51e545f08e466b
 DIST earlyoom-1.7-deps.tar.xz 1974036 BLAKE2B ff378ae64b6b293e3b9d9fa05607209a515edadd18edcb70e204de1e0808b06dfaca7e6dcddeffbda9dae8abbadf7ac6074df725997b96be8a8d8cc35ac4d8c8 SHA512 67072000f8695935f77494faca84c74c67de4b9a4b3b889b310ad674f28c7ed85a0d59e91f4d5caa06cc1d7c1e7ef31aa3a373851361b905dc29e6d4d04eeeb9
 DIST earlyoom-1.7.tar.gz 52210 BLAKE2B c8338434160e4ccaa5ee64299487ca47a3d94e894362c320cf8210caf895a34c7abb584654afcdcb6fc1e058d53c1fa7eb740477acb104ed295700faccbcbdc1 SHA512 5732632c38d9b511aaa81845b3d8f8afe737aa6498dca7e31accaf18bfcf271ba436946aa06a514a34c953f99343f9b197d8a2b8751e16d336aeb084944f3602
-EBUILD earlyoom-1.3.ebuild 1034 BLAKE2B 15f8900849da3b45875bc7433fe3c2d3e10e952ea9eb3a3708015dd9726fd2b15bb31b6740a434180f971dd9f4affd72165a1f6a9a98ebeca4761ca0acc13818 SHA512 7a609318f326ffe0cab35904c0356dc2ccc3b7d5e0896aa47eb00a357fc6940e9f0531a5e9f8cbafa1d0224e5c325ebda3d1f9125722e9e6a466a656c80e96b6
 EBUILD earlyoom-1.6.2.ebuild 1053 BLAKE2B bc87237f4fcc919006f6f8107b45c6686ff14544c348fb5d78e7336515577065abca80414dc8a4256e7596f65f9555c216235a5ec49213ad83d6457c52e2d142 SHA512 730046e388e955610ab1f4e30fd604607c515d08dce649be63bb604ecfce294ed50904c701952a9a8bfe78f67ce8177a3e197407c2670b4cb9c0e67c6072da2d
-EBUILD earlyoom-1.7.ebuild 1245 BLAKE2B 35b096159f6a944c20e6f586716f772d81660f575223dc51f4af6c28ccf90c5aefd02877251c3e1ca39120794a5d227d3dc08a63b7bd6980e16f512ac7029ab9 SHA512 f30be55754ae2f70334edd82291abaf4d412a32306e7257a3c47149f3a64e70e9236e465edfe3ad71bd7b6f071d5f601122609f9b5e51991db08538257f6d315
+EBUILD earlyoom-1.7-r1.ebuild 1266 BLAKE2B 6a71ea4fc0682017e2c906acf84f7d35fdd71369c806246e7067aab7338193b75767bd3dca6976a7e540fff5c0cea0fe16bfb1d674e93358a8fe26b6a0dcbb9e SHA512 edcf6b7fe1116ecc7ec053d19bdc3e7d4d9cc52712a01becb2ab2debd0d5352b54d04279fda489bc49dc2454a287b274054d907e25114b6efc42a26d29cacbff
 EBUILD earlyoom-9999.ebuild 1245 BLAKE2B 35b096159f6a944c20e6f586716f772d81660f575223dc51f4af6c28ccf90c5aefd02877251c3e1ca39120794a5d227d3dc08a63b7bd6980e16f512ac7029ab9 SHA512 f30be55754ae2f70334edd82291abaf4d412a32306e7257a3c47149f3a64e70e9236e465edfe3ad71bd7b6f071d5f601122609f9b5e51991db08538257f6d315
 MISC metadata.xml 389 BLAKE2B 2a9867dcee589d823ca6800813b22abdfae0122f49a307147be75c7890d05f859b29b0dfcda33837a7e7ab04c6b0d5d2ff9b4c0afe8c8a575c10fba26a866f11 SHA512 0eaf58d4de7afb7892646c0b0567cb25527e6608393046e037b5e3609decda79c4729d4687dec381df054c2a724bef261235adeeaa7c9159f16dc3a0098f3aa0
diff --git a/sys-apps/earlyoom/earlyoom-1.3.ebuild b/sys-apps/earlyoom/earlyoom-1.3.ebuild
deleted file mode 100644
index f8d435b12a4b..000000000000
--- a/sys-apps/earlyoom/earlyoom-1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Early OOM Daemon for Linux"
-HOMEPAGE="https://github.com/rfjakob/earlyoom"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-IUSE="docs systemd test"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND="
-	docs? ( virtual/pandoc )
-	test? ( dev-lang/go )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-test-fixed.patch"
-	default
-}
-
-src_compile() {
-	VERSION="v${PV}" emake earlyoom
-	use docs && VERSION="v${PV}" emake earlyoom.1
-	use systemd && emake PREFIX=/usr earlyoom.service
-}
-
-src_install() {
-	dobin earlyoom
-	use docs && doman earlyoom.1
-
-	insinto /etc/default
-	newins earlyoom.default earlyoom
-
-	doinitd "${FILESDIR}/${PN}"
-	use systemd && systemd_dounit earlyoom.service
-}
diff --git a/sys-apps/earlyoom/earlyoom-1.7.ebuild b/sys-apps/earlyoom/earlyoom-1.7-r1.ebuild
index 42e4a6373240..d3cab7d87fe4 100644
--- a/sys-apps/earlyoom/earlyoom-1.7.ebuild
+++ b/sys-apps/earlyoom/earlyoom-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz )"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT-with-advertising"
@@ -26,7 +26,10 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	man? ( virtual/pandoc )
-	test? ( dev-lang/go )
+	test? (
+		dev-lang/go
+		dev-util/cppcheck
+	)
 "
 
 src_unpack() {