Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/
Date: Tue, 25 May 2021 21:11:29
Message-Id: 1621977067.5364b21ba4cfabef27909c6daf2f4ff362ecb932.gyakovlev@gentoo
1 commit: 5364b21ba4cfabef27909c6daf2f4ff362ecb932
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 25 21:10:54 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue May 25 21:11:07 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5364b21b
7
8 app-admin/sysstat: drop 12.2.1
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 app-admin/sysstat/Manifest | 1 -
13 app-admin/sysstat/files/sysstat-11.0.4-cron.patch | 38 ----------
14 app-admin/sysstat/files/sysstat-11.7.3-flags.patch | 11 ---
15 app-admin/sysstat/sysstat-12.2.1.ebuild | 81 ----------------------
16 4 files changed, 131 deletions(-)
17
18 diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
19 index 5c06d1f99be..ef94f3b20e1 100644
20 --- a/app-admin/sysstat/Manifest
21 +++ b/app-admin/sysstat/Manifest
22 @@ -1,2 +1 @@
23 -DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 566382d83a0230517d22e2630a9cb1aa631d761c914188a4e7fb15eddaedbd25b8a3dffa9893b1b2bbcc31d87a37cbe11b2b50ab0ec94a28f84018685d1b35c8 SHA512 a19d0978eb11071c228462cda496a59721541e57a1d15cb2d0964f287ac2d50b5587fa5bc2b8fe6be2a1f00cbf2e7c3bc59db6494e3e8c1906aa81437b30d073
24 DIST sysstat-12.5.3.tar.gz 1504415 BLAKE2B a3dc267182939190441b6cfebff938881fe4a06a8c7d1c406c014ddc28c0ecb33af5f480b77cce56bfcd4c7af81c4fec09eccb989561dd979f03a94ea6521f5b SHA512 3f09ff2e7ca38497eb07dcd8770c0b7fe5cfa1140537b215a1648446f65d933852b97dd5a1a9596afa57b04f20da64385e3b2e384be8d7b5902f228dc01230a5
25
26 diff --git a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
27 deleted file mode 100644
28 index 9d047ac6e9f..00000000000
29 --- a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
30 +++ /dev/null
31 @@ -1,38 +0,0 @@
32 ---- a/Makefile.in
33 -+++ b/Makefile.in
34 -@@ -368,25 +368,19 @@
35 - $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
36 - ifdef SYSTEMD_UNIT_DIR
37 - mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)
38 --else
39 -- if [ -d /etc/cron.d ]; then \
40 -- mkdir -p $(DESTDIR)/etc/cron.d; \
41 -- elif [ -d /etc/cron.hourly -a -d /etc/cron.daily ]; then \
42 -- mkdir -p $(DESTDIR)/etc/cron.hourly $(DESTDIR)/etc/cron.daily; \
43 -- fi
44 -- if [ -d $(INIT_DIR) ]; then \
45 -- mkdir -p $(DESTDIR)$(INIT_DIR); \
46 -- elif [ -d $(RC_DIR) ]; then \
47 -+endif
48 -+ifeq ($(INSTALL_CRON),y)
49 -+ mkdir -p $(DESTDIR)/etc/cron.d; \
50 -+ mkdir -p $(DESTDIR)$(INIT_DIR); \
51 -+ if [ -d $(RC_DIR) ]; then \
52 - mkdir -p $(DESTDIR)$(RC_DIR); \
53 - fi
54 - endif
55 -- if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \
56 -- if [ -d $(DESTDIR)/etc/cron.d ]; then \
57 -- $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
58 -- elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
59 -- $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
60 -- $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
61 -- fi \
62 -+ if [ -d $(DESTDIR)/etc/cron.d ]; then \
63 -+ $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
64 -+ elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
65 -+ $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
66 -+ $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
67 - fi
68 - ifeq ($(COPY_ONLY),n)
69 - if [ \( -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" \) -a ! -d $(DESTDIR)/etc/cron.d ]; then \
70
71 diff --git a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch b/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
72 deleted file mode 100644
73 index 9438a0fd8f7..00000000000
74 --- a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
75 +++ /dev/null
76 @@ -1,11 +0,0 @@
77 ---- a/Makefile.in
78 -+++ b/Makefile.in
79 -@@ -71,7 +71,7 @@
80 - # Compiler flags
81 - CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
82 - DFLAGS = @DFLAGS@
83 --LFLAGS = @STRIP@
84 -+LFLAGS = $(LDFLAGS)
85 - DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
86 - DFLAGS += $(DFSENSORS)
87 -
88
89 diff --git a/app-admin/sysstat/sysstat-12.2.1.ebuild b/app-admin/sysstat/sysstat-12.2.1.ebuild
90 deleted file mode 100644
91 index f08a567e3b4..00000000000
92 --- a/app-admin/sysstat/sysstat-12.2.1.ebuild
93 +++ /dev/null
94 @@ -1,81 +0,0 @@
95 -# Copyright 1999-2020 Gentoo Authors
96 -# Distributed under the terms of the GNU General Public License v2
97 -
98 -EAPI=7
99 -inherit eutils flag-o-matic systemd toolchain-funcs
100 -
101 -DESCRIPTION="System performance tools for Linux"
102 -HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
103 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
104 -
105 -LICENSE="GPL-2"
106 -SLOT="0"
107 -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
108 -IUSE="debug nls lm-sensors selinux static"
109 -
110 -CDEPEND="
111 - nls? ( virtual/libintl )
112 - lm-sensors? ( sys-apps/lm-sensors:= )
113 -"
114 -DEPEND="
115 - ${CDEPEND}
116 - nls? ( sys-devel/gettext )
117 -"
118 -RDEPEND="
119 - ${CDEPEND}
120 - selinux? ( sec-policy/selinux-sysstat )
121 -"
122 -PATCHES=(
123 - "${FILESDIR}"/${PN}-11.0.4-cron.patch
124 - "${FILESDIR}"/${PN}-11.7.3-flags.patch
125 -)
126 -
127 -src_prepare() {
128 - if use nls; then
129 - strip-linguas -i nls/
130 - local lingua pofile
131 - for pofile in nls/*.po; do
132 - lingua=${pofile/nls\/}
133 - lingua=${lingua/.po}
134 - if ! has ${lingua} ${LINGUAS}; then
135 - rm "nls/${lingua}.po" || die
136 - fi
137 - done
138 - fi
139 -
140 - default
141 -}
142 -
143 -src_configure() {
144 - tc-export AR
145 - use static && append-ldflags -static
146 -
147 - sa_lib_dir=/usr/lib/sa \
148 - conf_dir=/etc \
149 - econf \
150 - $(use_enable lm-sensors sensors) \
151 - $(use_enable nls) \
152 - $(usex debug --enable-debuginfo '') \
153 - --enable-copy-only \
154 - --enable-documentation \
155 - --enable-install-cron \
156 - --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
157 -}
158 -
159 -src_install() {
160 - keepdir /var/log/sa
161 -
162 - emake \
163 - CHOWN=true \
164 - DESTDIR="${D}" \
165 - DOC_DIR=/usr/share/doc/${PF} \
166 - MANGRPARG='' \
167 - install
168 -
169 - dodoc -r contrib/
170 -
171 - newinitd "${FILESDIR}"/${PN}.init.d ${PN}
172 - systemd_dounit ${PN}.service
173 -
174 - rm "${D}"/usr/share/doc/${PF}/COPYING || die
175 -}