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

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 116 insertions, 81 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/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
+}