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/Manifest6
-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.xml16
-rw-r--r--app-admin/sysstat/sysstat-12.2.2.ebuild81
-rw-r--r--app-admin/sysstat/sysstat-12.3.2.ebuild81
-rw-r--r--app-admin/sysstat/sysstat-12.3.3.ebuild81
-rw-r--r--app-admin/sysstat/sysstat-12.6.2-r1.ebuild (renamed from app-admin/sysstat/sysstat-12.2.1.ebuild)59
-rw-r--r--app-admin/sysstat/sysstat-12.6.2-r2.ebuild (renamed from app-admin/sysstat/sysstat-12.3.1.ebuild)54
-rw-r--r--app-admin/sysstat/sysstat-999999.ebuild81
12 files changed, 119 insertions, 434 deletions
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 1841aaf6854d..128a93c378bd 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,5 +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.3.1.tar.gz 1245248 BLAKE2B 69848c452642be992c7b4af33268c0d6b30f16e5ea44ec13b00ab57e6ec3b498d92b707a53757de9066138a9ee92b995765f44f75f692e1b3c68d829519d53ca SHA512 f67a2dac22748217687bd7f58521c0719754f13298fb5faed8a6d58c2bb1f8620428191d0415e816eea07bb3ca81453e057d03c7db0096430ad7d6ba6b7b611e
-DIST sysstat-12.3.2.tar.gz 1335057 BLAKE2B e075d0def13cd786dd0c3c49d0770cfe3e946a6b6f500e4364bc30d79fdec08ee8b4c4a2ef3b0188da3435f5921e0b27c8dbd8845a6c6116cba88f8684992674 SHA512 e78feb082a6ccd634f1f1565769b56a6b7aee95853334e73395489445f6f0d96d2b5bdfeacec16f4530be8383ebc3b6b126e7df93abc3e67c409b3791d02e275
-DIST sysstat-12.3.3.tar.gz 1365214 BLAKE2B bd7969bbade8e4d00fd1c918ee59222d136908d932caabdc042b0ff09fcf9b4462aece256969736b68b0bd0f0138692c1af446000cbe1d0e2d294105b7da7658 SHA512 9bebb36c6bc8d8a105921b43cf458cd4691d2dd29d9534b9bf9b00e2d1dd907e99c4aefb928da75b31c057784be59d0c6fb4420ad8c97b3c2600f5493094ca9a
+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 a8fb43312942..b1ea97d19a2d 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -1,8 +1,14 @@
<?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>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+ <maintainer type="person">
+ <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>
</pkgmetadata>
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.3.2.ebuild b/app-admin/sysstat/sysstat-12.3.2.ebuild
deleted file mode 100644
index 70f1a5412854..000000000000
--- a/app-admin/sysstat/sysstat-12.3.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.3.3.ebuild b/app-admin/sysstat/sysstat-12.3.3.ebuild
deleted file mode 100644
index 70f1a5412854..000000000000
--- a/app-admin/sysstat/sysstat-12.3.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.2.1.ebuild b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
index 5237cc5a4064..6fdcaea03441 100644
--- a/app-admin/sysstat/sysstat-12.2.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
@@ -1,67 +1,74 @@
-# 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="debug nls lm-sensors selinux static"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+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 )
"
+
+REQUIRED_USE="dcron? ( !systemd )"
+
PATCHES=(
- "${FILESDIR}"/${PN}-11.0.4-cron.patch
- "${FILESDIR}"/${PN}-11.7.3-flags.patch
+ "${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
-
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 \
+ $(use_enable !systemd use-crond) \
$(use_enable lm-sensors sensors) \
$(use_enable nls) \
$(usex debug --enable-debuginfo '') \
+ --disable-compress-manpg \
+ --disable-stripping \
+ --disable-pcp \
--enable-copy-only \
--enable-documentation \
--enable-install-cron \
--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
}
+src_compile() {
+ LFLAGS="${LDFLAGS}" default
+}
+
src_install() {
keepdir /var/log/sa
diff --git a/app-admin/sysstat/sysstat-12.3.1.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
index 70f1a5412854..17f79510f663 100644
--- a/app-admin/sysstat/sysstat-12.3.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
@@ -1,61 +1,65 @@
-# 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="debug nls lm-sensors selinux static"
+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 )
"
+
+REQUIRED_USE="dcron? ( !systemd )"
+
PATCHES=(
- "${FILESDIR}"/${PN}-11.0.4-cron.patch
- "${FILESDIR}"/${PN}-11.7.3-flags.patch
+ "${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
-
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 \
+ $(use_enable !systemd use-crond) \
$(use_enable lm-sensors sensors) \
$(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-999999.ebuild b/app-admin/sysstat/sysstat-999999.ebuild
deleted file mode 100644
index c59bf0c9f963..000000000000
--- a/app-admin/sysstat/sysstat-999999.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 git-r3 systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-EGIT_REPO_URI="https://github.com/sysstat/sysstat"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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
-}