diff options
author | Michał Górny <mgorny@gentoo.org> | 2014-04-28 17:42:44 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2014-04-28 17:42:44 +0000 |
commit | 8a594f28c75afccf2916fbafcacbe434d29f0747 (patch) | |
tree | f3a7e7b0354e23b44a0880663927b50e4b66ebc4 /sys-libs | |
parent | Replace multilib_build_binaries with multilib_is_native_abi. The two are equi... (diff) | |
download | gentoo-2-8a594f28c75afccf2916fbafcacbe434d29f0747.tar.gz gentoo-2-8a594f28c75afccf2916fbafcacbe434d29f0747.tar.bz2 gentoo-2-8a594f28c75afccf2916fbafcacbe434d29f0747.zip |
Replace multilib_build_binaries with multilib_is_native_abi, in order to put an end to the confusion introduced by having two functions, the proper one suggesting it is just for binaries.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/libcap/ChangeLog | 7 | ||||
-rw-r--r-- | sys-libs/libcap/libcap-2.22-r2.ebuild | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog index 10729f09c94e..0795d31f06dc 100644 --- a/sys-libs/libcap/ChangeLog +++ b/sys-libs/libcap/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/libcap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.128 2014/04/18 05:41:58 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.129 2014/04/28 17:42:44 mgorny Exp $ + + 28 Apr 2014; Michał Górny <mgorny@gentoo.org> libcap-2.22-r2.ebuild: + Replace multilib_build_binaries with multilib_is_native_abi, in order to put + an end to the confusion introduced by having two functions, the proper one + suggesting it is just for binaries. 18 Apr 2014; Markus Meier <maekke@gentoo.org> libcap-2.22-r2.ebuild: arm stable, bug #507144 diff --git a/sys-libs/libcap/libcap-2.22-r2.ebuild b/sys-libs/libcap/libcap-2.22-r2.ebuild index df2af498c3ae..7be02e772977 100644 --- a/sys-libs/libcap/libcap-2.22-r2.ebuild +++ b/sys-libs/libcap/libcap-2.22-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r2.ebuild,v 1.6 2014/04/18 05:41:58 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r2.ebuild,v 1.7 2014/04/28 17:42:44 mgorny Exp $ EAPI="4" @@ -31,7 +31,7 @@ src_prepare() { } multilib_src_configure() { - if multilib_build_binaries && use pam; then + if multilib_is_native_abi && use pam; then pam=yes else pam=no @@ -55,10 +55,10 @@ multilib_src_install() { # no configure, needs explicit install line #444724#c3 emake install DESTDIR="${ED}" - multilib_build_binaries && gen_usr_ldscript -a cap + multilib_is_native_abi && gen_usr_ldscript -a cap rm -rf "${ED}"/usr/$(get_libdir)/security - if multilib_build_binaries && use pam; then + if multilib_is_native_abi && use pam; then dopammod pam_cap/pam_cap.so dopamsecurity '' pam_cap/capability.conf fi |