commit: af6597c492871a88539c2b30fe910ec3e72a37c1 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun Jul 28 21:01:16 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun Jul 28 21:01:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6597c4
app-admin/sysstat: Old Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> app-admin/sysstat/Manifest | 2 - app-admin/sysstat/files/sysstat-10.0.4-flags.patch | 31 -------- app-admin/sysstat/metadata.xml | 7 +- app-admin/sysstat/sysstat-11.4.0.ebuild | 92 ---------------------- app-admin/sysstat/sysstat-12.0.4.ebuild | 85 -------------------- 5 files changed, 2 insertions(+), 215 deletions(-) diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest index 60a9dda7c16..9a4509a3dc5 100644 --- a/app-admin/sysstat/Manifest +++ b/app-admin/sysstat/Manifest @@ -1,5 +1,3 @@ -DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604 -DIST sysstat-12.0.4.tar.gz 711554 BLAKE2B b671e185d70787f5773d6824a9838ddd5d5f537c66ac37895f88b6bbddbb78b4d81efa6f962e3b812d025b361ce388583811d4f199e1ffcfe1ba0f2119b6eb88 SHA512 0a47e2b692ac3317cfd72784f21cc03970d7673727c579d403895df0377d09836a1dc76ee5d99076f2c9347f033059d000d982f33ef915130c3a89afdd6dad96 DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3 DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca22526a1363e04f8bce06a6cd300d4ebf7e02c8f9048fc25794974efa38117dacdf12831bee4bfd43fe40d0b34dbb6 SHA512 e60721408861045bcb1a52b170682df54631926bf4eef5a2709e25b1469c13377026bac3e51f5eeed11c7149b916c00bf5c06a2ff65d9c28063de1ae108b61c2 DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b diff --git a/app-admin/sysstat/files/sysstat-10.0.4-flags.patch b/app-admin/sysstat/files/sysstat-10.0.4-flags.patch deleted file mode 100644 index 402e7d604b1..00000000000 --- a/app-admin/sysstat/files/sysstat-10.0.4-flags.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -69,9 +69,8 @@ - SYSCONFIG_DIR = @SYSCONFIG_DIR@ - - # Compiler flags --CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2 -+CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes - DFLAGS = @DFLAGS@ --LFLAGS = @STRIP@ - DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\" - DFLAGS += $(DFSENSORS) - -@@ -154,7 +153,7 @@ - $(CC) -o $@ -c $(CFLAGS) $(DFLAGS) $< - - % : %.o -- $(CC) -o $@ $(CFLAGS) $^ $(LFLAGS) -+ $(CC) -o $@ $(CFLAGS) $(LFLAGS) $^ $(LIBS) - - all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales - -@@ -196,7 +195,7 @@ - - sadc.o: sadc.c sa.h version.h common.h ioconf.h sysconfig.h rd_stats.h rd_sensors.h - --sadc: LFLAGS += $(LFSENSORS) -+sadc: LIBS = $(LFSENSORS) - sadc: sadc.o act_sadc.o sa_wrap.o sa_common.o librdstats.a librdsensors.a libsyscom.a - - sar.o: sar.c sa.h version.h common.h ioconf.h pr_stats.h sysconfig.h diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml index b62be507057..a8fb4331294 100644 --- a/app-admin/sysstat/metadata.xml +++ b/app-admin/sysstat/metadata.xml @@ -2,10 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="person"> - <email>j...@gentoo.org</email> - <name>Jeroen Roovers</name> +<email>j...@gentoo.org</email> +<name>Jeroen Roovers</name> </maintainer> -<use> - <flag name="isag">Install isag, the Interactive System Activity Graph tool</flag> -</use> </pkgmetadata> diff --git a/app-admin/sysstat/sysstat-11.4.0.ebuild b/app-admin/sysstat/sysstat-11.4.0.ebuild deleted file mode 100644 index ed42ea423d3..00000000000 --- a/app-admin/sysstat/sysstat-11.4.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic multilib systemd toolchain-funcs - -DESCRIPTION="System performance tools for Linux" -HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"; -SRC_URI="${HOMEPAGE}${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" -IUSE="debug isag nls lm_sensors selinux static" - -CDEPEND=" - isag? ( - dev-lang/tk:0 - dev-vcs/rcs - sci-visualization/gnuplot - ) - nls? ( virtual/libintl ) - lm_sensors? ( sys-apps/lm_sensors:= ) -" -DEPEND=" - ${CDEPEND} - nls? ( sys-devel/gettext ) -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-sysstat ) -" - -SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d - -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 - epatch \ - "${FILESDIR}"/${PN}-10.0.4-flags.patch \ - "${FILESDIR}"/${PN}-11.0.4-cron.patch -} - -src_configure() { - tc-export AR - use static && append-ldflags -static - - sa_lib_dir=/usr/$(get_libdir)/sa \ - conf_dir=/etc \ - rcdir=${SYSSTAT_FAKE_RC_DIR} \ - econf \ - $(use_enable debug debuginfo) \ - $(use_enable isag install-isag) \ - $(use_enable lm_sensors sensors) \ - $(use_enable nls) \ - --enable-copy-only \ - --enable-documentation \ - --enable-install-cron \ - --with-systemdsystemunitdir=$(systemd_get_unitdir) -} - -src_compile() { - emake LFLAGS="${LDFLAGS}" -} - -src_install() { - keepdir /var/log/sa - - emake \ - CHOWN=true \ - DESTDIR="${D}" \ - DOC_DIR=/usr/share/doc/${PF} \ - MANGRPARG='' \ - install - - dodoc contrib/sargraph/sargraph - - rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die - newinitd "${FILESDIR}"/${PN}.init.d ${PN} - systemd_dounit ${PN}.service - - rm -f "${D}"usr/share/doc/${PF}/COPYING -} diff --git a/app-admin/sysstat/sysstat-12.0.4.ebuild b/app-admin/sysstat/sysstat-12.0.4.ebuild deleted file mode 100644 index b9ca3b9892b..00000000000 --- a/app-admin/sysstat/sysstat-12.0.4.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic multilib 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 -) - -SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d - -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/$(get_libdir)/sa \ - conf_dir=/etc \ - rcdir=${SYSSTAT_FAKE_RC_DIR} \ - econf \ - $(use_enable debug debuginfo) \ - $(use_enable lm_sensors sensors) \ - $(use_enable nls) \ - --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/ - - rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die - newinitd "${FILESDIR}"/${PN}.init.d ${PN} - systemd_dounit ${PN}.service - - rm -f "${D}"usr/share/doc/${PF}/COPYING -}
