summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-04-15 12:54:43 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-04-15 12:54:43 +0000
commit5bccfe1271bb92177563c85ef6377fa6e19b4de8 (patch)
treee3a9cd6f608e20453a2f52b6b8306af2df0782b2 /dev-libs
parentVersion bump. Introduce USE="deprecated" to enable GTK+-2 instead of GTK+-3 f... (diff)
downloadgentoo-2-5bccfe1271bb92177563c85ef6377fa6e19b4de8.tar.gz
gentoo-2-5bccfe1271bb92177563c85ef6377fa6e19b4de8.tar.bz2
gentoo-2-5bccfe1271bb92177563c85ef6377fa6e19b4de8.zip
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)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/expat/ChangeLog6
-rw-r--r--dev-libs/expat/expat-2.1.0.ebuild14
2 files changed, 9 insertions, 11 deletions
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 <aballier@gentoo.org> 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 <ssuominen@gentoo.org> 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
}