Move variable setting to src_unpack #254840 by Bruno.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 35 insertions, 15 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/Manifest b/sys-libs/libcap/Manifest
index 2f4a5da77c34..1b33dc6135ea 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,12 +1,18 @@
-AUX 2.11/0001-Make-fixes.patch 3320 RMD160 083e071500f9e98475133a9b1e0b0ffe905e12a9 SHA1 3847289072d05e52224513a3c38a6874508f7159 SHA256 720907c5d37d9d8d81c20fcc5f8da67a87b048bfa95488cf03978282de2fd214
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.15/0001-build-system-fixes.patch 4623 RMD160 ce1bd3f18b19071b088361edcfebcfa21cb65d6d SHA1 cf3ce5a28af79c524a98909a8fa05152cf56e5ff SHA256 e369643f3c6cb92161607ecf685a19f8b975a8bc711f4274e2203deceb5503ee
 AUX 2.16/0001-build-system-fixes.patch 4626 RMD160 c65682439da1234a2d65c78331ad1abf662ade44 SHA1 26bb56752cd1cf51eb4cf0ee4baca6581c12f947 SHA256 b271302691e2839e36ca51d8aeef11f527ed70b5aa43b80e7e3b93fa7f6c255d
-AUX libcap-2.08-no-static.patch 150 RMD160 d20c85f07180de6220c432a9dc38c226a76781d4 SHA1 145a2b9b8dbeca0bfc6158891668d9fa1dfd9cf9 SHA256 e8608c1b17d474d26f220774e9144b36d162c0e9122afd46ed76e17b7093bea5
-DIST libcap-2.11.tar.bz2 47321 RMD160 e4ab15205b0638e88a4c5346c0ccc8e1fe6ccc81 SHA1 b292d74897bffd1f58a2cde0df4bd4a1433d58aa SHA256 a39882189f1921008eb18acc3f5517697ab13ad5eed1762ce67e31ff53805889
 DIST libcap-2.15.tar.bz2 48366 RMD160 4b93df3706923589f95b6c3450638bf4651bebc7 SHA1 99f9ebbd31c83925b7420f18aff90bf345d8cb5c SHA256 1c2b35eda964f86db32f37d6962d6493ae8325d2bba71bdbc7742419a3dc8721
 DIST libcap-2.16.tar.bz2 48451 RMD160 5cafe706af24d05c7a170005584892071183e9f0 SHA1 df4129715f6d77366972723e885dd3df817ac99d SHA256 9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f
-EBUILD libcap-2.11.ebuild 1301 RMD160 2e6bdd73f432a1df3aff331fe954b86943e86591 SHA1 a3726b9a30964b4283d559efc961ffc3780347ef SHA256 fc670bbdf1b9fa5ba1981304804e0a64043042223c7b504f54e44d93c192fc17
-EBUILD libcap-2.15.ebuild 1211 RMD160 b0a0923abc6aee1ffd852708ba176f514ea3df16 SHA1 8c5aaad8e6030fb803c077b9d313313547e7fe71 SHA256 784c77845415983f2f911049cc55d0beda796dd19eef998da399b2eb06a31980
-EBUILD libcap-2.16.ebuild 1226 RMD160 ae1c87e7fd38e3f5aa20b94c999039033705486c SHA1 6b03a088f7a48b5b0407cf968afa90943ed3fc68 SHA256 1fd370af31527abc88801ebda8e790efa823ab9131b666883fce21e59ad4d784
-MISC ChangeLog 12058 RMD160 cac1d711869fc8ae9c6f22ff757902869844ff89 SHA1 80bd06af8467b2bf019bcc9bbb60139c35c5b4de SHA256 f6fbde9fa7416807bb4d2bcbc5b757758f990dbc32126d266480ec3feacf7828
+EBUILD libcap-2.15.ebuild 1296 RMD160 4e02a4788a47fb58891ab5bd2d16936939d1ece8 SHA1 95a67fc3b253da39fa1d3731d248329c1c5dcbde SHA256 17fe028ed39c793a088b658b8a2db96896347cffde97703044c4076cfd98e9f1
+EBUILD libcap-2.16.ebuild 1307 RMD160 dad12b72057e79c5f871e41e05504b113c3b0aa1 SHA1 e97f2e8fb65f7c15f4c882f12aef4ce89b3fd2c1 SHA256 0e244ce1f2a295db0a2bddffad59e9568becc0751b562d059ded2f961d375cd8
+MISC ChangeLog 12210 RMD160 dc9a49d8e3f370698466bab19f42ebb987e51a5f SHA1 2ab0e004e8b7c1949597819528d0c3ad4e7f6d5f SHA256 1b84bbf8b7bc7abed4b3413ac4407edfbb26508449c84a063e490aa0debbff92
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklyEtwACgkQn/5bYzqsSmF73gCgm0E9xx7IHMbYX4nMgUNQ9dbQ
+HOoAoKF168uYqRdR6ZzUMyoPfgu14UD3
+=5XkP
+-----END PGP SIGNATURE-----
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