From 5bccfe1271bb92177563c85ef6377fa6e19b4de8 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sun, 15 Apr 2012 12:54:43 +0000 Subject: FreeBSD: only put libexpat in /, not libexpatu nor libexpatw which we do not need there. (Portage version: 2.2.0_alpha100/cvs/Linux x86_64) --- dev-libs/expat/ChangeLog | 6 +++++- dev-libs/expat/expat-2.1.0.ebuild | 14 ++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'dev-libs') diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog index df8d55268cd9..2726bda140dd 100644 --- a/dev-libs/expat/ChangeLog +++ b/dev-libs/expat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/expat # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.131 2012/04/15 11:50:06 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.132 2012/04/15 12:54:43 aballier Exp $ + + 15 Apr 2012; Alexis Ballier expat-2.1.0.ebuild: + FreeBSD: only put libexpat in /, not libexpatu nor libexpatw which we do not + need there. 15 Apr 2012; Samuli Suominen expat-2.1.0.ebuild: amd64/ppc/ppc64/x86 stable wrt #412089 diff --git a/dev-libs/expat/expat-2.1.0.ebuild b/dev-libs/expat/expat-2.1.0.ebuild index 44b048ce36c9..4c19bbc5ea45 100644 --- a/dev-libs/expat/expat-2.1.0.ebuild +++ b/dev-libs/expat/expat-2.1.0.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/dev-libs/expat/expat-2.1.0.ebuild,v 1.3 2012/04/15 11:50:06 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0.ebuild,v 1.4 2012/04/15 12:54:43 aballier Exp $ EAPI=4 inherit eutils libtool toolchain-funcs @@ -80,13 +80,7 @@ src_install() { rm -f "${ED}"usr/lib*/libexpat{,u,w}.la - # libgeom in /lib and ifconfig in /sbin require it on FreeBSD since we - # stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 - if use elibc_FreeBSD; then - if use unicode; then - gen_usr_ldscript -a expat{,u,w} - else - gen_usr_ldscript -a expat - fi - fi + # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since + # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 + use elibc_FreeBSD && gen_usr_ldscript -a expat } -- cgit v1.2.3-65-gdbad