Add debian patch to fix building with gcc-4.7 wrt #422575 by Diego Elio Pettenò <flameeyes@gentoo.org>

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x895192F9

3 files changed, 119 insertions, 15 deletions

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index a2243578a8c1..2a5ffdc4f933 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/STLport
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.80 2013/01/04 15:15:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.81 2013/03/03 12:57:39 xarthisius Exp $
+
+*STLport-5.2.1-r1 (03 Mar 2013)
+
+  03 Mar 2013; Kacper Kowalik <xarthisius@gentoo.org> +STLport-5.2.1-r1.ebuild:
+  Add debian patch to fix building with gcc-4.7 wrt #422575 by Diego Elio
+  Pettenò <flameeyes@gentoo.org>
 
   04 Jan 2013; Ulrich Müller <ulm@gentoo.org> STLport-5.2.1.ebuild:
   Fix LICENSE, bug 448166.
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index 04ac14c145c6..cb51f7a33b63 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 DIST STLport-5.2.1.tar.bz2 717202 SHA256 755b007b982c4545086c43affc8ed32c0acd577ee206eb1f6967e250c3546fc9 SHA512 c619f1965e42a444714f6a2bcbade3428e09823ad056930b32bf8224b7b3e4b4ae82e25e4ba7b4584f73645a7838a677f314b7bc583d1d9bbcef6fcafc439141 WHIRLPOOL 0d8539b98dd57c8b548bcfaeed3866c348f7f750b676404f40b2beda3c5095a2d94496d670e9f13b7287033fecd8c9f997aad44dfb07b310a8236956bdf2d52e
 DIST STLport-patches-5.2.1-1.tbz2 4911 SHA256 3b9741849a303afc1f4ae30f4748e7de729786c3630885d1ac70734846b55e61 SHA512 68adb3bb4751270636feef1e35659b490069306127dcbb52d58ff5ab1d6deb005fb7315b5b53b9cc11bf1386645330a1e644104f06f2bf68cfa288b87f6ddd36 WHIRLPOOL c4a1cf7dcecfd68b2056529a826bc5132b49147c3901d06d79b8a5c949635fd854391954c56cf15af0f081bab7370e11020747e27e749d74916242ee69a339a4
+DIST STLport-patches-5.2.1-2.tbz2 5245 SHA256 ccf0803a0b5e3c887e52d6132eb48932d566a933d299ebb22858ebd39dddc0c4 SHA512 ddc1b282d1b8008f1f6d5aa3eee0f821063c00fdf851cb569f69955dd3e1ad46b3e57a5c458a1f54aa75737cafe848cf20685b729951a58e80f14234804b92bb WHIRLPOOL cbb1ba74aca4cd454855aad6371ac7140fef42aa70b30c29e70a3b6d24044e5acd221a5a12c90414fb20bfb26ea879e7e3839ff8857b717d793538ca67380e33
+EBUILD STLport-5.2.1-r1.ebuild 2674 SHA256 310a74294c2562aecdc25ad0e54bf3d68e1f77941c688b99863570d52555e499 SHA512 96fc1b5dd52e18bf0986d90dfe5782e04e94db1248a7eb1c1eb97d41f1c3051618740bbbbd815b71c7768d33d2090240d6fc3405ad989016650e554956dde721 WHIRLPOOL d64c94907c273198c93076cb02d44ed63a638fe12a87006d8ff9e85ff22cd6d917d30f1bb8fcdf1e8f378251eb33fc3e18a1b1b7219daf0a3b7979562971d1aa
 EBUILD STLport-5.2.1.ebuild 2641 SHA256 6f996b3e8edb0419cd7c1030d3e5780127beff6c0a4148e8149bfd9d963ecf07 SHA512 67f34d97743ec61959975c1fcf1766e4ab19d9066487781a5279cde8eac81dc1d6402999e7c5f31d0f12c93a948a8fdb1806af9bdcc341666fb1cd22c506ebb8 WHIRLPOOL 789beeec95fb3f29bdde65885fa6492b4854a5879967cc503a24ae2d18e78b13bc58ac1d23bce3517a77c50c6b98bb804759b6ff735352286c6321e35fbd8681
-MISC ChangeLog 11585 SHA256 a0db0f92328473fcc5ef3ab8f7b84bb0ba33ca91b5ce900c9ea83728462dea48 SHA512 927de2f5bcfdc1b93474ca037dda80a1521f3f63cc707884db3ed23c6fced15af0bbc2625c4484403187eb611655c249bb355af65380683d7024d41c2102d222 WHIRLPOOL 1d10bba1c8397f078b3060c9e4539ff3862ec33f2238c34287636f8f21cf91211e33cdb2e182918ef197016f2d600046701279e756fc82f92b677b63907405af
+MISC ChangeLog 11814 SHA256 9c1535ed406a85245994e8561f4bdf2890c83df94cd918aec643762be7caa74d SHA512 2237f495fe32f523a3be94a81d2fd001ff1f908eb5b35f47f1264be804dd88a9f0048d3c3caac9e1b6113dd8a35557e472bbc14b338f051b887c086d20d3fa81 WHIRLPOOL 4ccc1eed6ed1bd745b6e317b6b6cacad042576a1bcf56035930b1f9c13911a81d07b994420c46a46e1fea337bddf2d0c839998833c5a757b87b160843e300f81
 MISC metadata.xml 243 SHA256 a127aa93730ed7bb90edca642be63155aeb752bd38dcbd3b874fa496f7a70cc2 SHA512 56a7589e56b7dc8e8dda953cac84cf4210f09615da3d327b65a591b854f513dba53358fbc04977f35423ae6d640c953e2a6a1db634daa8c14195fec757ed60de WHIRLPOOL 639e2d8e4f5f059c8c53ec89f88251dd92043eab8134bd9410b3cd1ea6c730af331777e94e633815048282edef74f4a4c09e787b919e1c6ff45634e387cf3380
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ5vKjAAoJEDxpGckxwJCBh3wP/1OW2fNTY/WVaaEstdYG6QDl
-qUrTvWUWpie2YEAewW8XBC0JvAdPvNIvnURui+kyjE+oJFdjK78ymdUCaMaFJCbX
-EciGVAu1rllP47Ysf8cuzMM8v7LWoXlbE6P/sHGFBnBWeTLFSbpcw5eCFJb3v/w9
-wKqKwxNfJj9UsY2+++SYbsJc8c5tzsNpVl/r7UisQBDoU5wUzw7faWAYKUsUmzkh
-levc/lSaWh0Ctc0o3GUbkPp0Q7OX5t92uDWof215YTO519eJvFKnLBFT9nCKIP81
-OPSZW8m3Lymvb6ZlR3XqBzY8tU72YBj+eDcdQMqt7aiZTAshJouWaNOXlWHNvVXf
-RtU1mE9wPZ4Z1tDIjy8x23VUgmSe4X3I3/NsQULddcVt5aRIMtmts0U/8eoHydY0
-XObKZTjAQYsjnClaIfp0el9el6NQjKd8atxF1Kx7LBbclRyLYJBen/ZO2MKZct5e
-HqC+WZuZkpIdEZR5miUrtnrp1C6D21zPqeEbiVhCpeC9sjXyMh8jCjEswAmsb4Cy
-JZqK7m+29StB4xmtd9IeWip1+kQgXNV0/CQqm7hBUw+Cu0JM9y8XFrpgzzcHbbrC
-49E92E61nFKjmnqkhodVzmTEU44I4i9c9t1e1LyYV5aQ/aDDpfTLe9eu1lkF4PLn
-/vmPiGsorrTx2NEsgsXu
-=4xXN
+iQIcBAEBCAAGBQJRM0jKAAoJEF0huFKJUZL5hhEQAI7JuSHFPDIdzzrCp4PDqXg7
+yS9X93iin4/D80UCC8NoRxNywXA0yPfqUscOdcqvUOczPnkYCyP28YOnntMih7ii
+IdsOVSP/A7twNEI+6HwKm7fBHQdCn13DGCDeqpXHfvn0zkQuxm+TWsapBib2PvAB
+NcO+MI4hOV1abokG0HoGFTSBHRhGZQ0vzcW1SQZ6g7tSCM63h7HyFYPNSZZC98uY
+wS3ZuBxvU9zEOfJoYHK7+FjQqZXYhQATurU6YlSbqIJSkS9qml2BRTJ/CpL0A1eE
+PJ0DF2/gum+Q+zb8sObfUZoHPV+Hj8GKFTFEkU1Va9FM9rqfXwCnWGh9kPEMkHAN
+XqKq8uc5g5inn0NHfjrFcCUvDfeKHK8pG6FuDOqCr+DweVRvvmhLpcfouaB0xO1P
+c2tK6dZvOIumP6Osti8C2kUFmhiVesoxNjwvdoFqqe4DXGryIS9TAxZWZObNRN2Z
+A3xDT7JdUomcbs5pOSoQInRTLWNE9/YC90dVA6kpqWf2uiDxllvaAkS80isacoXB
+SUFoTvI+56meogSiHt420fIrJC5Ly7WKDW0b/x8LBV5/oSuSUwMcBFkN4CqZeuu+
+lgOZ0FHlF+xlgYIttzR8EaAPKKI25+X8JArOci+fbjkM0IyFbePW950udaoFXPbx
+OQGwYjF4fJNSJ0OipZfl
+=4lFh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/STLport/STLport-5.2.1-r1.ebuild b/dev-libs/STLport/STLport-5.2.1-r1.ebuild
new file mode 100644
index 000000000000..c7f4af0098c8
--- /dev/null
+++ b/dev-libs/STLport/STLport-5.2.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/03/03 12:57:39 xarthisius Exp $
+
+EAPI="2"
+
+inherit eutils versionator toolchain-funcs multilib
+
+PATCH_V="2"
+
+DESCRIPTION="C++ STL library"
+HOMEPAGE="http://stlport.sourceforge.net/"
+SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2
+	http://dev.gentoo.org/~xarthisius/distfiles/${PN}-patches-${PV}-${PATCH_V}.tbz2"
+
+LICENSE="boehm-gc HPND"
+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
+}