Version bump. Disabled buggy tests and reported upstream

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 31 insertions, 124 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 23f6f5301cec..947a0e2f13cd 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-cpp/tbb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.6 2010/07/19 15:43:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.7 2010/08/04 22:23:35 bicatali Exp $
+
+*tbb-3.0.056 (04 Aug 2010)
+
+  04 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org> -tbb-3.0.018.ebuild,
+  -files/tbb-3.0.018-tests.patch, -tbb-3.0.035.ebuild,
+  -files/tbb-3.0.035-tests.patch, +tbb-3.0.056.ebuild,
+  +files/tbb-3.0.056-tests.patch:
+  Version bump. Disabled buggy tests and reported upstream
 
 *tbb-3.0.035 (19 Jul 2010)
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index a2d793df7359..50c7d5d1ce51 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX tbb-3.0.018-tests.patch 1175 RMD160 2d46ee593e22ec6a5f5133f02785a8a55f72bf5a SHA1 b476f118c377f018f4080de2bcb59f24be17f004 SHA256 06d4427960aa3a4ca9568deef5d9be44dc93234759c05b7a72c97feed3993165
-AUX tbb-3.0.035-tests.patch 678 RMD160 b5a83164ea53f58a6b9deee10575bda9e5930b19 SHA1 07b87610457233240da05302e20a3533e67043b7 SHA256 e044324bddf20a8977af3fb8c43932363f9e177ef51d54dd408dbf7022b8908b
+AUX tbb-3.0.056-tests.patch 885 RMD160 14af2f3f703376ab37668f8c21d57335e070a10a SHA1 688f884ce1fa255b774b6e8a0c684a24bc89beef SHA256 e35bb5e3b9ccf64b080763b52aa689c354ba5289aa01ca89c2610db50da146d8
 DIST tbb22_013oss_src.tgz 1519663 RMD160 158b62914b9467054eaf45c064fd0a940fe3a8d2 SHA1 b8e11fc8df5b6e27eec86a0588d9b376e520dfb5 SHA256 fc156e63cb4dbf4f31b412780ea798b95ecb5cbeb5f5f0f0a9510769f5205562
-DIST tbb30_018oss_src.tgz 1550402 RMD160 9655250d6974c38c2572d20cb41a62de13528f60 SHA1 d23755829aa0bc96fa59c3032c0c1bdf1dd3a62c SHA256 6a6e79ae3866ddaea664ae0e93e31563f16024a950c11be52a441c0c91ef62e7
-DIST tbb30_035oss_src.tgz 1556121 RMD160 9fc04205a8bb094fc1209988c100bf3b01ae5abd SHA1 7932a5db3cef757812074d18c051521d1b8de92c SHA256 1bcab3a433f1c6cc6b45ac856a43e055cb6ae8a19d1d5e6f97257bafabfc909e
+DIST tbb30_056oss_src.tgz 1585216 RMD160 7b49a6fcf61e53a19d194fc5c333f94db6ed4182 SHA1 7063d8e2691b2b0c9534b6e26fdf401b31a944fc SHA256 403c6b0f9e3b7d1a4c6e6e80533a79396748258815e963a5d1558fa232bea8b9
 EBUILD tbb-2.2.013-r1.ebuild 2021 RMD160 236b4c5f5b951fd93cbdcb057ee8d5d275a4d312 SHA1 b22338254a18f51f675f21adf32abc8346ac26d2 SHA256 af85f580290a478a996cf04d1f8d906f92bccd3aae324f1b2076b9f13c99301c
-EBUILD tbb-3.0.018.ebuild 2042 RMD160 82d570b7f738dbc373080a1cfb9bc9a2c56b0b74 SHA1 912aa90c3fca3f1420dab085a6ae8f181bbbcefe SHA256 7069f4a644b6d49ea6a2928d963d6662d8a66e81a104d6ee78f8d3a372f78bc5
-EBUILD tbb-3.0.035.ebuild 2061 RMD160 78fd3e1a9c10df09dc577a2762067e844ad13a45 SHA1 228985e2eebe9e2af607cd4819dd87261c227194 SHA256 0674b225f75d5e9b3d156edced1773c3356431d80d83243065178884bcbb89e2
-MISC ChangeLog 1416 RMD160 9f109eda1c20d96a3f85c24117d66791eb7b0954 SHA1 76f888fb0a696aa1b164ad2a04353d145cacceb7 SHA256 c9f6558e1010f30cbb29678172d93bde6c889f297a2644f57f0d0136347bcb98
+EBUILD tbb-3.0.056.ebuild 2044 RMD160 38429cb30d7f8e16db8355a3107fccd1f4a84908 SHA1 a27f90aacef5b76a468d07541b583b6790a865bd SHA256 8619244a970afd8dd0ef66f0e763f54024a03609b1bfbdcfbc697978e2aa617d
+MISC ChangeLog 1724 RMD160 8a87aa755198b6664e326c0c3abcaadbb576dedf SHA1 a70dcba1d775a0c1b7983d702b119e095a93b776 SHA256 f94b5cf9a54e9c7dd5603ab153b0cee6cba061b32e6457edf62ae9d4a19031ab
 MISC metadata.xml 717 RMD160 be2d076186bcee46082c531ff7e353a4c8ee1586 SHA1 bf683cdbaf02706d765d87beec9c9441d7f3f731 SHA256 1ea1ffacad0bf891171794c5f07ca78e1194d2b9438be5563b23a03f7acf39c2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxEcpUACgkQ1ycZbhPLE2BHcACeKXWOwC79ax1wiQpjKWQK3pmV
-1ZQAoK/M79vQnDxYTKJOX/pbGp8gPtjL
-=BaDG
+iEYEARECAAYFAkxZ9DAACgkQ1ycZbhPLE2BwRgCghdHhAoMTlggNWPkR0pwFdttd
+yJkAnik2JGM/JBDxHDrSzT59ID5qGp2c
+=/EMx
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/files/tbb-3.0.018-tests.patch b/dev-cpp/tbb/files/tbb-3.0.018-tests.patch
deleted file mode 100644
index c10e20a466e3..000000000000
--- a/dev-cpp/tbb/files/tbb-3.0.018-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/Makefile.test.orig	2010-05-28 20:00:18.000000000 +0100
-+++ build/Makefile.test	2010-05-28 20:06:20.000000000 +0100
-@@ -193,7 +193,7 @@
- # If a component Y uses component X, then tests for Y should come after tests for X.
- # Note that usually run_cmd is empty, and tests run directly
- test_tbb_plain: $(TEST_PREREQUISITE) $(TASK_CPP_DIRECTLY_INCLUDED) $(TEST_TBB_PLAIN.EXE)
--	$(run_cmd) ./test_tbb_version.$(TEST_EXT) $(args)
-+	#$(run_cmd) ./test_tbb_version.$(TEST_EXT) $(args)
-         # Checking TBB version first to make sure the following testing has anything in it
- 	$(run_cmd) ./test_assembly.$(TEST_EXT) $(args)
- 	$(run_cmd) ./test_compiler.$(TEST_EXT) $(args)
-@@ -254,7 +254,7 @@
- 
- CPLUS_FLAGS_DEPRECATED = $(DEFINE_KEY)TBB_DEPRECATED=1 $(subst $(WARNING_KEY),,$(CPLUS_FLAGS_NOSTRICT)) $(WARNING_SUPPRESS)
- 
--TEST_TBB_OLD.OBJ = test_concurrent_vector_v2.$(OBJ) test_concurrent_queue_v2.$(OBJ) test_mutex_v2.$(OBJ) test_task_v2.$(OBJ)
-+TEST_TBB_OLD.OBJ = test_concurrent_vector_v2.$(OBJ) test_concurrent_queue_v2.$(OBJ) test_mutex_v2.$(OBJ)
- 
- TEST_TBB_DEPRECATED.OBJ = test_concurrent_queue_deprecated.$(OBJ) \
- 	test_concurrent_vector_deprecated.$(OBJ) \
diff --git a/dev-cpp/tbb/files/tbb-3.0.035-tests.patch b/dev-cpp/tbb/files/tbb-3.0.056-tests.patch
index c756dfd908ea..183f8c83e440 100644
--- a/dev-cpp/tbb/files/tbb-3.0.035-tests.patch
+++ b/dev-cpp/tbb/files/tbb-3.0.056-tests.patch
@@ -1,6 +1,6 @@
---- build/Makefile.test.orig	2010-07-16 16:45:38.000000000 +0100
-+++ build/Makefile.test	2010-07-16 16:46:09.000000000 +0100
-@@ -191,7 +191,7 @@
+--- build/Makefile.test.orig	2010-08-04 23:37:11.000000000 +0100
++++ build/Makefile.test	2010-08-04 23:38:11.000000000 +0100
+@@ -191,10 +191,10 @@
  # If a component Y uses component X, then tests for Y should come after tests for X.
  # Note that usually run_cmd is empty, and tests run directly
  test_tbb_plain: $(TEST_PREREQUISITE) $(TASK_CPP_DIRECTLY_INCLUDED) $(TEST_TBB_PLAIN.EXE)
@@ -8,4 +8,8 @@
 +	#$(run_cmd) ./test_tbb_version.$(TEST_EXT) $(args)
          # Checking TBB version first to make sure the following testing has anything in it
  	$(run_cmd) ./test_assembly.$(TEST_EXT) $(args)
- 	$(run_cmd) ./test_compiler.$(TEST_EXT) $(args)
+-	$(run_cmd) ./test_compiler.$(TEST_EXT) $(args)
++	#$(run_cmd) ./test_compiler.$(TEST_EXT) $(args)
+         # Yes, 4:8 is intended on the next line. 
+ 	$(run_cmd) ./test_yield.$(TEST_EXT) $(args) 4:8
+ 	$(run_cmd) ./test_handle_perror.$(TEST_EXT) $(args)
diff --git a/dev-cpp/tbb/tbb-3.0.018.ebuild b/dev-cpp/tbb/tbb-3.0.018.ebuild
deleted file mode 100644
index baf84d5779a7..000000000000
--- a/dev-cpp/tbb/tbb-3.0.018.ebuild
+++ /dev/null
@@ -1,81 +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-3.0.018.ebuild,v 1.2 2010/05/28 19:09:14 bicatali Exp $
-
-EAPI=2
-inherit eutils versionator toolchain-funcs alternatives
-#  url number
-MYU="78/154"
-# release update
-MYR=""
-
-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}/${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}"/${P}-tests.patch
-	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 -j1 ${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-3.0.035.ebuild b/dev-cpp/tbb/tbb-3.0.056.ebuild
index 5b54dfe973dc..ea4df3b27434 100644
--- a/dev-cpp/tbb/tbb-3.0.035.ebuild
+++ b/dev-cpp/tbb/tbb-3.0.056.ebuild
@@ -1,13 +1,13 @@
 # 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-3.0.035.ebuild,v 1.1 2010/07/19 15:43:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.056.ebuild,v 1.1 2010/08/04 22:23:35 bicatali Exp $
 
-EAPI=2
-inherit eutils versionator toolchain-funcs alternatives
+EAPI=3
+inherit eutils versionator toolchain-funcs
 #  url number
-MYU="78/155"
+MYU="78/157"
 # release update
-MYR="%20update%20"1
+MYR="%20update%20"2
 
 PV1="$(get_version_component_range 1)"
 PV2="$(get_version_component_range 2)"
@@ -31,8 +31,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-tests.patch
 	sed -i \
 		-e "s/-O2/${CXXFLAGS}/g" \
-		build/*.inc \
-		|| die
+		build/*.inc || die
 }
 
 src_compile() {