Version bump

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

4 files changed, 26 insertions, 124 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 55244ef1e571..92ac75423345 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/tbb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.13 2011/08/02 17:17:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.14 2011/12/20 06:54:47 bicatali Exp $
+
+*tbb-4.0.278 (20 Dec 2011)
+
+  20 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> -tbb-3.0.174.ebuild,
+  -tbb-3.0.196.ebuild, +tbb-4.0.278.ebuild:
+  Version bump
 
 *tbb-3.0.221 (02 Aug 2011)
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index e3868988542a..ff21b63a87c7 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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_174oss_src.tgz 1826899 RMD160 5f6f853cf2fc6c05bd11dcf2928d60c5e2459fbf SHA1 b68764d0d9d2517c60fd88c71a3554d194733b03 SHA256 c06eae08435cb7118d2f922303fd83b03e2754d45a6c8fa98721cb09b0a463cc
-DIST tbb30_196oss_src.tgz 2015992 RMD160 8af026a436415b8d790a77b6a88165e1b926caaf SHA1 eb77db011bc595d77a69de4fb78004b370cabd2f SHA256 bc342b93b8456bdec911baaea2c44ae787c39b7bbcac88789f05ebed634510d7
 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
-EBUILD tbb-3.0.174.ebuild 3006 RMD160 585e6d26de3ce0142a6474e912a69d4207a89ab0 SHA1 44c9aecc1734f6aeb48c8fb6eae74262b271035a SHA256 e6161a3b809d9437727e59afdbaaf33582dff394464d398ca9e9f23cebfbfedb
-EBUILD tbb-3.0.196.ebuild 3006 RMD160 cd9074569c73e100f94fcac68bb60770e807f0a6 SHA1 f4e9db69c027ceabebfa9cf3aa8ab634222e0af9 SHA256 778d246dac9bd6168debb6cedfcdf4fe06a327dee771a9f406ff0ce9971fea65
 EBUILD tbb-3.0.221.ebuild 2834 RMD160 7a85b3ff5d1b140e78b3a100308ffed53681e903 SHA1 f987dc5ad6cafa8ff3fc20794e558e0e9e56c1e7 SHA256 915d753ef390d90d541c8c9f300991ac4660f5311301965ff33e7dc6e0523b85
-MISC ChangeLog 2812 RMD160 2b389c2909fdef023cf7e5eefdb7162ab01dc74a SHA1 8e8f6778dc05ad4ebb2179d093984feaabb2997d SHA256 d80030a806b505be5d2f8acab5bdb0c01187a7b84e6b07d8da1ff063ad753c8f
+EBUILD tbb-4.0.278.ebuild 2834 RMD160 2e01b9550ffc91e6248da6c45d052cd29a4cb965 SHA1 d5ac503cb3b7f59d3629f7f14c312516633ee2a1 SHA256 8e6bce7793a5ee4aedda614f9c02732c6c185d7e1df26f140ff36640a31fb3a3
+MISC ChangeLog 2976 RMD160 f79c0927396cca195c2595db967c728690ea478c SHA1 aefcf7151b101fdab159dde1559b978c61da5f8f SHA256 972d936beb62ec2c260bd19cd33e401c893ab47935be3ba7215445dc2a82ca21
 MISC metadata.xml 696 RMD160 5d37ca6d87a7745e6960f57061b26776cab4bcf9 SHA1 daf66be5bad7a99037dc03c74c657a8630bb8b0e SHA256 e4a63e4e978f0a14647476dadca43ca19f1a767bf9d77203876d7b7e1360af66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59AvcACgkQfXuS5UK5QB2WawP9GsI1DsNIyADNOqT8L9Xsld/t
-fNK9WiyoS9s0lfo+aKbQAKOPjznuqIMD7m5lhzpcUYxHfcnoWSUxM0tmfVbZ2Mwd
-dxI/E2GHprGNR40pfXSteH7r68kLXvHbIcpm+HO6zeMK2tvXpeWQet1yf7576igz
-i1SWKWufx3vLktN/QcY=
-=0Lot
+iEYEARECAAYFAk7wMWUACgkQ1ycZbhPLE2AQ7QCfZ/wT0s+3C4w2CPYDD3RaTWBF
+loAAoJGVgCLFOtinrYc7Dvkebt1Hq1Sn
+=Gukt
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/tbb-3.0.196.ebuild b/dev-cpp/tbb/tbb-3.0.196.ebuild
deleted file mode 100644
index 8528e8c4becc..000000000000
--- a/dev-cpp/tbb/tbb-3.0.196.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.196.ebuild,v 1.1 2011/05/31 21:34:13 bicatali Exp $
-
-EAPI=3
-inherit eutils versionator toolchain-funcs
-
-# those 2 below change pretty much every release
-# url number
-MYU="78/170"
-# release update
-MYR="%20update%20"7
-
-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="!<=dev-cpp/tbb-2.1.016"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.104-tests.patch
-	epatch "${FILESDIR}"/${PN}-3.0.174-gcc46.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
-}
-
-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 || die "emake failed"
-}
-
-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 || die "emake test failed"
-}
-
-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-3.0.174.ebuild b/dev-cpp/tbb/tbb-4.0.278.ebuild
index ed0c806dc01c..d863396593ef 100644
--- a/dev-cpp/tbb/tbb-3.0.174.ebuild
+++ b/dev-cpp/tbb/tbb-4.0.278.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.174.ebuild,v 1.1 2011/04/21 21:04:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.278.ebuild,v 1.1 2011/12/20 06:54:47 bicatali Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils versionator toolchain-funcs
 
 # those 2 below change pretty much every release
 # url number
-MYU="78/166"
+MYU="78/179"
 # release update
-MYR="%20update%20"6
+MYR="%20update%202"
 
 PV1="$(get_version_component_range 1)"
 PV2="$(get_version_component_range 2)"
@@ -31,7 +31,6 @@ S="${WORKDIR}/${MYP}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.0.104-tests.patch
-	epatch "${FILESDIR}"/${PN}-3.0.174-gcc46.patch
 	# use fully qualified compilers. do not force pentium4 for x86 users
 	local CC="$(tc-getCC)"
 	sed -i \
@@ -63,7 +62,7 @@ src_compile() {
 	if use debug || use examples; then
 		ccconf="${ccconf} tbb_debug tbbmalloc_debug"
 	fi
-	emake -C src ${ccconf} tbb_release tbbmalloc_release || die "emake failed"
+	emake -C src ${ccconf} tbb_release tbbmalloc_release
 }
 
 src_test() {
@@ -71,27 +70,25 @@ src_test() {
 	if use debug || use examples; then
 		${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
 	fi
-	emake -C src ${ccconf} test_release || die "emake test failed"
+	emake -C src ${ccconf} test_release
 }
 
 src_install(){
 	for l in $(find build -name lib\*.so.\*); do
-		dolib.so ${l} || die
+		dolib.so ${l}
 		local bl=$(basename ${l})
 		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
 	done
 	insinto /usr
-	doins -r include || die
+	doins -r include
 
 	dodoc README CHANGES doc/Release_Notes.txt
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/html || die
-	fi
+	use doc && dohtml -r doc/html/*
+
 	if use examples ; then
 		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc || die
+		doins build/*.inc
 		insinto /usr/share/doc/${PF}/examples
-		doins -r examples || die
+		doins -r examples
 	fi
 }