Version bump and clean up old ebuilds #45278

7 files changed, 58 insertions, 33 deletions

diff --git a/dev-libs/STLport/files/4.6.2-gcc-includes.patch b/dev-libs/STLport/files/4.6.2-gcc-includes.patch
new file mode 100644
index 000000000000..8e50aae3eb9c
--- /dev/null
+++ b/dev-libs/STLport/files/4.6.2-gcc-includes.patch
@@ -0,0 +1,21 @@
+--- STLport-4.6.2/stlport/config/stl_gcc.h.orig	2004-05-29 22:27:30.514737048 -0400
++++ STLport-4.6.2/stlport/config/stl_gcc.h	2004-05-29 22:26:14.539287072 -0400
+@@ -7,7 +7,9 @@
+ # define _STLP_USE_GLIBC
+ #endif
+ 
++#if (__GNUC__ >= 3) && (__GNUC_MAJOR__ >= 4)
+ #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
++#endif
+ 
+ # if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) )
+ #  define _STLP_NO_WCHAR_T
+@@ -263,7 +265,7 @@
+ 
+ # if (__GNUC__ >= 3)
+ 
+-#  if ((__GNUC_MINOR__ == 0) || (__APPLE__))
++#  if 1 || ((__GNUC_MINOR__ == 0) || (__APPLE__))
+ #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
+ #   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+ #  else
diff --git a/dev-libs/STLport/files/4.6.2-optimize.patch b/dev-libs/STLport/files/4.6.2-optimize.patch
new file mode 100644
index 000000000000..72cae200b939
--- /dev/null
+++ b/dev-libs/STLport/files/4.6.2-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/STLport-4.5.3-gcc3.patch b/dev-libs/STLport/files/STLport-4.5.3-gcc3.patch
index 2dfcc27214c1..67df51bc9afb 100644
--- a/dev-libs/STLport/files/STLport-4.5.3-gcc3.patch
+++ b/dev-libs/STLport/files/STLport-4.5.3-gcc3.patch
@@ -1,11 +1,15 @@
-diff -Naur STLport-4.5.3-busted/stlport/config/stl_gcc.h STLport-4.5.3/stlport/config/stl_gcc.h
---- STLport-4.5.3-busted/stlport/config/stl_gcc.h	Thu Jan 10 18:41:58 2002
-+++ STLport-4.5.3/stlport/config/stl_gcc.h	Sat Jul 13 00:13:35 2002
-@@ -250,9 +250,18 @@
+--- 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__ >= 1)
++# 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
diff --git a/dev-libs/STLport/files/STLport-4.5.3-gcc3.patch2 b/dev-libs/STLport/files/STLport-4.5.3-gcc3.patch2
deleted file mode 100644
index 67df51bc9afb..000000000000
--- a/dev-libs/STLport/files/STLport-4.5.3-gcc3.patch2
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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/digest-STLport-4.5.3-r1 b/dev-libs/STLport/files/digest-STLport-4.5.3-r1
deleted file mode 100644
index 291d823d7f54..000000000000
--- a/dev-libs/STLport/files/digest-STLport-4.5.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd4dd34b623a8704fbc800de79705171 STLport-4.5.3.tar.gz 739943
diff --git a/dev-libs/STLport/files/digest-STLport-4.5.3-r2 b/dev-libs/STLport/files/digest-STLport-4.5.3-r2
deleted file mode 100644
index 291d823d7f54..000000000000
--- a/dev-libs/STLport/files/digest-STLport-4.5.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd4dd34b623a8704fbc800de79705171 STLport-4.5.3.tar.gz 739943
diff --git a/dev-libs/STLport/files/digest-STLport-4.6.2 b/dev-libs/STLport/files/digest-STLport-4.6.2
new file mode 100644
index 000000000000..15e2434fee7a
--- /dev/null
+++ b/dev-libs/STLport/files/digest-STLport-4.6.2
@@ -0,0 +1 @@
+MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958