Version bump (bug #165837). Dropped static USE-flag.

Package-Manager: portage-2.1.2-r7

5 files changed, 138 insertions, 17 deletions

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index 08a969788a82..de50c5d19d66 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,12 @@
 # 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.43 2007/01/26 22:21:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.44 2007/02/11 23:56:09 dev-zero Exp $
+
+*STLport-5.0.3 (11 Feb 2007)
+
+  11 Feb 2007; Tiziano Müller <dev-zero@gentoo.org> +STLport-5.0.3.ebuild,
+  STLport-5.1.0.ebuild:
+  Version bump (bug #165837). Dropped static USE-flag.
 
   26 Jan 2007; Tiziano Müller <dev-zero@gentoo.org>
   files/STLport-5.1.0-wrong_russian_currency_name.patch:
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index d89cf07c8300..3d3c6469c849 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -28,6 +28,7 @@ RMD160 709a29772385a9a476b39c5cc7e9397174f17503 files/STLport-vector.patch 1106
 SHA256 bdc12f69e8fc1a7f350225357e0e32e96899aa39f471c4576ad37d61a6bd7d1b files/STLport-vector.patch 1106
 DIST STLport-4.6.2.tar.gz 755958 RMD160 32f091eaf2375eb2090255b6668e1d06506b817f SHA1 2910ecb520140b4de437a1a865507397e27f3d70 SHA256 b506f0e79adc60663a0dbef7192efa0936566c0d5bcf67637807df70541b9fe3
 DIST STLport-5.0.2.tar.bz2 636340 RMD160 048130af677b269b12cb1b12552ec7c443abe49a SHA1 94e0ab1a4c64e3482c0d84f9ba68744869af9fb3 SHA256 215fee03d5da5f8190b8d5776f1b2f49fe6078fce4858e62638fd5f114038f02
+DIST STLport-5.0.3.tar.bz2 639508 RMD160 9fac74a7177812c338b0e9a996cf7557ee90a437 SHA1 19b8f7dc23858708063d1b63920ca7ef4384da3b SHA256 5bdc0bb07180a8463b480c940e4294ca46cfdfed50b00d254539cb68ae4c2b24
 DIST STLport-5.1.0.tar.bz2 664143 RMD160 b49180f575315004ee83c7673f9b73ff23b03f2c SHA1 6715e9139edee569371097d3b9c122995a691daa SHA256 bafaf651679c1ab95a3d2ed54d6410915a047a617e4c9b8dbcb1b6fc3ce95e67
 EBUILD STLport-4.6.2-r2.ebuild 1412 RMD160 e25c61ed2dd0bedd4f527d8694beeca80c6b7bb8 SHA1 c560922cbeb5a26631de5d6f397d7b6be4355574 SHA256 1b24a2e25c0d2291dc942ba9445f599fa909a69f7faea66ea29dfdd61f53fff2
 MD5 c5eb5b123e291195b93222221f1b0b46 STLport-4.6.2-r2.ebuild 1412
@@ -37,14 +38,18 @@ 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 2683 RMD160 a5dbeaddbc45b12e6db2c976566fa92e9e81d7f6 SHA1 6ff9dd85eb3289932cf71ea565af06a6a77cacb1 SHA256 c4eef17397bc0eb42003c704e76bec7fe1113e8253816627e4e1b0f2292baf61
-MD5 97f669dc3fe5cbdd0841b298095bd02c STLport-5.1.0.ebuild 2683
-RMD160 a5dbeaddbc45b12e6db2c976566fa92e9e81d7f6 STLport-5.1.0.ebuild 2683
-SHA256 c4eef17397bc0eb42003c704e76bec7fe1113e8253816627e4e1b0f2292baf61 STLport-5.1.0.ebuild 2683
-MISC ChangeLog 6245 RMD160 c6e5fd35dc947bc1e35da4573c26ee196585078c SHA1 79f043fa6b681ee7adaff068b61f2e01e8fbe374 SHA256 a43f82d15da7ca0f2a5453eee30efd2c1635652203f7aa6086ceb1dc5b206ec7
-MD5 3c18cc737bfcf6da5230557eb9b24471 ChangeLog 6245
-RMD160 c6e5fd35dc947bc1e35da4573c26ee196585078c ChangeLog 6245
-SHA256 a43f82d15da7ca0f2a5453eee30efd2c1635652203f7aa6086ceb1dc5b206ec7 ChangeLog 6245
+EBUILD STLport-5.0.3.ebuild 2575 RMD160 5e37807d6de96a5d98001a043e6ed4c3f65ed5a6 SHA1 4c49c673202c431ae75534e0cd3c0623026944f7 SHA256 832b2af56341e56dfc6da54502044897da5a9ce9e16c9339fa26a711e3c78393
+MD5 092a8be5a11d6ae3ceb9c838c78af83b STLport-5.0.3.ebuild 2575
+RMD160 5e37807d6de96a5d98001a043e6ed4c3f65ed5a6 STLport-5.0.3.ebuild 2575
+SHA256 832b2af56341e56dfc6da54502044897da5a9ce9e16c9339fa26a711e3c78393 STLport-5.0.3.ebuild 2575
+EBUILD STLport-5.1.0.ebuild 2612 RMD160 c06f9bc6206189ef2d3ce3740b54fbaf5469e53e SHA1 19b5a64096126de21426be2a77188fed996f75fe SHA256 62fa3364ae1a6a3daba4f9030d19cef3e7476330f3dd8daeb6423bd9a6571cce
+MD5 26db21aa47d19b8db006d7ac4c8cc887 STLport-5.1.0.ebuild 2612
+RMD160 c06f9bc6206189ef2d3ce3740b54fbaf5469e53e STLport-5.1.0.ebuild 2612
+SHA256 62fa3364ae1a6a3daba4f9030d19cef3e7476330f3dd8daeb6423bd9a6571cce STLport-5.1.0.ebuild 2612
+MISC ChangeLog 6431 RMD160 bc4aa34ad973a56fcb1ee436bf7e2e9bf4f4afcb SHA1 617e87b44e255f1c18fc74dfda0288fd69676bc6 SHA256 feef14674ba875d4cc31394640e2ebb61e0b8ca29efa0a2ed477880f54fbc660
+MD5 045cb85363dfefad514063d5dacda5d1 ChangeLog 6431
+RMD160 bc4aa34ad973a56fcb1ee436bf7e2e9bf4f4afcb ChangeLog 6431
+SHA256 feef14674ba875d4cc31394640e2ebb61e0b8ca29efa0a2ed477880f54fbc660 ChangeLog 6431
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
@@ -55,6 +60,9 @@ SHA256 0888bc0b68f79c4eef0bbe1398f18ec43d85e555daadba92004ab630967455d9 files/di
 MD5 320fa0788495cf2cad81401c7a502dfd files/digest-STLport-5.0.2 244
 RMD160 6120b9383b3c4db686e8b3baaffbe878a877503e files/digest-STLport-5.0.2 244
 SHA256 c0f36803ed4b427d91173ac038699a6c6167dabcbd0f423424e53b62ba74f635 files/digest-STLport-5.0.2 244
+MD5 a9186a88d0265f7e0487b6260d5f2202 files/digest-STLport-5.0.3 244
+RMD160 bcc51c8c78f11f897b95fde131e5dcc0a6c1f4e2 files/digest-STLport-5.0.3 244
+SHA256 53ed38b4abe7c30147472154a4a44fa51ea836969b58e3daffba46fc58745dd7 files/digest-STLport-5.0.3 244
 MD5 20b21b3724bbae1722e020bec4abdca5 files/digest-STLport-5.1.0 244
 RMD160 92b2df2851b0f1bb585a1ea236f5483da711f639 files/digest-STLport-5.1.0 244
 SHA256 410a66db46974eb459f05587629694d8e36b4eef50535d768279a6a3f36830a5 files/digest-STLport-5.1.0 244
diff --git a/dev-libs/STLport/STLport-5.0.3.ebuild b/dev-libs/STLport/STLport-5.0.3.ebuild
new file mode 100644
index 000000000000..93ded04924c2
--- /dev/null
+++ b/dev-libs/STLport/STLport-5.0.3.ebuild
@@ -0,0 +1,107 @@
+# 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.0.3.ebuild,v 1.1 2007/02/11 23:56:09 dev-zero Exp $
+
+inherit eutils versionator eutils toolchain-funcs multilib flag-o-matic
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="C++ STL library"
+HOMEPAGE="http://stlport.sourceforge.net/"
+SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2"
+LICENSE="as-is"
+SLOT="0"
+IUSE="boost"
+
+DEPEND="boost? ( dev-libs/boost )"
+RDEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/STLport-5.0.2-gcc41.patch"
+	epatch "${FILESDIR}/STLport-5.1.0-wrong_russian_currency_name.patch"
+
+	sed -i \
+		-e 's/\(OPT += \)-O2/\1/' \
+		build/Makefiles/gmake/*cc.mak \
+		|| die "sed opts failed"
+
+	sed -i \
+		-e 's/_STLP_VENDOR_CSTD::wcsftime/::wcsftime/' \
+		stlport/stl/_cwchar.h || die "sed failed"
+
+}
+
+src_compile() {
+	cat <<- EOF >> stlport/stl_user_config.h
+	#define _STLP_NATIVE_INCLUDE_PATH ../g++-v$(gcc-major-version)
+	EOF
+
+	sed -i \
+		-e "s|\(CC :=\) gcc|\1 $(tc-getCC)|" \
+		-e "s|\(CXX :=\) c++|\1 $(tc-getCXX)|" \
+		-e "s|^\(CFLAGS = \)|\1 ${CFLAGS} |" \
+		-e "s|^\(CCFLAGS = \)|\1 ${CFLAGS} |" \
+		build/Makefiles/gmake/gcc.mak || die "sed failed"
+
+	local myconf
+	if use boost ; then
+		myconf="${myconf} --with-boost=${ROOT}usr/include"
+		sed -i \
+			-e 'N;N;N;s:/\**\n\(#define _STLP_USE_BOOST_SUPPORT 1\)*\n\*/:\1:' \
+			stlport/stl_user_config.h
+	fi
+
+	cd "${S}/build/lib"
+
+	append-lfs-flags
+
+	# It's not an autoconf script
+	./configure \
+		${myconf} \
+		--with-extra-cxxflags="${CXXFLAGS}" || die "configure failed"
+
+	cd "${S}"
+
+	cat <<- EOF >> build/Makefiles/config.mak
+	CFLAGS := ${CFLAGS}
+	EOF
+
+	local targets
+	targets="all-shared all-static"
+
+	# The build-system is broken in respect to parallel builds, bug #161881
+	emake \
+		-j1 \
+		-C build/lib \
+		-f gcc.mak \
+		depend ${targets} || die "Compile failed"
+}
+
+src_install() {
+	emake -C build/lib -f gcc.mak install
+	dolib.so lib/*
+
+	emake -C build/lib -f gcc.mak install-static
+	dolib.a lib/*.a
+
+	insinto /usr/include
+	doins -r stlport
+
+	dodoc README etc/ChangeLog* etc/*.txt doc/*
+}
+
+src_test() {
+	cd "${S}/build"
+
+	sed -i \
+		-e "1aLDFLAGS := -L${S}/build/lib/obj/gcc/shared -L${S}/build/lib/obj/gcc/shared-g -L${S}/build/lib/obj/gcc/shared-stlg" \
+		test/unit/gcc.mak || die "sed failed"
+
+	emake -j1 -C test/unit -f gcc.mak || die "emake tests failed"
+
+	export LD_LIBRARY_PATH="./lib/obj/gcc/shared-stlg"
+	./test/unit/obj/gcc/shared-stlg/stl_unit_test || die "unit tests failed"
+}
diff --git a/dev-libs/STLport/STLport-5.1.0.ebuild b/dev-libs/STLport/STLport-5.1.0.ebuild
index 4f7e3cfd80b7..b39ed1c4e857 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.10 2007/01/26 21:40:04 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.1.0.ebuild,v 1.11 2007/02/11 23:56:09 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 static"
+IUSE="boost"
 
 DEPEND="boost? ( dev-libs/boost )"
 RDEPEND="${RDEPEND}"
@@ -71,8 +71,7 @@ src_compile() {
 	EOF
 
 	local targets
-	targets="all-shared"
-	use static && targets="${targets} all-static"
+	targets="all-shared all-static"
 
 	# The build-system is broken in respect to parallel builds, bug #161881
 	emake \
@@ -86,10 +85,8 @@ src_install() {
 	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
+	emake -C build/lib -f gcc.mak install-static
+	dolib.a lib/*.a
 
 	insinto /usr/include
 	doins -r stlport
diff --git a/dev-libs/STLport/files/digest-STLport-5.0.3 b/dev-libs/STLport/files/digest-STLport-5.0.3
new file mode 100644
index 000000000000..056ef0057099
--- /dev/null
+++ b/dev-libs/STLport/files/digest-STLport-5.0.3
@@ -0,0 +1,3 @@
+MD5 21d5275f4f8b190be1572b8498382091 STLport-5.0.3.tar.bz2 639508
+RMD160 9fac74a7177812c338b0e9a996cf7557ee90a437 STLport-5.0.3.tar.bz2 639508
+SHA256 5bdc0bb07180a8463b480c940e4294ca46cfdfed50b00d254539cb68ae4c2b24 STLport-5.0.3.tar.bz2 639508