Added patch to fix compilation on ppc.

Package-Manager: portage-2.0.51.21-r1

4 files changed, 46 insertions, 22 deletions

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index 60692cc25b77..0a3edd8d4fe1 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/STLport
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.19 2004/07/06 22:03:58 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.20 2005/05/07 23:03:12 josejx Exp $
+
+  07 May 2005; Joseph Jezak <josejx@gentoo.org> +files/STLport-vector.patch,
+  STLport-4.6.2-r2.ebuild:
+  Added compile fix for ppc.
 
 *STLport-4.6.2-r2 (06 Jul 2004)
 
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index 77abe05aab1b..36798ba073be 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 14607dcecaf62ad0d80c620b7cf33888 ChangeLog 2844
-MD5 8ba934ff19986f7dcb9835fa5a2f187e STLport-4.6.2-r2.ebuild 1218
-MD5 3e474572fe4df01c7632a78f013c6d1e STLport-4.5.3-r3.ebuild 1086
+MD5 50fe96ef7b2be365938dd0cf6d275bf4 ChangeLog 2978
+MD5 7bc11d1f5e72215db93c62d3daa48654 STLport-4.6.2-r2.ebuild 1282
 MD5 f3494ab6de09331256de03606375dddc STLport-4.6.2.ebuild 1046
-MD5 a26aa0654153d685b61549c4290b540b files/50STLport-4.0 210
-MD5 7a319fa8b6dbaf6dbf5da8833f08892c files/STLport-4.5.3-gcc3.patch 695
-MD5 2684edb96cbc495281b93fe12da5fcaf files/digest-STLport-4.6.2-r2 65
-MD5 7949a0c399ae8cd1c8c6d7ada426848f files/STLport-4.5.3-optimize.patch 999
+MD5 3e474572fe4df01c7632a78f013c6d1e STLport-4.5.3-r3.ebuild 1086
+MD5 23f0d4cef12b1a0dc10be56556de2cf2 files/4.6.2-gcc-includes.patch 728
 MD5 71f426e2327ad577fdeaa14cf17f7b19 files/digest-STLport-4.5.3-r3 65
 MD5 2684edb96cbc495281b93fe12da5fcaf files/digest-STLport-4.6.2 65
-MD5 23f0d4cef12b1a0dc10be56556de2cf2 files/4.6.2-gcc-includes.patch 728
 MD5 7949a0c399ae8cd1c8c6d7ada426848f files/4.6.2-optimize.patch 999
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA9JU4HTu7gpaalycRAp3UAKDTg3DIlgnjiyduWm5IgKiAMSjEIQCfa5ci
-Y3FcbNPor3ch1GADM+IGQLs=
-=fB8o
------END PGP SIGNATURE-----
+MD5 7a319fa8b6dbaf6dbf5da8833f08892c files/STLport-4.5.3-gcc3.patch 695
+MD5 7949a0c399ae8cd1c8c6d7ada426848f files/STLport-4.5.3-optimize.patch 999
+MD5 a26aa0654153d685b61549c4290b540b files/50STLport-4.0 210
+MD5 2684edb96cbc495281b93fe12da5fcaf files/digest-STLport-4.6.2-r2 65
+MD5 e4ade56502c64dc0858dd39acf14be1a files/STLport-vector.patch 1106
diff --git a/dev-libs/STLport/STLport-4.6.2-r2.ebuild b/dev-libs/STLport/STLport-4.6.2-r2.ebuild
index 0a253934dfca..842f62cfb8e0 100644
--- a/dev-libs/STLport/STLport-4.6.2-r2.ebuild
+++ b/dev-libs/STLport/STLport-4.6.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-4.6.2-r2.ebuild,v 1.2 2004/07/14 02:06:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-4.6.2-r2.ebuild,v 1.3 2005/05/07 23:03:12 josejx Exp $
 
 inherit eutils
 
@@ -21,6 +21,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-optimize.patch
 	epatch ${FILESDIR}/${PV}-gcc-includes.patch
 	sed -i 's:-D_STLP_REAL_LOCALE_IMPLEMENTED::' src/gcc-linux.mak
+	if use ppc; then
+		epatch ${FILESDIR}/STLport-vector.patch
+	fi
 }
 
 src_compile() {
diff --git a/dev-libs/STLport/files/STLport-vector.patch b/dev-libs/STLport/files/STLport-vector.patch
new file mode 100644
index 000000000000..85a19b373b55
--- /dev/null
+++ b/dev-libs/STLport/files/STLport-vector.patch
@@ -0,0 +1,26 @@
+--- src/gcc-linux.mak.old	2005-01-06 12:22:54.127217800 +1100
++++ src/gcc-linux.mak	2005-01-06 12:24:28.192917640 +1100
+@@ -46,8 +46,8 @@
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+ 
+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC
+ 
+ include common_percent_rules.mak
+ include common_rules.mak
+--- src/gcc.mak.old	2005-01-06 15:20:18.840975336 +1100
++++ src/gcc.mak	2005-01-06 15:21:00.373661408 +1100
+@@ -44,8 +44,8 @@
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+ 
+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
+ 
+ include common_percent_rules.mak
+ include common_rules.mak