6 files changed, 66 insertions, 39 deletions
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
index a4a54c346ec9..09487a44a762 100644
--- a/app-admin/cpulimit/Manifest
+++ b/app-admin/cpulimit/Manifest
@@ -1 +1 @@
-DIST cpulimit-2.4.tar.gz 24669 BLAKE2B e0fe0d6766e76e6e2a68dcdc553039400233daabbb14ce4a9dae46a7b694d2ecd660f4c1d13f417a74b12365c719780c732a03bd91c6384d1e7118d0fce521fb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0
+DIST cpulimit-2.8.tar.gz 24860 BLAKE2B 6d4002d2cbc46da9ce102da77b701e6a99c2e7d16e2e7989baa1e07ef335b126a8c717c4779d121aee1e580ebf057a16b4f83c1bc6a29c904a7532debc4c490a SHA512 aeb121739a5dc9f94c6ddb0905ed05eb7d146c9d0e71c34ba46aad798bda2c30b7ccc548338b4c468f9885f09d97a4565c00199c8df6af74dc9b6f23940c540e
diff --git a/app-admin/cpulimit/cpulimit-2.4.ebuild b/app-admin/cpulimit/cpulimit-2.4.ebuild
deleted file mode 100644
index 984249c13da9..000000000000
--- a/app-admin/cpulimit/cpulimit-2.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Limits the CPU usage of a process"
-HOMEPAGE="http://cpulimit.sourceforge.net"
-SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-	# set correct VERSION
-	#sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c \
-	#	|| die 'sed on VERSION string failed'
-
-	default
-}
-
-src_install() {
-	local DOCS=( CHANGELOG README )
-	dosbin ${PN}
-	doman ${PN}.1
-	einstalldocs
-}
diff --git a/app-admin/cpulimit/cpulimit-2.8.ebuild b/app-admin/cpulimit/cpulimit-2.8.ebuild
new file mode 100644
index 000000000000..1229deee0b00
--- /dev/null
+++ b/app-admin/cpulimit/cpulimit-2.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Limits the CPU usage of a process"
+HOMEPAGE="https://cpulimit.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/limitcpu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~riscv x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-inline-func.patch"	# Bug #686528
+)
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc CHANGELOG README
+}
diff --git a/app-admin/cpulimit/files/cpulimit-2.8-inline-func.patch b/app-admin/cpulimit/files/cpulimit-2.8-inline-func.patch
new file mode 100644
index 000000000000..12b516223a01
--- /dev/null
+++ b/app-admin/cpulimit/files/cpulimit-2.8-inline-func.patch
@@ -0,0 +1,11 @@
+--- a/cpulimit.c	2023-02-06 19:07:19.450894524 +0300
++++ b/cpulimit.c	2023-02-06 19:07:28.834337797 +0300
+@@ -125,7 +125,7 @@
+ 
+ 
+ //return ta-tb in microseconds (no overflow checks!)
+-inline long timediff(const struct timespec *ta,const struct timespec *tb) {
++static long timediff(const struct timespec *ta,const struct timespec *tb) {
+     unsigned long us = (ta->tv_sec-tb->tv_sec)*1000000 + (ta->tv_nsec/1000 - tb->tv_nsec/1000);
+     return us;
+ }
diff --git a/app-admin/cpulimit/files/cpulimit-2.8-makefile.patch b/app-admin/cpulimit/files/cpulimit-2.8-makefile.patch
new file mode 100644
index 000000000000..7daf8a7092ab
--- /dev/null
+++ b/app-admin/cpulimit/files/cpulimit-2.8-makefile.patch
@@ -0,0 +1,25 @@
+--- a/Makefile	2023-02-06 18:47:21.311693323 +0300
++++ b/Makefile	2023-02-06 18:48:23.392517904 +0300
+@@ -2,6 +2,7 @@
+ PREFIX?=/usr
+ CFLAGS?=-Wall -O2
+ CC?=clang
++DESTDIR=
+ 
+ all: cpulimit
+ 
+@@ -21,10 +22,10 @@
+ 	$(MAKE) -C test
+ 
+ install: cpulimit
+-	mkdir -p ${PREFIX}/bin
+-	mkdir -p ${PREFIX}/share/man/man1
+-	cp cpulimit ${PREFIX}/bin
+-	cp cpulimit.1 ${PREFIX}/share/man/man1
++	mkdir -p ${DESTDIR}/${PREFIX}/bin
++	mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
++	cp cpulimit ${DESTDIR}/${PREFIX}/bin
++	cp cpulimit.1 ${DESTDIR}/${PREFIX}/share/man/man1
+ 
+ deinstall:
+ 	rm -f ${PREFIX}/bin/cpulimit
diff --git a/app-admin/cpulimit/metadata.xml b/app-admin/cpulimit/metadata.xml
index 2f011b11fe67..301d5fbb3d91 100644
--- a/app-admin/cpulimit/metadata.xml
+++ b/app-admin/cpulimit/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">limitcpu</remote-id>
 	</upstream>