Version bump as requested by "teidakankan" in bug #483076. Rediffed existing cross-compile & nogets patches. Texi fix is by Dmitrijs Ledkovs and from Debian bug #696204.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

6 files changed, 425 insertions, 6 deletions

diff --git a/sys-process/acct/ChangeLog b/sys-process/acct/ChangeLog
index a2974a6c5290..d3f912291505 100644
--- a/sys-process/acct/ChangeLog
+++ b/sys-process/acct/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-process/acct
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.68 2013/10/09 13:39:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.69 2013/10/10 19:18:37 chainsaw Exp $
+
+*acct-6.6.1 (10 Oct 2013)
+
+  10 Oct 2013; Tony Vroon <chainsaw@gentoo.org> +acct-6.6.1.ebuild,
+  +files/acct-6.6.1-cross-compile.patch, +files/acct-6.6.1-no-gets.patch,
+  +files/acct-6.6.1-texi-failure.patch:
+  Version bump as requested by "teidakankan" in bug #483076. Rediffed existing
+  cross-compile & nogets patches. Texi fix is by Dmitrijs Ledkovs and from
+  Debian bug #696204.
 
   09 Oct 2013; Jeroen Roovers <jer@gentoo.org> acct-6.5.5-r3.ebuild:
   Stable for HPPA (bug #485338).
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 353bb3152d89..8a99d3e3445a 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -3,20 +3,25 @@ Hash: SHA256
 
 AUX acct-6.5.5-cross-compile.patch 8335 SHA256 368cd7d9598c1c63a082b8aa40989b4701fc04b97ccea136ebcc66ab8b0f0e83 SHA512 c30d71f7ef83ec1aea66bebe40eafcce55047b34f26e929ae1a93279c2371a69fca0934eaf3e1e915e451b2ec2d9ab97eab94d1dfe28e18532747d1815030e91 WHIRLPOOL 0e14c899a7d13f2b23e12229f7ef97280d6e9ce52848045bd00558d2738e4f271f6536bbab675ebee0dfa742d540ac86591d7906d3d3e2e3d1a1c0ed7b5d1b2e
 AUX acct-6.5.5-no-gets.patch 779 SHA256 0aa8aac492b2a380c9661362d3731c9827516052c008881182b01b3ca302eece SHA512 adefec843a1339ff1f14c71b2164f1fc77d5f17f053a6da45dfe74851891e89b4a90dda8ef8405b277c9e5f08c18eb6767aae6cc069566526127cd93eba3fd4e WHIRLPOOL 3d7a15bdaaed005c97d9934f09e94594e0e796bb3b4736502e6a77401c8423949d8c1d2caf5e594f2d0c6299d3b032a4c1b025710cb064cf37216707c30d5850
+AUX acct-6.6.1-cross-compile.patch 8526 SHA256 0cccd5f1e284c3d5690cb3c0a7865d0ab9a24d46ffc5672ef0147d37132424a8 SHA512 b32ea89c0b57e00aaeab7e37896cd26b569433cdb884abd7d5f20e24d7a5fe1044d548d09a7987f83c900b553fb6c60dbeb0f7bde319e487b67d99de6bc4023d WHIRLPOOL ada52269d01cecb667622f260c0ea2d13ab07757bd1bb9074de6723fced47fb3ade4eae35d274808cef780562be7b4c554c5de5b4e5de6cd4054686ceacb1194
+AUX acct-6.6.1-no-gets.patch 516 SHA256 b8984f964e89dbdc266a319c5514224137a81b92a1b28d795883d4e6be39e629 SHA512 f3b612e4f67eb77d993559bdc8522e74a80d70ff110cc67dabe12280ecf2bcedfa449359cc9de432fd979c9e38457393809fad666f0ab32ede93dc47983a77ac WHIRLPOOL 71d04cb35646479448aa7697777df6e15a1a0882511d7b5de0bc2ca98e6d0829e5b9a639d78295083065eefe06a1cbf2bf1bb760d2e517ca760ce12946a0c944
+AUX acct-6.6.1-texi-failure.patch 1122 SHA256 2f6d044706014d9571ed0de4b1a10c48164a0f2e1280b85beba0c11a3b7d322f SHA512 de33f73389220b440f484c96ec9ec323a640e420d4659bc09dd8b79da366a11d29631abec2be40f0a8d2b4579435b44a54f8f7f61eff8f785c1c28491213d8e3 WHIRLPOOL 574f0409ce70fab4d83dfde69b33d6255778a872e0613461918b97dd90c68f5830d8201c44b6d25e6322825e98f306369b14be6fa574a672c57e02ac13ed9c26
 AUX acct.confd 389 SHA256 03dec915e2f80746a5147f3a6ff34a5ce8d3dc4b0007a318a29c5f9ca91cdb31 SHA512 1d193d675f38ce8360251939ff0fdf89c1ba04244b2f2ee19a4180f180aa464447027dcd532cc044e9da7651c050c42e8bfe6ee350d29be3510395e44790c150 WHIRLPOOL 6298c8a8a8a64774d6fd5543e397c0b1e1f86dc20d440d34a9c6bc23cfd9ab55e59e569a75d2425c4b76d1cf5b407438a00e86057d19a317e4af150ec9617013
 AUX acct.initd 693 SHA256 5ba55e2ec0339e5c5a99351c89eb58414a7ce8d04409208f62db772b9b624d25 SHA512 ae1014f7fd38d1fd954fecc765bb765f4e2ec25eb515b30c581b255e233423f3fefae6e1eb32cbfbfa1006020f94a1ff8325b56968bee7442452856fd0e8723e WHIRLPOOL 8c19dc6319fc52de52e2c0061b4a43f254f469c9d4cb699b80a8745ef6964167378935b6533f39b2f585f863ab2d5d601caaa24c6978932ba9dcd5fcb56ddbe1
 AUX acct.logrotate 209 SHA256 e3f70c702dd95dc2309688354c08136fad83fdfc28789d6ea5b5ccbe1ea1512f SHA512 a91ac927ce536827eea6c4ce5c454df831d61120ff453582c4e2fa186b1e8ea52792ed529c242e58ce8a575ac5d26bc1a97670880fb51e8c08598d54894fb90e WHIRLPOOL 4a6330ccb4882d30e80c45f22253cdad4658e2f33f3a54aea4745171f1e1ecb9911116c86a5eaaeadfc062584d96eeb8bbee81556f6014cc75b3ff2d807a0b12
 AUX acct.service 382 SHA256 468040c3fc5be494ba0f84492048c03b6c5919a24549cb94bd42da30a4483743 SHA512 8c2523526eb3185765eac62676761af6758d0090d68ba48aeacc59c7a45f0722c867fb97d02ff3ceaa8d77637d2b915938d545f7d782e4f7aa46861f25364bd3 WHIRLPOOL df650e7d412d95b1f3253ac1b90f6fa9f7e31d9aef514a3d5f400db57ac55358c0343cbc9810b42de61e5e1b783a615afa8768e0216b1add2fd07ceac79f5826
 DIST acct-6.5.5.tar.gz 747225 SHA256 4163c87b9e92a73a65eaeadc6c41caa4626da782ff26d6e7a945edcc140a6fd5 SHA512 6a36548cfe0e68829c94780aac4053f8a5840c5a704b88a9562758408dc64b4e26965743aec51ef02f7780efcfbf42d20805fecb12a68e7e1f279a1259151fb0 WHIRLPOOL 30c431dfe3af181770e261470090528fd21d41b45a234181ef0f1a62226979d4de38f851b1d5e200feba5b08acf30d2fe18a517f6096f3fcbc8e32dca9630be4
+DIST acct-6.6.1.tar.gz 2869677 SHA256 554515611ef9299012b7510050868a48fc178ce1544947123ab46ec50230ffcb SHA512 4bc3d6b41aeafcf8acfdd020057f1b6f15eea3589981387bca7e57aa8fe71d058e8def97f139dd2c11a1ac39f2d8b95bd103d31caff042cf716dd961b9588f5d WHIRLPOOL 097b7c5f55aac40dd5d63b6ce80a1c2809241f3999c15d5c2c3d8f418f1e51b90ed3c5937655dafd9d702fc72b1d1a6faae870e0c2722c3716e097d5d3b98cd1
 EBUILD acct-6.5.5-r1.ebuild 1025 SHA256 a0a9fd9d6584a97d7ab86885f41eee84b1d929c869d372748ea98b49d8b6c839 SHA512 8b36714d3aa4e340fe4a9d3929a4ddb3bec0595c559faee97e19ad467f0371e78a1a538ef39a2eaff8105b85457c8f586fabc3a5fbb5459b6e2df402ade00754 WHIRLPOOL 1c993f25eca7350a62656ef222c5823fbadc1fa9d936272de96137f848c07811cb72e255da611d2846ae285320eac5fb624e14c94ab1caf35f446d13c3f64330
 EBUILD acct-6.5.5-r2.ebuild 1232 SHA256 21d07cf36787ef360abe8d236130425228f17381a9c48a3aeb56adcf592d0806 SHA512 9ab7d19dfd4be42bcc887149f9262fbbf1955b2449ad4176a1fc73d750cf3a0503b61b97f10bc04150de17492cf167695e3d2f645ea4742bc8f3c7af42dc30a3 WHIRLPOOL ea2701d5f61e8dd0ef31d4f9b5fdf2533258ee743caa65a529155f08f318fab3396296131dbaddb78cca7238e3c2eaa5eca8facc81ccc03de4465c05c9c9cf9a
 EBUILD acct-6.5.5-r3.ebuild 1280 SHA256 507950a684c4cd6b9adeb6af22a76284a023f1155c583b286ef3f228e12c5e1c SHA512 acc953fc125f3101a50b85d00cfc9cda53d14017de732a126ed64e4702101717e798f0f2c1810c02a21e7f0c868c42275c6fcf76948a421417fc97179823f6b1 WHIRLPOOL 6ac55fd8d753f1e62ee45ff1cb207034a2089703854bffe3114075c5393548103f3d1a0846eccb06b54285a5e8e6f74c60456a1b943e7fcdcd0ecc661bd87c4b
-MISC ChangeLog 9671 SHA256 5b928083a619eaeaaef85ae864c62a5620111d73cbd4a28ddf61f561e6b8769d SHA512 67804237eecdd87b5d31522a0fad034d142b4975f0acae2d542afdf0e59b45dc15e0db799c63f35a5f2a1ad7893e4363d46c63e137950b36111abd811d7caff0 WHIRLPOOL 726496a04852b6a4c67b36ea150bcf0a30ceb9364f1792ca9ba74420061e324b3fe6100a2ddeac41364ec856e9833d2c31bda7d506d570694873800206687586
+EBUILD acct-6.6.1.ebuild 1297 SHA256 caf356c4907230cefdccbe7357ffc0b90da4c9c5cebaf7a5e59cddbb2b06692a SHA512 a503a38bf197b581fb77d09facf410c8ed6f2252aa9797c42a82ddebb44f327b489c2c64e1d972360b772dd575d6baaff6b9afcd27d1c27299b3c5cd668901a0 WHIRLPOOL 5988040e8bf52dcc5254269f9f4621dffd0454b87a9ed91548142d377d8ced06d523bfed5ee4c84e63a2f23ad877f020944e7d0ec7c4eed24f8b77ef78ee0f17
+MISC ChangeLog 10062 SHA256 85f1997c23f8574f62f38d90e493381c5882313b2e4ed181ea3f5947cf8bd28a SHA512 1f2dab27acd641f7c27b071b9a4b6908c274aad9b11e38f10d65f8b8271c3fb5b44155699689f8bcc05a49df6fd7ee37af10993f5454a2a6cc3d4586efc0ac65 WHIRLPOOL 5e3500a5917c8c339f5e5192041c36ad3a1546751dfe794569924da581198225db77b366a65669db80e5bbba120a09128600b7e4781c7c6776ffb01d4c4a2efe
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlJVXJcACgkQVWmRsqeSphPHPgCfRUxrzaqUrdo7Sis3gavq8wVB
-n1kAn0++hlUzUgPwFlZD1utiabMcwYBc
-=Pz1N
+iEYEAREIAAYFAlJW/oYACgkQp5vW4rUFj5pDyACeOK9HNIytmhTWsdmGnZ7qV6Uh
+b4wAnjVM1/JBH7yprxWLQjOKSf4JMtl6
+=saUs
 -----END PGP SIGNATURE-----
diff --git a/sys-process/acct/acct-6.6.1.ebuild b/sys-process/acct/acct-6.6.1.ebuild
new file mode 100644
index 000000000000..0419c6096227
--- /dev/null
+++ b/sys-process/acct/acct-6.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.6.1.ebuild,v 1.1 2013/10/10 19:18:37 chainsaw Exp $
+
+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" )
+
+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/files/acct-6.6.1-cross-compile.patch b/sys-process/acct/files/acct-6.6.1-cross-compile.patch
new file mode 100644
index 000000000000..4dbfcfb33ebc
--- /dev/null
+++ b/sys-process/acct/files/acct-6.6.1-cross-compile.patch
@@ -0,0 +1,314 @@
+diff -uNr acct-6.6.1.ORIG/configure.ac acct-6.6.1/configure.ac
+--- acct-6.6.1.ORIG/configure.ac	2013-10-10 20:00:31.581225736 +0100
++++ acct-6.6.1/configure.ac	2013-10-10 20:03:42.393231583 +0100
+@@ -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
+diff -uNr acct-6.6.1.ORIG/files.h acct-6.6.1/files.h
+--- acct-6.6.1.ORIG/files.h	1970-01-01 01:00:00.000000000 +0100
++++ acct-6.6.1/files.h	2013-10-10 20:01:36.314227720 +0100
+@@ -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 */
+diff -uNr acct-6.6.1.ORIG/files.h.in acct-6.6.1/files.h.in
+--- acct-6.6.1.ORIG/files.h.in	2013-10-10 20:00:31.584225736 +0100
++++ acct-6.6.1/files.h.in	1970-01-01 01:00:00.000000000 +0100
+@@ -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 -uNr acct-6.6.1.ORIG/Makefile.am acct-6.6.1/Makefile.am
+--- acct-6.6.1.ORIG/Makefile.am	2013-10-10 20:00:31.585225736 +0100
++++ acct-6.6.1/Makefile.am	2013-10-10 20:01:36.313227720 +0100
+@@ -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-no-gets.patch b/sys-process/acct/files/acct-6.6.1-no-gets.patch
new file mode 100644
index 000000000000..6362122b7ca5
--- /dev/null
+++ b/sys-process/acct/files/acct-6.6.1-no-gets.patch
@@ -0,0 +1,14 @@
+diff -uNr acct-6.6.1.ORIG/lib/stdio.in.h acct-6.6.1/lib/stdio.in.h
+--- acct-6.6.1.ORIG/lib/stdio.in.h	2013-10-10 20:06:21.740236465 +0100
++++ acct-6.6.1/lib/stdio.in.h	2013-10-10 20:08:09.969239782 +0100
+@@ -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
new file mode 100644
index 000000000000..aa9f3c3586b8
--- /dev/null
+++ b/sys-process/acct/files/acct-6.6.1-texi-failure.patch
@@ -0,0 +1,32 @@
+Description: Fix FTBFS with new texinfo.
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.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