8 files changed, 75 insertions, 8 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/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>