Added patch for the unittests. Added static USE-flag.

Package-Manager: portage-2.1.2_rc4-r1

4 files changed, 44 insertions, 13 deletions

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index c17079ec88e9..8869f7c7ff23 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/STLport
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.40 2007/01/13 13:48:52 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.41 2007/01/13 21:20:56 dev-zero Exp $
+
+  13 Jan 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/STLport-5.1.0-wrong_russian_currency_name.patch,
+  STLport-5.1.0.ebuild:
+  Added patch for the unittests. Added static USE-flag.
 
   13 Jan 2007; Tiziano Müller <dev-zero@gentoo.org> STLport-5.1.0.ebuild:
   Disabled parallel builds for building the library as well.
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index 164ff3c604d0..c136066c3394 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -18,6 +18,10 @@ AUX STLport-5.1.0-ppc.patch 619 RMD160 8c37969b3ba3f9a76b4ef6c64f8b1a755ed84414
 MD5 f09b1a04c8f17e6acf3745f6bdb46a3f files/STLport-5.1.0-ppc.patch 619
 RMD160 8c37969b3ba3f9a76b4ef6c64f8b1a755ed84414 files/STLport-5.1.0-ppc.patch 619
 SHA256 31a091634a819e5035863d19d26cd98858c226ec3340be8b7270eb6006006380 files/STLport-5.1.0-ppc.patch 619
+AUX STLport-5.1.0-wrong_russian_currency_name.patch 1046 RMD160 6f8424b4a67e5a1ca8679ee990ebd6827a5d5b92 SHA1 72d09b5095bac7ca7ef379b9fbd3c198a22d092c SHA256 9eb3c2681b9561052989129191b90b787cfdfad0b8b0c072be91a40c45775cfa
+MD5 d2d8c341c850bb6caf5e674c54925787 files/STLport-5.1.0-wrong_russian_currency_name.patch 1046
+RMD160 6f8424b4a67e5a1ca8679ee990ebd6827a5d5b92 files/STLport-5.1.0-wrong_russian_currency_name.patch 1046
+SHA256 9eb3c2681b9561052989129191b90b787cfdfad0b8b0c072be91a40c45775cfa files/STLport-5.1.0-wrong_russian_currency_name.patch 1046
 AUX STLport-vector.patch 1106 RMD160 709a29772385a9a476b39c5cc7e9397174f17503 SHA1 08fa5ec4d11f89f03dbd6d2f80cff56d34a29b8e SHA256 bdc12f69e8fc1a7f350225357e0e32e96899aa39f471c4576ad37d61a6bd7d1b
 MD5 e4ade56502c64dc0858dd39acf14be1a files/STLport-vector.patch 1106
 RMD160 709a29772385a9a476b39c5cc7e9397174f17503 files/STLport-vector.patch 1106
@@ -33,14 +37,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 2444 RMD160 e2ef192da366bc3808adcb8fbba2610c971bae55 SHA1 f80473e9a2fbeb6077dce6d0da87bbc6977b5333 SHA256 c23b35a9f8a32ddaae811d5b1bd8f673b02f1226480765ecd4b8607f96c85f16
-MD5 3ba854db1fc15d144305fb72daf58702 STLport-5.1.0.ebuild 2444
-RMD160 e2ef192da366bc3808adcb8fbba2610c971bae55 STLport-5.1.0.ebuild 2444
-SHA256 c23b35a9f8a32ddaae811d5b1bd8f673b02f1226480765ecd4b8607f96c85f16 STLport-5.1.0.ebuild 2444
-MISC ChangeLog 5696 RMD160 e29d64f0e7642948a43c91757db27d56c804494b SHA1 69ded750f81f6420016840c02b92e2b15c133b83 SHA256 1007c8387e164805dbaf9a557db1257d9f7ea11e4050f3862340a0b69097a6bc
-MD5 137e10ce069204d9878d586d4f18a1b3 ChangeLog 5696
-RMD160 e29d64f0e7642948a43c91757db27d56c804494b ChangeLog 5696
-SHA256 1007c8387e164805dbaf9a557db1257d9f7ea11e4050f3862340a0b69097a6bc ChangeLog 5696
+EBUILD STLport-5.1.0.ebuild 2682 RMD160 f87600dd8d5ca47ac7dcdcd3e3fa54cedff7fae6 SHA1 d5e48941fbc0172122f022d01cc9b846a4908242 SHA256 a6b9f9f790384e04d01c530ec81175233e41f4e7dec5d9b73ad429e292f44ac6
+MD5 71588f8b9e22c1260962891a5be98dcb STLport-5.1.0.ebuild 2682
+RMD160 f87600dd8d5ca47ac7dcdcd3e3fa54cedff7fae6 STLport-5.1.0.ebuild 2682
+SHA256 a6b9f9f790384e04d01c530ec81175233e41f4e7dec5d9b73ad429e292f44ac6 STLport-5.1.0.ebuild 2682
+MISC ChangeLog 5888 RMD160 d480718ff8015a855d428ce218b452413e22ab83 SHA1 6ba6e02d946025f0d5ea4961b6202e416d0b0f7b SHA256 b53cbc4beba35dbefde44dc1dd42fadf7f3ac2111e84d46b9b9487fe8ea20710
+MD5 d8a1a7f97567b9e292c9b9dfb29bc420 ChangeLog 5888
+RMD160 d480718ff8015a855d428ce218b452413e22ab83 ChangeLog 5888
+SHA256 b53cbc4beba35dbefde44dc1dd42fadf7f3ac2111e84d46b9b9487fe8ea20710 ChangeLog 5888
 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 a15e39fab900..65d525f9bea7 100644
--- a/dev-libs/STLport/STLport-5.1.0.ebuild
+++ b/dev-libs/STLport/STLport-5.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.8 2007/01/13 13:48:52 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.1.0.ebuild,v 1.9 2007/01/13 21:20:56 dev-zero Exp $
 
 inherit eutils versionator eutils toolchain-funcs multilib flag-o-matic
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://stlport.sourceforge.net/"
 SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
-IUSE="boost"
+IUSE="boost static"
 
 DEPEND="boost? ( dev-libs/boost )"
 RDEPEND="${RDEPEND}"
@@ -22,6 +22,7 @@ src_unpack() {
 
 	# It should be save to apply this on non-ppc systems as well
 	epatch "${FILESDIR}/${P}-ppc.patch"
+	epatch "${FILESDIR}/${P}-wrong_russian_currency_name.patch"
 
 	sed -i \
 		-e 's/\(OPT += \)-O2/\1/' \
@@ -69,16 +70,26 @@ src_compile() {
 	CFLAGS := ${CFLAGS}
 	EOF
 
+	local targets
+	targets="all-shared"
+	use static && targets="${targets} all-static"
+
 	# The build-system is broken in respect to parallel builds, bug #161881
 	emake \
 		-j1 \
 		-C build/lib \
 		-f gcc.mak \
-		depend all || die "Compile failed"
+		depend ${targets} || die "Compile failed"
 }
 
 src_install() {
-	dolib.so build/lib/obj/*/*/libstlport*.so* || die "dolib.so failed"
+	emake -C build/lib -f gcc.mak install
+	dolib.so lib/*
+
+	if use static ; then
+		emake -C build/lib -f gcc.mak install-static
+		dolib.a lib/*.a
+	fi
 
 	insinto /usr/include
 	doins -r stlport
diff --git a/dev-libs/STLport/files/STLport-5.1.0-wrong_russian_currency_name.patch b/dev-libs/STLport/files/STLport-5.1.0-wrong_russian_currency_name.patch
new file mode 100644
index 000000000000..5735b17205b8
--- /dev/null
+++ b/dev-libs/STLport/files/STLport-5.1.0-wrong_russian_currency_name.patch
@@ -0,0 +1,11 @@
+--- test/unit/locale_test.cpp.orig	2007-01-13 21:56:42.000000000 +0100
++++ test/unit/locale_test.cpp	2007-01-13 21:57:14.000000000 +0100
+@@ -35,7 +35,7 @@
+ #else
+                                                                                                                                           " " },
+ #endif
+-  { "ru_RU.koi8r", ",",           ".",           "RUR ",           "",                   "",           "\xd2\xd5\xc2", ".",               " " },
++  { "ru_RU.koi8r", ",",           ".",           "RUB ",           "",                   "",           "\xd2\xd5\xc2", ".",               " " },
+   { "en_GB",       ".",           ",",           "GBP ",           "",                   "\xa3",       "",           ".",                 "," },
+   { "en_US",       ".",           ",",           "USD ",           "",                   "$",          "",           ".",                 "," },
+   { "C",           ".",           ",",           "",               "",                   "",           "",           " ",                 " " },