commit:     77aca0ef3f94bb4dd7ca1ef81671a1cfef148581
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 11:11:00 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 11:20:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77aca0ef

sys-process/audit: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-process/audit/Manifest                         |   7 -
 sys-process/audit/audit-1.7.18.ebuild              | 132 ------------
 sys-process/audit/audit-2.0.5.ebuild               | 177 ----------------
 sys-process/audit/audit-2.1.3-r1.ebuild            | 189 -----------------
 sys-process/audit/audit-2.2.2-r2.ebuild            | 195 ------------------
 sys-process/audit/audit-2.2.2-r3.ebuild            | 195 ------------------
 sys-process/audit/audit-2.4.1-r1.ebuild            | 187 -----------------
 sys-process/audit/audit-2.4.1.ebuild               | 187 -----------------
 sys-process/audit/audit-2.4.3-r1.ebuild            | 225 ---------------------
 sys-process/audit/audit-2.4.3.ebuild               | 221 --------------------
 sys-process/audit/audit-2.4.4.ebuild               | 225 ---------------------
 sys-process/audit/files/audit-1.7.17-python.patch  |  12 --
 .../audit/files/audit-1.7.18-as-needed.patch       |  30 ---
 .../audit/files/audit-1.7.18-missing_headers.patch |  13 --
 sys-process/audit/files/audit-2.0.5-python.patch   |  22 --
 sys-process/audit/files/audit-2.1.3-python.patch   |  24 ---
 sys-process/audit/files/audit-2.4.1-python.patch   |  22 --
 17 files changed, 2063 deletions(-)

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 1f324b6..871369d 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,8 +1 @@
-DIST audit-1.7.18.tar.gz 1566698 SHA256 
c3e9e7df9e0776c3f90acfde7432ed362ff3ae5c40488391789bc8262f97f17c SHA512 
15d27602dcb8d5a0dac2eb299a96d4d34b36fd303c90bd1cee6d6151bc1c6b83f09e7437029bee54f4435afd1386be0a1351bde1fb705ac24749b9e31c75919f
 WHIRLPOOL 
fc38a5668fdd72c11269000f384abb1d783bbec36c20df9bd266a4dfccd0363d9616bff46c708882c3b66520d141f298346add3637ae1a5db5e646a7bd1db539
-DIST audit-2.0.5.tar.gz 810519 SHA256 
1ef85e606a0fda21596577f5c205c0df7eb56d7cffbb84aeeeb72ce44e61a83b SHA512 
5e5e7f6af79792aa4f8577b6a5975440167b19e35d555c7c60c51d0af20f6bfeafb78a89f8b546efe9b9c79296ee5872fa0056f34a61650c66f34ceedc8b15c4
 WHIRLPOOL 
d5ec4d00555858f8d8e5d42400ce0775b9db1d7fc1efc995dbfb45fc59c34d2b0268879d2fd35b60af3b07498e166b2afc6dbbc23f5943a50e1da9898d7aeb4b
-DIST audit-2.1.3.tar.gz 833647 SHA256 
1c61858d8ed299128aa6bd8e85bac758bfe33e61358d259e52acb7d961fee90e SHA512 
0f5c02ee3eb35687e85cfea0cae2bc11c35d2de5c44347f8f3cde4d268aeef215547cfb4b577afffc737ce5944219f46b4594ac122479d8b2e185efe3cdb069b
 WHIRLPOOL 
c83ac2bf929f524c4bc34ffcd503db9687a2c8affe3b5bb0a908e40ba8e98beced6fee6f3212db7267cf11cef3dbd13915a1ee09334f2cf58a686a1acfff0946
-DIST audit-2.2.2.tar.gz 907066 SHA256 
8bc2b45a5f08f5df6cebcd5543f24b7e68e28b64da4b23f08de2c6616384302b SHA512 
98d83162e69816611dfac3d3ecc19235403ea5809d7a5cd9f13444c2085f03e46657802addb58ee31c251749f89417926ae40bcd99a77d64f062712830fde9bb
 WHIRLPOOL 
f127d3b9645d4e679a83767d688b83c7d59d4a35a166bc9f5038df89852768b695bc0c30e26fea0930aa29fed4583aa5218a42d5898d2a7c542e04cf58b9a9e9
-DIST audit-2.4.1.tar.gz 942147 SHA256 
059346fa0e922faf4dcc054382b21f4845cd8c4942e82cfd0d4cd52bd2b03026 SHA512 
4ca29ee2c784861f75f9e05f5c4dfc3d3ebb9d51e454e8a069ef4d08db3754fb19189714935351e70b26ed44347a266ae6c31e68361d5e9efd89f657f91dbd50
 WHIRLPOOL 
49ecfdd2363eb8bcf25d40b36bf228c8bd31611804b284dde004d42a250a39c387bd0abff223cf4041f62805d5bb189a19375f5806385344ca219d823d267f2e
-DIST audit-2.4.3.tar.gz 998974 SHA256 
9c914704fecc602e143e37152f3efbab2469692684c1a8cc1b801c1b49c7abc6 SHA512 
2bbaa11ed5e2d8138711df325ec1997c4eb955123699fd330b5272b7f3475ca61c9753e1c103abfc9c49e1fc8aaf52dbd55545e3f1874214979ddece64ad79aa
 WHIRLPOOL 
1a0c0a273fddc49d15322a2423d4038488738d6597d0641182befab91646355bbee393a5d09d446dc4cf2f4579dd7ea99928cadd77bc72c355db0a10d4964da5
-DIST audit-2.4.4.tar.gz 1004024 SHA256 
25f57f465f3230d7b1166b615ffd6748818a3dc225d0e8b396c5b2e951674e23 SHA512 
752fa75fdf3406c0a61b57d05cf048e2b79c48589d881a231cb410c8b6031ec50c56b694c7f545c8d78000d4969933cb965016ef5b4a54a9391ad3ea6a55ee40
 WHIRLPOOL 
3656d6610409f5d2097b8d145c81cfb16104460d1eb14718315aa04d101cbac9952f6d168225bf768eb0b3786a1fdbe26798c0980d729a96c82891ca1720d0f2
 DIST audit-2.6.4.tar.gz 1078677 SHA256 
b5a79cecd9593c368c9e42d5af72fcd14f046676657e906970b6c4a1aa5d06c7 SHA512 
69b5d3987d2b8b189d1242fde639af3d7d366e901733133e47ee71223caf73aa7da40b7811298f0af861969b0ab482c5ef9830b711bdd15bd5f4d0ebc88a1224
 WHIRLPOOL 
bda2f7bb754620b003c9c7df2e29d169e0421a9f0a1cf11396539fc3cae1d3907dc4265c3941e24a30eb206032a894989e74b803f2c4a7558057b879c41b2642

diff --git a/sys-process/audit/audit-1.7.18.ebuild 
b/sys-process/audit/audit-1.7.18.ebuild
deleted file mode 100644
index aa3c304..00000000
--- a/sys-process/audit/audit-1.7.18.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit autotools eutils multilib toolchain-funcs python eutils
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-       dev-lang/swig
-       >=sys-kernel/linux-headers-2.6.23"
-# Do not use os-headers as this is linux specific
-
-pkg_setup() {
-       python_set_active_version 2
-       python_pkg_setup
-}
-
-src_prepare() {
-       # Old patch applies fine
-       #EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
-
-       # Applied by upstream
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
-
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               -e '/^SUBDIRS/s,\\$,,g' \
-               "${S}"/Makefile.am
-       rm -rf "${S}"/system-config-audit
-
-       # Probably goes away in 1.6.9
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/audit-1.6.8-subdirs-fix.patch
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${PN}-1.7.17-python.patch
-       # bug #405887
-       epatch "${FILESDIR}"/audit-1.7.18-as-needed.patch
-       epatch "${FILESDIR}"/audit-1.7.18-missing_headers.patch
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Disable byte-compilation of Python modules.
-       echo "#!/bin/sh" > py-compile
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-src_configure() {
-       #append-flags -D'__attribute__(x)='
-       econf --sbindir=/sbin --without-prelude
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/*
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-1.7.17 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-1.2.3 auditd
-
-       # things like shadow use this so we need to be in /
-       dodir /$(get_libdir)
-       mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
-       gen_usr_ldscript libaudit.so libauparse.so
-
-       # remove RedHat garbage
-       rm -r "${D}"/etc/{rc.d,sysconfig} || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       doins "${FILESDIR}"/audit.rules*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       # Don't install .la files in Python directories.
-       python_clean_installation_image
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       python_mod_optimize audit.py
-}
-
-pkg_postrm() {
-       python_mod_cleanup audit.py
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/audit-2.0.5.ebuild 
b/sys-process/audit/audit-2.0.5.ebuild
deleted file mode 100644
index a7790c6..00000000
--- a/sys-process/audit/audit-2.0.5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit autotools multilib toolchain-funcs python linux-info eutils
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap prelude"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-                prelude? ( dev-libs/libprelude )
-                sys-libs/libcap-ng"
-DEPEND="${RDEPEND}
-       dev-lang/swig
-       >=sys-kernel/linux-headers-2.6.34"
-# Do not use os-headers as this is linux specific
-
-CONFIG_CHECK="~AUDIT"
-
-pkg_setup() {
-       linux-info_pkg_setup
-       python_pkg_setup
-       PYTHON_DIRS="bindings/python swig"
-}
-
-src_prepare() {
-       # Old patch applies fine
-       #EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
-
-       # Applied by upstream
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
-
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac || die
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               -e '/^SUBDIRS/s,\\$,,g' \
-               "${S}"/Makefile.am || die
-       rm -rf "${S}"/system-config-audit
-
-       # Probably goes away in 1.6.9
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/audit-1.6.8-subdirs-fix.patch
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac || die
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am || die
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${P}-python.patch
-
-       # Python bindings are built/installed manually.
-       sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
-       sed -e "/^SUBDIRS =/s/ swig//" -i Makefile.am
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Disable byte-compilation of Python modules.
-       echo "#!/bin/sh" > py-compile
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-src_configure() {
-       #append-flags -D'__attribute__(x)='
-       econf --sbindir=/sbin $(use_with prelude)
-}
-
-src_compile() {
-       default
-
-       python_copy_sources ${PYTHON_DIRS}
-
-       building() {
-               emake \
-                       PYTHON_VERSION="$(python_get_version)" \
-                       pyexecdir="$(python_get_sitedir)"
-       }
-       local dir
-       for dir in ${PYTHON_DIRS}; do
-               python_execute_function -s --source-dir ${dir} building
-       done
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-
-       installation() {
-               emake \
-                       DESTDIR="${D}" \
-                       PYTHON_VERSION="$(python_get_version)" \
-                       pyexecdir="$(python_get_sitedir)" \
-                       install
-       }
-       local dir
-       for dir in ${PYTHON_DIRS}; do
-               python_execute_function -s --source-dir ${dir} installation
-       done
-
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/*
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-1.7.17 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-1.2.3 auditd
-
-       # things like shadow use this so we need to be in /
-       dodir /$(get_libdir)
-       mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
-       gen_usr_ldscript libaudit.so libauparse.so
-
-       # remove RedHat garbage
-       rm -r "${D}"/etc/{rc.d,sysconfig} || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       doins "${FILESDIR}"/audit.rules*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       # Don't install .la files in Python directories.
-       python_clean_installation_image
-}
-
-pkg_preinst() {
-       default
-       # Preserve from the audit-1 series
-       preserve_old_lib /$(get_libdir)/libau{dit,parse}.so.0
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       python_mod_optimize audit.py
-       # Preserve from the audit-1 series
-       preserve_old_lib_notify /$(get_libdir)/libau{dit,parse}.so.0
-}
-
-pkg_postrm() {
-       python_mod_cleanup audit.py
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/audit-2.1.3-r1.ebuild 
b/sys-process/audit/audit-2.1.3-r1.ebuild
deleted file mode 100644
index 613825a..00000000
--- a/sys-process/audit/audit-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit autotools multilib toolchain-funcs python linux-info eutils
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="ldap prelude python"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-                prelude? ( dev-libs/libprelude )
-                sys-libs/libcap-ng"
-DEPEND="${RDEPEND}
-       python? ( dev-lang/swig )
-       >=sys-kernel/linux-headers-2.6.34"
-# Do not use os-headers as this is linux specific
-
-CONFIG_CHECK="~AUDIT"
-PYTHON_DIRS="bindings/python swig"
-
-pkg_setup() {
-       linux-info_pkg_setup
-       use python && python_pkg_setup
-}
-
-src_prepare() {
-       # Old patch applies fine
-       #EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
-
-       # Applied by upstream
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
-
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac || die
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               "${S}"/Makefile.am || die
-       rm -rf "${S}"/system-config-audit
-
-       # Probably goes away in 1.6.9
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/audit-1.6.8-subdirs-fix.patch
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac || die
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am || die
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${PN}-2.1.3-python.patch
-
-       # glibc/kernel upstreams suck with both defining ia64_fpreg
-       # This patch is a horribly workaround that is only valid as long as you
-       # don't need the OTHER definitions in fpu.h.
-       epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
-
-       # Python bindings are built/installed manually.
-       sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
-       sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Disable byte-compilation of Python modules.
-       echo "#!/bin/sh" > py-compile
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-src_configure() {
-       #append-flags -D'__attribute__(x)='
-       econf --sbindir=/sbin $(use_with prelude)
-}
-
-src_compile_python() {
-       python_copy_sources ${PYTHON_DIRS}
-
-       building() {
-               emake \
-                       PYTHON_VERSION="$(python_get_version)" \
-                       pyexecdir="$(python_get_sitedir)"
-       }
-       local dir
-       for dir in ${PYTHON_DIRS}; do
-               python_execute_function -s --source-dir ${dir} building
-       done
-}
-
-src_compile() {
-       default
-       use python && src_compile_python
-}
-
-src_install_python() {
-       installation() {
-               emake \
-                       DESTDIR="${D}" \
-                       PYTHON_VERSION="$(python_get_version)" \
-                       pyexecdir="$(python_get_sitedir)" \
-                       install
-       }
-       local dir
-       for dir in ${PYTHON_DIRS}; do
-               python_execute_function -s --source-dir ${dir} installation
-       done
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-       use python && src_install_python
-
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/{*.rules,avc_snap,skeleton.c}
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
-
-       # things like shadow use this so we need to be in /
-       gen_usr_ldscript -a audit auparse
-
-       [ -f "${D}"/sbin/audisp-remote ] && \
-       dodir /usr/sbin && \
-       mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
-
-       # remove RedHat garbage
-       rm -r "${D}"/etc/{rc.d,sysconfig} || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
-       doins "${FILESDIR}"/audit.rules.stop*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       # Don't install .la files in Python directories.
-       use python && python_clean_installation_image
-}
-
-pkg_preinst() {
-       # Preserve from the audit-1 series
-       preserve_old_lib /$(get_libdir)/libau{dit,parse}.so.0
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       use python && python_mod_optimize audit.py
-       # Preserve from the audit-1 series
-       preserve_old_lib_notify /$(get_libdir)/libau{dit,parse}.so.0
-}
-
-pkg_postrm() {
-       use python && python_mod_cleanup audit.py
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/audit-2.2.2-r2.ebuild 
b/sys-process/audit/audit-2.2.2-r2.ebuild
deleted file mode 100644
index 1e04b62..00000000
--- a/sys-process/audit/audit-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 
linux-info eutils systemd
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ldap prelude python"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-                prelude? ( dev-libs/libprelude )
-                sys-libs/libcap-ng"
-DEPEND="${RDEPEND}
-       python? ( dev-lang/swig )
-       >=sys-kernel/linux-headers-2.6.34"
-# Do not use os-headers as this is linux specific
-
-CONFIG_CHECK="~AUDIT"
-
-pkg_setup() {
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       # Old patch applies fine
-       #EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
-
-       # Applied by upstream
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
-
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac || die
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               "${S}"/Makefile.am || die
-       rm -rf "${S}"/system-config-audit
-
-       # Probably goes away in 1.6.9
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/audit-1.6.8-subdirs-fix.patch
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac || die
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am || die
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${PN}-2.1.3-python.patch
-
-       # glibc/kernel upstreams suck with both defining ia64_fpreg
-       # This patch is a horribly workaround that is only valid as long as you
-       # don't need the OTHER definitions in fpu.h.
-       epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
-
-       # Python bindings are built/installed manually.
-       sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
-       sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-multilib_src_configure() {
-       local ECONF_SOURCE=${S}
-       #append-flags -D'__attribute__(x)='
-       econf \
-               --sbindir=/sbin \
-               --enable-systemd \
-               --without-python \
-               $(multilib_native_use_with prelude)
-
-       if multilib_is_native_abi; then
-               python_configure() {
-                       mkdir -p "${BUILD_DIR}" || die
-                       cd "${BUILD_DIR}" || die
-                       econf --with-python
-               }
-
-               use python && python_foreach_impl python_configure
-       fi
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               default
-
-               python_compile() {
-                       emake -C "${BUILD_DIR}"/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la"
-                       emake -C "${BUILD_DIR}"/bindings/python \
-                               
VPATH="${S}/bindings/python:${native_build}/bindings/python" \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la"
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_compile
-       else
-               emake -C lib
-               emake -C auparse
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               emake DESTDIR="${D}" initdir="$(systemd_get_unitdir)" install
-
-               python_install() {
-                       emake -C "${BUILD_DIR}"/swig \
-                               VPATH="${native_build}/lib" \
-                               DESTDIR="${D}" install
-                       emake -C "${BUILD_DIR}"/bindings/python \
-                               
VPATH="${S}/bindings/python:${native_build}/bindings/python" \
-                               DESTDIR="${D}" install
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_install
-
-               # things like shadow use this so we need to be in /
-               gen_usr_ldscript -a audit auparse
-       else
-               emake -C lib DESTDIR="${D}" install
-               emake -C auparse DESTDIR="${D}" install
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/{*.rules,avc_snap,skeleton.c}
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
-
-       [ -f "${D}"/sbin/audisp-remote ] && \
-       dodir /usr/sbin && \
-       mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
-       doins "${FILESDIR}"/audit.rules.stop*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       prune_libtool_files --modules
-}
-
-pkg_preinst() {
-       # Preserve from the audit-1 series
-       preserve_old_lib /$(get_libdir)/libau{dit,parse}.so.0
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       # Preserve from the audit-1 series
-       preserve_old_lib_notify /$(get_libdir)/libau{dit,parse}.so.0
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/audit-2.2.2-r3.ebuild 
b/sys-process/audit/audit-2.2.2-r3.ebuild
deleted file mode 100644
index 20450b7..00000000
--- a/sys-process/audit/audit-2.2.2-r3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 
linux-info eutils systemd
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ldap prelude python"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-                prelude? ( dev-libs/libprelude )
-                sys-libs/libcap-ng"
-DEPEND="${RDEPEND}
-       python? ( dev-lang/swig )
-       >=sys-kernel/linux-headers-2.6.34"
-# Do not use os-headers as this is linux specific
-
-CONFIG_CHECK="~AUDIT"
-
-pkg_setup() {
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       # Old patch applies fine
-       #EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
-
-       # Applied by upstream
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
-
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac || die
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               "${S}"/Makefile.am || die
-       rm -rf "${S}"/system-config-audit
-
-       # Probably goes away in 1.6.9
-       #EPATCH_OPTS="-p1 -d${S}" epatch 
"${FILESDIR}"/audit-1.6.8-subdirs-fix.patch
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac || die
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am || die
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${PN}-2.1.3-python.patch
-
-       # glibc/kernel upstreams suck with both defining ia64_fpreg
-       # This patch is a horribly workaround that is only valid as long as you
-       # don't need the OTHER definitions in fpu.h.
-       epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
-
-       # Python bindings are built/installed manually.
-       sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
-       sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-multilib_src_configure() {
-       local ECONF_SOURCE=${S}
-       #append-flags -D'__attribute__(x)='
-       econf \
-               --sbindir=/sbin \
-               --enable-systemd \
-               --without-python \
-               $(multilib_native_use_with prelude)
-
-       if multilib_is_native_abi; then
-               python_configure() {
-                       mkdir -p "${BUILD_DIR}" || die
-                       cd "${BUILD_DIR}" || die
-                       econf --with-python
-               }
-
-               use python && python_foreach_impl python_configure
-       fi
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               default
-
-               python_compile() {
-                       emake -C "${BUILD_DIR}"/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la"
-                       emake -C "${BUILD_DIR}"/bindings/python \
-                               
VPATH="${S}/bindings/python:${native_build}/bindings/python" \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la"
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_compile
-       else
-               emake -C lib
-               emake -C auparse
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               emake DESTDIR="${D}" initdir="$(systemd_get_unitdir)" install
-
-               python_install() {
-                       emake -C "${BUILD_DIR}"/swig \
-                               VPATH="${native_build}/lib" \
-                               DESTDIR="${D}" install
-                       emake -C "${BUILD_DIR}"/bindings/python \
-                               
VPATH="${S}/bindings/python:${native_build}/bindings/python" \
-                               DESTDIR="${D}" install
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_install
-
-               # things like shadow use this so we need to be in /
-               gen_usr_ldscript -a audit auparse
-       else
-               emake -C lib DESTDIR="${D}" install
-               emake -C auparse DESTDIR="${D}" install
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/{*.rules,avc_snap,skeleton.c}
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
-
-       [ -f "${D}"/sbin/audisp-remote ] && \
-       dodir /usr/sbin && \
-       mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
-       doins "${FILESDIR}"/audit.rules.stop*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       prune_libtool_files --modules
-}
-
-pkg_preinst() {
-       # Preserve from the audit-1 series
-       preserve_old_lib /$(get_libdir)/libaudit.so.0
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       # Preserve from the audit-1 series
-       preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/audit-2.4.1-r1.ebuild 
b/sys-process/audit/audit-2.4.1-r1.ebuild
deleted file mode 100644
index 3602fe8..00000000
--- a/sys-process/audit/audit-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 
linux-info eutils systemd
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ldap python"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-                sys-libs/libcap-ng"
-DEPEND="${RDEPEND}
-       python? ( ${PYTHON_DEPS}
-               dev-lang/swig )
-       >=sys-kernel/linux-headers-2.6.34"
-# Do not use os-headers as this is linux specific
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CONFIG_CHECK="~AUDIT"
-
-pkg_setup() {
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac || die
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               "${S}"/Makefile.am || die
-       rm -rf "${S}"/system-config-audit
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac || die
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am || die
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${PN}-2.4.1-python.patch
-
-       # glibc/kernel upstreams suck with both defining ia64_fpreg
-       # This patch is a horribly workaround that is only valid as long as you
-       # don't need the OTHER definitions in fpu.h.
-       epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
-
-       # Python bindings are built/installed manually.
-       sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
-       sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-multilib_src_configure() {
-       local ECONF_SOURCE=${S}
-       #append-flags -D'__attribute__(x)='
-       econf \
-               --sbindir=/sbin \
-               --enable-systemd \
-               --without-python
-
-       if multilib_is_native_abi; then
-               python_configure() {
-                       mkdir -p "${BUILD_DIR}" || die
-                       cd "${BUILD_DIR}" || die
-                       econf --with-python
-               }
-
-               use python && python_foreach_impl python_configure
-       fi
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               default
-
-               python_compile() {
-                       emake -C "${BUILD_DIR}"/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la"
-                       emake -C "${BUILD_DIR}"/bindings/python \
-                               
VPATH="${S}/bindings/python:${native_build}/bindings/python" \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la"
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_compile
-       else
-               emake -C lib
-               emake -C auparse
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               emake DESTDIR="${D}" initdir="$(systemd_get_unitdir)" install
-
-               python_install() {
-                       emake -C "${BUILD_DIR}"/swig \
-                               VPATH="${native_build}/lib" \
-                               DESTDIR="${D}" install
-                       emake -C "${BUILD_DIR}"/bindings/python \
-                               
VPATH="${S}/bindings/python:${native_build}/bindings/python" \
-                               DESTDIR="${D}" install
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_install
-
-               # things like shadow use this so we need to be in /
-               gen_usr_ldscript -a audit auparse
-       else
-               emake -C lib DESTDIR="${D}" install
-               emake -C auparse DESTDIR="${D}" install
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/{*.rules,avc_snap,skeleton.c}
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
-
-       [ -f "${D}"/sbin/audisp-remote ] && \
-       dodir /usr/sbin && \
-       mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
-       doins "${FILESDIR}"/audit.rules.stop*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       prune_libtool_files --modules
-}
-
-pkg_preinst() {
-       # Preserve from the audit-1 series
-       preserve_old_lib /$(get_libdir)/libaudit.so.0
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       # Preserve from the audit-1 series
-       preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/audit-2.4.1.ebuild 
b/sys-process/audit/audit-2.4.1.ebuild
deleted file mode 100644
index 73901d5..00000000
--- a/sys-process/audit/audit-2.4.1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 
linux-info eutils systemd
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ldap python"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-                sys-libs/libcap-ng"
-DEPEND="${RDEPEND}
-       python? ( ${PYTHON_DEPS}
-               dev-lang/swig )
-       >=sys-kernel/linux-headers-2.6.34"
-# Do not use os-headers as this is linux specific
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CONFIG_CHECK="~AUDIT"
-
-pkg_setup() {
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac || die
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               "${S}"/Makefile.am || die
-       rm -rf "${S}"/system-config-audit
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac || die
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am || die
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${PN}-2.4.1-python.patch
-
-       # glibc/kernel upstreams suck with both defining ia64_fpreg
-       # This patch is a horribly workaround that is only valid as long as you
-       # don't need the OTHER definitions in fpu.h.
-       epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
-
-       # Python bindings are built/installed manually.
-       sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
-       sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-multilib_src_configure() {
-       local ECONF_SOURCE=${S}
-       #append-flags -D'__attribute__(x)='
-       econf \
-               --sbindir=/sbin \
-               --enable-systemd \
-               --without-python
-
-       if multilib_is_native_abi; then
-               python_configure() {
-                       mkdir -p "${BUILD_DIR}" || die
-                       cd "${BUILD_DIR}" || die
-                       econf --with-python
-               }
-
-               use python && python_foreach_impl python_configure
-       fi
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               default
-
-               python_compile() {
-                       emake -C "${BUILD_DIR}"/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la"
-                       emake -C "${BUILD_DIR}"/bindings/python \
-                               
VPATH="${S}/bindings/python:${native_build}/bindings/python" \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la"
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_compile
-       else
-               emake -C lib
-               emake -C auparse
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               emake DESTDIR="${D}" initdir="$(systemd_get_unitdir)" install
-
-               python_install() {
-                       emake -C "${BUILD_DIR}"/swig \
-                               VPATH="${native_build}/lib" \
-                               DESTDIR="${D}" install
-                       emake -C "${BUILD_DIR}"/bindings/python \
-                               
VPATH="${S}/bindings/python:${native_build}/bindings/python" \
-                               DESTDIR="${D}" install
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_install
-
-               # things like shadow use this so we need to be in /
-               gen_usr_ldscript -a audit auparse
-       else
-               emake -C lib DESTDIR="${D}" install
-               emake -C auparse DESTDIR="${D}" install
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/{*.rules,avc_snap,skeleton.c}
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
-
-       [ -f "${D}"/sbin/audisp-remote ] && \
-       dodir /usr/sbin && \
-       mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
-       doins "${FILESDIR}"/audit.rules.stop*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       prune_libtool_files --modules
-}
-
-pkg_preinst() {
-       # Preserve from the audit-1 series
-       preserve_old_lib /$(get_libdir)/libau{dit,parse}.so.0
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       # Preserve from the audit-1 series
-       preserve_old_lib_notify /$(get_libdir)/libau{dit,parse}.so.0
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/audit-2.4.3-r1.ebuild 
b/sys-process/audit/audit-2.4.3-r1.ebuild
deleted file mode 100644
index e1fd1a1..00000000
--- a/sys-process/audit/audit-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 
linux-info eutils systemd
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc 
x86"
-IUSE="ldap python"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-               sys-libs/libcap-ng"
-DEPEND="${RDEPEND}
-               >=sys-kernel/linux-headers-2.6.34
-               python? (
-                       ${PYTHON_DEPS}
-                       dev-lang/swig:0
-               )"
-# Do not use os-headers as this is linux specific
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CONFIG_CHECK="~AUDIT"
-
-pkg_setup() {
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       epatch_user
-
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac || die
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               "${S}"/Makefile.am || die
-       rm -rf "${S}"/system-config-audit
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac || die
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am || die
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${PN}-2.4.3-python.patch
-
-       # glibc/kernel upstreams suck with both defining ia64_fpreg
-       # This patch is a horribly workaround that is only valid as long as you
-       # don't need the OTHER definitions in fpu.h.
-       epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
-
-       # there is no --without-golang conf option
-       sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-multilib_src_configure() {
-       local ECONF_SOURCE=${S}
-       econf \
-               --sbindir=/sbin \
-               --enable-systemd \
-               --without-python \
-               --without-python3
-
-       if multilib_is_native_abi; then
-               python_configure() {
-                       mkdir -p "${BUILD_DIR}" || die
-                       cd "${BUILD_DIR}" || die
-
-                       if python_is_python3; then
-                               econf --without-python --with-python3
-                       else
-                               econf --with-python --without-python3
-                       fi
-               }
-
-               use python && python_foreach_impl python_configure
-       fi
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               default
-
-               python_compile() {
-                       local pysuffix pydef
-                       if python_is_python3; then
-                               pysuffix=3
-                               pydef='USE_PYTHON3=true'
-                       else
-                               pysuffix=2
-                               pydef='HAVE_PYTHON=true'
-                       fi
-
-                       emake -C "${BUILD_DIR}"/bindings/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la" \
-                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
-                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
-                               ${pydef}
-                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
-                               ${pydef}
-               }
-
-               local native_build="${BUILD_DIR}"
-               use python && python_foreach_impl python_compile
-       else
-               emake -C lib
-               emake -C auparse
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               emake DESTDIR="${D}" initdir="$(systemd_get_unitdir)" install
-
-               python_install() {
-                       local pysuffix pydef
-                       if python_is_python3; then
-                               pysuffix=3
-                               pydef='USE_PYTHON3=true'
-                       else
-                               pysuffix=2
-                               pydef='HAVE_PYTHON=true'
-                       fi
-
-                       emake -C "${BUILD_DIR}"/bindings/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la" \
-                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
-                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
-                               ${pydef} \
-                               DESTDIR="${D}" install
-                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
-                               ${pydef} \
-                               DESTDIR="${D}" install
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_install
-
-               # things like shadow use this so we need to be in /
-               gen_usr_ldscript -a audit auparse
-       else
-               emake -C lib DESTDIR="${D}" install
-               emake -C auparse DESTDIR="${D}" install
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/{*.rules,avc_snap,skeleton.c}
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
-
-       chmod 644 "${D}/$(systemd_get_unitdir)"/auditd.service || die # 556436
-
-       [ -f "${D}"/sbin/audisp-remote ] && \
-       dodir /usr/sbin && \
-       mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
-       doins "${FILESDIR}"/audit.rules.stop*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       prune_libtool_files --modules
-}
-
-pkg_preinst() {
-       # Preserve from the audit-1 series
-       preserve_old_lib /$(get_libdir)/libaudit.so.0
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       # Preserve from the audit-1 series
-       preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/audit-2.4.3.ebuild 
b/sys-process/audit/audit-2.4.3.ebuild
deleted file mode 100644
index f1495bd..00000000
--- a/sys-process/audit/audit-2.4.3.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 
linux-info eutils systemd
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ldap python"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-                sys-libs/libcap-ng"
-DEPEND="${RDEPEND}
-       python? ( ${PYTHON_DEPS}
-               dev-lang/swig )
-       >=sys-kernel/linux-headers-2.6.34"
-# Do not use os-headers as this is linux specific
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CONFIG_CHECK="~AUDIT"
-
-pkg_setup() {
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       epatch_user
-
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac || die
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               "${S}"/Makefile.am || die
-       rm -rf "${S}"/system-config-audit
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac || die
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am || die
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${PN}-2.4.3-python.patch
-
-       # glibc/kernel upstreams suck with both defining ia64_fpreg
-       # This patch is a horribly workaround that is only valid as long as you
-       # don't need the OTHER definitions in fpu.h.
-       epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
-
-       # there is no --without-golang conf option
-       sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-multilib_src_configure() {
-       local ECONF_SOURCE=${S}
-       econf \
-               --sbindir=/sbin \
-               --enable-systemd \
-               --without-python \
-               --without-python3
-
-       if multilib_is_native_abi; then
-               python_configure() {
-                       mkdir -p "${BUILD_DIR}" || die
-                       cd "${BUILD_DIR}" || die
-
-                       if python_is_python3; then
-                               econf --without-python --with-python3
-                       else
-                               econf --with-python --without-python3
-                       fi
-               }
-
-               use python && python_foreach_impl python_configure
-       fi
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               default
-
-               python_compile() {
-                       local pysuffix pydef
-                       if python_is_python3; then
-                               pysuffix=3
-                               pydef='USE_PYTHON3=true'
-                       else
-                               pysuffix=2
-                               pydef='HAVE_PYTHON=true'
-                       fi
-
-                       emake -C "${BUILD_DIR}"/bindings/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la" \
-                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
-                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
-                               ${pydef}
-                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
-                               ${pydef}
-               }
-
-               local native_build="${BUILD_DIR}"
-               use python && python_foreach_impl python_compile
-       else
-               emake -C lib
-               emake -C auparse
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               emake DESTDIR="${D}" initdir="$(systemd_get_unitdir)" install
-
-               python_install() {
-                       local pysuffix pydef
-                       if python_is_python3; then
-                               pysuffix=3
-                               pydef='USE_PYTHON3=true'
-                       else
-                               pysuffix=2
-                               pydef='HAVE_PYTHON=true'
-                       fi
-
-                       emake -C "${BUILD_DIR}"/bindings/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la" \
-                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
-                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
-                               ${pydef} \
-                               DESTDIR="${D}" install
-                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
-                               ${pydef} \
-                               DESTDIR="${D}" install
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_install
-
-               # things like shadow use this so we need to be in /
-               gen_usr_ldscript -a audit auparse
-       else
-               emake -C lib DESTDIR="${D}" install
-               emake -C auparse DESTDIR="${D}" install
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/{*.rules,avc_snap,skeleton.c}
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
-
-       [ -f "${D}"/sbin/audisp-remote ] && \
-       dodir /usr/sbin && \
-       mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
-       doins "${FILESDIR}"/audit.rules.stop*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       prune_libtool_files --modules
-}
-
-pkg_preinst() {
-       # Preserve from the audit-1 series
-       preserve_old_lib /$(get_libdir)/libaudit.so.0
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       # Preserve from the audit-1 series
-       preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/audit-2.4.4.ebuild 
b/sys-process/audit/audit-2.4.4.ebuild
deleted file mode 100644
index a1b47a8..00000000
--- a/sys-process/audit/audit-2.4.4.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit autotools multilib multilib-minimal toolchain-funcs python-r1 
linux-info eutils systemd
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
-IUSE="ldap python"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap )
-               sys-libs/libcap-ng"
-DEPEND="${RDEPEND}
-               >=sys-kernel/linux-headers-2.6.34
-               python? (
-                       ${PYTHON_DEPS}
-                       dev-lang/swig:0
-               )"
-# Do not use os-headers as this is linux specific
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CONFIG_CHECK="~AUDIT"
-
-pkg_setup() {
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       epatch_user
-
-       # Do not build GUI tools
-       sed -i \
-               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-               "${S}"/configure.ac || die
-       sed -i \
-               -e 's,system-config-audit,,g' \
-               "${S}"/Makefile.am || die
-       rm -rf "${S}"/system-config-audit
-
-       if ! use ldap; then
-               sed -i \
-                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-                       "${S}"/configure.ac || die
-               sed -i \
-                       -e '/^SUBDIRS/s,zos-remote,,g' \
-                       "${S}"/audisp/plugins/Makefile.am || die
-       fi
-
-       # Don't build static version of Python module.
-       epatch "${FILESDIR}"/${PN}-2.4.3-python.patch
-
-       # glibc/kernel upstreams suck with both defining ia64_fpreg
-       # This patch is a horribly workaround that is only valid as long as you
-       # don't need the OTHER definitions in fpu.h.
-       epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
-
-       # there is no --without-golang conf option
-       sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
-
-       # Regenerate autotooling
-       eautoreconf
-
-       # Bug 352198: Avoid parallel build fail
-       cd "${S}"/src/mt
-       [[ ! -s private.h ]] && ln -s ../../lib/private.h .
-}
-
-multilib_src_configure() {
-       local ECONF_SOURCE=${S}
-       econf \
-               --sbindir=/sbin \
-               --enable-systemd \
-               --without-python \
-               --without-python3
-
-       if multilib_is_native_abi; then
-               python_configure() {
-                       mkdir -p "${BUILD_DIR}" || die
-                       cd "${BUILD_DIR}" || die
-
-                       if python_is_python3; then
-                               econf --without-python --with-python3
-                       else
-                               econf --with-python --without-python3
-                       fi
-               }
-
-               use python && python_foreach_impl python_configure
-       fi
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               default
-
-               python_compile() {
-                       local pysuffix pydef
-                       if python_is_python3; then
-                               pysuffix=3
-                               pydef='USE_PYTHON3=true'
-                       else
-                               pysuffix=2
-                               pydef='HAVE_PYTHON=true'
-                       fi
-
-                       emake -C "${BUILD_DIR}"/bindings/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la" \
-                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
-                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
-                               ${pydef}
-                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
-                               ${pydef}
-               }
-
-               local native_build="${BUILD_DIR}"
-               use python && python_foreach_impl python_compile
-       else
-               emake -C lib
-               emake -C auparse
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               emake DESTDIR="${D}" initdir="$(systemd_get_unitdir)" install
-
-               python_install() {
-                       local pysuffix pydef
-                       if python_is_python3; then
-                               pysuffix=3
-                               pydef='USE_PYTHON3=true'
-                       else
-                               pysuffix=2
-                               pydef='HAVE_PYTHON=true'
-                       fi
-
-                       emake -C "${BUILD_DIR}"/bindings/swig \
-                               VPATH="${native_build}/lib" \
-                               LIBS="${native_build}/lib/libaudit.la" \
-                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
-                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
-                               ${pydef} \
-                               DESTDIR="${D}" install
-                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
-                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
-                               ${pydef} \
-                               DESTDIR="${D}" install
-               }
-
-               local native_build=${BUILD_DIR}
-               use python && python_foreach_impl python_install
-
-               # things like shadow use this so we need to be in /
-               gen_usr_ldscript -a audit auparse
-       else
-               emake -C lib DESTDIR="${D}" install
-               emake -C auparse DESTDIR="${D}" install
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc AUTHORS ChangeLog README* THANKS TODO
-       docinto contrib
-       dodoc contrib/{*.rules,avc_snap,skeleton.c}
-       docinto contrib/plugin
-       dodoc contrib/plugin/*
-
-       newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
-       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
-
-       chmod 644 "${D}/$(systemd_get_unitdir)"/auditd.service || die # 556436
-
-       [ -f "${D}"/sbin/audisp-remote ] && \
-       dodir /usr/sbin && \
-       mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
-
-       # Gentoo rules
-       insinto /etc/audit/
-       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
-       doins "${FILESDIR}"/audit.rules.stop*
-
-       # audit logs go here
-       keepdir /var/log/audit/
-
-       # Security
-       lockdown_perms "${D}"
-
-       prune_libtool_files --modules
-}
-
-pkg_preinst() {
-       # Preserve from the audit-1 series
-       preserve_old_lib /$(get_libdir)/libaudit.so.0
-}
-
-pkg_postinst() {
-       lockdown_perms "${ROOT}"
-       # Preserve from the audit-1 series
-       preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
-}
-
-lockdown_perms() {
-       # upstream wants these to have restrictive perms
-       basedir="$1"
-       chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 
2>/dev/null
-       chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-       chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 
2>/dev/null
-}

diff --git a/sys-process/audit/files/audit-1.7.17-python.patch 
b/sys-process/audit/files/audit-1.7.17-python.patch
deleted file mode 100644
index 13fed4a..00000000
--- a/sys-process/audit/files/audit-1.7.17-python.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- swig/Makefile.am
-+++ swig/Makefile.am
-@@ -28,7 +28,8 @@
- pyexec_PYTHON = audit.py
- pyexec_LTLIBRARIES = _audit.la
- pyexec_SOLIBRARIES = _audit.so
--_audit_la_LDFLAGS = -module -avoid-version
-+_audit_la_CFLAGS = -shared
-+_audit_la_LDFLAGS = -module -avoid-version -shared
- _audit_la_HEADERS: $(top_builddir)/config.h 
- _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h 
${top_builddir}/lib/libaudit.la
- nodist__audit_la_SOURCES  = audit_wrap.c

diff --git a/sys-process/audit/files/audit-1.7.18-as-needed.patch 
b/sys-process/audit/files/audit-1.7.18-as-needed.patch
deleted file mode 100644
index 2e951d0..00000000
--- a/sys-process/audit/files/audit-1.7.18-as-needed.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- audit-1.7.13.orig/src/Makefile.in
-+++ audit-1.7.13/src/Makefile.in
-@@ -273,10 +273,10 @@
- AM_CFLAGS = -D_REENTRANT -D_GNU_SOURCE
- noinst_HEADERS = auditd-config.h auditd-event.h auditd-listen.h 
ausearch-llist.h ausearch-options.h auditctl-llist.h aureport-options.h 
ausearch-parse.h aureport-scan.h ausearch-lookup.h ausearch-int.h 
auditd-dispatch.h ausearch-string.h ausearch-nvpair.h ausearch-common.h 
ausearch-avc.h ausearch-time.h ausearch-lol.h
- auditd_SOURCES = auditd.c auditd-event.c auditd-config.c auditd-reconfig.c 
auditd-sendmail.c auditd-dispatch.c auditd-listen.c
--auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE 
-fno-strict-aliasing 
--auditd_LDFLAGS = -pie -Wl,-z,relro
-+auditd_CFLAGS = -pthread -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE 
-fno-strict-aliasing 
-+auditd_LDFLAGS = -pthread -pie -Wl,-z,relro
- auditd_DEPENDENCIES = mt/libauditmt.a libev/libev.a
- auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm $(gss_libs)
- auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c
- auditctl_DEPENDENCIES = mt/libauditmt.a 
- aureport_SOURCES = aureport.c auditd-config.c ausearch-llist.c 
aureport-options.c ausearch-string.c ausearch-parse.c aureport-scan.c 
aureport-output.c ausearch-lookup.c ausearch-int.c ausearch-time.c 
ausearch-nvpair.c ausearch-avc.c ausearch-lol.c
---- audit-1.7.13.orig/src/Makefile.am
-+++ audit-1.7.13/src/Makefile.am
-@@ -31,10 +31,10 @@
- noinst_HEADERS = auditd-config.h auditd-event.h auditd-listen.h 
ausearch-llist.h ausearch-options.h auditctl-llist.h aureport-options.h 
ausearch-parse.h aureport-scan.h ausearch-lookup.h ausearch-int.h 
auditd-dispatch.h ausearch-string.h ausearch-nvpair.h ausearch-common.h 
ausearch-avc.h ausearch-time.h ausearch-lol.h
- 
- auditd_SOURCES = auditd.c auditd-event.c auditd-config.c auditd-reconfig.c 
auditd-sendmail.c auditd-dispatch.c auditd-listen.c
--auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE 
-fno-strict-aliasing 
--auditd_LDFLAGS = -pie -Wl,-z,relro
-+auditd_CFLAGS = -pthread -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE 
-fno-strict-aliasing 
-+auditd_LDFLAGS = -pthread -pie -Wl,-z,relro
- auditd_DEPENDENCIES = mt/libauditmt.a libev/libev.a
- auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm $(gss_libs)
- 
- auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c
- auditctl_DEPENDENCIES = mt/libauditmt.a

diff --git a/sys-process/audit/files/audit-1.7.18-missing_headers.patch 
b/sys-process/audit/files/audit-1.7.18-missing_headers.patch
deleted file mode 100644
index 120b173..00000000
--- a/sys-process/audit/files/audit-1.7.18-missing_headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: audit-1.7.13/lib/libaudit.c
-===========================================
---- audit-1.7.13.orig/lib/libaudit.c
-+++ audit-1.7.13/lib/libaudit.c
-@@ -36,6 +36,8 @@
- #include <sys/utsname.h>
- #include <fcntl.h>    /* O_NOFOLLOW needs gnu defined */
- #include <limits.h>   /* for PATH_MAX */
-+#include <sys/stat.h>
-+#include <sys/types.h>
- 
- #include "libaudit.h"
- #include "private.h"

diff --git a/sys-process/audit/files/audit-2.0.5-python.patch 
b/sys-process/audit/files/audit-2.0.5-python.patch
deleted file mode 100644
index 29742ab..00000000
--- a/sys-process/audit/files/audit-2.0.5-python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- bindings/python/Makefile.am
-+++ bindings/python/Makefile.am
-@@ -27,5 +27,6 @@
- 
- auparse_la_SOURCES = auparse_python.c
- auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS) 
-I/usr/include/python$(PYTHON_VERSION) -fno-strict-aliasing
--auparse_la_LDFLAGS = -module -avoid-version
-+auparse_la_CFLAGS = -shared
-+auparse_la_LDFLAGS = -module -avoid-version -shared
- auparse_la_LIBADD = ../../auparse/libauparse.la ../../lib/libaudit.la
---- swig/Makefile.am
-+++ swig/Makefile.am
-@@ -28,7 +28,8 @@
- pyexec_PYTHON = audit.py
- pyexec_LTLIBRARIES = _audit.la
- pyexec_SOLIBRARIES = _audit.so
--_audit_la_LDFLAGS = -module -avoid-version
-+_audit_la_CFLAGS = -shared
-+_audit_la_LDFLAGS = -module -avoid-version -shared
- _audit_la_HEADERS: $(top_builddir)/config.h 
- _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h 
${top_builddir}/lib/libaudit.la
- nodist__audit_la_SOURCES  = audit_wrap.c

diff --git a/sys-process/audit/files/audit-2.1.3-python.patch 
b/sys-process/audit/files/audit-2.1.3-python.patch
deleted file mode 100644
index a9feec1..00000000
--- a/sys-process/audit/files/audit-2.1.3-python.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nuar --exclude '*.orig' audit-2.1.3.orig/bindings/python/Makefile.am 
audit-2.1.3/bindings/python/Makefile.am
---- audit-2.1.3.orig/bindings/python/Makefile.am       2011-08-15 
17:31:01.000000000 +0000
-+++ audit-2.1.3/bindings/python/Makefile.am    2011-09-10 19:01:36.974983756 
+0000
-@@ -27,5 +27,6 @@
- 
- auparse_la_SOURCES = auparse_python.c
- auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS) 
-I/usr/include/python$(PYTHON_VERSION) -fno-strict-aliasing
--auparse_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
-+auparse_la_CFLAGS = -shared
-+auparse_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
- auparse_la_LIBADD = ../../auparse/libauparse.la ../../lib/libaudit.la
-diff -Nuar --exclude '*.orig' audit-2.1.3.orig/swig/Makefile.am 
audit-2.1.3/swig/Makefile.am
---- audit-2.1.3.orig/swig/Makefile.am  2011-08-15 17:31:03.000000000 +0000
-+++ audit-2.1.3/swig/Makefile.am       2011-09-10 19:02:14.095067690 +0000
-@@ -28,7 +28,8 @@
- pyexec_PYTHON = audit.py
- pyexec_LTLIBRARIES = _audit.la
- pyexec_SOLIBRARIES = _audit.so
--_audit_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
-+_audit_la_CFLAGS = -shared
-+_audit_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
- _audit_la_HEADERS: $(top_builddir)/config.h 
- _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h 
${top_builddir}/lib/libaudit.la
- nodist__audit_la_SOURCES  = audit_wrap.c

diff --git a/sys-process/audit/files/audit-2.4.1-python.patch 
b/sys-process/audit/files/audit-2.4.1-python.patch
deleted file mode 100644
index 6c27396..00000000
--- a/sys-process/audit/files/audit-2.4.1-python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- audit-2.4.1/bindings/python/Makefile.am
-+++ audit-2.4.1/bindings/python/Makefile.am
-@@ -27,5 +27,6 @@
- 
- auparse_la_SOURCES = auparse_python.c
- auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS) -I@PYINCLUDEDIR@ 
-fno-strict-aliasing
--auparse_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
-+auparse_la_CFLAGS = -shared
-+auparse_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
- auparse_la_LIBADD = ${top_builddir}/auparse/libauparse.la 
${top_builddir}/lib/libaudit.la
---- audit-2.4.1/swig/Makefile.am
-+++ audit-2.4.1/swig/Makefile.am
-@@ -27,7 +27,8 @@
- pyexec_PYTHON = audit.py
- pyexec_LTLIBRARIES = _audit.la
- pyexec_SOLIBRARIES = _audit.so
--_audit_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
-+_audit_la_CFLAGS = -shared
-+_audit_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
- _audit_la_HEADERS: $(top_builddir)/config.h 
- _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h 
${top_builddir}/lib/libaudit.la
- nodist__audit_la_SOURCES  = audit_wrap.c

Reply via email to