diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2012-12-22 23:53:27 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-12-22 23:53:27 +0000 |
commit | 6fb5000e18a81ea7c74d83e59b3b60573612428d (patch) | |
tree | 8bd653851faaba98c28a15ebb98add76b2bdb474 /sys-process | |
parent | Check for CONFIG_MODULES (diff) | |
download | gentoo-2-6fb5000e18a81ea7c74d83e59b3b60573612428d.tar.gz gentoo-2-6fb5000e18a81ea7c74d83e59b3b60573612428d.tar.bz2 gentoo-2-6fb5000e18a81ea7c74d83e59b3b60573612428d.zip |
Bug #448174: default not valid in pkg_*inst preinst. Also /usr/sbin existence.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-process')
-rw-r--r-- | sys-process/audit/ChangeLog | 6 | ||||
-rw-r--r-- | sys-process/audit/audit-2.1.3-r1.ebuild | 5 | ||||
-rw-r--r-- | sys-process/audit/audit-2.2.2.ebuild | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog index 049029c17424..ed1b6244883d 100644 --- a/sys-process/audit/ChangeLog +++ b/sys-process/audit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-process/audit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.86 2012/12/22 07:36:33 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.87 2012/12/22 23:53:27 robbat2 Exp $ + + 22 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> audit-2.1.3-r1.ebuild, + audit-2.2.2.ebuild: + Bug #448174: default not valid in pkg_*inst preinst. Also /usr/sbin existence. 22 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> audit-2.1.3-r1.ebuild, audit-2.2.2.ebuild: diff --git a/sys-process/audit/audit-2.1.3-r1.ebuild b/sys-process/audit/audit-2.1.3-r1.ebuild index b3faf3249d08..5785197d21af 100644 --- a/sys-process/audit/audit-2.1.3-r1.ebuild +++ b/sys-process/audit/audit-2.1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.1.3-r1.ebuild,v 1.12 2012/12/22 07:36:33 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.1.3-r1.ebuild,v 1.13 2012/12/22 23:53:27 robbat2 Exp $ EAPI="3" PYTHON_DEPEND="python? 2" @@ -143,6 +143,7 @@ src_install() { 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 @@ -164,8 +165,6 @@ src_install() { } pkg_preinst() { -# default functions is missing for pkg_preinst in EAPI 3 -# default # Preserve from the audit-1 series preserve_old_lib /$(get_libdir)/libau{dit,parse}.so.0 } diff --git a/sys-process/audit/audit-2.2.2.ebuild b/sys-process/audit/audit-2.2.2.ebuild index 660171dd9447..2c155deced14 100644 --- a/sys-process/audit/audit-2.2.2.ebuild +++ b/sys-process/audit/audit-2.2.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.2.2.ebuild,v 1.2 2012/12/22 07:36:33 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.2.2.ebuild,v 1.3 2012/12/22 23:53:27 robbat2 Exp $ -EAPI="4" +EAPI="5" PYTHON_DEPEND="python? 2" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" @@ -143,6 +143,7 @@ src_install() { 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 @@ -164,7 +165,6 @@ src_install() { } pkg_preinst() { - default # Preserve from the audit-1 series preserve_old_lib /$(get_libdir)/libau{dit,parse}.so.0 } |