Rename initd script to be more Gentoo like. Bump to add logrotate script thanks to Jeremy Sermersheim (bug #313099).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

9 files changed, 83 insertions, 14 deletions

diff --git a/sys-process/acct/ChangeLog b/sys-process/acct/ChangeLog
index 49b5695c16a3..7d7eca920890 100644
--- a/sys-process/acct/ChangeLog
+++ b/sys-process/acct/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/acct
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.24 2010/04/28 19:09:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.25 2010/04/28 19:32:40 jer Exp $
+
+*acct-6.5.4-r1 (28 Apr 2010)
+
+  28 Apr 2010; Jeroen Roovers <jer@gentoo.org> acct-6.5.1.ebuild,
+  acct-6.5.3.ebuild, acct-6.5.4.ebuild, +acct-6.5.4-r1.ebuild,
+  +files/acct.initd, +files/acct.logrotate, -files/acct.rc6, metadata.xml:
+  Rename initd script to be more Gentoo like. Bump to add logrotate script
+  thanks to Jeremy Sermersheim (bug #313099).
 
   28 Apr 2010; Jeroen Roovers <jer@gentoo.org> -acct-6.3.5-r1.ebuild,
   -acct-6.3.5-r2.ebuild, -files/acct.rc6-6.3.5-r3, -acct-6.3.5-r3.ebuild,
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 5f13aee85193..0bc22b4aef63 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -1,10 +1,12 @@
 AUX acct.confd 389 RMD160 4059420389cfe442983e55f7e23e4a9df7473743 SHA1 0dd7b18b9c0a76218ceec46607fe34b63d80e4ba SHA256 03dec915e2f80746a5147f3a6ff34a5ce8d3dc4b0007a318a29c5f9ca91cdb31
-AUX acct.rc6 669 RMD160 189df29d95eae20ba040aaeb33baae1db5a229b6 SHA1 5b58d4d46add183632fa5c11f64389fc893529fc SHA256 f8d09eeaff38c4e442d19966d7bbfa0e9d08d2173a661e22e3ec25ffef119413
+AUX acct.initd 671 RMD160 83b40ccf21a17b4f82869fb96c6643fae85fc4a6 SHA1 4a884120ede717b27c17c4a67985f31e4be870c2 SHA256 3a75ee3c969bdf894d82bd38e1b7932ca96b9c63a7641cd3fe8d79b463a239ab
+AUX acct.logrotate 456 RMD160 6e122665b574597094b4a55c113aeb3421199993 SHA1 342badaabecf6ca296ef9a7761b076a43699b587 SHA256 4ece5dd28e2e7e2a93217b2ba3e648f458527bbd13ea255eda84696bcbc1b4ea
 DIST acct-6.5.1.tar.gz 625140 RMD160 862bec0dc5f17ff31a2958dc7ef66d6781351df1 SHA1 e7393004864699daa73d5981af060fad2e0cb76e SHA256 c08fd478e452493467d0142dc5b405784e9efec9b279e6205d2650173324c211
 DIST acct-6.5.3.tar.gz 649490 RMD160 a76dd2f981db59f247d127d1df9809b505c515d8 SHA1 2b2b9f0e90281dee0f26f7325a5396ea11637eab SHA256 b45603b2b8c13b1f495d89720c458dd8f485fdbac4835cad3dcbb1b078fa8828
 DIST acct-6.5.4.tar.gz 643605 RMD160 3750b49ced07f028ca5881e94d7b6e29c4c0a62d SHA1 0102c906160225303014af0d1f76d5542d305622 SHA256 6ac2f5d7dd327b8434b05671fe49815c19e14af920c860efc121529bc1d979bb
-EBUILD acct-6.5.1.ebuild 929 RMD160 d6bfced11609b7782ecfcfd83f20fe9c8628517a SHA1 bf50382160ef231703a67426e837c47f5530f37b SHA256 35b6807ff0597007289258dff7c143da916530aba5133a8f41ca0b39ce94abe0
-EBUILD acct-6.5.3.ebuild 929 RMD160 aa11cb8aab21e5cff003d0153d5633b7a69475a5 SHA1 1761e5938bfc237db828c64b81011237db11ccc6 SHA256 cd88625c10e93b529da6e9033f0a17af330deb87da6ebfa5922bf578d9639d97
-EBUILD acct-6.5.4.ebuild 929 RMD160 e2600febd4d1204b044b2c4bd990e875d53e7d5f SHA1 cbbca0a3912d504b84658ac4decbccad22e19b02 SHA256 ef01e4d6273aa63279cda0eca92603e6532fb62f29b797ccd72ad0a575aeab25
-MISC ChangeLog 4284 RMD160 8f753f1817a0c1068591e380c04cc6504042a0bb SHA1 0368402c5ffceb863b043595771cc211ebd1a645 SHA256 cbd365e687190a0c3536a07b6f60031987e5ec5e2908916ea12c6421ba897e1d
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD acct-6.5.1.ebuild 926 RMD160 7a6a529b4c3367cced7c99002402843b8b3a2c9e SHA1 e1af410def43ad5d24f95c2c6b51b26727991443 SHA256 1e2c581f591f189dd5d771a322658c3a607e136e74a4942a3613881fb047c562
+EBUILD acct-6.5.3.ebuild 931 RMD160 8e6e91aed6867886cc42d269f229d54f14ea9941 SHA1 b95622f6b52598f9f9942c2b14442e9a3c46136a SHA256 99c18405dcbdd57586828ce44eeba65a7ad5ccc9745428d6a90898f896cf76d8
+EBUILD acct-6.5.4-r1.ebuild 1041 RMD160 c679918544b47f4b862ca78d4ba7c9f64e343c0b SHA1 32df2d99eec66e11ff3739f906e82e67a2d23152 SHA256 643fc98e07c8ad10c0eb6d85068da6c877edf0ceb8fd0e8f9adafeb1a6723e13
+EBUILD acct-6.5.4.ebuild 931 RMD160 fbb008c4e61c3b1c569f126d63d55e8907d4955a SHA1 ab77410ccb89683fcb12a359e7643b9dc1e1120d SHA256 f08b52da983e14089c753a301cc15dbf540dd70a4dc88edd76e80d65136ba5d4
+MISC ChangeLog 4640 RMD160 70d40a3abe13ba4837fa8c965dfbe405af2f932f SHA1 0a2c1a477c0e704d2c7a45c32654a078f22371fd SHA256 84bac22effe9d9f3ac67fe027cbe9fefeb17594d978bc5a58b1487adc21eebae
+MISC metadata.xml 259 RMD160 a3f4d9a3887a5b9eb002a68ad106bb6fe94bb0b1 SHA1 9db746bf72d5f1cce428679e454d5dc532bb25b5 SHA256 0cd8f48696631c9e348f4a112971ef1ce101a73c692337836ba9bd461821b082
diff --git a/sys-process/acct/acct-6.5.1.ebuild b/sys-process/acct/acct-6.5.1.ebuild
index 58786a881d2e..73f218cb627b 100644
--- a/sys-process/acct/acct-6.5.1.ebuild
+++ b/sys-process/acct/acct-6.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.1.ebuild,v 1.8 2010/03/11 18:35:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.1.ebuild,v 1.9 2010/04/28 19:32:40 jer Exp $
 
 DESCRIPTION="GNU system accounting utilities"
 HOMEPAGE="https://savannah.gnu.org/projects/acct/"
@@ -20,7 +20,7 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.rc6 acct || die
+	newinitd "${FILESDIR}"/acct.initd acct || die
 	newconfd "${FILESDIR}"/acct.confd acct
 
 	# sys-apps/sysvinit already provides this
diff --git a/sys-process/acct/acct-6.5.3.ebuild b/sys-process/acct/acct-6.5.3.ebuild
index 4f12415cf8d1..36ed8c71100e 100644
--- a/sys-process/acct/acct-6.5.3.ebuild
+++ b/sys-process/acct/acct-6.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.3.ebuild,v 1.2 2010/01/26 05:18:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.3.ebuild,v 1.3 2010/04/28 19:32:40 jer Exp $
 
 DESCRIPTION="GNU system accounting utilities"
 HOMEPAGE="https://savannah.gnu.org/projects/acct/"
@@ -20,7 +20,7 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.rc6 acct || die
+	newinitd "${FILESDIR}"/acct.initd acct || die
 	newconfd "${FILESDIR}"/acct.confd acct
 
 	# sys-apps/sysvinit already provides this
diff --git a/sys-process/acct/acct-6.5.4-r1.ebuild b/sys-process/acct/acct-6.5.4-r1.ebuild
new file mode 100644
index 000000000000..8cc9e5a88377
--- /dev/null
+++ b/sys-process/acct/acct-6.5.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.4-r1.ebuild,v 1.1 2010/04/28 19:32:40 jer Exp $
+
+DESCRIPTION="GNU system accounting utilities"
+HOMEPAGE="https://savannah.gnu.org/projects/acct/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+IUSE="logrotate"
+
+src_compile() {
+	econf --enable-linux-multiformat
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	keepdir /var/account
+	newinitd "${FILESDIR}"/acct.initd acct || die
+	newconfd "${FILESDIR}"/acct.confd acct
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/acct.logrotate acct
+	fi
+
+	# sys-apps/sysvinit already provides this
+	rm "${D}"/usr/bin/last "${D}"/usr/share/man/man1/last.1 || die
+
+	# accton in / is only a temp workaround for #239748
+	dodir /sbin
+	mv "${D}"/usr/sbin/accton "${D}"/sbin/ || die
+}
diff --git a/sys-process/acct/acct-6.5.4.ebuild b/sys-process/acct/acct-6.5.4.ebuild
index c3eef0fe74fc..ed669ba8684c 100644
--- a/sys-process/acct/acct-6.5.4.ebuild
+++ b/sys-process/acct/acct-6.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.4.ebuild,v 1.1 2010/02/15 22:11:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.4.ebuild,v 1.2 2010/04/28 19:32:40 jer Exp $
 
 DESCRIPTION="GNU system accounting utilities"
 HOMEPAGE="https://savannah.gnu.org/projects/acct/"
@@ -20,7 +20,7 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.rc6 acct || die
+	newinitd "${FILESDIR}"/acct.initd acct || die
 	newconfd "${FILESDIR}"/acct.confd acct
 
 	# sys-apps/sysvinit already provides this
diff --git a/sys-process/acct/files/acct.rc6 b/sys-process/acct/files/acct.initd
index b90ba3c7ea06..29fb28ab65fc 100644
--- a/sys-process/acct/files/acct.rc6
+++ b/sys-process/acct/files/acct.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.rc6,v 1.5 2010/04/28 19:09:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.initd,v 1.1 2010/04/28 19:32:40 jer Exp $
 
 opts="report"
 
diff --git a/sys-process/acct/files/acct.logrotate b/sys-process/acct/files/acct.logrotate
new file mode 100644
index 000000000000..84de6d8b0fc3
--- /dev/null
+++ b/sys-process/acct/files/acct.logrotate
@@ -0,0 +1,20 @@
+# Logrotate file for acct
+ 
+/var/account/pacct {
+    prerotate
+        if [ -h /lib/rc/init.d/started/acct ]; then
+             /etc/init.d/acct stop > /dev/null 2>&1 || true
+        fi
+    endscript
+    compress
+    delaycompress
+    notifempty
+    daily
+    rotate 31
+    create 0600 root root
+    postrotate
+        if [ -h /lib/rc/init.d/started/acct ]; then
+             /etc/init.d/acct start > /dev/null 2>&1 || true
+        fi
+    endscript
+}     
diff --git a/sys-process/acct/metadata.xml b/sys-process/acct/metadata.xml
index 96a2d586367d..f59edcdefbdd 100644
--- a/sys-process/acct/metadata.xml
+++ b/sys-process/acct/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+<flag name="logrotate">Install a logrotate script to rotate /var/account/*</flag>
+</use>
 </pkgmetadata>