From 390688ae65dad06202f8f1441845c4b499ffc10e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Sun, 1 Apr 2007 19:17:18 +0000 Subject: [PATCH] Version bump. Fixes bug #172860, thanks to Robin Johnson. Package-Manager: portage-2.1.2.2 --- dev-libs/STLport/ChangeLog | 9 +- dev-libs/STLport/Manifest | 30 ++++- dev-libs/STLport/STLport-5.1.2.ebuild | 107 ++++++++++++++++++ ...rt-5.1.2-wrong_russian_currency_name.patch | 11 ++ dev-libs/STLport/files/digest-STLport-5.1.2 | 3 + 5 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 dev-libs/STLport/STLport-5.1.2.ebuild create mode 100644 dev-libs/STLport/files/STLport-5.1.2-wrong_russian_currency_name.patch create mode 100644 dev-libs/STLport/files/digest-STLport-5.1.2 diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog index 218f75263ff9..e1cc07c50026 100644 --- a/dev-libs/STLport/ChangeLog +++ b/dev-libs/STLport/ChangeLog @@ -1,6 +1,13 @@ # 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.54 2007/03/12 16:08:59 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.55 2007/04/01 19:17:18 dev-zero Exp $ + +*STLport-5.1.2 (01 Apr 2007) + + 01 Apr 2007; Tiziano Müller + +files/STLport-5.1.2-wrong_russian_currency_name.patch, + +STLport-5.1.2.ebuild: + Version bump. Fixes bug #172860, thanks to Robin Johnson. 12 Mar 2007; Raúl Porcel STLport-5.1.0.ebuild: x86 stable diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest index 5981fa9138b0..0ad93a0095f6 100644 --- a/dev-libs/STLport/Manifest +++ b/dev-libs/STLport/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX STLport-5.0.2-gcc41.patch 419 RMD160 76d81b4aa58721b1aa41cd2112b1fb11bcf1bd90 SHA1 d7944c8e53ee192a3f8569e7ed9b944a9ddf2e37 SHA256 160cb4b6defa4e537ed8d591e52880247cb075f89c8913372605e8290f9bc90d MD5 2893a09a401bc17386d4223147dd1cef files/STLport-5.0.2-gcc41.patch 419 RMD160 76d81b4aa58721b1aa41cd2112b1fb11bcf1bd90 files/STLport-5.0.2-gcc41.patch 419 @@ -18,8 +21,13 @@ AUX STLport-5.1.0-wrong_russian_currency_name.patch 1049 RMD160 f27ff8b99c711a61 MD5 5ba46827492c629d15d03d47b5da1bc1 files/STLport-5.1.0-wrong_russian_currency_name.patch 1049 RMD160 f27ff8b99c711a61312ea36707e313b1d2ba158a files/STLport-5.1.0-wrong_russian_currency_name.patch 1049 SHA256 5ffed03f2d867b4079f6d2b88f42b3fe45821043a9db4c910a8179bb912800c1 files/STLport-5.1.0-wrong_russian_currency_name.patch 1049 +AUX STLport-5.1.2-wrong_russian_currency_name.patch 1050 RMD160 66bd42c7d7ee7a14a6be3f69a057162d5f8abacc SHA1 2f0e3291cb538c66531c2a7e037ca245a170b61c SHA256 07658cdd06c472fb6fa84254517db48931662fcd26f0bc56d41687fe9f8c115c +MD5 04f8780be2ff13682f65ad590528a2af files/STLport-5.1.2-wrong_russian_currency_name.patch 1050 +RMD160 66bd42c7d7ee7a14a6be3f69a057162d5f8abacc files/STLport-5.1.2-wrong_russian_currency_name.patch 1050 +SHA256 07658cdd06c472fb6fa84254517db48931662fcd26f0bc56d41687fe9f8c115c files/STLport-5.1.2-wrong_russian_currency_name.patch 1050 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 +DIST STLport-5.1.2.tar.bz2 675633 RMD160 c3fd1af92d270179c6cf07a09a0e6e13173dc875 SHA1 35294b85ed95b93720325490259642d4128c657b SHA256 6f6189d4233e4195a45b3e3a3d5504fd0c66b44c6217549702e8440419e28d84 EBUILD STLport-5.0.3.ebuild 2643 RMD160 4d4d1ee673c23efa03e7214ef53e92999817d7d6 SHA1 e6664ee3142d3bfdd3eaca53c01d3a395e4146e3 SHA256 bdaf97ad4651eaa4d77d9df19240d90aaa613992309c1409c7739069ffca20db MD5 1994e2855339e0139563a0b8e8b718a2 STLport-5.0.3.ebuild 2643 RMD160 4d4d1ee673c23efa03e7214ef53e92999817d7d6 STLport-5.0.3.ebuild 2643 @@ -28,10 +36,14 @@ EBUILD STLport-5.1.0.ebuild 2607 RMD160 df25db8ba8c8c1be42a870e0a77eb2a32924d5a9 MD5 4addf88ec3f59ded96ae4ed86788e209 STLport-5.1.0.ebuild 2607 RMD160 df25db8ba8c8c1be42a870e0a77eb2a32924d5a9 STLport-5.1.0.ebuild 2607 SHA256 503f3b1bd75120e1ad2ab1b0bd95e9561a7b5f4e9e81c11878fbdc767dbc88aa STLport-5.1.0.ebuild 2607 -MISC ChangeLog 7717 RMD160 3eb75d63e28cfe913213f7b78bae99c379edaeb2 SHA1 8936676b5bf0bc82c0a3302652d46850f1775fad SHA256 48d9ba05101cec417a512150934b5fc2da6e977b42cd661fd2153712aea9e762 -MD5 0ab46f4c31ae2c1881c6997351576482 ChangeLog 7717 -RMD160 3eb75d63e28cfe913213f7b78bae99c379edaeb2 ChangeLog 7717 -SHA256 48d9ba05101cec417a512150934b5fc2da6e977b42cd661fd2153712aea9e762 ChangeLog 7717 +EBUILD STLport-5.1.2.ebuild 2546 RMD160 ffdac0ccdbef525ae2c13acd0287bb0c0a62dc28 SHA1 af441adde469a8392b98949d9532466c1ada143d SHA256 060cdd88abed9a082b7801ead0220be413f21ac6c66aa59e874f1c66cbb1fb9c +MD5 6be9d9894df6fafd8215dc60c3af315e STLport-5.1.2.ebuild 2546 +RMD160 ffdac0ccdbef525ae2c13acd0287bb0c0a62dc28 STLport-5.1.2.ebuild 2546 +SHA256 060cdd88abed9a082b7801ead0220be413f21ac6c66aa59e874f1c66cbb1fb9c STLport-5.1.2.ebuild 2546 +MISC ChangeLog 7945 RMD160 218dedccd5e42616bdcf07acab6faca846f89d38 SHA1 14e7a04fde38ff84d2e8395b1c5297c6f47f3315 SHA256 da101e19856c9699a13d4657d196589a5f49850e007f4b5c9d63041907c2a07d +MD5 e099c6368cdb494b5f3c745f5d12881f ChangeLog 7945 +RMD160 218dedccd5e42616bdcf07acab6faca846f89d38 ChangeLog 7945 +SHA256 da101e19856c9699a13d4657d196589a5f49850e007f4b5c9d63041907c2a07d ChangeLog 7945 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156 @@ -42,3 +54,13 @@ SHA256 53ed38b4abe7c30147472154a4a44fa51ea836969b58e3daffba46fc58745dd7 files/di 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 +MD5 770b652337bd18f117fc4a2b7402604f files/digest-STLport-5.1.2 244 +RMD160 830a12c18c55f1dfdf94569de5f4085465f2bfec files/digest-STLport-5.1.2 244 +SHA256 76033ce9aeedbbf86533667bf3fc939e5b99c8afb36da7e16c99646f3c1b6d11 files/digest-STLport-5.1.2 244 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFGEAVUGwVqY66cHjARAuAfAJ0b0sm4dZCSRMFGEt/NrZJCKLeX1ACfTe/6 +3e6jpNI5vKVmdr7xu/hsAg4= +=Aefc +-----END PGP SIGNATURE----- diff --git a/dev-libs/STLport/STLport-5.1.2.ebuild b/dev-libs/STLport/STLport-5.1.2.ebuild new file mode 100644 index 000000000000..9dedeb4158a6 --- /dev/null +++ b/dev-libs/STLport/STLport-5.1.2.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.1.2.ebuild,v 1.1 2007/04/01 19:17:18 dev-zero Exp $ + +inherit eutils versionator eutils toolchain-funcs multilib flag-o-matic + +KEYWORDS="~amd64 ~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}/${P}-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/config/user_config.h + #define _STLP_NATIVE_INCLUDE_PATH ../g++-v$(gcc-major-version) + EOF + + append-lfs-flags + + 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} |" \ + -e "s|^\(CPPFLAGS = \)|\1 ${CPPFLAGS} |" \ + build/Makefiles/gmake/gcc.mak || die "sed failed" + + local myconf + if use boost ; then + myconf="${myconf} --with-boost=/usr/include" + sed -i \ + -e 'N;N;N;s:/\**\n\(#define _STLP_USE_BOOST_SUPPORT 1\)*\n\*/:\1:' \ + stlport/stl/config/user_config.h + fi + + cd "${S}/build/lib" + + # 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/so -L${S}/build/lib/obj/gcc/so_g -L${S}/build/lib/obj/gcc/so_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/so_stlg" + ./test/unit/obj/gcc/so_stlg/stl_unit_test || die "unit tests failed" +} diff --git a/dev-libs/STLport/files/STLport-5.1.2-wrong_russian_currency_name.patch b/dev-libs/STLport/files/STLport-5.1.2-wrong_russian_currency_name.patch new file mode 100644 index 000000000000..1ba70bcf5665 --- /dev/null +++ b/dev-libs/STLport/files/STLport-5.1.2-wrong_russian_currency_name.patch @@ -0,0 +1,11 @@ +--- test/unit/locale_test.cpp.orig 2007-04-01 13:09:56.000000000 +0200 ++++ test/unit/locale_test.cpp 2007-04-01 13:10:37.000000000 +0200 +@@ -36,7 +36,7 @@ + # else + " " }, + # endif +- { "ru_RU.koi8r", ",", ".", "RUR ", "", "", "\xd2\xd5\xc2", ".", " " }, ++ { "ru_RU.koi8r", ",", ".", "RUB ", "RUR", "", "\xd2\xd5\xc2", ".", " " }, + { "en_GB", ".", ",", "GBP ", "", "\xa3", "", ".", "," }, + { "en_US", ".", ",", "USD ", "", "$", "", ".", "," }, + { "C", ".", ",", "", "", "", "", " ", " " }, diff --git a/dev-libs/STLport/files/digest-STLport-5.1.2 b/dev-libs/STLport/files/digest-STLport-5.1.2 new file mode 100644 index 000000000000..d99584c4de00 --- /dev/null +++ b/dev-libs/STLport/files/digest-STLport-5.1.2 @@ -0,0 +1,3 @@ +MD5 937b114455f304eb1cf7b9cc2ca103a3 STLport-5.1.2.tar.bz2 675633 +RMD160 c3fd1af92d270179c6cf07a09a0e6e13173dc875 STLport-5.1.2.tar.bz2 675633 +SHA256 6f6189d4233e4195a45b3e3a3d5504fd0c66b44c6217549702e8440419e28d84 STLport-5.1.2.tar.bz2 675633 -- 2.26.2