diff options
| -rw-r--r-- | app-admin/sysstat/ChangeLog | 11 | ||||
| -rw-r--r-- | app-admin/sysstat/Manifest | 24 | ||||
| -rw-r--r-- | app-admin/sysstat/files/crontab | 16 | ||||
| -rw-r--r-- | app-admin/sysstat/files/digest-sysstat-5.0.4 | 1 | ||||
| -rw-r--r-- | app-admin/sysstat/files/digest-sysstat-5.0.5-r2 (renamed from app-admin/sysstat/files/digest-sysstat-5.0.5-r1) | 0 | ||||
| -rw-r--r-- | app-admin/sysstat/files/digest-sysstat-6.0.0 | 1 | ||||
| -rw-r--r-- | app-admin/sysstat/metadata.xml | 9 | ||||
| -rw-r--r-- | app-admin/sysstat/sysstat-5.0.4.ebuild | 41 | ||||
| -rw-r--r-- | app-admin/sysstat/sysstat-5.0.5-r2.ebuild (renamed from app-admin/sysstat/sysstat-5.0.5-r1.ebuild) | 28 | ||||
| -rw-r--r-- | app-admin/sysstat/sysstat-6.0.0.ebuild | 47 | ||||
| -rw-r--r-- | app-admin/sysstat/sysstat-6.0.1.ebuild | 6 |
11 files changed, 59 insertions, 125 deletions
diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog index 95db64380a87..8fc2890e5717 100644 --- a/app-admin/sysstat/ChangeLog +++ b/app-admin/sysstat/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-admin/sysstat # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.38 2005/08/05 12:57:44 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.39 2005/08/25 05:50:30 ka0ttic Exp $ + +*sysstat-5.0.5-r2 (25 Aug 2005) + + 25 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> +files/crontab, + +metadata.xml, -sysstat-5.0.4.ebuild, -sysstat-5.0.5-r1.ebuild, + +sysstat-5.0.5-r2.ebuild, -sysstat-6.0.0.ebuild, sysstat-6.0.1.ebuild: + Revision bump; provide our own crontab that's not broken; make sure + SA_LIB_DIR gets passed to make otherwise sa{1,2,dc} will be installed to + /usr/local/lib. Keeping keywords. Tidy old ebuilds. 05 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> sysstat-5.0.5-r1.ebuild, sysstat-6.0.0.ebuild, sysstat-6.0.1.ebuild: diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest index 6e8a9b7c8285..629de9d22d61 100644 --- a/app-admin/sysstat/Manifest +++ b/app-admin/sysstat/Manifest @@ -1,23 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 a5e6fc5b53b896faeab070b389a14532 sysstat-5.0.4.ebuild 961 -MD5 5412f863b00047a13c6e0853febb7ea9 sysstat-5.0.5-r1.ebuild 1137 -MD5 ae68a8a2ba614b0a0f3e5e3909cbb9c6 sysstat-6.0.1.ebuild 1290 -MD5 aed02d84ae9a667c0f878ba4182c489f sysstat-6.0.0.ebuild 1188 +MD5 13fbbbca1077538fd85109c574ac1d49 sysstat-6.0.1.ebuild 1174 MD5 675ff477bc1593491723b612471e4e54 sysstat-5.0.2.ebuild 961 -MD5 b1e4ad6099b53b2b6cc0fbba7bb7f265 ChangeLog 4815 +MD5 129dd42817057d0ac7562edb1af22620 ChangeLog 5252 +MD5 bcf3c9d058881b44080409217f96a8ba sysstat-5.0.5-r2.ebuild 1179 +MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254 +MD5 a899283ed4a4cc5a67bc138e2590144a files/crontab 519 MD5 fb5bff216a55ef8704f4946af00ed172 files/digest-sysstat-5.0.2 65 -MD5 53d6bd1111ffa77e7b53d51b96b5d812 files/digest-sysstat-5.0.4 65 -MD5 524d1ab101c324db0a21cff67ded4fa3 files/digest-sysstat-6.0.0 65 MD5 73ba0e07b9338cd0d56ee3ebabd1ec79 files/digest-sysstat-6.0.1 65 MD5 4eac2aae2f83cb52393c58896d9a5151 files/sysstat-6.0.1-gcc4.diff 5918 MD5 ddf73fe10757e3b706c377f8fad79245 files/sysstat-6.0.0-gcc4.diff 6647 -MD5 d63e5ccba8489c1875bb404a477ed9f0 files/digest-sysstat-5.0.5-r1 65 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC82LkViELBEf1JB0RAujOAJ9QXZUrId44IoY9P0qudllGXdJmiwCeJ/0u -gFuzk9mtVHVj9L0fHMN5eJY= -=JUVI ------END PGP SIGNATURE----- +MD5 d63e5ccba8489c1875bb404a477ed9f0 files/digest-sysstat-5.0.5-r2 65 diff --git a/app-admin/sysstat/files/crontab b/app-admin/sysstat/files/crontab new file mode 100644 index 000000000000..98ddad096b44 --- /dev/null +++ b/app-admin/sysstat/files/crontab @@ -0,0 +1,16 @@ +# Crontab sample for app-admin/sysstat +# +# 8am-7pm activity reports every 20 minutes during weekdays. +# 0 8-18 * * 1-5 /usr/lib/sa1 -d 1200 3 & +# activity reports every 10 minutes everyday. +0 * * * * root /usr/lib/sa1 -d 600 6 & +# +# Activity reports every an hour on Saturday and Sunday. +# 0 * * * 0,6 /usr/lib/sa1 -d & +# +# 7pm-8am activity reports every an hour during weekdays. +# 0 19-7 * * 1-5 /usr/lib/sa1 -d & +# +# Daily summary prepared at 19:05. +# 5 19 * * 1-5 /usr/lib/sa2 -A & +5 19 * * * root /usr/lib/sa2 -A & diff --git a/app-admin/sysstat/files/digest-sysstat-5.0.4 b/app-admin/sysstat/files/digest-sysstat-5.0.4 deleted file mode 100644 index 00e69461a5cd..000000000000 --- a/app-admin/sysstat/files/digest-sysstat-5.0.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 9ab916248dd721a9ebb042c559d15b81 sysstat-5.0.4.tar.gz 122096 diff --git a/app-admin/sysstat/files/digest-sysstat-5.0.5-r1 b/app-admin/sysstat/files/digest-sysstat-5.0.5-r2 index b786398b81a1..b786398b81a1 100644 --- a/app-admin/sysstat/files/digest-sysstat-5.0.5-r1 +++ b/app-admin/sysstat/files/digest-sysstat-5.0.5-r2 diff --git a/app-admin/sysstat/files/digest-sysstat-6.0.0 b/app-admin/sysstat/files/digest-sysstat-6.0.0 deleted file mode 100644 index e29bd3d50c5a..000000000000 --- a/app-admin/sysstat/files/digest-sysstat-6.0.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 f94347f3010996a44e55bb209dbed09c sysstat-6.0.0.tar.gz 150024 diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml new file mode 100644 index 000000000000..d31152aca840 --- /dev/null +++ b/app-admin/sysstat/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>no-herd</herd> + <maintainer> + <email>ka0ttic@gentoo.org</email> + <name>Aaron Walker</name> + </maintainer> +</pkgmetadata> diff --git a/app-admin/sysstat/sysstat-5.0.4.ebuild b/app-admin/sysstat/sysstat-5.0.4.ebuild deleted file mode 100644 index 6882fe13f118..000000000000 --- a/app-admin/sysstat/sysstat-5.0.4.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-5.0.4.ebuild,v 1.4 2005/01/01 11:30:33 eradicator Exp $ - -DESCRIPTION="System performance tools for Linux" -HOMEPAGE="http://perso.wanadoo.fr/sebastien.godard/" -SRC_URI="http://perso.wanadoo.fr/sebastien.godard/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips" -IUSE="nls" - -DEPEND="virtual/libc" -RDEPEND="nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd ${S} - sed -i -e "s:-O2:${CFLAGS}:" Makefile -} - -src_compile() { - yes "" | make config - use nls || sed -i 's/\(ENABLE_NLS\ =\ \)y/\1n/g' build/CONFIG - make PREFIX=/usr || die -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man{1,8} - dodir /var/log/sa - keepdir /var/log/sa - - make \ - DESTDIR=${D} \ - PREFIX=/usr \ - MAN_DIR=/usr/share/man \ - DOC_DIR=/usr/share/doc/${PF} \ - install || die -} diff --git a/app-admin/sysstat/sysstat-5.0.5-r1.ebuild b/app-admin/sysstat/sysstat-5.0.5-r2.ebuild index 50836acd4d91..be1b2d47df64 100644 --- a/app-admin/sysstat/sysstat-5.0.5-r1.ebuild +++ b/app-admin/sysstat/sysstat-5.0.5-r2.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-5.0.5-r1.ebuild,v 1.11 2005/08/05 12:57:44 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-5.0.5-r2.ebuild,v 1.1 2005/08/25 05:50:30 ka0ttic Exp $ + +inherit eutils DESCRIPTION="System performance tools for Linux" HOMEPAGE="http://perso.wanadoo.fr/sebastien.godard/" @@ -11,34 +13,36 @@ SLOT="0" KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86" IUSE="nls" -DEPEND="virtual/libc" RDEPEND="nls? ( sys-devel/gettext )" src_unpack() { unpack ${A} cd ${S} - sed -i -e "s:-O2:${CFLAGS}:" Makefile - sed -i -e '1d;2i # Crontab sample for app-admin/sysstat' -e '2d;3d;s:PREFIX:/usr:' crontab.sample + sed -i -e "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed" + epatch ${FILESDIR}/${P}-gcc4.diff } src_compile() { + # ick. interactive makefile rule yes '' | make config - use nls || sed -i 's/\(ENABLE_NLS\ =\ \)y/\1n/g' build/CONFIG - make PREFIX=/usr || die + + if ! use nls ; then + sed -i 's/\(ENABLE_NLS\ =\ \)y/\1n/g' build/CONFIG || \ + die "sed CONFIG failed" + fi + + make PREFIX=/usr SA_LIB_DIR=/usr/lib/sa || die "make failed" } src_install() { - dodir /usr/bin - dodir /usr/share/man/man{1,8} - dodir /var/log/sa keepdir /var/log/sa - dodir /etc/cron.d - cp ./crontab.sample ${D}/etc/cron.d/sysstat + newdoc ${FILESDIR}/crontab crontab.example make \ DESTDIR=${D} \ PREFIX=/usr \ MAN_DIR=/usr/share/man \ DOC_DIR=/usr/share/doc/${PF} \ - install || die + SA_LIB_DIR=/usr/lib/sa \ + install || die "make install failed" } diff --git a/app-admin/sysstat/sysstat-6.0.0.ebuild b/app-admin/sysstat/sysstat-6.0.0.ebuild deleted file mode 100644 index 545afc9e94c8..000000000000 --- a/app-admin/sysstat/sysstat-6.0.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-6.0.0.ebuild,v 1.3 2005/08/05 12:57:44 ferdy Exp $ - -inherit eutils - -DESCRIPTION="System performance tools for Linux" -HOMEPAGE="http://perso.wanadoo.fr/sebastien.godard/" -SRC_URI="http://perso.wanadoo.fr/sebastien.godard/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="nls" - -DEPEND="nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd ${S} - sed -i -e "s:-O2:${CFLAGS}:" Makefile - sed -i -e '1d;2i # Crontab sample for app-admin/sysstat' -e '2d;3d;s:PREFIX:/usr:' crontab.sample - epatch ${FILESDIR}/${P}-gcc4.diff -} - -src_compile() { - yes '' | make config - use nls || sed -i 's/\(ENABLE_NLS\ =\ \)y/\1n/g' build/CONFIG - make PREFIX=/usr || die -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man{1,8} - dodir /var/log/sa - keepdir /var/log/sa - dodir /etc/cron.d - cp ./crontab.sample ${D}/etc/cron.d/sysstat - - make \ - DESTDIR=${D} \ - PREFIX=/usr \ - MAN_DIR=/usr/share/man \ - DOC_DIR=/usr/share/doc/${PF} \ - SA_LIB_DIR=/usr/lib/sa \ - install || die -} diff --git a/app-admin/sysstat/sysstat-6.0.1.ebuild b/app-admin/sysstat/sysstat-6.0.1.ebuild index 816c9d1fb6ed..f3aa4b0c97df 100644 --- a/app-admin/sysstat/sysstat-6.0.1.ebuild +++ b/app-admin/sysstat/sysstat-6.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-6.0.1.ebuild,v 1.3 2005/08/05 12:57:44 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-6.0.1.ebuild,v 1.4 2005/08/25 05:50:30 ka0ttic Exp $ inherit eutils @@ -19,8 +19,6 @@ src_unpack() { unpack ${A} cd ${S} sed -i -e "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed" - sed -i -e '1d;2i # Crontab sample for app-admin/sysstat' \ - -e '2d;3d;s:PREFIX:/usr:' crontab.sample || die "sed crontab.sample failed" epatch ${FILESDIR}/${P}-gcc4.diff } @@ -38,7 +36,7 @@ src_compile() { src_install() { keepdir /var/log/sa - dodoc crontab.sample + newdoc ${FILESDIR}/crontab crontab.example make \ DESTDIR=${D} \ |