close bug 6111

5 files changed, 107 insertions, 1 deletions

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index ddbacc6af681..ff333bed50f0 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/STLport
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.5 2002/08/15 20:36:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.6 2002/09/13 17:45:43 lostlogic Exp $
+
+*STLport-4.5.3-r2 (13 Sep 2002)
+
+  13 Sep 2002; Brandon Low <lostlogic@gentoo.org> STLport-4.5.3-r2.ebuild :
+
+  Fix for gcc-3.2, and follow make.conf optimizations.  Thanks to
+  nwourms@netscape.net (Nicholas Wourms) closes bug 6111.
 
   15 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
diff --git a/dev-libs/STLport/STLport-4.5.3-r2.ebuild b/dev-libs/STLport/STLport-4.5.3-r2.ebuild
new file mode 100644
index 000000000000..3a94cf3bd9a7
--- /dev/null
+++ b/dev-libs/STLport/STLport-4.5.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-4.5.3-r2.ebuild,v 1.1 2002/09/13 17:45:43 lostlogic Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="C++ STL library"
+SRC_URI="http://www.stlport.org/archive/${P}.tar.gz"
+HOMEPAGE="http://www.stlport.org"
+
+DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
+
+SLOT="0"
+KEYWORDS="x86 sparc sparc64"
+LICENSE="as-is"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-gcc3.patch2 || die "Patching failed"
+	patch -p1 < ${FILESDIR}/${P}-optimize.patch || die "Patching failed"
+}
+
+src_compile() {
+	cd src
+	emake -f gcc-linux.mak || die "Compile failed"
+}
+
+src_install () {
+
+	dodir /usr/include
+	cp -R ${S}/stlport ${D}/usr/include
+	rm -rf ${D}/usr/include/stlport/BC50
+		
+	dodir /usr/lib
+	cp -R ${S}/lib/* ${D}/usr/lib/
+	rm -rf ${D}/usr/lib/obj
+	
+	cd ${S}/etc/
+	dodoc ChangeLog* README TODO *.txt
+
+	cd ${S}
+	dohtml -r doc
+}
diff --git a/dev-libs/STLport/files/STLport-4.5.3-gcc3.patch2 b/dev-libs/STLport/files/STLport-4.5.3-gcc3.patch2
new file mode 100644
index 000000000000..67df51bc9afb
--- /dev/null
+++ b/dev-libs/STLport/files/STLport-4.5.3-gcc3.patch2
@@ -0,0 +1,26 @@
+--- STLport-4.5.3-busted/stlport/config/stl_gcc.h	Thu Jan 10 13:41:58 2002
++++ STLport-4.5.3/stlport/config/stl_gcc.h	Tue Aug  6 08:41:46 2002
+@@ -250,9 +250,23 @@
+ 
+ # if (__GNUC__ >= 3)
+ 
++# if (__GNUC_MINOR__ >= 2)
++
++#  define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
++#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v32/backward
++
++# elif (__GNUC_MINOR__ >= 1)
++
++#  define _STLP_NATIVE_INCLUDE_PATH ../g++-v31
++#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v31/backward
++
++# else
++
+ #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
+ #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+ 
++# endif
++
+ # elif (__GNUC_MINOR__ < 8)
+ 
+ #  define _STLP_NO_OWN_IOSTREAMS 1
diff --git a/dev-libs/STLport/files/STLport-4.5.3-optimize.patch b/dev-libs/STLport/files/STLport-4.5.3-optimize.patch
new file mode 100644
index 000000000000..72cae200b939
--- /dev/null
+++ b/dev-libs/STLport/files/STLport-4.5.3-optimize.patch
@@ -0,0 +1,27 @@
+--- STLport-4.5.3-old/src/gcc-linux.mak	Fri Jan 18 17:06:52 2002
++++ STLport-4.5.3/src/gcc-linux.mak	Tue Aug  6 09:15:49 2002
+@@ -1,7 +1,7 @@
+ #
+ # compiler
+ #
+-CC = gcc
++CC = gcc ${CFLAGS}
+ CXX = c++  -pthread -fexceptions
+ 
+ #
+@@ -40,11 +40,11 @@
+ # CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -D_STLP_REAL_LOCALE_IMPLEMENTED
+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
+ 
+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
+ 
+-CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+-CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) ${CXXFLAGS} -g
++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -g -fPIC
+ 
+ CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+ CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
diff --git a/dev-libs/STLport/files/digest-STLport-4.5.3-r2 b/dev-libs/STLport/files/digest-STLport-4.5.3-r2
new file mode 100644
index 000000000000..291d823d7f54
--- /dev/null
+++ b/dev-libs/STLport/files/digest-STLport-4.5.3-r2
@@ -0,0 +1 @@
+MD5 cd4dd34b623a8704fbc800de79705171 STLport-4.5.3.tar.gz 739943