diff options
author | Michael Stewart <vericgar@gentoo.org> | 2006-10-15 20:15:33 +0000 |
---|---|---|
committer | Michael Stewart <vericgar@gentoo.org> | 2006-10-15 20:15:33 +0000 |
commit | 1c4d3b4b5ce79226e1a87ec25597f61014e22e2e (patch) | |
tree | 892a1c5503a18efca5befa6ab6903903724e3c41 /dev-libs | |
parent | Marking amd64 stable (diff) | |
download | gentoo-2-1c4d3b4b5ce79226e1a87ec25597f61014e22e2e.tar.gz gentoo-2-1c4d3b4b5ce79226e1a87ec25597f61014e22e2e.tar.bz2 gentoo-2-1c4d3b4b5ce79226e1a87ec25597f61014e22e2e.zip |
Remove apr.exp as it's not used and causes collisions between SLOTs
(Portage version: 2.1.2_pre2)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/apr/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/apr/apr-0.9.12.ebuild | 7 | ||||
-rw-r--r-- | dev-libs/apr/apr-1.2.7-r3.ebuild | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog index 5c2fd779849b..0a257b99a8ce 100644 --- a/dev-libs/apr/ChangeLog +++ b/dev-libs/apr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/apr # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.70 2006/09/10 17:32:03 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.71 2006/10/15 20:15:33 vericgar Exp $ + + 15 Oct 2006; Michael Stewart <vericgar@gentoo.org> apr-0.9.12.ebuild, + apr-1.2.7-r3.ebuild: + Remove apr.exp as it's not used and causes collisions between SLOTs 10 Sep 2006; Javier Villavicencio <the_paya@gentoo.org> apr-1.2.7-r3.ebuild: diff --git a/dev-libs/apr/apr-0.9.12.ebuild b/dev-libs/apr/apr-0.9.12.ebuild index b4680a1ab217..10a9cfe728eb 100644 --- a/dev-libs/apr/apr-0.9.12.ebuild +++ b/dev-libs/apr/apr-0.9.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.12.ebuild,v 1.13 2006/09/03 22:01:49 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.12.ebuild,v 1.14 2006/10/15 20:15:33 vericgar Exp $ inherit eutils flag-o-matic libtool @@ -68,4 +68,9 @@ src_install() { cp -p build/*.pl ${D}/usr/share/apr-0/build dodoc CHANGES LICENSE NOTICE + + # This file is only used on AIX systems, which gentoo is not, + # and causes collisions between the SLOTs, so kill it + rm ${D}/usr/$(get_libdir)/apr.exp + } diff --git a/dev-libs/apr/apr-1.2.7-r3.ebuild b/dev-libs/apr/apr-1.2.7-r3.ebuild index 42a93b2aebbd..b415ce0ba7d6 100644 --- a/dev-libs/apr/apr-1.2.7-r3.ebuild +++ b/dev-libs/apr/apr-1.2.7-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7-r3.ebuild,v 1.2 2006/09/10 17:32:03 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7-r3.ebuild,v 1.3 2006/10/15 20:15:33 vericgar Exp $ inherit autotools @@ -75,6 +75,10 @@ src_install() { make DESTDIR="${D}" install || die "make install failed" + # This file is only used on AIX systems, which gentoo is not, + # and causes collisions between the SLOTs, so kill it + rm ${D}/usr/$(get_libdir)/apr.exp + dodoc CHANGES NOTICE LICENSE } |