Disable linking with boost for now, use --with-extra-cxxflags, and add patch to fix compilation with gcc-4 by Hanno Meyer-Thurow <h.mth AT web DOT de>; bug #127676 and bug #127188

(Portage version: 2.1_pre7-r4)

4 files changed, 46 insertions, 22 deletions

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index 3e23799720ae..f8952223279f 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2006/03/02 04:59:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.29 2006/04/09 03:58:07 halcy0n Exp $
+
+  09 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/STLport-5.0.2-gcc41.patch, STLport-5.0.2.ebuild:
+  Disable linking with boost for now, use --with-extra-cxxflags, and add patch
+  to fix compilation with gcc-4 by Hanno Meyer-Thurow <h.mth AT web DOT de>;
+  bug #127676 and bug #127188
 
 *STLport-5.0.2 (02 Mar 2006)
 
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index e25953e89d8b..c2204e99c2cb 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b707764f764c3ab42baa6182cfe9478e ChangeLog 3787
 RMD160 55f5c01ebd7361ebaa161486abe01143db36925b ChangeLog 3787
 SHA256 e757fa5661519d747ddc47fa98f8132b425e6dc9750dfb499de26f27a7323292 ChangeLog 3787
@@ -13,9 +10,9 @@ SHA256 c89bd65558b46651797e19eda5d7c2aba951c0567547f0d4a25e7858886f904b STLport-
 MD5 e340e20782902cff317847a7b2135888 STLport-5.0.1.ebuild 1280
 RMD160 64059be53fde601671b73e212f207c1cacb4aaec STLport-5.0.1.ebuild 1280
 SHA256 9f690c35a623ef93ac66c7e19e35a86c6e85381d74849224013da1ede144cd57 STLport-5.0.1.ebuild 1280
-MD5 ecb7c90a128e14ef410d1b589390ff32 STLport-5.0.2.ebuild 1280
-RMD160 dd8a3d84efa628a969604eecf83958c3927e010b STLport-5.0.2.ebuild 1280
-SHA256 ee518b51e319e3cc5f63925af6d0e6d427f2360bec649af9adeb0440eb87e8d4 STLport-5.0.2.ebuild 1280
+MD5 2f5c14a9a12ea154aa06a8bdad06e500 STLport-5.0.2.ebuild 1630
+RMD160 1d662d08fc02f54f7bada562a57e5242331c7b3e STLport-5.0.2.ebuild 1630
+SHA256 24e8fbd503b55d59dd6739f6907fcef5f27ff3e84893507b1f9fc33708e9bf2f STLport-5.0.2.ebuild 1630
 MD5 2f3f666186f0f3ba7e64d101c9f5c05d files/4.6.2-gcc-includes.patch 812
 RMD160 f9534981f673104d86ec787d7f05fcceb2a9f08c files/4.6.2-gcc-includes.patch 812
 SHA256 5174eed89fd74d633c092c18f027cd872a4b8b8e469996dc94e6c17b5a37874d files/4.6.2-gcc-includes.patch 812
@@ -31,6 +28,9 @@ SHA256 2e7ef9d4744948da7a95363bd094df4020ba2c62fecfb18fd4d2f2b6d4474e56 files/ST
 MD5 7949a0c399ae8cd1c8c6d7ada426848f files/STLport-4.5.3-optimize.patch 999
 RMD160 7ecbe6be0a0bc06f1bcc7ae0f6975d04a9363297 files/STLport-4.5.3-optimize.patch 999
 SHA256 c0f9f7d178ffe20a2cb168b29e0ad79fe35a447c12ab9e6c236d9069e36a5a80 files/STLport-4.5.3-optimize.patch 999
+MD5 2893a09a401bc17386d4223147dd1cef files/STLport-5.0.2-gcc41.patch 419
+RMD160 76d81b4aa58721b1aa41cd2112b1fb11bcf1bd90 files/STLport-5.0.2-gcc41.patch 419
+SHA256 160cb4b6defa4e537ed8d591e52880247cb075f89c8913372605e8290f9bc90d files/STLport-5.0.2-gcc41.patch 419
 MD5 e4ade56502c64dc0858dd39acf14be1a files/STLport-vector.patch 1106
 RMD160 709a29772385a9a476b39c5cc7e9397174f17503 files/STLport-vector.patch 1106
 SHA256 bdc12f69e8fc1a7f350225357e0e32e96899aa39f471c4576ad37d61a6bd7d1b files/STLport-vector.patch 1106
@@ -49,10 +49,3 @@ SHA256 c0f36803ed4b427d91173ac038699a6c6167dabcbd0f423424e53b62ba74f635 files/di
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
 SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEBnvX2+ySkm8kpY0RAuWFAJ9ogNTd5lF1tlr9yY+a/31+f/ELAwCeJ3JS
-ZocPhU15YsSXzBTSMbDaSj0=
-=VKB5
------END PGP SIGNATURE-----
diff --git a/dev-libs/STLport/STLport-5.0.2.ebuild b/dev-libs/STLport/STLport-5.0.2.ebuild
index 750a209c557a..43522b4e81d6 100644
--- a/dev-libs/STLport/STLport-5.0.2.ebuild
+++ b/dev-libs/STLport/STLport-5.0.2.ebuild
@@ -1,8 +1,8 @@
 # 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.0.2.ebuild,v 1.1 2006/03/02 04:59:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.0.2.ebuild,v 1.2 2006/04/09 03:58:07 halcy0n Exp $
 
-inherit eutils multilib
+inherit eutils toolchain-funcs multilib
 
 MY_P=${PN}-${PV/_rc/RC}
 DESCRIPTION="C++ STL library"
@@ -16,26 +16,40 @@ IUSE=""
 
 DEPEND=""
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}"/${PN}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+
 	sed -i \
 		-e 's:OPT += -O2::' \
 		-e 's:OPT += -g::' \
 		build/Makefiles/gmake/{,lib/,app/}*.mak \
 		|| die "sed opts failed"
 
-	cat <<- EOF >> stlport/config/stl_gcc.h
-	#undef _STLP_NATIVE_INCLUDE_PATH
-	#define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-	EOF
+	if [[ $(gcc-major-version) == "3" ]] ; then
+		cat <<- EOF >> stlport/config/stl_gcc.h
+		#undef _STLP_NATIVE_INCLUDE_PATH
+		#define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
+		EOF
+	else
+		cat <<- EOF >> stlport/config/stl_gcc.h
+		#undef _STLP_NATIVE_INCLUDE_PATH
+		#define _STLP_NATIVE_INCLUDE_PATH ../g++-v4
+		EOF
+	fi
 }
 
 src_compile() {
-	export OPT=${CXXFLAGS}
+	cd "${S}"/build/lib
+	./configure \
+		--with-boost \
+		--with-extra-cxxflags="${CXXFLAGS}" || die "configure failed"
+	cd ../..
+
 	emake \
 		-C build/lib \
 		-f gcc.mak \
diff --git a/dev-libs/STLport/files/STLport-5.0.2-gcc41.patch b/dev-libs/STLport/files/STLport-5.0.2-gcc41.patch
new file mode 100644
index 000000000000..a593c0f3ed9a
--- /dev/null
+++ b/dev-libs/STLport/files/STLport-5.0.2-gcc41.patch
@@ -0,0 +1,11 @@
+--- STLport/stlport/cwchar.orig	2006-03-22 16:35:19.000000000 +0100
++++ STLport/stlport/cwchar	2006-03-22 16:35:31.000000000 +0100
+@@ -191,7 +191,7 @@
+ #        if (!defined(__MSL__) || __MSL__ > 0x7001 ) && !defined(_STLP_WCE_NET) && \
+              !defined(_STLP_USE_UCLIBC) /* at least in uClibc 0.9.26 */
+ 
+-using _STLP_VENDOR_CSTD::wcsftime;
++using ::wcsftime;
+ #        endif
+ using _STLP_VENDOR_CSTD::wcstok;
+