Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-admin/sysstat
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/sysstat')
-rw-r--r--app-admin/sysstat/Manifest7
-rw-r--r--app-admin/sysstat/files/sysstat-11.0.4-cron.patch38
-rw-r--r--app-admin/sysstat/files/sysstat-11.7.3-flags.patch11
-rw-r--r--app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch27
-rw-r--r--app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch18
-rw-r--r--app-admin/sysstat/metadata.xml9
-rw-r--r--app-admin/sysstat/sysstat-12.2.1.ebuild81
-rw-r--r--app-admin/sysstat/sysstat-12.2.2.ebuild81
-rw-r--r--app-admin/sysstat/sysstat-12.2.3.ebuild81
-rw-r--r--app-admin/sysstat/sysstat-12.4.0.ebuild83
-rw-r--r--app-admin/sysstat/sysstat-12.6.2-r1.ebuild (renamed from app-admin/sysstat/sysstat-12.5.3.ebuild)51
-rw-r--r--app-admin/sysstat/sysstat-12.6.2-r2.ebuild (renamed from app-admin/sysstat/sysstat-12.4.1.ebuild)53
12 files changed, 104 insertions, 436 deletions
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 8060f354e3b2..128a93c378bd 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,6 +1 @@
-DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 566382d83a0230517d22e2630a9cb1aa631d761c914188a4e7fb15eddaedbd25b8a3dffa9893b1b2bbcc31d87a37cbe11b2b50ab0ec94a28f84018685d1b35c8 SHA512 a19d0978eb11071c228462cda496a59721541e57a1d15cb2d0964f287ac2d50b5587fa5bc2b8fe6be2a1f00cbf2e7c3bc59db6494e3e8c1906aa81437b30d073
-DIST sysstat-12.2.2.tar.gz 1227793 BLAKE2B 7dcfe904aa60e9c61af516e718668a3f8fb9e4274c51a2c9d44b5e56dc6cf27ffb18d44641970f75abe1c1f8a2c5df8b7a7874da8745757f937ccc2ffbfa03d4 SHA512 82f4fb1e78a26275bdc6f6939dd2c75d7822e930992e74c1eaeda65c0e873d88e777a7f315c7b073aaacb6956281b2119448af2ca22ae6e7f1d20c370b01e3e4
-DIST sysstat-12.2.3.tar.gz 1227666 BLAKE2B e78cba586eb8e5f5a971f608ee0df39a20e3af9f02db1778c52bbb09eb4565e29ffb79d68ed00af0142ccbf1120b97825c638b323b53e0b210c96bf808db4aa1 SHA512 d837193b59840b1b1a87f927a4416ba4c688f3b470be00e9ab013b62b2f11e7b963ef4cf521bc42a0a041ea8923e176922ee5b6df56c0612b6646054b048f067
-DIST sysstat-12.4.0.tar.gz 1375207 BLAKE2B 66a9c15bb4e3b349158c9f7ab37d00c77844f0fd654df1b613141d906d3c89477e581d7143c77ba6952dd2cc7296f0611bc99aeec8e55e8090a488d5a286ee8b SHA512 156cb38bc4cedb68278d9054ce5b477cbdc84d2480ca302988c0fb5427b9f1f823f0939f2bc1c91fa7657b00b29d02d1f58aeafd342eef83b07d79c3f4141be4
-DIST sysstat-12.4.1.tar.gz 1377429 BLAKE2B 878d20575f5397adf10f64ad935b1c08709f6149f875975377c0a9f9b741f9bf352d0dd92ae31c0e7544c2e59e2058fab9ec5be95bfe9d070048661a7ba3bbfa SHA512 203e77095bddeb3797a65ed9e51cab90beaae7f579624c3f55d6903d45b9395d2134ea8e773a572710fd837fd26fb5437dccad63a913536b916f659207256d98
-DIST sysstat-12.5.3.tar.gz 1504415 BLAKE2B a3dc267182939190441b6cfebff938881fe4a06a8c7d1c406c014ddc28c0ecb33af5f480b77cce56bfcd4c7af81c4fec09eccb989561dd979f03a94ea6521f5b SHA512 3f09ff2e7ca38497eb07dcd8770c0b7fe5cfa1140537b215a1648446f65d933852b97dd5a1a9596afa57b04f20da64385e3b2e384be8d7b5902f228dc01230a5
+DIST sysstat-12.6.2.tar.gz 1455025 BLAKE2B aba2d8fd5fae8d6df740173d7ccd60beb0628c4c2205342f72ec03d6c48995d397de0d6f2cace24accf1a9274da37cf3bba86888717bc8d62d262ffd1c6f995e SHA512 376047de55598c6f671b999203809219a40206a9c58499399681af9ebe6048dd4da96c8ef5827d75cc369a7b69c3f1aadef1a5e8deec318a12b230d61f09fc08
diff --git a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
deleted file mode 100644
index 9d047ac6e9fe..000000000000
--- a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -368,25 +368,19 @@
- $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
- ifdef SYSTEMD_UNIT_DIR
- mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)
--else
-- if [ -d /etc/cron.d ]; then \
-- mkdir -p $(DESTDIR)/etc/cron.d; \
-- elif [ -d /etc/cron.hourly -a -d /etc/cron.daily ]; then \
-- mkdir -p $(DESTDIR)/etc/cron.hourly $(DESTDIR)/etc/cron.daily; \
-- fi
-- if [ -d $(INIT_DIR) ]; then \
-- mkdir -p $(DESTDIR)$(INIT_DIR); \
-- elif [ -d $(RC_DIR) ]; then \
-+endif
-+ifeq ($(INSTALL_CRON),y)
-+ mkdir -p $(DESTDIR)/etc/cron.d; \
-+ mkdir -p $(DESTDIR)$(INIT_DIR); \
-+ if [ -d $(RC_DIR) ]; then \
- mkdir -p $(DESTDIR)$(RC_DIR); \
- fi
- endif
-- if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \
-- if [ -d $(DESTDIR)/etc/cron.d ]; then \
-- $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
-- elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
-- $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
-- $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
-- fi \
-+ if [ -d $(DESTDIR)/etc/cron.d ]; then \
-+ $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
-+ elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
-+ $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
-+ $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
- fi
- ifeq ($(COPY_ONLY),n)
- if [ \( -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" \) -a ! -d $(DESTDIR)/etc/cron.d ]; then \
diff --git a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch b/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
deleted file mode 100644
index 9438a0fd8f74..000000000000
--- a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -71,7 +71,7 @@
- # Compiler flags
- CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
- DFLAGS = @DFLAGS@
--LFLAGS = @STRIP@
-+LFLAGS = $(LDFLAGS)
- DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
- DFLAGS += $(DFSENSORS)
-
diff --git a/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch
new file mode 100644
index 000000000000..413cdad8b015
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch
@@ -0,0 +1,27 @@
+From 954ff2e2673cef48f0ed44668c466eab041db387 Mon Sep 17 00:00:00 2001
+From: Pavel Kopylov <pkopylov@cloudlinux.com>
+Date: Wed, 17 May 2023 11:33:45 +0200
+Subject: [PATCH] Fix an overflow which is still possible for some values.
+
+---
+ common.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/common.c b/common.c
+index 48493b5f..12cd8d9f 100644
+--- a/common.c
++++ b/common.c
+@@ -431,8 +431,11 @@ int check_dir(char *dirname)
+ void check_overflow(unsigned int val1, unsigned int val2,
+ unsigned int val3)
+ {
+- if ((unsigned long long) val1 * (unsigned long long) val2 *
+- (unsigned long long) val3 > UINT_MAX) {
++ if ((val1 != 0) && (val2 != 0) && (val3 != 0) &&
++ (((unsigned long long)UINT_MAX / (unsigned long long)val1 <
++ (unsigned long long)val2) ||
++ ((unsigned long long)UINT_MAX / ((unsigned long long)val1 *
++ (unsigned long long)val2) < (unsigned long long)val3))) {
+ #ifdef DEBUG
+ fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n",
+ __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 *
diff --git a/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch
new file mode 100644
index 000000000000..854a66219ff9
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -94,10 +94,14 @@
+ endif
+
+ # Compiler flags
++ifndef CPPFLAGS
++CPPFLAGS = @CPPFLAGS@
++endif
++CPPFLAGS += @DEFS@
+ ifndef CFLAGS
+ CFLAGS = @CFLAGS@
+ endif
+-CFLAGS += -Wall -Wstrict-prototypes -pipe -O2
++CFLAGS += $(CPPFLAGS)
+
+ ifndef DFLAGS
+ DFLAGS = @DFLAGS@
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index 50a898b9e1ca..b1ea97d19a2d 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">sysstat/sysstat</remote-id>
+ </upstream>
<use>
<flag name="dcron">Adjust cronjobs to work properly under <pkg>sys-process/dcron</pkg></flag>
</use>
diff --git a/app-admin/sysstat/sysstat-12.2.1.ebuild b/app-admin/sysstat/sysstat-12.2.1.ebuild
deleted file mode 100644
index f08a567e3b49..000000000000
--- a/app-admin/sysstat/sysstat-12.2.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="debug nls lm-sensors selinux static"
-
-CDEPEND="
- nls? ( virtual/libintl )
- lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )
-"
-RDEPEND="
- ${CDEPEND}
- selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-11.0.4-cron.patch
- "${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
- if use nls; then
- strip-linguas -i nls/
- local lingua pofile
- for pofile in nls/*.po; do
- lingua=${pofile/nls\/}
- lingua=${lingua/.po}
- if ! has ${lingua} ${LINGUAS}; then
- rm "nls/${lingua}.po" || die
- fi
- done
- fi
-
- default
-}
-
-src_configure() {
- tc-export AR
- use static && append-ldflags -static
-
- sa_lib_dir=/usr/lib/sa \
- conf_dir=/etc \
- econf \
- $(use_enable lm-sensors sensors) \
- $(use_enable nls) \
- $(usex debug --enable-debuginfo '') \
- --enable-copy-only \
- --enable-documentation \
- --enable-install-cron \
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
- keepdir /var/log/sa
-
- emake \
- CHOWN=true \
- DESTDIR="${D}" \
- DOC_DIR=/usr/share/doc/${PF} \
- MANGRPARG='' \
- install
-
- dodoc -r contrib/
-
- newinitd "${FILESDIR}"/${PN}.init.d ${PN}
- systemd_dounit ${PN}.service
-
- rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/app-admin/sysstat/sysstat-12.2.2.ebuild b/app-admin/sysstat/sysstat-12.2.2.ebuild
deleted file mode 100644
index 70f1a5412854..000000000000
--- a/app-admin/sysstat/sysstat-12.2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug nls lm-sensors selinux static"
-
-CDEPEND="
- nls? ( virtual/libintl )
- lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )
-"
-RDEPEND="
- ${CDEPEND}
- selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-11.0.4-cron.patch
- "${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
- if use nls; then
- strip-linguas -i nls/
- local lingua pofile
- for pofile in nls/*.po; do
- lingua=${pofile/nls\/}
- lingua=${lingua/.po}
- if ! has ${lingua} ${LINGUAS}; then
- rm "nls/${lingua}.po" || die
- fi
- done
- fi
-
- default
-}
-
-src_configure() {
- tc-export AR
- use static && append-ldflags -static
-
- sa_lib_dir=/usr/lib/sa \
- conf_dir=/etc \
- econf \
- $(use_enable lm-sensors sensors) \
- $(use_enable nls) \
- $(usex debug --enable-debuginfo '') \
- --enable-copy-only \
- --enable-documentation \
- --enable-install-cron \
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
- keepdir /var/log/sa
-
- emake \
- CHOWN=true \
- DESTDIR="${D}" \
- DOC_DIR=/usr/share/doc/${PF} \
- MANGRPARG='' \
- install
-
- dodoc -r contrib/
-
- newinitd "${FILESDIR}"/${PN}.init.d ${PN}
- systemd_dounit ${PN}.service
-
- rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/app-admin/sysstat/sysstat-12.2.3.ebuild b/app-admin/sysstat/sysstat-12.2.3.ebuild
deleted file mode 100644
index 70f1a5412854..000000000000
--- a/app-admin/sysstat/sysstat-12.2.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug nls lm-sensors selinux static"
-
-CDEPEND="
- nls? ( virtual/libintl )
- lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )
-"
-RDEPEND="
- ${CDEPEND}
- selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-11.0.4-cron.patch
- "${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
- if use nls; then
- strip-linguas -i nls/
- local lingua pofile
- for pofile in nls/*.po; do
- lingua=${pofile/nls\/}
- lingua=${lingua/.po}
- if ! has ${lingua} ${LINGUAS}; then
- rm "nls/${lingua}.po" || die
- fi
- done
- fi
-
- default
-}
-
-src_configure() {
- tc-export AR
- use static && append-ldflags -static
-
- sa_lib_dir=/usr/lib/sa \
- conf_dir=/etc \
- econf \
- $(use_enable lm-sensors sensors) \
- $(use_enable nls) \
- $(usex debug --enable-debuginfo '') \
- --enable-copy-only \
- --enable-documentation \
- --enable-install-cron \
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
- keepdir /var/log/sa
-
- emake \
- CHOWN=true \
- DESTDIR="${D}" \
- DOC_DIR=/usr/share/doc/${PF} \
- MANGRPARG='' \
- install
-
- dodoc -r contrib/
-
- newinitd "${FILESDIR}"/${PN}.init.d ${PN}
- systemd_dounit ${PN}.service
-
- rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/app-admin/sysstat/sysstat-12.4.0.ebuild b/app-admin/sysstat/sysstat-12.4.0.ebuild
deleted file mode 100644
index c2688d2e957d..000000000000
--- a/app-admin/sysstat/sysstat-12.4.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug nls lm-sensors selinux static systemd"
-
-CDEPEND="
- nls? ( virtual/libintl )
- lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )
-"
-RDEPEND="
- ${CDEPEND}
- selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
- if use nls; then
- strip-linguas -i nls/
- local lingua pofile
- for pofile in nls/*.po; do
- lingua=${pofile/nls\/}
- lingua=${lingua/.po}
- if ! has ${lingua} ${LINGUAS}; then
- rm "nls/${lingua}.po" || die
- fi
- done
- fi
-
- default
-}
-
-src_configure() {
- tc-export AR
- use static && append-ldflags -static
-
- # --enable-compress-manpg <= Yes, that is inverted.
- sa_lib_dir=/usr/lib/sa \
- conf_dir=/etc \
- econf \
- $(use_enable !systemd use-crond) \
- $(use_enable lm-sensors sensors) \
- $(use_enable nls) \
- $(usex debug --enable-debuginfo '') \
- --enable-compress-manpg \
- --enable-copy-only \
- --enable-documentation \
- --enable-install-cron \
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
- keepdir /var/log/sa
-
- emake \
- CHOWN=true \
- DESTDIR="${D}" \
- DOC_DIR=/usr/share/doc/${PF} \
- MANGRPARG='' \
- install
-
- dodoc -r contrib/
-
- newinitd "${FILESDIR}"/${PN}.init.d ${PN}
- systemd_dounit ${PN}.service
-
- rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/app-admin/sysstat/sysstat-12.5.3.ebuild b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
index 655a3391632c..6fdcaea03441 100644
--- a/app-admin/sysstat/sysstat-12.5.3.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
@@ -1,55 +1,54 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
+EAPI=8
+
+inherit systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+HOMEPAGE="https://sysstat.github.io/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="dcron debug nls lm-sensors selinux static systemd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="dcron debug nls lm-sensors selinux systemd"
-CDEPEND="
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
nls? ( virtual/libintl )
lm-sensors? ( sys-apps/lm-sensors:= )
"
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )
-"
+
+DEPEND="${COMMON_DEPEND}"
+
RDEPEND="
- ${CDEPEND}
+ ${COMMON_DEPEND}
!dcron? ( !sys-process/dcron )
selinux? ( sec-policy/selinux-sysstat )
"
REQUIRED_USE="dcron? ( !systemd )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-12.6.2-check_overflow.patch
+)
+
src_prepare() {
- if use nls; then
- strip-linguas -i nls/
- local lingua pofile
- for pofile in nls/*.po; do
- lingua=${pofile/nls\/}
- lingua=${lingua/.po}
- if ! has ${lingua} ${LINGUAS}; then
- rm "nls/${lingua}.po" || die
- fi
- done
+ if use dcron; then
+ sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
fi
-
- use dcron && { sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die ; }
default
}
src_configure() {
tc-export AR
- use static && append-ldflags -static
+ # --enable-lto only appends -flto
sa_lib_dir=/usr/lib/sa \
conf_dir=/etc \
econf \
@@ -58,6 +57,8 @@ src_configure() {
$(use_enable nls) \
$(usex debug --enable-debuginfo '') \
--disable-compress-manpg \
+ --disable-stripping \
+ --disable-pcp \
--enable-copy-only \
--enable-documentation \
--enable-install-cron \
diff --git a/app-admin/sysstat/sysstat-12.4.1.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
index 82b41029b0a2..17f79510f663 100644
--- a/app-admin/sysstat/sysstat-12.4.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
@@ -1,58 +1,55 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
+EAPI=8
+
+inherit systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+HOMEPAGE="https://sysstat.github.io/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="dcron debug nls lm-sensors selinux static systemd"
+IUSE="dcron debug nls lm-sensors selinux systemd"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
-CDEPEND="
+COMMON_DEPEND="
nls? ( virtual/libintl )
lm-sensors? ( sys-apps/lm-sensors:= )
"
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )
-"
+
+DEPEND="${COMMON_DEPEND}"
+
RDEPEND="
- ${CDEPEND}
+ ${COMMON_DEPEND}
!dcron? ( !sys-process/dcron )
selinux? ( sec-policy/selinux-sysstat )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
REQUIRED_USE="dcron? ( !systemd )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-12.6.2-check_overflow.patch
+ "${FILESDIR}"/${PN}-12.6.2-defs_and_flags.patch
+)
+
src_prepare() {
- if use nls; then
- strip-linguas -i nls/
- local lingua pofile
- for pofile in nls/*.po; do
- lingua=${pofile/nls\/}
- lingua=${lingua/.po}
- if ! has ${lingua} ${LINGUAS}; then
- rm "nls/${lingua}.po" || die
- fi
- done
+ if use dcron; then
+ sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
fi
-
- use dcron && { sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die ; }
default
}
src_configure() {
tc-export AR
- use static && append-ldflags -static
+ # --enable-lto only appends -flto
sa_lib_dir=/usr/lib/sa \
conf_dir=/etc \
econf \
@@ -61,6 +58,8 @@ src_configure() {
$(use_enable nls) \
$(usex debug --enable-debuginfo '') \
--disable-compress-manpg \
+ --disable-stripping \
+ --disable-pcp \
--enable-copy-only \
--enable-documentation \
--enable-install-cron \