Do not install libfam.la when USE=-static-libs.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index fd4c755971b64a99c33261b8f7f63b4802be0645..0f5045c6668b32ae6d8b99262b780840ff7847c3 100644 (file)
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/fam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.68 2012/01/05 15:49:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.69 2012/01/05 16:03:23 jer Exp $
+
+  05 Jan 2012; Jeroen Roovers <jer@gentoo.org> fam-2.7.0-r6.ebuild:
+  Do not install libfam.la when USE=-static-libs.
 
   05 Jan 2012; Jeroen Roovers <jer@gentoo.org> fam-2.7.0-r6.ebuild:
   Stable for HPPA (bug #396749).

diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index d03a7f70cdd744a526619d85b912a6bb612aa90c..a8024ce7cb9d3a0e67ebc812477d02f0cf4c953c 100644 (file)
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -11,13 +11,13 @@ DIST fam-2.7.0-dnotify.patch.bz2 7127 RMD160 dfca4dc1fa98c968ba684cb0510e0ad241d
 DIST fam-2.7.0.tar.gz 301974 RMD160 1895b578d6a141c36d5bee4e3fbbc2a298a91430 SHA1 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 SHA256 1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
 DIST fam_2.7.0-17.diff.gz 28056 RMD160 1d1eccacd5dd2cfffacb4daa2bda2610062dc0b2 SHA1 680b03081b014246425f5b722fdb832ee254393e SHA256 2362384d1fbde5dcbccf70f617aedbcae44d3f826a5b9df1331b070da1e0d5c2
 EBUILD fam-2.7.0-r5.ebuild 2265 RMD160 2f3feaff35184d75a9fb81b29f49da6b6adfd534 SHA1 8c9de55ad392d5accbb1afd5c05cdfcb99264bf6 SHA256 e64348f5ee23a8dda61c3fd74a4baef76d75b4b712affa812e08e41d9de9a605
-EBUILD fam-2.7.0-r6.ebuild 1248 RMD160 1256a5bfa3d5d38fcd72c88282fcd2a65716fb24 SHA1 7fbe52eba6bf2d9fdff0162b7491b1e413db81f8 SHA256 c991af57fbb7209f7e4b218d344858135c4df23512a3033d31c8ea291b3d21eb
-MISC ChangeLog 12449 RMD160 5bb522669f2412214c96c8ce173ff223eb9a2984 SHA1 7b576bc644c4acee97474615fc0c3720381402a2 SHA256 0c0712e866c8662395337496106dbf42a6144391daaf1be4f4692f7767050e0b
+EBUILD fam-2.7.0-r6.ebuild 1314 RMD160 508871ec51a6569885e2abca5e55d1c4c89f3438 SHA1 5ce4ccfe2f42593853997fb228e1068d0696e2eb SHA256 1d0b5f33a5e1df391d613c8c4287d4e2740de74837c428da8007ac04613806a6
+MISC ChangeLog 12568 RMD160 c6689f9bd43345c4f00640570170aac7a419a71f SHA1 e814f50b12cf976a9d4119ff57679883f91d0b9a SHA256 ffa143266ca04fbb90af36e3d345e8a132e538bd827d81f0c8da3b05f7e7e837
 MISC metadata.xml 230 RMD160 f4eaafe69d80938604be6213ca2529b73ced7a53 SHA1 27d0d9e737236700ad6d266c9a2fc8869f427869 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8FxpgACgkQVWmRsqeSphPMUgCeO9eoNamFukQUKFN2zzfzV7bp
-QoUAnRIpW45DpXToMvJiYU8FK8lVQixS
-=9rbo
+iEYEARECAAYFAk8FydEACgkQVWmRsqeSphOe/ACfSNRsXUCLYYbh2PDJU65nW4Uy
+RAcAn2JeBQQjTQ1v7XBkq3LRdT5k2Mwm
+=6iXt
 -----END PGP SIGNATURE-----

diff --git a/app-admin/fam/fam-2.7.0-r6.ebuild b/app-admin/fam/fam-2.7.0-r6.ebuild
index a592aa3de04358656cca969b076de3e911089b1b..13bd700b3afa6fc3360e356e2029ab02e75756bb 100644 (file)
--- a/app-admin/fam/fam-2.7.0-r6.ebuild
+++ b/app-admin/fam/fam-2.7.0-r6.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/app-admin/fam/fam-2.7.0-r6.ebuild,v 1.4 2012/01/05 15:49:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r6.ebuild,v 1.5 2012/01/05 16:03:23 jer Exp $
 
 EAPI="2"
 
@@ -35,6 +35,9 @@ src_configure() {
 
 src_install() {
        emake install DESTDIR="${D}" || die
+       if ! use static-libs; then
+               rm -f "${D}"/usr/lib*/libfam.la
+       fi
 
        sed -i "${D}"/etc/fam.conf \
                -e "s:local_only = false:local_only = true:g" \