Fixed boost support (thanks to geki for pointing this out)

Package-Manager: portage-2.1.2_rc3-r8

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index c8b19d572d5e7b20c25a8528420c41211873e2d9..fa1dca1c436e8be63fd2129f10378b7e45eedfe0 100644 (file)
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/STLport
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.35 2006/12/24 01:35:09 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.36 2006/12/24 11:22:52 dev-zero Exp $
+
+  24 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> STLport-5.1.0.ebuild:
+  Fixed boost support (thanks to geki for pointing this out)
 
   24 Dec 2006; Tiziano Müller <dev-zero@gentoo.org>
   +files/STLport-5.1.0-ppc.patch, STLport-5.1.0.ebuild:

diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index 0f4bb602685f019c54084da716e9fefdb59100bc..8c02bfdecf9138d298d29c75ed96973791bfaa20 100644 (file)
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -33,14 +33,14 @@ EBUILD STLport-5.0.2.ebuild 1634 RMD160 2df8fc291866d9ddc74abc555fd3ee60bdc6b145
 MD5 1b4446022516f2fac4f5e5ff3aab1214 STLport-5.0.2.ebuild 1634
 RMD160 2df8fc291866d9ddc74abc555fd3ee60bdc6b145 STLport-5.0.2.ebuild 1634
 SHA256 88367ec5a6927a2d80244243452b37d46d69dfffe3b7d2cd42c62b045422dc67 STLport-5.0.2.ebuild 1634
-EBUILD STLport-5.1.0.ebuild 2221 RMD160 74ae8e63a942380609c3c330b8bf1a8c73bf5540 SHA1 90d034f53e33228f7669d8e68553b9a91e7950a9 SHA256 071ed78c6c86c13b37e94a5417c6b0353c2c77ce91637c53d9d0d8f3f4e83e8d
-MD5 58f7ea301eb59e9895e7b3528e140b97 STLport-5.1.0.ebuild 2221
-RMD160 74ae8e63a942380609c3c330b8bf1a8c73bf5540 STLport-5.1.0.ebuild 2221
-SHA256 071ed78c6c86c13b37e94a5417c6b0353c2c77ce91637c53d9d0d8f3f4e83e8d STLport-5.1.0.ebuild 2221
-MISC ChangeLog 5080 RMD160 9b23f5486f9b15bfd87575facbdbb62d77d35e13 SHA1 3cb38f80cd317aa9a7179b52383b84581c9d7853 SHA256 24ce2fa3fece1e43f4188e4c2ec3adcfe4ff08a20e02c684f38da2b3f15ecc78
-MD5 bfd5418407f0e2cf164fff9e1683cf32 ChangeLog 5080
-RMD160 9b23f5486f9b15bfd87575facbdbb62d77d35e13 ChangeLog 5080
-SHA256 24ce2fa3fece1e43f4188e4c2ec3adcfe4ff08a20e02c684f38da2b3f15ecc78 ChangeLog 5080
+EBUILD STLport-5.1.0.ebuild 2347 RMD160 b16dcb364725e3bb3948fea2b80cd4e55ff12f10 SHA1 a473f6af00994f291951ebb62eef4e1299d6acb2 SHA256 2f04b915705a54892daaeadca4b0a7a492133b0187e91edb3460508f01e65372
+MD5 a20c309a9457ece8c6153535b6329c56 STLport-5.1.0.ebuild 2347
+RMD160 b16dcb364725e3bb3948fea2b80cd4e55ff12f10 STLport-5.1.0.ebuild 2347
+SHA256 2f04b915705a54892daaeadca4b0a7a492133b0187e91edb3460508f01e65372 STLport-5.1.0.ebuild 2347
+MISC ChangeLog 5217 RMD160 98931f121dc76ec70bd400f289912b655b4c9956 SHA1 bebd5138bdaed8b218151700247c0ce6c367c283 SHA256 84f78d03204f6b4e7bec597903591984071c13f6486ebc8fd056b2b37b8a4010
+MD5 4bafd6f383ca1750967698733ff76497 ChangeLog 5217
+RMD160 98931f121dc76ec70bd400f289912b655b4c9956 ChangeLog 5217
+SHA256 84f78d03204f6b4e7bec597903591984071c13f6486ebc8fd056b2b37b8a4010 ChangeLog 5217
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156

diff --git a/dev-libs/STLport/STLport-5.1.0.ebuild b/dev-libs/STLport/STLport-5.1.0.ebuild
index ff7f7a8e74cf32a6a6702ac9b8ce45f509d7f5c7..57933cf9572f92e4f083cb8582c0dacfe5f735b8 100644 (file)
--- a/dev-libs/STLport/STLport-5.1.0.ebuild
+++ b/dev-libs/STLport/STLport-5.1.0.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/STLport/STLport-5.1.0.ebuild,v 1.3 2006/12/24 01:35:09 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.1.0.ebuild,v 1.4 2006/12/24 11:22:52 dev-zero Exp $
 
 inherit eutils versionator eutils toolchain-funcs multilib flag-o-matic
 
@@ -46,10 +46,15 @@ src_compile() {
                -e "s/^\(CCFLAGS = \)/\1 ${CFLAGS} /" \
                build/Makefiles/gmake/gcc.mak || die "sed failed"
 
-       cd "${S}/build/lib"
-
        local myconf
-       use boost && myconf="${myconf} --with-boost=${ROOT}usr/$(get_libdir)"
+       if use boost ; then
+               myconf="${myconf} --with-boost=${ROOT}usr/include"
+               sed -i \
+                       -e 'N;N;N;s:/\**\n\(#define _STLP_USE_BOOST_SUPPORT 1\)*\n\*/:\1:' \
+                       stlport/stl/config/user_config.h
+       fi
+
+       cd "${S}/build/lib"
 
        append-lfs-flags