Backport build fix to stable (bug 462130), restore keywords, remove old

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

5 files changed, 22 insertions, 121 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index ff845ac57d5a..7e89769bfe0d 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/tbb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.38 2013/05/01 23:26:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.39 2013/05/02 15:54:43 dilfridge Exp $
+
+  02 May 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  tbb-4.1.20121003.ebuild, -tbb-4.1.20130116.ebuild,
+  tbb-4.1.20130116-r1.ebuild:
+  Backport build fix to stable (bug 462130), restore keywords, remove old
 
 *tbb-4.1.20130116-r1 (01 May 2013)
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 80a1c04a257f..dcf6e9dcf3ac 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -6,8 +6,7 @@ AUX tbb-4.1.20121003-ldflags.patch 14517 SHA256 4ebbe650a8005ac5667fc5f4815ee049
 AUX tbb-4.1.20121003-ppc.patch 895 SHA256 762ea4b118ede189c9f527d8fbe4bdad2fb3814729267dc0333b03a5f1056923 SHA512 1b07f84163a1f372519b2a44ce1ed355c5d9bdad1987f2b2efcd5a85b599624b37d907d0dcc0c1d2254b619803edbeabdc5cbb7d933986b78b77081ecd4a23ab WHIRLPOOL cbbe2829f4e829867b4844486f07ff0be509f6b850332f5ee376e86519e0eb63598a2179c687199ad5b16a67ce74080f178940c8ac6bff354bf66dafb7192b06
 DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1
 DIST tbb41_20130116oss_src.tgz 2461689 SHA256 4ae2c10899e3b6ef2f686013ec5901fc658444ca90178efaca6014b0665c34b6 SHA512 a537411cf9ae66caaa97af33fbc1e56b6598be7b14526c42fd24cedebac06b1979b39c89b080ff9ff353a1ce82b1d10c4863add79fb15578dd3b1598aea1200f WHIRLPOOL 279eb059a4877cd11d7c01bd8483885c12fbb389c51d0944cfe96270051705b8b42b6d6273533bfb668c231a557fe0cc127b091f2ba88237349137a8015e5654
-EBUILD tbb-4.1.20121003.ebuild 2936 SHA256 79b650dbaff2d318d5b3d2f817acf47809b72af46564b8f2dc6e7e9b97e558c5 SHA512 29dd0fec5d413c3debaf44ef27ba818c8717675213243dcd1867f634d8317249cf9816869404ee44cb534b407f572209a87ce2c14a8916d32cb769aad8558475 WHIRLPOOL 081f5e527a174c54fc17b0fb2b6d4ea0bbd83c8ffe44a87927432478229386d2de90a6fc74fc12a7266c1982b3994025d7420c36c1f7db1822a3cc8bf2d77913
-EBUILD tbb-4.1.20130116-r1.ebuild 3307 SHA256 c9e33c00b081fda956df990bda50fc2dcd14d3139ab11d1b58cbb916784167fe SHA512 7b70593222c1c5940da0a3cb5fa20bf6c63fbc6067353b84bc7b2f9eacae007c738939c7885532b694be2b733efdc0375a9f2571a06f7a7d1f88b3d9abcd5c57 WHIRLPOOL 68d54041d64f940b59795165c1e2690247f8d62ed2796c36a2d8e777232743509f76f34452785482bc359470e5379d7039f661c2d43aa79356bec25c11690b58
-EBUILD tbb-4.1.20130116.ebuild 2936 SHA256 dbf1396f570fdef5b994242b555126b82493277efdf0f0f6a0568aac327202fb SHA512 4996a0b91bfe3cadfbc65924091f10717015be1b8249c1fe98f8b94604ca2914481dc4cc3d3abd7e01294818bea473b4b925529b773b9a74ea854357da5bb191 WHIRLPOOL 99e9023057b6f1ea0cb887086fab109a32b2ca05650fbfffb6dd17b41746754ade2a15061fb77dd1559b320f2f7fb4d7e3e4c1fdc01c6fa12e57a3d3fed16892
-MISC ChangeLog 6635 SHA256 06efd67c21d7734c234508157cac0ead4266cb43ab992bc50d510e089231bb00 SHA512 c8dbec18f90eb688c8da7a3f58c217e391f0e8bac2e11fb98e53589305808f4054f0b65175f40a3db406c058a130778c1d73b89c05fd744b811eb49e7b641f85 WHIRLPOOL da2a7985e24d06b90c776f17554c986e15b435dec92ed2010de8c5b9cec9038c05f07022b6969968c867686cd5d4467ae4c699d9847a5e204a3494f7b0d20b8c
+EBUILD tbb-4.1.20121003.ebuild 3350 SHA256 c422114ee9a59cf5398d54d89648437fa287adf86371dc9dafac13985cbe31eb SHA512 18257adb61fc4943355b89fb654953c1198ec390483dbc0c3886e89a0f737f356651a2470c172b1a1ce0ff6501f7c8a6bef0875469f8c4f9ea0eafcb7af4bcd8 WHIRLPOOL 7e1f8bf7d51ed959d8eb95a7887b1bc169d86babac7452fd7a688fce9689f1ad6437de1fc8549167bf8a425161cee1b394baa41a0c8638adbe3c815bc89fe1d3
+EBUILD tbb-4.1.20130116-r1.ebuild 3347 SHA256 956c07fc424f749eb47165c7068c15eec9850e554bafc5e7b40bec6e85a79499 SHA512 ff740b466b7f3f862071719964897b44cc1ec68720ea5eae2b185d47360a4590dd0f3a7ff81ec0ae66a43702a60013c27f3f049069070fb4c0ea35f16225138e WHIRLPOOL 5b2c465eaa7f3ea328272260aece036bed09f8d271986468963e10f56772cbed675d2f22f4275ccad3240c7a36bf9f4fb17ed110c5b33a0fcd49a7e3c41d2318
+MISC ChangeLog 6850 SHA256 674ef547231b5df9998046eaa7a029fc023a31329cb6a803ad5f267ada0fb099 SHA512 79535e1da2bc7e0e302422587dd7daf14a19bf9ac9cf3d16ca3b40539efb9a7f6dfaa2f593a6914d81c8c96b3df41c1d612a24c1ac1b9d53cfbe3256ff33df13 WHIRLPOOL ae22eb2ae40feb27b1b78e998de5351144f369b7fd16f94b08ea90dee017268828b75a8482d5a444452ce91cad6d37b0ea0155760fb2a0e916e57e0c03958bf4
 MISC metadata.xml 507 SHA256 2c4e4f0b91675da8916c33fd9277b846cd9cbcd8f2629b173682273e9e3edb28 SHA512 8efb5b8d01879a8707fc5d9dd2424edff475be7a1664bf23d8c7bf42f20af01d6a15f39c921cdb264560be3e6dd9ad1325fcf6979e326264f0c2e7cf828cd757 WHIRLPOOL 5a99185cb1995f3210930c5e117e11de2395cf4182e3892a5ad6487a61e8ac53e4c9f17ac1742ad40b1b6f4d159e4fde26b3ca9e4bf9d351fc49243a5f40bb2b
diff --git a/dev-cpp/tbb/tbb-4.1.20121003.ebuild b/dev-cpp/tbb/tbb-4.1.20121003.ebuild
index 8ba6a99881e7..5bec683adbec 100644
--- a/dev-cpp/tbb/tbb-4.1.20121003.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20121003.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.6 2013/02/22 17:26:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.7 2013/05/02 15:54:42 dilfridge Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -39,6 +39,16 @@ src_prepare() {
 		-e "/^ASM/s/as/$(tc-getAS)/g" \
 		build/*.gcc.inc || die
 
+	# force 64bit where applicable, 32bit where applicable... 
+	# built-in detection is based on running kernel, which messes up
+	# e.g. in a x86 chroot on amd64 kernel. Bug 462130
+	# see build/linux.inc for values
+	use amd64 && export arch=x86_64
+	use amd64-linux && export arch=x86_64
+	use x86 && export arch=ia32
+	use x86-linux && export arch=ia32
+	# no idea what to do with ppc but so far it seems to work
+
 	find include -name \*.html -delete || die
 
 	# pc files are for debian and fedora compatibility
diff --git a/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild b/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild
index 4493bdd13802..cdb99fa8899a 100644
--- a/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild,v 1.1 2013/05/01 23:26:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild,v 1.2 2013/05/02 15:54:43 dilfridge Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_release
 LICENSE="GPL-2-with-exceptions"
 
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 
 DEPEND=""
diff --git a/dev-cpp/tbb/tbb-4.1.20130116.ebuild b/dev-cpp/tbb/tbb-4.1.20130116.ebuild
deleted file mode 100644
index c76f5b9701a3..000000000000
--- a/dev-cpp/tbb/tbb-4.1.20130116.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20130116.ebuild,v 1.2 2013/02/17 00:17:37 dilfridge Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib versionator toolchain-funcs
-
-PV1="$(get_version_component_range 1)"
-PV2="$(get_version_component_range 2)"
-PV3="$(get_version_component_range 3)"
-MYP="${PN}${PV1}${PV2}_${PV3}oss"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="http://www.threadingbuildingblocks.org/"
-SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch \
-		"${FILESDIR}"/${PN}-4.1.20121003-ppc.patch
-	# use fully qualified gcc compilers. do not force march/mcpu
-	# not tested with icc
-	# order in sed expressions is important
-	sed -i \
-		-e "s/g++/$(tc-getCXX)/g" \
-		-e "s/gcc/$(tc-getCC)/g" \
-		-e 's/-m\(arch\|cpu\)=*[[:space:]]//g' \
-		-e 's/-\(m\|-\)\(64\|32\)//g' \
-		-e 's/-O2/$(CXXFLAGS)/g' \
-		-e "/^ASM/s/as/$(tc-getAS)/g" \
-		build/*.gcc.inc || die
-
-	find include -name \*.html -delete || die
-
-	# pc files are for debian and fedora compatibility
-	# some deps use them
-	cat <<-EOF > ${PN}.pc.template
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Cflags: -I\${includedir}
-	EOF
-	cp ${PN}.pc.template ${PN}.pc
-	cat <<-EOF >> ${PN}.pc
-		Libs: -L\${libdir} -ltbb
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc.pc
-	cat <<-EOF >> ${PN}malloc.pc
-		Libs: -L\${libdir} -ltbbmalloc
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc_proxy.pc
-	cat <<-EOF >> ${PN}malloc_proxy.pc
-		Libs: -L\${libdir} -ltbbmalloc_proxy
-		Libs.private: -lrt
-		Requires: tbbmalloc
-	EOF
-	use debug || sed -i -e '/_debug/d' Makefile
-}
-
-src_compile() {
-	if [[ $(tc-getCXX) == *g++ ]]; then
-		comp="gcc"
-	elif [[ $(tc-getCXX) == *ic*c ]]; then
-		comp="icc"
-	else
-		die "compiler $(tc-getCXX) not supported by build system"
-	fi
-	emake compiler=${comp} tbb tbbmalloc
-}
-
-src_test() {
-	append-cxxflags -fabi-version=4
-	# avoid oversubscribing with -j1
-	emake -j1 compiler=${comp} test
-}
-
-src_install(){
-	local l
-	for l in $(find build -name lib\*.so.\*); do
-		dolib.so ${l}
-		local bl=$(basename ${l})
-		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-	done
-	doheader -r include/*
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins *.pc
-
-	dodoc README CHANGES doc/Release_Notes.txt
-	use doc && dohtml -r doc/html/*
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples
-	fi
-}