Version bump. Introduced a pkg-config file, bug #405723

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 122 insertions, 87 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 57ebc84925f7..714b51b469ac 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/tbb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.15 2012/01/07 20:47:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.16 2012/02/27 02:28:55 bicatali Exp $
+
+*tbb-4.0.297 (27 Feb 2012)
+
+  27 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> -tbb-2.2.013-r1.ebuild,
+  +tbb-4.0.297.ebuild:
+  Version bump. Introduced a pkg-config file, bug #405723
 
   07 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> tbb-4.0.278.ebuild:
   Remove html files from include directory, thanks a3li bug #398003
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index cc7b6f840d94..2cf920fdb680 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 AUX tbb-3.0.104-tests.patch 676 RMD160 08111b5f403e0b437e7c23a9905c6ecd4b4cab39 SHA1 b205d4123ca1ca3ec8fb7a839e048ef7ff6063f0 SHA256 7d486b4b462a9d13226a29f303a374209e52c4e5ef0d0c8a216ea0b503bb0b21
 AUX tbb-3.0.174-gcc46.patch 1600 RMD160 77c2aaf4cbf566ba11f8bb27a91d94aaa42600cb SHA1 98ffc2ccec74c94e522dafd27bbc1923db627154 SHA256 7d2b422d013defecbd62bd1f04db73b3038f4f4901e543d50c35fada8309d40b
-DIST tbb22_013oss_src.tgz 1519663 RMD160 158b62914b9467054eaf45c064fd0a940fe3a8d2 SHA1 b8e11fc8df5b6e27eec86a0588d9b376e520dfb5 SHA256 fc156e63cb4dbf4f31b412780ea798b95ecb5cbeb5f5f0f0a9510769f5205562
 DIST tbb30_221oss_src.tgz 1856676 RMD160 17cabfb522b2b3acc98fa4717c17accad91d04c5 SHA1 79c6b347f457e3176a5beae598a14b3a25bac4a0 SHA256 7bd3ecac7ef0ed13b1d71080006676ef31f7c08fb20c787208d94138bdf4e676
 DIST tbb40_278oss_src.tgz 2083516 RMD160 1b328f47a0afd14d50404b0079a958f0ae510d89 SHA1 d04ca01332d3f0148f91f6b5d8e69fa68edd8a6d SHA256 dd5c93a457acc1ef21c2d4c4008441ddc5b75e6be82cdd3c15fa1eda3656e4ef
-EBUILD tbb-2.2.013-r1.ebuild 2021 RMD160 236b4c5f5b951fd93cbdcb057ee8d5d275a4d312 SHA1 b22338254a18f51f675f21adf32abc8346ac26d2 SHA256 af85f580290a478a996cf04d1f8d906f92bccd3aae324f1b2076b9f13c99301c
+DIST tbb40_297oss_src.tgz 2097295 RMD160 492234b9ad7a8584c9e779117dca21f9a9b3ce92 SHA1 e5ef5ad3427fbdd700b0117cfba563178a1314e3 SHA256 2d1d10564e536c0ecf50d2db984f9fd9c615909bab13531936f0ca2c0e7cc2c2
 EBUILD tbb-3.0.221.ebuild 2834 RMD160 7a85b3ff5d1b140e78b3a100308ffed53681e903 SHA1 f987dc5ad6cafa8ff3fc20794e558e0e9e56c1e7 SHA256 915d753ef390d90d541c8c9f300991ac4660f5311301965ff33e7dc6e0523b85
 EBUILD tbb-4.0.278.ebuild 2870 RMD160 22b6413251c1f9a1a12c132eff83f41f50f48fa6 SHA1 a3d9b157e37ffd8f5cd0db5039929edef6b2f987 SHA256 baa50ead400f13b008d56fc4359f63386ad6ecce96fe85f615e38b59caf50c86
-MISC ChangeLog 3120 RMD160 4aa7d68561a46824bf7f29eae0028994b3e91a72 SHA1 abe2b74b7eccc3fa6923757a13d3bc3591f06b3f SHA256 4d231c9b9078a98f6d1dc90d8b88894c71073fd7d76ba52b952d6564824a2856
+EBUILD tbb-4.0.297.ebuild 3179 RMD160 eba6f784df8e4911fb18aaa66a5faaa6a3dd527e SHA1 d611361400647c6231bde91f9b12f787532efbb6 SHA256 4f1fb96c742f1f797e2005804f0841bd6c2ee6e01a1522c3420100424bd820da
+MISC ChangeLog 3309 RMD160 0d06dcf2fd827afb7c94bd504e796bcfde6e2a04 SHA1 e8cc637337899f2fc056ca86c953c27db8b82a8b SHA256 c76e097832672aafc52165be56217862cf35f2799ade5ed011168a0e9cfd7cf6
 MISC metadata.xml 696 RMD160 5d37ca6d87a7745e6960f57061b26776cab4bcf9 SHA1 daf66be5bad7a99037dc03c74c657a8630bb8b0e SHA256 e4a63e4e978f0a14647476dadca43ca19f1a767bf9d77203876d7b7e1360af66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8Ir3QACgkQ1ycZbhPLE2BGkwCeJTmu9xl2qGryGlx/8gdmXQyL
-cocAn1/mjRGPkcbI4XFUaH9Bj/LelotN
-=pjSA
+iEYEARECAAYFAk9K6m8ACgkQ1ycZbhPLE2DysACgk1ClSYzx8rgPnI9Q7WtpAiKS
+NLEAoI57VLzxHTNhIAa76T+Ysn8x65lq
+=poKp
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/tbb-2.2.013-r1.ebuild b/dev-cpp/tbb/tbb-2.2.013-r1.ebuild
deleted file mode 100644
index 285f65861b3a..000000000000
--- a/dev-cpp/tbb/tbb-2.2.013-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-2.2.013-r1.ebuild,v 1.1 2010/04/20 20:35:04 bicatali Exp $
-
-EAPI=2
-inherit eutils versionator toolchain-funcs alternatives
-#  url number
-MYU="78/147"
-# release update
-MYR="3"
-
-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://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}%20update%20${MYR}/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-DEPEND="!<=dev-cpp/tbb-2.1.016"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	sed -i \
-		-e "s/-O2/${CXXFLAGS}/g" \
-		build/*.inc \
-		|| die
-}
-
-src_compile() {
-	if [[ $(tc-getCXX) == *g++ ]]; then
-		myconf="compiler=gcc"
-	elif [[ $(tc-getCXX) == *ic*c ]]; then
-		myconf="compiler=icc"
-	fi
-	# from the Makefile, split debug
-	cd src
-	emake ${myconf} tbb_release tbbmalloc_release || die "emake failed"
-	if use debug || use examples; then
-		emake ${myconf} tbb_debug tbbmalloc_debug || die "emake debug failed"
-	fi
-}
-
-src_test() {
-	cd src
-	emake ${myconf} test_release || die "emake test failed"
-	if use debug || use examples; then
-		emake ${myconf} test_debug tbbmalloc_test_debug || die "emake test debug failed"
-	fi
-
-}
-
-src_install(){
-	for l in $(find build -name lib\*.so.\*); do
-		dolib.so ${l} || die
-		local bl=$(basename ${l})
-		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-	done
-	insinto /usr
-	doins -r include || die
-
-	dodoc README CHANGES doc/Release_Notes.txt
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/html || die
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples || die
-	fi
-}
diff --git a/dev-cpp/tbb/tbb-4.0.297.ebuild b/dev-cpp/tbb/tbb-4.0.297.ebuild
new file mode 100644
index 000000000000..bdda849693a0
--- /dev/null
+++ b/dev-cpp/tbb/tbb-4.0.297.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.1 2012/02/27 02:28:55 bicatali Exp $
+
+EAPI=4
+inherit eutils versionator toolchain-funcs
+
+# those 2 below change pretty much every release
+# url number
+MYU="78/181"
+# release update
+MYR="%20update%203"
+
+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://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.104-tests.patch
+	# use fully qualified compilers. do not force pentium4 for x86 users
+	local CC="$(tc-getCC)"
+	sed -i \
+		-e "s/-O2/${CXXFLAGS}/g" \
+		-e 's/^\(CPLUS = \)g++ $/\1'"$(tc-getCXX)/" \
+		-e 's/^\(CONLY = \)gcc$/\1'"${CC}/" \
+		-e 's/\(shell \)gcc\( --version\)/\1'"${CC}"'\2/' \
+		-e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
+		build/*.inc || die
+	# - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
+	#   actual command.
+	# - Force generation of version_string.tmp immediately after the directory
+	#   is created.  This avoids a race when the user builds tbb and tbbmalloc
+	#   concurrently.  The choice of Makefile.tbb (instead of
+	#   Makefile.tbbmalloc) is arbitrary.
+	sed -i \
+		-e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
+		-e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1"  -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
+		src/Makefile || die
+	find include -name \*.html -delete
+
+	cat <<-EOF > ${PN}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -ltbb -ltbbmalloc
+		Cflags: -I\${includedir}/tbb
+	EOF
+}
+
+src_compile() {
+	if [[ $(tc-getCXX) == *g++ ]]; then
+		myconf="compiler=gcc"
+	elif [[ $(tc-getCXX) == *ic*c ]]; then
+		myconf="compiler=icc"
+	fi
+	local ccconf="${myconf}"
+	if use debug || use examples; then
+		ccconf="${ccconf} tbb_debug tbbmalloc_debug"
+	fi
+	emake -C src ${ccconf} tbb_release tbbmalloc_release
+}
+
+src_test() {
+	local ccconf="${myconf}"
+	if use debug || use examples; then
+		${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
+	fi
+	emake -C src ${ccconf} test_release
+}
+
+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
+	insinto /usr
+	doins -r include
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.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
+}