diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-01-17 17:18:14 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-01-17 17:18:14 +0000 |
| commit | cfca10c061039ca901d221b3078441e3d7484ef5 (patch) | |
| tree | 15c660f50549e9c04c45f3f7f0b2862b00587bbf /sys-libs/libcap | |
| parent | old (diff) | |
| download | gentoo-2-cfca10c061039ca901d221b3078441e3d7484ef5.tar.gz gentoo-2-cfca10c061039ca901d221b3078441e3d7484ef5.tar.bz2 gentoo-2-cfca10c061039ca901d221b3078441e3d7484ef5.zip | |
Move variable setting to src_unpack #254840 by Bruno.
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'sys-libs/libcap')
| -rw-r--r-- | sys-libs/libcap/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/libcap/libcap-2.15.ebuild | 11 | ||||
| -rw-r--r-- | sys-libs/libcap/libcap-2.16.ebuild | 13 |
3 files changed, 22 insertions, 8 deletions
diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog index df515fa8a33a..03b396a720e3 100644 --- a/sys-libs/libcap/ChangeLog +++ b/sys-libs/libcap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/libcap # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.85 2009/01/05 18:12:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.86 2009/01/17 17:18:14 vapier Exp $ + + 17 Jan 2009; Mike Frysinger <vapier@gentoo.org> libcap-2.15.ebuild, + libcap-2.16.ebuild: + Move variable setting to src_unpack #254840 by Bruno. 05 Jan 2009; Jeroen Roovers <jer@gentoo.org> libcap-2.15.ebuild: Stable for HPPA (bug #252321). diff --git a/sys-libs/libcap/libcap-2.15.ebuild b/sys-libs/libcap/libcap-2.15.ebuild index e6fc86279955..3acd91ed800d 100644 --- a/sys-libs/libcap/libcap-2.15.ebuild +++ b/sys-libs/libcap/libcap-2.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.15.ebuild,v 1.9 2009/01/05 18:12:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.15.ebuild,v 1.10 2009/01/17 17:18:14 vapier Exp $ inherit eutils multilib toolchain-funcs pam @@ -23,15 +23,20 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PV}/*.patch sed -i -e '/cap_setfcap.*morgan/s:^:#:' pam_cap/capability.conf + sed -i \ + -e "/^PAM_CAP/s:=.*:=$(use pam && echo yes || echo no):" \ + -e '/^DYNAMIC/s:=.*:=yes:' \ + -e "/^lib=/s:=.*:=$(get_libdir):" \ + Make.Rules } src_compile() { tc-export BUILD_CC CC AR RANLIB - emake DYNAMIC=yes PAM_CAP=$(use pam && echo yes || echo no) || die + emake || die } src_install() { - emake install DESTDIR="${D}" lib=$(get_libdir) || die + emake install DESTDIR="${D}" || die gen_usr_ldscript libcap.so mv "${D}"/$(get_libdir)/libcap.a "${D}"/usr/$(get_libdir)/ || die diff --git a/sys-libs/libcap/libcap-2.16.ebuild b/sys-libs/libcap/libcap-2.16.ebuild index 8c85e97da96b..e72f832aeef1 100644 --- a/sys-libs/libcap/libcap-2.16.ebuild +++ b/sys-libs/libcap/libcap-2.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.16.ebuild,v 1.1 2008/12/24 21:46:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.16.ebuild,v 1.2 2009/01/17 17:18:14 vapier Exp $ inherit eutils multilib toolchain-funcs pam @@ -23,15 +23,20 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PV}/*.patch sed -i -e '/cap_setfcap.*morgan/s:^:#:' pam_cap/capability.conf + sed -i \ + -e "/^PAM_CAP/s:=.*:=$(use pam && echo yes || echo no):" \ + -e '/^DYNAMIC/s:=.*:=yes:' \ + -e "/^lib=/s:=.*:=$(get_libdir):" \ + Make.Rules } src_compile() { tc-export BUILD_CC CC AR RANLIB - emake DYNAMIC=yes PAM_CAP=$(use pam && echo yes || echo no) || die + emake || die } src_install() { - emake install DESTDIR="${D}" lib=$(get_libdir) || die + emake install DESTDIR="${D}" || die gen_usr_ldscript libcap.so mv "${D}"/$(get_libdir)/libcap.a "${D}"/usr/$(get_libdir)/ || die |