summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-07-11 19:52:51 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-07-11 19:52:51 +0000
commit5730afaa43c5cca99713e93110bb72930627a631 (patch)
treeabb182c101f10ef34e8bc27ca70b5d9df6aaec3b /dev-libs/expat
parentOnly build nfs ioslave if rpc/rpc.h exists, bug 371363. Backport from 4.7. (diff)
downloadgentoo-2-5730afaa43c5cca99713e93110bb72930627a631.tar.gz
gentoo-2-5730afaa43c5cca99713e93110bb72930627a631.tar.bz2
gentoo-2-5730afaa43c5cca99713e93110bb72930627a631.zip
move libexpat.so.1 to /lib with FreeBSD libc as thats now a library required by libs in /lib and programs in /sbin
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/expat')
-rw-r--r--dev-libs/expat/ChangeLog8
-rw-r--r--dev-libs/expat/expat-2.0.1-r3.ebuild11
2 files changed, 13 insertions, 6 deletions
diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index a16f62aa677f..d096787cb247 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/expat
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.97 2010/03/09 22:04:59 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.98 2011/07/11 19:52:50 aballier Exp $
+
+ 11 Jul 2011; Alexis Ballier <aballier@gentoo.org> expat-2.0.1-r3.ebuild:
+ move libexpat.so.1 to /lib with FreeBSD libc as thats now a library required
+ by libs in /lib and programs in /sbin
09 Mar 2010; Joseph Jezak <josejx@gentoo.org> expat-2.0.1-r3.ebuild:
Marked ppc stable for bug #303727.
diff --git a/dev-libs/expat/expat-2.0.1-r3.ebuild b/dev-libs/expat/expat-2.0.1-r3.ebuild
index cbd76133dbb3..074a1a8dccb6 100644
--- a/dev-libs/expat/expat-2.0.1-r3.ebuild
+++ b/dev-libs/expat/expat-2.0.1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.1-r3.ebuild,v 1.8 2010/03/09 22:04:59 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.1-r3.ebuild,v 1.9 2011/07/11 19:52:51 aballier Exp $
-inherit eutils libtool
+inherit eutils libtool toolchain-funcs
DESCRIPTION="XML parsing libraries"
HOMEPAGE="http://expat.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
+IUSE="elibc_FreeBSD"
src_unpack() {
unpack ${A}
@@ -29,6 +29,9 @@ src_unpack() {
src_install() {
emake install DESTDIR="${D}" || die
+ # libgeom in /lib and ifconfig in /sbin require it on FreeBSD since we
+ # stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+ use elibc_FreeBSD && gen_usr_ldscript -a expat
dodoc Changes README || die
dohtml doc/* || die
}