Version bump (bug #255393), also solves bug #276247 (tests failing), bug #332917 (building with glibc 2.12).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 106 insertions, 2 deletions

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index 4cd8c214db68..831240bd433a 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/STLport
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.73 2010/01/06 22:38:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.74 2010/08/21 10:27:12 dev-zero Exp $
+
+*STLport-5.2.1 (21 Aug 2010)
+
+  21 Aug 2010; Tiziano Müller <dev-zero@gentoo.org> +STLport-5.2.1.ebuild:
+  Version bump (bug #255393), also solves bug #276247 (tests failing), bug
+  #332917 (building with glibc 2.12).
 
   06 Jan 2010; Jeroen Roovers <jer@gentoo.org> STLport-5.1.5.ebuild:
   Marked ~hppa (bug #299937).
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index 8bb00fdb493b..bbee7924de17 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -10,8 +10,11 @@ AUX STLport-5.1.5-portability-hack.patch 693 RMD160 1336764fa42f7707238887c0eabb
 DIST STLport-5.1.2.tar.bz2 675633 RMD160 c3fd1af92d270179c6cf07a09a0e6e13173dc875 SHA1 35294b85ed95b93720325490259642d4128c657b SHA256 6f6189d4233e4195a45b3e3a3d5504fd0c66b44c6217549702e8440419e28d84
 DIST STLport-5.1.3.tar.bz2 679697 RMD160 7e0b484849039893717caaeb9f5cdd35e7798267 SHA1 37c2174a8884e8c83c7378901031ccaf9a29cd6b SHA256 08ecdec9fccd5e629af9cf5b5ce88e3476e8caf396aa390520e0cc18bc9fd5b4
 DIST STLport-5.1.5.tar.bz2 682914 RMD160 bc24cbba247821a9b94fbc7cdf8d2b421bcc6afb SHA1 0c8b188fe74162998aea17ad689397adf99b2d93 SHA256 2470ca40adc89750c69affffde8a9e6ab6a03f4e3c93640067089f99e76f6dc5
+DIST STLport-5.2.1.tar.bz2 717202 RMD160 ab972549d32513390cadb28f566a4a8fe034d8ec SHA1 98518859f538192245ab838d56107992b21ac469 SHA256 755b007b982c4545086c43affc8ed32c0acd577ee206eb1f6967e250c3546fc9
+DIST STLport-patches-5.2.1-1.tbz2 4911 RMD160 0b09a03274ac21e337dec1e7fe118de4bb3042d3 SHA1 70e5c31051a471d36e31a9f231f34903f136656a SHA256 3b9741849a303afc1f4ae30f4748e7de729786c3630885d1ac70734846b55e61
 EBUILD STLport-5.1.2.ebuild 2599 RMD160 1e997ffff0d25161851109c1a0e588c30e040856 SHA1 c209c16a198ba6ec2befd71fbccbd56b29f4883f SHA256 a0c02ebebdaa29880c2c4930b9156ea2b8a9e5b7938085644e8da5ecb6ecc68c
 EBUILD STLport-5.1.3.ebuild 2794 RMD160 fa7864b56c36a9b1dee2afd7f186058e27dfff5e SHA1 1fedc44b9b02390e38b4a0fda6c4666462ab3570 SHA256 d9b8a54d70275f64047b0d45a7848fc7833c5aaf736dd649dac5cb52c8022ae6
 EBUILD STLport-5.1.5.ebuild 3562 RMD160 099f3592698a4e772f0f978acae30d3d5b26986d SHA1 bcb863920f6f1541b6b660322961ba7ef661f637 SHA256 956c0cccc07fd47c8e7d7fe66eb053f1ce2b6e534239561aa670097676ec78ee
-MISC ChangeLog 10713 RMD160 1d1277b58437c08fe98328a5318598be1189215e SHA1 b95a5c12885b3974de4b1f948d52fc3ce3fd40b3 SHA256 846f105e9d0f53eabaff06fb3207fb2759c5bc9a8d455e77d35e4f18ca64c534
+EBUILD STLport-5.2.1.ebuild 2642 RMD160 42c62cc7ce0e1601bffb06a96765388f254d1cd7 SHA1 98ad6c40f21434a349cac413ef7a05ebdcea6347 SHA256 b92a33f3683aad3903803aca717ece547ab2495d402205796c7aae0c7a9c861e
+MISC ChangeLog 10938 RMD160 b3f449fdacdb7e29653d09d3477846083d616089 SHA1 49c21265ca050bc7dd723d3fd8abe519c3b0ee29 SHA256 f24ea6541d725040de3f604325c91d1f95d2b1bc31a8b73645233eca6dd5beba
 MISC metadata.xml 243 RMD160 4c7b362fa5a0b3f13257e1826c40bf362c7f1b1c SHA1 91e79215f176c1d0c966927810d729c658604e92 SHA256 a127aa93730ed7bb90edca642be63155aeb752bd38dcbd3b874fa496f7a70cc2
diff --git a/dev-libs/STLport/STLport-5.2.1.ebuild b/dev-libs/STLport/STLport-5.2.1.ebuild
new file mode 100644
index 000000000000..d75d730cf603
--- /dev/null
+++ b/dev-libs/STLport/STLport-5.2.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.2.1.ebuild,v 1.1 2010/08/21 10:27:12 dev-zero Exp $
+
+EAPI="2"
+
+inherit eutils versionator toolchain-funcs multilib
+
+PATCH_V="1"
+
+DESCRIPTION="C++ STL library"
+HOMEPAGE="http://stlport.sourceforge.net/"
+SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2
+	mirror://gentoo/distfiles/${PN}-patches-${PV}-${PATCH_V}.tbz2"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="boost debug static static-libs threads"
+
+DEPEND="boost? ( >=dev-libs/boost-1.35.0-r5 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# make sure OSNAME is not in the environment (bug #305399)
+	unset OSNAME
+}
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}/patches"
+	EPATCH_SUFFIX="diff"
+	epatch
+
+	# We have to add this to host.h to make sure
+	# that dependencies of STLport use the same settings
+	cat <<- EOF >> stlport/stl/config/host.h
+	#define _STLP_NATIVE_INCLUDE_PATH ../g++-v$(gcc-major-version)
+	/* use pthreads for threading */
+	#define _PTHREADS
+	/* enable largefile support */
+	#define _FILE_OFFSET_BITS 64
+	#define _LARGEFILE_SOURCE
+	#define _LARGEFILE64_SOURCE
+	EOF
+}
+
+src_configure() {
+	local myconf
+
+	if use boost ; then
+		BOOST_PKG="$(best_version ">=dev-libs/boost-1.35.0-r5")"
+		BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+		BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+		BOOST_INC="/usr/include/boost-${BOOST_VER}"
+
+		myconf+="--with-boost=${BOOST_INC} --with-system-boost "
+		# make sure user apps (e.g. other packges using STLport) use boost as well
+		sed -i \
+			-e 'N;N;N;s:/\**\n\(#define _STLP_USE_BOOST_SUPPORT 1\)*\n\*/:\1:' \
+			stlport/stl/config/user_config.h
+	fi
+
+	use debug || myconf+="--without-debug "
+	use static-libs && myconf+="--enable-static "
+	use threads || myconf+="--without-thread "
+	use static && myconf+="--use-static-gcc "
+
+	# It's not an autoconf script
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--use-compiler-family=gcc \
+		${myconf} \
+		--with-cc="$(tc-getCC)" \
+		--with-cxx="$(tc-getCXX)" \
+		--with-extra-cflags="${CFLAGS}" \
+		--with-extra-cxxflags="${CXXFLAGS}" \
+		--with-extra-ldflags="${LDFLAGS}" || die "configure failed"
+}
+
+src_install() {
+	# precreate some directories
+	dodir /usr/$(get_libdir)
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc README etc/ChangeLog etc/*.txt doc/*.txt doc/{FAQ,README.utf8}
+}
+
+src_test() {
+	if use static ; then
+		ewarn "Tests don't work when building with USE=static. Skipping..."
+		return
+	fi
+	default
+}