Remove apr.exp as it's not used and causes collisions between SLOTs

Package-Manager: portage-2.1.2_pre2

4 files changed, 28 insertions, 15 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/Manifest b/dev-libs/apr/Manifest
index 53ecb15d0469..3d13c8bc3ffa 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -11,10 +11,10 @@ DIST apr-0.9.6.tar.gz 1025231 RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 SH
 DIST apr-0.9.7.tar.gz 1045136 RMD160 d2978d3f3d505885e0782b2b2b40fa1ccc2e9e7a SHA1 c95983aac24bed3d0fea0eb430901dc6db5f6f5c SHA256 9d102909d840b2e2960a8175408e6d6a6e28a35112bd1190a22d346b0b66b2ba
 DIST apr-1.2.2.tar.gz 1096029 RMD160 13a4edd59fb93596c8cae4549d38a0022a5c6758 SHA1 41204a42d3d95b9c7b430f233a57ce60181c2b7b SHA256 23826f62b305efef3f6c6e7e6b8ddad05ec48a2f36410ff508b3fc4714a33dfc
 DIST apr-1.2.7.tar.gz 1102370 RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 SHA1 437ad4066f71a197029ff86a8cb55f3b6817a1f3 SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa
-EBUILD apr-0.9.12.ebuild 2233 RMD160 04d2ad7a5257b127c1f127e8bf9cf054e1749a32 SHA1 d26fe514b9992a6cdfa6f8cd477b56b16e689fd4 SHA256 d77bde492ed4677574d072f0b44295a6ab71714fc497363673084dceee3e1372
-MD5 187deaa995e20b70e82f0737b2edd926 apr-0.9.12.ebuild 2233
-RMD160 04d2ad7a5257b127c1f127e8bf9cf054e1749a32 apr-0.9.12.ebuild 2233
-SHA256 d77bde492ed4677574d072f0b44295a6ab71714fc497363673084dceee3e1372 apr-0.9.12.ebuild 2233
+EBUILD apr-0.9.12.ebuild 2391 RMD160 15239d5f2f15cd92fbf66c52a4789709ec056345 SHA1 ff52595609d047850ff7753290d5ea1446a5a5a2 SHA256 8aaf089c10a37a782e767f7bfe5abf4ab6dee2067060713817ad982839e7d724
+MD5 0d828f9169b71031ce7f2ee852e0c71d apr-0.9.12.ebuild 2391
+RMD160 15239d5f2f15cd92fbf66c52a4789709ec056345 apr-0.9.12.ebuild 2391
+SHA256 8aaf089c10a37a782e767f7bfe5abf4ab6dee2067060713817ad982839e7d724 apr-0.9.12.ebuild 2391
 EBUILD apr-0.9.6-r3.ebuild 1534 RMD160 7c2e849526b2de3e59606a0939adee47db1a3f11 SHA1 63ecf41ab814152095cca916d7b69cda90f3aa1b SHA256 0795ed7fb1daed9fa97160ce1d117ce43ec063d48b06f1a6b56ab28a0497db08
 MD5 2fc416814f4a3443b28fc548cf8d86dc apr-0.9.6-r3.ebuild 1534
 RMD160 7c2e849526b2de3e59606a0939adee47db1a3f11 apr-0.9.6-r3.ebuild 1534
@@ -39,18 +39,18 @@ EBUILD apr-1.2.7-r2.ebuild 2541 RMD160 1bcdc8473dab1ac33751d61596dca8df782124d0
 MD5 968b56c7740d4ed75213fab50e628f7f apr-1.2.7-r2.ebuild 2541
 RMD160 1bcdc8473dab1ac33751d61596dca8df782124d0 apr-1.2.7-r2.ebuild 2541
 SHA256 f218b3885772fdfd5b996324b153821dd5a60e393dcec3ac5eb9f09ffbccc229 apr-1.2.7-r2.ebuild 2541
-EBUILD apr-1.2.7-r3.ebuild 2630 RMD160 2efa3f7d05804a91aea6da7a80280f7b186824d1 SHA1 042f4945a7863ef10bb20ff75012e4d0f688c45f SHA256 bc3561f10c59271454fb5feeeb68290f356dc27b888006ea37dc276b519d0e06
-MD5 4024fcb79b8e81c3c89685f504d85513 apr-1.2.7-r3.ebuild 2630
-RMD160 2efa3f7d05804a91aea6da7a80280f7b186824d1 apr-1.2.7-r3.ebuild 2630
-SHA256 bc3561f10c59271454fb5feeeb68290f356dc27b888006ea37dc276b519d0e06 apr-1.2.7-r3.ebuild 2630
+EBUILD apr-1.2.7-r3.ebuild 2784 RMD160 dc8ef7b262454e41b5e52c7ff46d1906d9f81a5f SHA1 5c006d3b3bec0d1c89b64d2eec7d9e6d431cbf16 SHA256 2c0c8627e6413561a7711755648b24c1880d8ae387ae957a74b9a49f057432d2
+MD5 d6b86f759b8778d4748e11eb5d75a660 apr-1.2.7-r3.ebuild 2784
+RMD160 dc8ef7b262454e41b5e52c7ff46d1906d9f81a5f apr-1.2.7-r3.ebuild 2784
+SHA256 2c0c8627e6413561a7711755648b24c1880d8ae387ae957a74b9a49f057432d2 apr-1.2.7-r3.ebuild 2784
 EBUILD apr-1.2.7.ebuild 1557 RMD160 3774769a8236b5a1c8503e2e3111ca141ab4d757 SHA1 bcc1ba578dbfd0c4313fd46610bbc3009807d3e1 SHA256 56d2756aa7c3b00c93f25787dc6345c3a5c18835639990fbd735e6b9fda09e15
 MD5 d0f3560135caff1eba14a54de39753f5 apr-1.2.7.ebuild 1557
 RMD160 3774769a8236b5a1c8503e2e3111ca141ab4d757 apr-1.2.7.ebuild 1557
 SHA256 56d2756aa7c3b00c93f25787dc6345c3a5c18835639990fbd735e6b9fda09e15 apr-1.2.7.ebuild 1557
-MISC ChangeLog 8822 RMD160 9065aad8279198b2fa996269133c88a9f0610294 SHA1 2dd52d34db7edba1d9ffa8c3236f669f6d476318 SHA256 577e3b2ad0d6f10391ed77d6a8c15defae25d828246d0b344cc53b3102a6d0c1
-MD5 b2065302ba9b3154ad430920cd51c16b ChangeLog 8822
-RMD160 9065aad8279198b2fa996269133c88a9f0610294 ChangeLog 8822
-SHA256 577e3b2ad0d6f10391ed77d6a8c15defae25d828246d0b344cc53b3102a6d0c1 ChangeLog 8822
+MISC ChangeLog 8988 RMD160 1ae91a41ee41f031e3d7e1056247267670c34411 SHA1 58a703d11c31a694a2f0ac64dc045f14e01ea9b4 SHA256 3e7e0e51e18da11c83be7ce43b096b6374f485af2a03de9e18bfc9094c2f29fa
+MD5 f384fceea69dc9fa90b161fe41bad9a5 ChangeLog 8988
+RMD160 1ae91a41ee41f031e3d7e1056247267670c34411 ChangeLog 8988
+SHA256 3e7e0e51e18da11c83be7ce43b096b6374f485af2a03de9e18bfc9094c2f29fa ChangeLog 8988
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
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
 }