summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-01-05 16:03:23 +0000
committerJeroen Roovers <jer@gentoo.org>2012-01-05 16:03:23 +0000
commitc7421e1aeda8ddf5835db48c6b89ade973f8d81b (patch)
tree664ac1decb3a250881d5d7cdd6b367e2e6c713cb /app-admin
parentVersion bump to 1.1.1 (diff)
downloadgentoo-2-c7421e1aeda8ddf5835db48c6b89ade973f8d81b.tar.gz
gentoo-2-c7421e1aeda8ddf5835db48c6b89ade973f8d81b.tar.bz2
gentoo-2-c7421e1aeda8ddf5835db48c6b89ade973f8d81b.zip
Do not install libfam.la when USE=-static-libs.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/fam/ChangeLog5
-rw-r--r--app-admin/fam/fam-2.7.0-r6.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index fd4c755971b6..0f5045c6668b 100644
--- 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/fam-2.7.0-r6.ebuild b/app-admin/fam/fam-2.7.0-r6.ebuild
index a592aa3de043..13bd700b3afa 100644
--- 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" \