Move to stable since there was no functional difference anyway.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

5 files changed, 9 insertions, 101 deletions

diff --git a/sys-process/acct/ChangeLog b/sys-process/acct/ChangeLog
index ff4bc810a395..c299a6046eea 100644
--- a/sys-process/acct/ChangeLog
+++ b/sys-process/acct/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/acct
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.47 2011/01/26 05:36:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.48 2011/05/30 11:39:21 jer Exp $
+
+  30 May 2011; Jeroen Roovers <jer@gentoo.org> -acct-6.5.5.ebuild,
+  acct-6.5.5-r1.ebuild, -files/acct.initd-r1, -files/acct.logrotate-r1:
+  Move to stable since there was no functional difference anyway.
 
 *acct-6.5.5-r1 (26 Jan 2011)
 
diff --git a/sys-process/acct/acct-6.5.5-r1.ebuild b/sys-process/acct/acct-6.5.5-r1.ebuild
index 6ff9e8157d74..2d98aa053e76 100644
--- a/sys-process/acct/acct-6.5.5-r1.ebuild
+++ b/sys-process/acct/acct-6.5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.5-r1.ebuild,v 1.1 2011/01/26 05:36:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.5-r1.ebuild,v 1.2 2011/05/30 11:39:21 jer Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="alpha amd64 hppa ppc x86"
 IUSE=""
 
 src_configure() {
@@ -23,10 +23,10 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.initd-r1 acct || die
+	newinitd "${FILESDIR}"/acct.initd acct || die
 	newconfd "${FILESDIR}"/acct.confd acct || die
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/acct.logrotate-r1 acct || die
+	newins "${FILESDIR}"/acct.logrotate acct || die
 
 	# sys-apps/sysvinit already provides this
 	rm "${D}"/usr/bin/last "${D}"/usr/share/man/man1/last.1 || die
diff --git a/sys-process/acct/acct-6.5.5.ebuild b/sys-process/acct/acct-6.5.5.ebuild
deleted file mode 100644
index d58b799f6000..000000000000
--- a/sys-process/acct/acct-6.5.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.5.ebuild,v 1.6 2011/01/23 14:52:48 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils
-
-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=""
-
-src_configure() {
-	econf --enable-linux-multiformat
-}
-
-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
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/acct.logrotate acct
-
-	# 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/files/acct.initd-r1 b/sys-process/acct/files/acct.initd-r1
deleted file mode 100644
index 6edc548ad2fd..000000000000
--- a/sys-process/acct/files/acct.initd-r1
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/files/acct.initd-r1,v 1.1 2011/01/26 05:36:22 jer Exp $
-
-opts="report reload"
-
-depend() {
-    need localmount
-}
-
-checkconfig() {
-	export ACCT_LOG=${ACCT_LOG:-/var/account/pacct}
-	if [[ ! -e ${ACCT_LOG} ]] ; then
-		touch "${ACCT_LOG}"
-		chmod 600 "${ACCT_LOG}"
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting accounting"
-	accton "${ACCT_LOG}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping accounting"
-	accton off
-	eend $?
-}
-
-report() {
-	sa ${REPORT_OPTS} "${ACCT_LOG}"
-}
-
-reload() {
-	service_started "${SVCNAME}" || return
-	svc_stop
-	svc_start
-}
-
-# vim:ts=4 sw=4:
diff --git a/sys-process/acct/files/acct.logrotate-r1 b/sys-process/acct/files/acct.logrotate-r1
deleted file mode 100644
index 26f98115e2a0..000000000000
--- a/sys-process/acct/files/acct.logrotate-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Logrotate file for acct
- 
-/var/account/pacct {
-	compress
-	delaycompress
-	notifempty
-	daily
-	rotate 31
-	create 0600 root root
-	missingok
-	postrotate
-		/etc/init.d/acct reload > /dev/null 2>&1	
-	endscript
-}