[gentoo-commits] repo/gentoo:master commit in: sys-process/acct/, sys-process/acct/files/

[Lars Wendler]

commit:     8427a9e87b372c0b9dc9e8a91b9185ede4e4d1ec
Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Sun Dec  3 07:19:09 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 15:10:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8427a9e8

sys-process/acct: Remove old

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-process/acct/Manifest                          |   3 -
 sys-process/acct/acct-6.5.5-r4.ebuild              |  43 ---
 sys-process/acct/acct-6.6.1.ebuild                 |  48 ---
 sys-process/acct/acct-6.6.2-r1.ebuild              |  45 ---
 sys-process/acct/acct-6.6.2.ebuild                 |  45 ---
 sys-process/acct/acct-6.6.4.ebuild                 |  44 ---
 .../acct/files/acct-6.5.5-cross-compile.patch      | 323 --------------------
 sys-process/acct/files/acct-6.5.5-no-gets.patch    |  22 --
 .../acct/files/acct-6.6.1-cross-compile.patch      | 324 ---------------------
 sys-process/acct/files/acct-6.6.1-math.patch       |  27 --
 sys-process/acct/files/acct-6.6.1-no-gets.patch    |  25 --
 .../acct/files/acct-6.6.1-texi-failure.patch       |  32 --
 .../acct/files/acct-6.6.2-cross-compile.patch      | 320 --------------------
 sys-process/acct/files/acct.confd                  |  13 -
 sys-process/acct/files/acct.initd                  |  36 ---
 sys-process/acct/files/acct.initd-r1               |  33 ---
 sys-process/acct/files/acct.logrotate              |  14 -
 17 files changed, 1397 deletions(-)

diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 917c33fe087..20b32d7064c 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -1,4 +1 @@
-DIST acct-6.5.5.tar.gz 747225 BLAKE2B 7e44b8a3ccbaf31511185717c00089cee6ce55fb571a34a808aa26f919ed3d1f153a76bb9fd6a449adf1a298cec08e166a80f824f5813b7fd09fbbe35e4e17cc SHA512 6a36548cfe0e68829c94780aac4053f8a5840c5a704b88a9562758408dc64b4e26965743aec51ef02f7780efcfbf42d20805fecb12a68e7e1f279a1259151fb0
-DIST acct-6.6.1.tar.gz 2869677 BLAKE2B 8d84200d235f12bda99213d4910a24958b7ac77b9c6bb060d85926cc1ba04b67776cd5e7e3f88076ffaa4fa3540f53ae012b2a8dbc9198bf137d0c24a701ae71 SHA512 4bc3d6b41aeafcf8acfdd020057f1b6f15eea3589981387bca7e57aa8fe71d058e8def97f139dd2c11a1ac39f2d8b95bd103d31caff042cf716dd961b9588f5d
-DIST acct-6.6.2.tar.gz 852375 BLAKE2B 34de3765ced8cf3f9e57428ce222c5e69a6c38b3d39be4c7f3482e9300713e0d7bff945fecf75a29ccc3056cda1558a3bf05b4e1b3413c2d5b3912f4c7208c9c SHA512 5942aa3d1faebb29bd6d6ff97c2ba8525dc5a9c85522c3f549ce0772042d3736e19126ddd7e10fe0681a6ac496b8d3aafda0894577a3b64c59f3b78fc222d2b3
 DIST acct-6.6.4.tar.gz 853273 BLAKE2B 2ee42ae849f8e7c5c6dbe33d45e944f945cef87a5fef0074ac31848547ab9b7068509bce3c4b47b35bfde49b02daf43ae812cc58284c50185e4bdc660dccae52 SHA512 413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2

diff --git a/sys-process/acct/acct-6.5.5-r4.ebuild b/sys-process/acct/acct-6.5.5-r4.ebuild
deleted file mode 100644
index fbfc364215c..00000000000
--- a/sys-process/acct/acct-6.5.5-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit eutils autotools systemd
-
-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 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-6.5.5-cross-compile.patch \
-		"${FILESDIR}"/${PN}-6.5.5-no-gets.patch
-	eautoreconf
-}
-
-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-r1 acct || die
-	newconfd "${FILESDIR}"/acct.confd acct || die
-	systemd_dounit "${FILESDIR}"/acct.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/acct.logrotate acct || die
-
-	# sys-apps/sysvinit already provides this
-	rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die
-
-	# accton in / is only a temp workaround for #239748
-	dodir /sbin
-	mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die
-}

diff --git a/sys-process/acct/acct-6.6.1.ebuild b/sys-process/acct/acct-6.6.1.ebuild
deleted file mode 100644
index f1852b70af1..00000000000
--- a/sys-process/acct/acct-6.6.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools base systemd
-
-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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cross-compile.patch
-	"${FILESDIR}"/${P}-no-gets.patch
-	"${FILESDIR}"/${P}-texi-failure.patch
-	"${FILESDIR}"/${P}-math.patch
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-linux-multiformat
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.initd acct
-	newconfd "${FILESDIR}"/acct.confd acct
-	systemd_dounit "${FILESDIR}"/acct.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/acct.logrotate acct
-
-	# sys-apps/sysvinit already provides this
-	rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die
-
-	# accton in / is only a temp workaround for #239748
-	dodir /sbin
-	mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die
-}

diff --git a/sys-process/acct/acct-6.6.2-r1.ebuild b/sys-process/acct/acct-6.6.2-r1.ebuild
deleted file mode 100644
index 22276e67c86..00000000000
--- a/sys-process/acct/acct-6.6.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools base systemd
-
-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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.6.2-cross-compile.patch
-	"${FILESDIR}"/${PN}-6.6.1-no-gets.patch
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-linux-multiformat
-}
-
-src_install() {
-	default
-	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.initd-r1 acct
-	newconfd "${FILESDIR}"/acct.confd acct
-	systemd_dounit "${FILESDIR}"/acct.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/acct.logrotate acct
-
-	# sys-apps/sysvinit already provides this
-	rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die
-
-	# accton in / is only a temp workaround for #239748
-	dodir /sbin
-	mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die
-}

diff --git a/sys-process/acct/acct-6.6.2.ebuild b/sys-process/acct/acct-6.6.2.ebuild
deleted file mode 100644
index 95199c408ee..00000000000
--- a/sys-process/acct/acct-6.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools base systemd
-
-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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.6.2-cross-compile.patch
-	"${FILESDIR}"/${PN}-6.6.1-no-gets.patch
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-linux-multiformat
-}
-
-src_install() {
-	default
-	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.initd acct
-	newconfd "${FILESDIR}"/acct.confd acct
-	systemd_dounit "${FILESDIR}"/acct.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/acct.logrotate acct
-
-	# sys-apps/sysvinit already provides this
-	rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die
-
-	# accton in / is only a temp workaround for #239748
-	dodir /sbin
-	mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die
-}

diff --git a/sys-process/acct/acct-6.6.4.ebuild b/sys-process/acct/acct-6.6.4.ebuild
deleted file mode 100644
index 46888474a25..00000000000
--- a/sys-process/acct/acct-6.6.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools systemd
-
-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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.6.4-cross-compile.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-linux-multiformat
-}
-
-src_install() {
-	default
-	keepdir /var/account
-	newinitd "${FILESDIR}"/acct.initd-r2 acct
-	newconfd "${FILESDIR}"/acct.confd-r1 acct
-	systemd_dounit "${FILESDIR}"/acct.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/acct.logrotate-r1 acct
-
-	# sys-apps/sysvinit already provides this
-	rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die
-
-	# accton in / is only a temp workaround for #239748
-	dodir /sbin
-	mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die
-}

diff --git a/sys-process/acct/files/acct-6.5.5-cross-compile.patch b/sys-process/acct/files/acct-6.5.5-cross-compile.patch
deleted file mode 100644
index 2fb7bfa7bc2..00000000000
--- a/sys-process/acct/files/acct-6.5.5-cross-compile.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-https://savannah.gnu.org/patch/?7473
-
-From 8958c3cb7b77ec50d8dae0490d8c80dee798e20d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@×××××.com>
-Date: Fri, 18 Feb 2011 06:13:20 +0100
-Subject: [PATCH] Don't generate files.h at build-time using an execution test.
-
-The *_LOC variables are never used in the build itself, but only in the
-built code; this means that they don't need to be known to ./configure at
-all.
-
-Since the previous method made acct not cross-compilable at all, this is
-much preferred.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -66,11 +66,6 @@
- SYS_AC = @SYS_AC@
- SYS_SA = @SYS_SA@
- 
--WTMP_FILE_LOC = @WTMP_FILE_LOC@
--ACCT_FILE_LOC = @ACCT_FILE_LOC@
--SAVACCT_FILE_LOC = @SAVACCT_FILE_LOC@
--USRACCT_FILE_LOC = @USRACCT_FILE_LOC@
--
- compare-ac: ac
- 	@echo
- 	@echo "Running tests for ac"
---- a/configure.ac
-+++ b/configure.ac
-@@ -159,101 +159,6 @@
- 		AC_EGREP_HEADER([comp_t],[sys/acct.h],[AC_DEFINE(HAVE_COMP_T, 1, Define if <sys/acct.h> uses the COMP_T type.)])
-   ) ]
- )
--dnl
--dnl find out where utmp/pacct are stored
--dnl
--AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <stdio.h>
--#include <stdlib.h>
--#include <sys/types.h>
--#include <stdint.h>	/* GNU/kFreeBSD */
--#include <sys/acct.h>
--#include <utmp.h>
--
--#ifndef WTMP_FILE
--#  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__)
--#    define WTMP_FILE "/var/log/wtmp"
--#  else
--#    if defined(sun) || defined(AMIX)
--#      define WTMP_FILE "/var/adm/wtmp"
--#    else
--#      if defined(sgi) || defined(SVR4)
--#        define WTMP_FILE "/usr/adm/wtmp"
--#      else
--#        define WTMP_FILE "/usr/adm/wtmp"
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifndef ACCT_FILE
--#  if defined(__FreeBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__)
--#    define ACCT_FILE "/var/account/pacct"
--#  else
--#    if defined(__NetBSD__)
--#      define ACCT_FILE "/var/account/acct"
--#    else
--#      if defined(sun) || defined(AMIX)
--#        define ACCT_FILE "/var/adm/pacct"
--#      else
--#        if defined(sgi) || defined(SVR4) || defined(M_XENIX)
--#          define ACCT_FILE "/usr/adm/pacct"
--#        else
--#          define ACCT_FILE "/usr/adm/acct"
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifndef SAVACCT_FILE
--#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__)
--#    define SAVACCT_FILE "/var/account/savacct"
--#  else
--#    if defined(sun) || defined(AMIX)
--#      define SAVACCT_FILE "/var/adm/savacct"
--#    else
--#      if defined(sgi) || defined(SVR4)
--#        define SAVACCT_FILE "/usr/adm/savacct"
--#      else
--#        define SAVACCT_FILE "/usr/adm/savacct"
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifndef USRACCT_FILE
--#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__)
--#    define USRACCT_FILE "/var/account/usracct"
--#  else
--#    if defined(sun) || defined(AMIX)
--#      define USRACCT_FILE "/var/adm/usracct"
--#    else
--#      if defined(sgi) || defined(SVR4)
--#        define USRACCT_FILE "/usr/adm/usracct"
--#      else
--#        define USRACCT_FILE "/usr/adm/usracct"
--#      endif
--#    endif
--#  endif
--#endif
--
--main ()
--{
--  FILE *fp;
--  fp = fopen ("locs", "w");
--  fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE);
--  fprintf (fp, "ACCT_FILE_LOC=%s\n", ACCT_FILE);
--  fprintf (fp, "SAVACCT_FILE_LOC=%s\n", SAVACCT_FILE);
--  fprintf (fp, "USRACCT_FILE_LOC=%s\n", USRACCT_FILE);
--  fclose (fp);
--  exit(0);
--}
--]])],[. ./locs; rm locs],[echo "Error -- could not locate your wtmp and acct files."; exit 1],[echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ])
- AC_TYPE_PID_T dnl for sys/acct.h
- AC_TYPE_UID_T dnl same as above
- AC_TYPE_SIZE_T
-@@ -366,12 +271,6 @@
- AC_SUBST(LASTCOMM_MAN)
- AC_SUBST(SA_MAN)
- 
--dnl Substitutions for file locations
--AC_SUBST(WTMP_FILE_LOC)
--AC_SUBST(ACCT_FILE_LOC)
--AC_SUBST(SAVACCT_FILE_LOC)
--AC_SUBST(USRACCT_FILE_LOC)
--
- dnl Dump the makefiles and etc.
--AC_CONFIG_FILES([Makefile lib/Makefile files.h version.h])
-+AC_CONFIG_FILES([Makefile lib/Makefile version.h])
- AC_OUTPUT
---- /dev/null
-+++ b/files.h
-@@ -0,0 +1,123 @@
-+/* files.h
-+ *
-+ * file locations
-+ *
-+ */
-+
-+#ifndef FILES_H
-+#define FILES_H
-+
-+#include "config.h"
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <stdint.h>	/* GNU/kFreeBSD */
-+
-+#ifdef LINUX_MULTIFORMAT
-+# include "linux-acct.h"
-+#else
-+# include <stdint.h> /* GNU/kFreeBSD */
-+# include <sys/acct.h>
-+# if defined __FreeBSD__ || defined __FreeBSD_kernel__
-+#  include <osreldate.h>
-+#  if __FreeBSD_kernel__
-+#   define __FreeBSD_version __FreeBSD_kernel_version
-+#  endif /* __FreeBSD_kernel__ */
-+#  if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */
-+#   define acct acctv2
-+#   define ac_flag ac_flagx
-+#  endif
-+# endif
-+#endif
-+
-+#include <utmp.h>
-+
-+#ifndef WTMP_FILE
-+#  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__)
-+#    define WTMP_FILE "/var/log/wtmp"
-+#  else
-+#    if defined(sun) || defined(AMIX)
-+#      define WTMP_FILE "/var/adm/wtmp"
-+#    else
-+#      if defined(sgi) || defined(SVR4)
-+#        define WTMP_FILE "/usr/adm/wtmp"
-+#      else
-+#        define WTMP_FILE "/usr/adm/wtmp"
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef ACCT_FILE
-+#  if defined(__FreeBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__)
-+#    define ACCT_FILE "/var/account/pacct"
-+#  else
-+#    if defined(__NetBSD__)
-+#      define ACCT_FILE "/var/account/acct"
-+#    else
-+#      if defined(sun) || defined(AMIX)
-+#        define ACCT_FILE "/var/adm/pacct"
-+#      else
-+#        if defined(sgi) || defined(SVR4) || defined(M_XENIX)
-+#          define ACCT_FILE "/usr/adm/pacct"
-+#        else
-+#          define ACCT_FILE "/usr/adm/acct"
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef SAVACCT_FILE
-+#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__)
-+#    define SAVACCT_FILE "/var/account/savacct"
-+#  else
-+#    if defined(sun) || defined(AMIX)
-+#      define SAVACCT_FILE "/var/adm/savacct"
-+#    else
-+#      if defined(sgi) || defined(SVR4)
-+#        define SAVACCT_FILE "/usr/adm/savacct"
-+#      else
-+#        define SAVACCT_FILE "/usr/adm/savacct"
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef USRACCT_FILE
-+#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__)
-+#    define USRACCT_FILE "/var/account/usracct"
-+#  else
-+#    if defined(sun) || defined(AMIX)
-+#      define USRACCT_FILE "/var/adm/usracct"
-+#    else
-+#      if defined(sgi) || defined(SVR4)
-+#        define USRACCT_FILE "/usr/adm/usracct"
-+#      else
-+#        define USRACCT_FILE "/usr/adm/usracct"
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#define WTMP_FILE_LOC WTMP_FILE
-+#define ACCT_FILE_LOC ACCT_FILE
-+#define SAVACCT_FILE_LOC SAVACCT_FILE
-+#define USRACCT_FILE_LOC USRACCT_FILE
-+
-+/* Workaround for a kernel includes problem */
-+#if defined(__linux__) && defined(__alpha__)
-+#undef AHZ
-+#define AHZ 1024
-+#endif
-+
-+#ifndef AHZ
-+#define AHZ 64
-+#endif
-+
-+#endif /* ! FILES_H */
---- a/files.h.in
-+++ /dev/null
-@@ -1,48 +0,0 @@
--/* files.h.in
-- *
-- * file locations
-- *
-- */
--
--#ifndef FILES_H
--#define FILES_H
--
--#include "config.h"
--
--#include <sys/types.h>
--
--#ifdef LINUX_MULTIFORMAT
--# include "linux-acct.h"
--#else
--# include <stdint.h> /* GNU/kFreeBSD */
--# include <sys/acct.h>
--# if defined __FreeBSD__ || defined __FreeBSD_kernel__
--#  include <osreldate.h>
--#  if __FreeBSD_kernel__
--#   define __FreeBSD_version __FreeBSD_kernel_version
--#  endif /* __FreeBSD_kernel__ */
--#  if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */
--#   define acct acctv2
--#   define ac_flag ac_flagx
--#  endif
--# endif
--#endif
--
--#include <utmp.h>
--
--#define WTMP_FILE_LOC "@WTMP_FILE_LOC@"
--#define ACCT_FILE_LOC "@ACCT_FILE_LOC@"
--#define SAVACCT_FILE_LOC "@SAVACCT_FILE_LOC@"
--#define USRACCT_FILE_LOC "@USRACCT_FILE_LOC@"
--
--/* Workaround for a kernel includes problem */
--#if defined(__linux__) && defined(__alpha__)
--#undef AHZ
--#define AHZ 1024
--#endif
--
--#ifndef AHZ
--#define AHZ 64
--#endif
--
--#endif /* ! FILES_H */

diff --git a/sys-process/acct/files/acct-6.5.5-no-gets.patch b/sys-process/acct/files/acct-6.5.5-no-gets.patch
deleted file mode 100644
index 3478b66de9d..00000000000
--- a/sys-process/acct/files/acct-6.5.5-no-gets.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-hack until acct pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@××××××.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

diff --git a/sys-process/acct/files/acct-6.6.1-cross-compile.patch b/sys-process/acct/files/acct-6.6.1-cross-compile.patch
deleted file mode 100644
index 67ac7d56fad..00000000000
--- a/sys-process/acct/files/acct-6.6.1-cross-compile.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-https://savannah.gnu.org/patch/?7473
-
-From 8958c3cb7b77ec50d8dae0490d8c80dee798e20d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@×××××.com>
-Date: Fri, 18 Feb 2011 06:13:20 +0100
-Subject: [PATCH] Don't generate files.h at build-time using an execution test.
-
-The *_LOC variables are never used in the build itself, but only in the
-built code; this means that they don't need to be known to ./configure at
-all.
-
-Since the previous method made acct not cross-compilable at all, this is
-much preferred.
-
---- acct-6.6.1/configure.ac
-+++ acct-6.6.1/configure.ac
-@@ -228,102 +228,6 @@
- 		AC_EGREP_HEADER([comp_t],[sys/acct.h],[AC_DEFINE(HAVE_COMP_T, 1, Define if <sys/acct.h> uses the COMP_T type.)])
-   ) ]
- )
--dnl
--dnl find out where utmp/pacct are stored
--dnl
--AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <stdio.h>
--#include <stdlib.h>
--#include <sys/types.h>
--#include <stdint.h>	/* GNU/kFreeBSD */
--#include <sys/acct.h>
--#include <utmp.h>
--
--#ifndef WTMP_FILE
--#  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
--#    define WTMP_FILE "/var/log/account/wtmp"
--#  else
--#    if defined(sun) || defined(AMIX)
--#      define WTMP_FILE "/var/adm/wtmp"
--#    else
--#      if defined(sgi) || defined(SVR4)
--#        define WTMP_FILE "/usr/adm/wtmp"
--#      else
--#        define WTMP_FILE "/usr/adm/wtmp"
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifndef ACCT_FILE
--#  if defined(__FreeBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
--#    define ACCT_FILE "/var/log/account/pacct"
--#  else
--#    if defined(__NetBSD__)
--#      define ACCT_FILE "/var/log/account/acct"
--#    else
--#      if defined(sun) || defined(AMIX)
--#        define ACCT_FILE "/var/adm/pacct"
--#      else
--#        if defined(sgi) || defined(SVR4) || defined(M_XENIX)
--#          define ACCT_FILE "/usr/adm/pacct"
--#        else
--#          define ACCT_FILE "/usr/adm/acct"
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifndef SAVACCT_FILE
--#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
--#    define SAVACCT_FILE "/var/log/account/savacct"
--#  else
--#    if defined(sun) || defined(AMIX)
--#      define SAVACCT_FILE "/var/adm/savacct"
--#    else
--#      if defined(sgi) || defined(SVR4)
--#        define SAVACCT_FILE "/usr/adm/savacct"
--#      else
--#        define SAVACCT_FILE "/usr/adm/savacct"
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifndef USRACCT_FILE
--#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
--#    define USRACCT_FILE "/var/log/account/usracct"
--#  else
--#    if defined(sun) || defined(AMIX)
--#      define USRACCT_FILE "/var/adm/usracct"
--#    else
--#      if defined(sgi) || defined(SVR4)
--#        define USRACCT_FILE "/usr/adm/usracct"
--#      else
--#        define USRACCT_FILE "/usr/adm/usracct"
--#      endif
--#    endif
--#  endif
--#endif
--
--main ()
--{
--  FILE *fp;
--  fp = fopen ("locs", "w");
--  fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE);
--  fprintf (fp, "ACCT_FILE_LOC=%s\n", ACCT_FILE);
--  fprintf (fp, "SAVACCT_FILE_LOC=%s\n", SAVACCT_FILE);
--  fprintf (fp, "USRACCT_FILE_LOC=%s\n", USRACCT_FILE);
--  fclose (fp);
--  exit(0);
--}
--]])],[. ./locs; rm locs],[echo "Error -- could not locate your wtmp and acct files."; exit 1],[echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ])
--
- dnl types
- AC_TYPE_PID_T dnl for sys/acct.h
- AC_TYPE_UID_T dnl same as above
-@@ -366,12 +270,6 @@
- AC_SUBST(LASTCOMM_MAN)
- AC_SUBST(SA_MAN)
- 
--dnl Substitutions for file locations
--AC_SUBST(WTMP_FILE_LOC)
--AC_SUBST(ACCT_FILE_LOC)
--AC_SUBST(SAVACCT_FILE_LOC)
--AC_SUBST(USRACCT_FILE_LOC)
--
- dnl Dump the makefiles and etc.
--AC_CONFIG_FILES([Makefile lib/Makefile files.h version.h])
-+AC_CONFIG_FILES([Makefile lib/Makefile version.h])
- AC_OUTPUT
---- acct-6.6.1/files.h
-+++ acct-6.6.1/files.h
-@@ -0,0 +1,123 @@
-+/* files.h
-+ *
-+ * file locations
-+ *
-+ */
-+
-+#ifndef FILES_H
-+#define FILES_H
-+
-+#include "config.h"
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <stdint.h>	/* GNU/kFreeBSD */
-+
-+#ifdef LINUX_MULTIFORMAT
-+# include "linux-acct.h"
-+#else
-+# include <stdint.h> /* GNU/kFreeBSD */
-+# include <sys/acct.h>
-+# if defined __FreeBSD__ || defined __FreeBSD_kernel__
-+#  include <osreldate.h>
-+#  if __FreeBSD_kernel__
-+#   define __FreeBSD_version __FreeBSD_kernel_version
-+#  endif /* __FreeBSD_kernel__ */
-+#  if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */
-+#   define acct acctv2
-+#   define ac_flag ac_flagx
-+#  endif
-+# endif
-+#endif
-+
-+#include <utmp.h>
-+
-+#ifndef WTMP_FILE
-+#  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__)
-+#    define WTMP_FILE "/var/log/wtmp"
-+#  else
-+#    if defined(sun) || defined(AMIX)
-+#      define WTMP_FILE "/var/adm/wtmp"
-+#    else
-+#      if defined(sgi) || defined(SVR4)
-+#        define WTMP_FILE "/usr/adm/wtmp"
-+#      else
-+#        define WTMP_FILE "/usr/adm/wtmp"
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef ACCT_FILE
-+#  if defined(__FreeBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__)
-+#    define ACCT_FILE "/var/account/pacct"
-+#  else
-+#    if defined(__NetBSD__)
-+#      define ACCT_FILE "/var/account/acct"
-+#    else
-+#      if defined(sun) || defined(AMIX)
-+#        define ACCT_FILE "/var/adm/pacct"
-+#      else
-+#        if defined(sgi) || defined(SVR4) || defined(M_XENIX)
-+#          define ACCT_FILE "/usr/adm/pacct"
-+#        else
-+#          define ACCT_FILE "/usr/adm/acct"
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef SAVACCT_FILE
-+#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__)
-+#    define SAVACCT_FILE "/var/account/savacct"
-+#  else
-+#    if defined(sun) || defined(AMIX)
-+#      define SAVACCT_FILE "/var/adm/savacct"
-+#    else
-+#      if defined(sgi) || defined(SVR4)
-+#        define SAVACCT_FILE "/usr/adm/savacct"
-+#      else
-+#        define SAVACCT_FILE "/usr/adm/savacct"
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef USRACCT_FILE
-+#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__)
-+#    define USRACCT_FILE "/var/account/usracct"
-+#  else
-+#    if defined(sun) || defined(AMIX)
-+#      define USRACCT_FILE "/var/adm/usracct"
-+#    else
-+#      if defined(sgi) || defined(SVR4)
-+#        define USRACCT_FILE "/usr/adm/usracct"
-+#      else
-+#        define USRACCT_FILE "/usr/adm/usracct"
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#define WTMP_FILE_LOC WTMP_FILE
-+#define ACCT_FILE_LOC ACCT_FILE
-+#define SAVACCT_FILE_LOC SAVACCT_FILE
-+#define USRACCT_FILE_LOC USRACCT_FILE
-+
-+/* Workaround for a kernel includes problem */
-+#if defined(__linux__) && defined(__alpha__)
-+#undef AHZ
-+#define AHZ 1024
-+#endif
-+
-+#ifndef AHZ
-+#define AHZ 64
-+#endif
-+
-+#endif /* ! FILES_H */
---- acct-6.6.1/files.h.in
-+++ acct-6.6.1/files.h.in
-@@ -1,48 +0,0 @@
--/* files.h.in
-- *
-- * file locations
-- *
-- */
--
--#ifndef FILES_H
--#define FILES_H
--
--#include "config.h"
--
--#include <sys/types.h>
--
--#ifdef LINUX_MULTIFORMAT
--# include "linux-acct.h"
--#else
--# include <stdint.h> /* GNU/kFreeBSD */
--# include <sys/acct.h>
--# if defined __FreeBSD__ || defined __FreeBSD_kernel__
--#  include <osreldate.h>
--#  if __FreeBSD_kernel__
--#   define __FreeBSD_version __FreeBSD_kernel_version
--#  endif /* __FreeBSD_kernel__ */
--#  if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */
--#   define acct acctv2
--#   define ac_flag ac_flagx
--#  endif
--# endif
--#endif
--
--#include <utmp.h>
--
--#define WTMP_FILE_LOC "@WTMP_FILE_LOC@"
--#define ACCT_FILE_LOC "@ACCT_FILE_LOC@"
--#define SAVACCT_FILE_LOC "@SAVACCT_FILE_LOC@"
--#define USRACCT_FILE_LOC "@USRACCT_FILE_LOC@"
--
--/* Workaround for a kernel includes problem */
--#if defined(__linux__) && defined(__alpha__)
--#undef AHZ
--#define AHZ 1024
--#endif
--
--#ifndef AHZ
--#define AHZ 64
--#endif
--
--#endif /* ! FILES_H */
---- acct-6.6.1/Makefile.am
-+++ acct-6.6.1/Makefile.am
-@@ -66,11 +66,6 @@
- SYS_AC = @SYS_AC@
- SYS_SA = @SYS_SA@
- 
--WTMP_FILE_LOC = @WTMP_FILE_LOC@
--ACCT_FILE_LOC = @ACCT_FILE_LOC@
--SAVACCT_FILE_LOC = @SAVACCT_FILE_LOC@
--USRACCT_FILE_LOC = @USRACCT_FILE_LOC@
--
- compare-ac: ac
- 	@echo
- 	@echo "Running tests for ac"

diff --git a/sys-process/acct/files/acct-6.6.1-math.patch b/sys-process/acct/files/acct-6.6.1-math.patch
deleted file mode 100644
index a1d6fe72e75..00000000000
--- a/sys-process/acct/files/acct-6.6.1-math.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://savannah.gnu.org/bugs/?42973
-https://bugs.gentoo.org/519552
-
-these files use frexp/ldexp which is in -lm
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,6 +26,7 @@ accton_SOURCES = accton.c common.c
- 
- dump_acct_SOURCES = dump-acct.c common.c file_rd.c \
-   pacct_rd.c
-+dump_acct_LDADD = $(LDADD) -lm
- 
- dump_utmp_SOURCES = dump-utmp.c common.c file_rd.c \
-   utmp_rd.c
-@@ -37,9 +38,11 @@ last_SOURCES = last.c common.c file_rd.c hashtab.c \
- 
- lastcomm_SOURCES = lastcomm.c common.c dev_hash.c file_rd.c \
-   hashtab.c pacct_rd.c uid_hash.c
-+lastcomm_LDADD = $(LDADD) -lm
- 
- sa_SOURCES = sa.c common.c file_rd.c hashtab.c \
-   pacct_rd.c uid_hash.c
-+sa_LDADD = $(LDADD) -lm
- 
- noinst_HEADERS = common.h config.h dev_hash.h file_rd.h hashtab.h \
-   pacct_rd.h uid_hash.h utmp_rd.h al_share.cpp linux-acct.h

diff --git a/sys-process/acct/files/acct-6.6.1-no-gets.patch b/sys-process/acct/files/acct-6.6.1-no-gets.patch
deleted file mode 100644
index f2f83975d58..00000000000
--- a/sys-process/acct/files/acct-6.6.1-no-gets.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-hack until acct pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@××××××.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- acct-6.6.1/lib/stdio.in.h
-+++ acct-6.6.1/lib/stdio.in.h
-@@ -699,10 +699,6 @@
-    so any use of gets warrants an unconditional warning; besides, C11
-    removed it.  */
- #undef gets
--#if HAVE_RAW_DECL_GETS
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
--#endif
--
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
- struct obstack;

diff --git a/sys-process/acct/files/acct-6.6.1-texi-failure.patch b/sys-process/acct/files/acct-6.6.1-texi-failure.patch
deleted file mode 100644
index aa9f3c3586b..00000000000
--- a/sys-process/acct/files/acct-6.6.1-texi-failure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Fix FTBFS with new texinfo.
-Author: Dmitrijs Ledkovs <dmitrij.ledkov@××××××.com>
-
---- acct-6.5.5.orig/accounting.texi
-+++ acct-6.5.5/accounting.texi
-@@ -66,7 +66,7 @@ approved by the Foundation.
- @end titlepage
- 
- @c ----------------------------------------------------------------------
--@ifinfo
-+@ifnottex
- @node Top, Preface, (dir), (dir)
- 
- Welcome to the GNU Accounting Utilities!  If you don't have a clue about
-@@ -77,7 +77,7 @@ program's name.
- This is Edition @value{EDITION} of the documentation, updated
- @value{UPDATED} for version @value{VERSION} of the GNU Accounting
- Utilities.
--@end ifinfo
-+@end ifnottex
- 
- @menu
- * Preface::                     general information about the accounting utilities
-@@ -468,7 +468,7 @@ overhead, it is forseeable that the entr
- wrong order.  GNU @code{ac} automatically compensates for this, but some
- other @code{ac}s may not...  beware.
- 
--@unnumberedsubsubsec The FTP Problem
-+@unnumberedsubsec The FTP Problem
- 
- I've tested the standard @code{ac} in Ultrix 4.2 (DECstation/DECsystem),
- SunOS 4.1.1 (Sun3, Sun4, Sparc), Mach 2.5 (Omron/Luna), and DomainOS

diff --git a/sys-process/acct/files/acct-6.6.2-cross-compile.patch b/sys-process/acct/files/acct-6.6.2-cross-compile.patch
deleted file mode 100644
index 70b0556fd48..00000000000
--- a/sys-process/acct/files/acct-6.6.2-cross-compile.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-https://savannah.gnu.org/patch/?7473
-
-From 8958c3cb7b77ec50d8dae0490d8c80dee798e20d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@×××××.com>
-Date: Fri, 18 Feb 2011 06:13:20 +0100
-Subject: [PATCH] Don't generate files.h at build-time using an execution test.
-
-The *_LOC variables are never used in the build itself, but only in the
-built code; this means that they don't need to be known to ./configure at
-all.
-
-Since the previous method made acct not cross-compilable at all, this is
-much preferred.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -69,11 +69,6 @@ SYS_LASTCOMM = @SYS_LASTCOMM@
- SYS_AC = @SYS_AC@
- SYS_SA = @SYS_SA@
- 
--WTMP_FILE_LOC = @WTMP_FILE_LOC@
--ACCT_FILE_LOC = @ACCT_FILE_LOC@
--SAVACCT_FILE_LOC = @SAVACCT_FILE_LOC@
--USRACCT_FILE_LOC = @USRACCT_FILE_LOC@
--
- compare-ac: ac
- 	@echo
- 	@echo "Running tests for ac"
---- a/configure.ac
-+++ b/configure.ac
-@@ -229,101 +229,6 @@ AC_CHECK_HEADER(sys/acct.h,
- 		AC_EGREP_HEADER([comp_t],[sys/acct.h],[AC_DEFINE(HAVE_COMP_T, 1, Define if <sys/acct.h> uses the COMP_T type.)])
-   ) ]
- )
--dnl
--dnl find out where utmp/pacct are stored
--dnl
--AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <stdio.h>
--#include <stdlib.h>
--#include <sys/types.h>
--#include <stdint.h>	/* GNU/kFreeBSD */
--#include <sys/acct.h>
--#include <utmp.h>
--
--#ifndef WTMP_FILE
--#  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
--#    define WTMP_FILE "/var/log/account/wtmp"
--#  else
--#    if defined(sun) || defined(AMIX)
--#      define WTMP_FILE "/var/adm/wtmp"
--#    else
--#      if defined(sgi) || defined(SVR4)
--#        define WTMP_FILE "/usr/adm/wtmp"
--#      else
--#        define WTMP_FILE "/usr/adm/wtmp"
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifndef ACCT_FILE
--#  if defined(__FreeBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
--#    define ACCT_FILE "/var/log/account/pacct"
--#  else
--#    if defined(__NetBSD__)
--#      define ACCT_FILE "/var/log/account/acct"
--#    else
--#      if defined(sun) || defined(AMIX)
--#        define ACCT_FILE "/var/adm/pacct"
--#      else
--#        if defined(sgi) || defined(SVR4) || defined(M_XENIX)
--#          define ACCT_FILE "/usr/adm/pacct"
--#        else
--#          define ACCT_FILE "/usr/adm/acct"
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifndef SAVACCT_FILE
--#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
--#    define SAVACCT_FILE "/var/log/account/savacct"
--#  else
--#    if defined(sun) || defined(AMIX)
--#      define SAVACCT_FILE "/var/adm/savacct"
--#    else
--#      if defined(sgi) || defined(SVR4)
--#        define SAVACCT_FILE "/usr/adm/savacct"
--#      else
--#        define SAVACCT_FILE "/usr/adm/savacct"
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifndef USRACCT_FILE
--#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
--        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
--#    define USRACCT_FILE "/var/log/account/usracct"
--#  else
--#    if defined(sun) || defined(AMIX)
--#      define USRACCT_FILE "/var/adm/usracct"
--#    else
--#      if defined(sgi) || defined(SVR4)
--#        define USRACCT_FILE "/usr/adm/usracct"
--#      else
--#        define USRACCT_FILE "/usr/adm/usracct"
--#      endif
--#    endif
--#  endif
--#endif
--
--main ()
--{
--  FILE *fp;
--  fp = fopen ("locs", "w");
--  fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE);
--  fprintf (fp, "ACCT_FILE_LOC=%s\n", ACCT_FILE);
--  fprintf (fp, "SAVACCT_FILE_LOC=%s\n", SAVACCT_FILE);
--  fprintf (fp, "USRACCT_FILE_LOC=%s\n", USRACCT_FILE);
--  fclose (fp);
--  exit(0);
--}
--]])],[. ./locs; rm locs],[echo "Error -- could not locate your wtmp and acct files."; exit 1],[echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ])
- 
- dnl types
- AC_TYPE_PID_T dnl for sys/acct.h
-@@ -367,12 +272,6 @@ AC_SUBST(ACCTON_MAN)
- AC_SUBST(LASTCOMM_MAN)
- AC_SUBST(SA_MAN)
- 
--dnl Substitutions for file locations
--AC_SUBST(WTMP_FILE_LOC)
--AC_SUBST(ACCT_FILE_LOC)
--AC_SUBST(SAVACCT_FILE_LOC)
--AC_SUBST(USRACCT_FILE_LOC)
--
- dnl Dump the makefiles and etc.
--AC_CONFIG_FILES([Makefile lib/Makefile files.h version.h])
-+AC_CONFIG_FILES([Makefile lib/Makefile version.h])
- AC_OUTPUT
---- /dev/null
-+++ b/files.h
-@@ -0,0 +1,120 @@
-+/* files.h.in
-+ *
-+ * file locations
-+ *
-+ */
-+
-+#ifndef FILES_H
-+#define FILES_H
-+
-+#include "config.h"
-+
-+#include <sys/types.h>
-+
-+#ifdef LINUX_MULTIFORMAT
-+# include "linux-acct.h"
-+#else
-+# include <stdint.h> /* GNU/kFreeBSD */
-+# include <sys/acct.h>
-+# if defined __FreeBSD__ || defined __FreeBSD_kernel__
-+#  include <osreldate.h>
-+#  if defined __FreeBSD_kernel__
-+#   define __FreeBSD_version __FreeBSD_kernel_version
-+#  endif /* __FreeBSD_kernel__ */
-+#  if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */
-+#   define acct acctv2
-+#   define ac_flag ac_flagx
-+#  endif
-+# endif
-+#endif
-+
-+#include <utmp.h>
-+
-+#ifndef WTMP_FILE
-+#  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
-+#    define WTMP_FILE "/var/log/account/wtmp"
-+#  else
-+#    if defined(sun) || defined(AMIX)
-+#      define WTMP_FILE "/var/adm/wtmp"
-+#    else
-+#      if defined(sgi) || defined(SVR4)
-+#        define WTMP_FILE "/usr/adm/wtmp"
-+#      else
-+#        define WTMP_FILE "/usr/adm/wtmp"
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef ACCT_FILE
-+#  if defined(__FreeBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
-+#    define ACCT_FILE "/var/log/account/pacct"
-+#  else
-+#    if defined(__NetBSD__)
-+#      define ACCT_FILE "/var/log/account/acct"
-+#    else
-+#      if defined(sun) || defined(AMIX)
-+#        define ACCT_FILE "/var/adm/pacct"
-+#      else
-+#        if defined(sgi) || defined(SVR4) || defined(M_XENIX)
-+#          define ACCT_FILE "/usr/adm/pacct"
-+#        else
-+#          define ACCT_FILE "/usr/adm/acct"
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef SAVACCT_FILE
-+#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
-+#    define SAVACCT_FILE "/var/log/account/savacct"
-+#  else
-+#    if defined(sun) || defined(AMIX)
-+#      define SAVACCT_FILE "/var/adm/savacct"
-+#    else
-+#      if defined(sgi) || defined(SVR4)
-+#        define SAVACCT_FILE "/usr/adm/savacct"
-+#      else
-+#        define SAVACCT_FILE "/usr/adm/savacct"
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef USRACCT_FILE
-+#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
-+        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
-+#    define USRACCT_FILE "/var/log/account/usracct"
-+#  else
-+#    if defined(sun) || defined(AMIX)
-+#      define USRACCT_FILE "/var/adm/usracct"
-+#    else
-+#      if defined(sgi) || defined(SVR4)
-+#        define USRACCT_FILE "/usr/adm/usracct"
-+#      else
-+#        define USRACCT_FILE "/usr/adm/usracct"
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#define WTMP_FILE_LOC WTMP_FILE
-+#define ACCT_FILE_LOC ACCT_FILE
-+#define SAVACCT_FILE_LOC SAVACCT_FILE
-+#define USRACCT_FILE_LOC USRACCT_FILE
-+
-+/* Workaround for a kernel includes problem */
-+#if defined(__linux__) && defined(__alpha__)
-+#undef AHZ
-+#define AHZ 1024
-+#endif
-+
-+#ifndef AHZ
-+#define AHZ 64
-+#endif
-+
-+#endif /* ! FILES_H */
---- a/files.h.in
-+++ /dev/null
-@@ -1,48 +0,0 @@
--/* files.h.in
-- *
-- * file locations
-- *
-- */
--
--#ifndef FILES_H
--#define FILES_H
--
--#include "config.h"
--
--#include <sys/types.h>
--
--#ifdef LINUX_MULTIFORMAT
--# include "linux-acct.h"
--#else
--# include <stdint.h> /* GNU/kFreeBSD */
--# include <sys/acct.h>
--# if defined __FreeBSD__ || defined __FreeBSD_kernel__
--#  include <osreldate.h>
--#  if defined __FreeBSD_kernel__
--#   define __FreeBSD_version __FreeBSD_kernel_version
--#  endif /* __FreeBSD_kernel__ */
--#  if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */
--#   define acct acctv2
--#   define ac_flag ac_flagx
--#  endif
--# endif
--#endif
--
--#include <utmp.h>
--
--#define WTMP_FILE_LOC "@WTMP_FILE_LOC@"
--#define ACCT_FILE_LOC "@ACCT_FILE_LOC@"
--#define SAVACCT_FILE_LOC "@SAVACCT_FILE_LOC@"
--#define USRACCT_FILE_LOC "@USRACCT_FILE_LOC@"
--
--/* Workaround for a kernel includes problem */
--#if defined(__linux__) && defined(__alpha__)
--#undef AHZ
--#define AHZ 1024
--#endif
--
--#ifndef AHZ
--#define AHZ 64
--#endif
--
--#endif /* ! FILES_H */

diff --git a/sys-process/acct/files/acct.confd b/sys-process/acct/files/acct.confd
deleted file mode 100644
index 133efabcf62..00000000000
--- a/sys-process/acct/files/acct.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/conf.d/acct
-
-# ACCT_LOG specifies the accounting logging file.
-# Remember to create it manually if it doesn't yet exist.
-
-ACCT_LOG="/var/account/pacct"
-
-# REPORT_OPTS contains arguments for the "sa" command,
-# used for console-reporting.
-# Please run "sa --help" or "man sa" to get a description
-# of available options.
-
-REPORT_OPTS="--sort-real-time --list-all-names --percentage"

diff --git a/sys-process/acct/files/acct.initd b/sys-process/acct/files/acct.initd
deleted file mode 100644
index d6d9dfd6245..00000000000
--- a/sys-process/acct/files/acct.initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="report"
-
-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}" >/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping accounting"
-	accton off >/dev/null
-	eend $?
-}
-
-report() {
-	sa ${REPORT_OPTS} "${ACCT_LOG}"
-}

diff --git a/sys-process/acct/files/acct.initd-r1 b/sys-process/acct/files/acct.initd-r1
deleted file mode 100644
index 09d9739fea2..00000000000
--- a/sys-process/acct/files/acct.initd-r1
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="report"
-
-depend() {
-	need localmount
-}
-
-checkconfig() {
-	export ACCT_LOG=${ACCT_LOG:-/var/account/pacct}
-	checkpath -f -m 600 "${ACCT_LOG}"
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting accounting"
-	accton "${ACCT_LOG}" >/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping accounting"
-	accton off >/dev/null
-	eend $?
-}
-
-report() {
-	sa ${REPORT_OPTS} "${ACCT_LOG}"
-}

diff --git a/sys-process/acct/files/acct.logrotate b/sys-process/acct/files/acct.logrotate
deleted file mode 100644
index af6213434cd..00000000000
--- a/sys-process/acct/files/acct.logrotate
+++ /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 --quiet --ifstarted restart
-	endscript
-}