Move to stable since there was no functional difference anyway.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

6 files changed, 23 insertions, 106 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/Manifest b/sys-process/acct/Manifest
index 7bd29de1df71..f67b2e7c2111 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX acct.confd 389 RMD160 4059420389cfe442983e55f7e23e4a9df7473743 SHA1 0dd7b18b9c0a76218ceec46607fe34b63d80e4ba SHA256 03dec915e2f80746a5147f3a6ff34a5ce8d3dc4b0007a318a29c5f9ca91cdb31
 AUX acct.initd 753 RMD160 cc252e0c813ae48983781fcaf072ea223aa277f3 SHA1 3095dec2a9f2c6c5b0b9d20f558f8ac10dced9f5 SHA256 ccb237c7b733215f204e154d2790c54252d3d4a62b93d515b8deb1b1855a24d6
-AUX acct.initd-r1 756 RMD160 c35d97c4dc6afde1ebead806f599403d997125d9 SHA1 d5f2efdeacca554579744e51a7c12d59e664e075 SHA256 24215d5adbc605553184a6fb9fbafcab91eca0e1d9c186140f3de167a19929f0
 AUX acct.logrotate 209 RMD160 da0db73100fbfa3b8f17940001e92d49acbeae32 SHA1 bd402cef98435688498d55cb73aa461397609c06 SHA256 9516d7817255ef802fd2cfc3c44394f0c36e6fc076a8d18e2c05ca30a6c68891
-AUX acct.logrotate-r1 209 RMD160 da0db73100fbfa3b8f17940001e92d49acbeae32 SHA1 bd402cef98435688498d55cb73aa461397609c06 SHA256 9516d7817255ef802fd2cfc3c44394f0c36e6fc076a8d18e2c05ca30a6c68891
+AUX acct.logrotate-r1.orig 209 RMD160 da0db73100fbfa3b8f17940001e92d49acbeae32 SHA1 bd402cef98435688498d55cb73aa461397609c06 SHA256 9516d7817255ef802fd2cfc3c44394f0c36e6fc076a8d18e2c05ca30a6c68891
+AUX acct.logrotate-r1.rej 764 RMD160 c34b87c60504d83461ed9f710d93d80d30e6a8b3 SHA1 3f0cffb6ab11d793752eeb2f2124897115c36e97 SHA256 afaa56957a75f3a3312ecd858d437390f5f0e320442af3690b39bf9b3a0ecc4e
 DIST acct-6.5.5.tar.gz 747225 RMD160 f1e8d29a3433cb9c4cf650a78bc7288a1c64cd7a SHA1 907456b1dcf14c5079f834338e2de32cd7371a73 SHA256 4163c87b9e92a73a65eaeadc6c41caa4626da782ff26d6e7a945edcc140a6fd5
-EBUILD acct-6.5.5-r1.ebuild 1036 RMD160 49b12ed60e996f4a00f1041a1172e27d21dffeb8 SHA1 1eea14fd071fcd62a72b033fb1bdd65e8a3c8f22 SHA256 01d23fc407604efd15d32db5467dbe21bf6b8820de37f605c05d0d8fbd60011d
-EBUILD acct-6.5.5.ebuild 1012 RMD160 98f4ea6b9c6b7c5c5ff4863378cfe30179e434df SHA1 8456f861b5ce181402bcbec16a96a1291f643f49 SHA256 b509ee6323fb9175270b59b332efd3ea2c6c685a6d5ea330fdbf67f6a41b4685
-MISC ChangeLog 7246 RMD160 5927bdbd693c9600d86c731d8ccbc0d2a13b1d76 SHA1 524b5812ffc37e5ee23109173e5a99933f5d60d4 SHA256 b38576a0a068915c131d2feb81c3330975ae8b0117adc2d233982b6205809058
+EBUILD acct-6.5.5-r1.ebuild 1025 RMD160 3a94deac14d9859df8f593c186dbe4b36cf18b91 SHA1 a913e913196a957d58284f4bd635bbc335d7aca7 SHA256 a0a9fd9d6584a97d7ab86885f41eee84b1d929c869d372748ea98b49d8b6c839
+MISC ChangeLog 7452 RMD160 376695395989dd551945a037d3df42af62cbc027 SHA1 369c70b68bcbd8d715a4b337e970ebd3bdc2730e SHA256 f3226d696a3756b5f63dc80344e3accc80649b561f1956237fece4f5dfeb1319
 MISC metadata.xml 219 RMD160 4a90c1bc52966d2392d2bbf984e11045e6245c4d SHA1 357acb6b8c3a433b3bf79daf091febf7632e25de SHA256 4c413cf308dfd4db9cc6420c540fd4a29f6a1bb8e8a11564fc4a39ad9b800297
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3jgfIACgkQVWmRsqeSphMHlgCfcPXUwuc+hJRUz/96zgK8oFBw
+KpAAn1lEKCEZbYJRvOjMFA4Vy69+8zgC
+=qN2C
+-----END PGP SIGNATURE-----
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
-}