gentoo resync : 16.04.2018

8 files changed, 14 insertions, 53 deletions

diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 64fc772d1478..3c481a54221c 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,15 +1,14 @@
-AUX tbb-2017.20161128-build.patch 5103 BLAKE2B 7dc6b73be18590251e6ccbb9bc395d8b10bc2349db3fa5676932952eefee3b9f5b9956c3623f8eda3648fca8723e61ea56ea7b3b9a628fb5affeb5f15332587d SHA512 875dc2aa87562e0701840e08a3414dfea4a22eed999682395a6e568d351c6f7243b435b4664e80004b761c1721ecabf09f1732d4df7d10e0843338762a8ebbac
-AUX tbb-2017.20161128-underlinking.patch 389 BLAKE2B 88b85cf0a2c8706dff908d4c4e73e1399aa8ac85f7c2df1bd5daebc564e4007c4bf0df27647e53764c6dd437422ed48885e798a6e4fc6b5900810c7855c9ceeb SHA512 bfd3b9d5221a89a120e115447a9aa653e93a208422c68c8cc74a672f42037fd1af3dc755480d746570f2c5dbeb173650d9b4acfb38aaec5d3c3feea6c2232af1
-AUX tbb-4.0.297-underlinking.patch 475 BLAKE2B 523c9f81b4c81e6f46e9fe579730fe5579a4f099f5c6486053cb2931521748a1ade0ea19687f261a016d00784be82bcbe1194a29a004f410a11847e836bb5ad8 SHA512 26103f87299e56e08d404e0cdda47f3b2be89e770ea12e84ee7f681050364e674aca1ba8326b81db0a73c2f53e973b89b97af3f36c7e762d4699767481b64486
-AUX tbb-4.3.20150611-build.patch 5291 BLAKE2B db5e6789b9077c09daa9d740d21c2319fdf44549e05b9392e32a8ca173b90c850361195e66044a3516445b458997f9697d9656ebb72bff02bdd10dec3f4f6040 SHA512 1648810b9ea89a904eaf2d15168dbf51abefb8ad337aad561f4b93691163ffb9bab52ade91ed71abc2305a60294c33254603ea60f4255fcccf92a2906d4c09a6
-AUX tbb-4.4.20160803-build.patch 5101 BLAKE2B eafb36dc2d11af8f0b0ed79c122628626823675fcf3ee69edcb33fef25d7abbb6c3fbd657a5d680121e3808c20392fc49b1666fd9b00019e4c09a149710384fc SHA512 472df5a7cf1a4640f6e945146363351efe3ae26e499757571ddefcb6e5fef1c43a299ede9874f221674388b94f2bbe2bf88449d503da21adab7d030ec6792dce
+AUX tbb-2017.20161128-build.patch 4840 BLAKE2B eec4a437f0a609c8f39b76950aae76c9e357cd0705ad521a3304aceb8361c10cdf0d28078370c840ad315cbe06f3b134ca5d58036b2718a136f3958c3942e9c1 SHA512 40ca5bdfe05eecbc47a9af062e6ede3e14200048cdebd796af71cd5f27b350c65e5aa569cc8a6e2f3cfbd90fec167d4f053abc36310b07113910ba25061c56a4
+AUX tbb-4.0.297-underlinking.patch 479 BLAKE2B c4e0410c4651bb7db99494c6746eb43cd488e4f37c38bdbdf4ecf6ab7ece1e469393f6b4296fc41524dec931bdec72e97ed05e3ab8e685584a58519bb945bd61 SHA512 2e5e17d1547e809e035b148ef6d45f5db9902f535a2bc2283051f1cc29d43c32c15db7cdd048a50493a13ccf6b44a3538054e50a47fca080df535bed1768de85
+AUX tbb-4.3.20150611-build.patch 4806 BLAKE2B dd5f785a8c3d6d715c1573a14aaa3dda1216dc4c4a124b24b217e4e919675f2eb64488f8423acf3bd5d568d30bd011c8d107db0b5de2774e7439561da947f758 SHA512 82c8121e2214a02f0bbf647eb03486e5c7db3e180f834001c5ad7ac53791e876ddd63bef1af6ba2590d9673af6beb6b725138bbad8c3b61271b29b7eb72f41c0
+AUX tbb-4.4.20160803-build.patch 4838 BLAKE2B 3e410208ee260dc0839b3658e436d742b8c03eba5eb6f7c6b697bae75d0078a2099b1cf012f32b1a3486d87a2eba123fcad7e651c3ce63dc883491b2e7192af7 SHA512 cee8733f667fec20ea5760176bec587e4c0dfc9286841ccc6f72702a3440fe5ea4054b7e7c22c98d4d4814ef4bd160264962d3a4d58d177141c15cf391c5f30e
 AUX tbb-4.4.20160803-underlinking.patch 389 BLAKE2B 88b85cf0a2c8706dff908d4c4e73e1399aa8ac85f7c2df1bd5daebc564e4007c4bf0df27647e53764c6dd437422ed48885e798a6e4fc6b5900810c7855c9ceeb SHA512 bfd3b9d5221a89a120e115447a9aa653e93a208422c68c8cc74a672f42037fd1af3dc755480d746570f2c5dbeb173650d9b4acfb38aaec5d3c3feea6c2232af1
 DIST tbb-2017.20170226.tar.gz 2856407 BLAKE2B 10c9f1230a57e0cc778f4f7ad9395a7dc9044b7f203e704cfdc479632e2aaf35f05caa168d9caea490abc6d96ec7d77ea6e7effbc9d5b589a6e41e3374b8b9cb SHA512 d07eeca53138432a4ac20145169907f5271e234bedfb53e0eabbed2b6fafaecdc0a2ad7bdbead205993f822e7c415233cce9afd7575d366c17a117d5cc971a65
 DIST tbb2017_20161128oss_src.tgz 2965854 BLAKE2B 8c5aed6d8477297922767803617346feebb712d1f4b2df6d71a86f039b5563afc666454985e68a528a812aaad40b5fd0562bb91d357c45156fec46e5389ec542 SHA512 3c48ce196d2d3557e86cea7ede9dea456bbaeb29dbed34210f99c6f380406403a6056ccfa3d5befe6b29c4f8a9ee58ca6da545249cf4ec4ec85b463e04e4518c
 DIST tbb43_20150611oss_src.tgz 2757631 BLAKE2B d1a00b531b747aeae05d052ac2d894b4d5dbee628988794ac9721058e5b3cd7efb60877ff1183d155d75bc2a0b413863911c438da9db1c30ec8e74e2de442118 SHA512 83d5d827706b774ef5cd6df8082e5d7f48683388684423bb40565dfc25892fc2e57c382f719b78087d83e51edb3f7f7215f33d8b5039b55c32788d80efa6e0b8
 DIST tbb44_20160803oss_src.tgz 2874050 BLAKE2B 097e4e4fb2c14b6ab073409b26c7d5044cd7f2edb56efb0b307b1e07b4496a668d34eec88086d2f8e68eb050df9e2b48af81b5e47c860b15786e0c48df736d9c SHA512 01b1dcdaffa96c3d503e44d7b236b1115f419c122dab0f40de4c9dc90db315a1f3755cc91adf9df91d5d31d8927df115230db94cf175edac09ae438b46374a92
-EBUILD tbb-2017.20161128.ebuild 3299 BLAKE2B c7c3d776ffcb7ad64fa72ece6366284c71a1722c68a50a71ba36c82a2f78e5725e7f80361dbb1a7d823a5a1845b7eaada80909bdf25b1ae0b294fec2014b4c71 SHA512 7744c1f7c80d995f251c0a487ddd2917f4f18f84ad281ea77e84098678e14e80ad1c234c99d85af61077c317b2c3c03c5630beddb5dba3cb0d5144c0d23568ef
+EBUILD tbb-2017.20161128.ebuild 3328 BLAKE2B 87677082f5c83d0bee403d212ddd8b45c33243ac56c817619d32ed9dfd645ab33f120e309443e2dcf12c594da7912488a8558a2c7f242235db7b03ce8a947a6a SHA512 b6e06f73c2000ff7e56c9a885e09fc03ae33dfd70a619f158f42b062cf728e9d90e125fee620e0a58120086314f09783583d46b4de390a8b08b342c63ff2e9e4
 EBUILD tbb-2017.20170226.ebuild 3333 BLAKE2B 9a2f957732090316450a1af0e6f8743a1ccf0cd231b7a97d1da439ee26fbc0ed5daa6511ac757943d028b7540daded559ba0ef524d52d23957fded67a14f757e SHA512 593c93bfbce11af83eecf138bd6354ded0e3353d6f80b7ce53f3e2a178b8c1f5f7a0de27ec144556f7df74ae38b4f3df5e1ef56d372f772ee424e9f0d30fdd30
 EBUILD tbb-4.3.20150611.ebuild 3142 BLAKE2B 1014e7cf3a5615a7533ea37bbf0a4995e4a60d4669cfef3baf4630df59877bdc947fa308192b3e9752d19570beea0e42752072d04269bb41f45baf3fd2ec1073 SHA512 9f35df30d1641eca5adbf57cc99757cb80a25ed15dbf5aa9b8aff1163ccd5e67fb7ec0c47b1283f613d82b05e69da5cf7243a9d9dc55bd8be1bed7a1f0cf5bde
-EBUILD tbb-4.4.20160803.ebuild 3359 BLAKE2B f8927b9a50864e5dd4aea01c45d9bd75e1fd48278d0d6016aeb3d71c64294a07e8cb75543ce0792a7c4ccecba7637b256c6fcd3bae0b09d22600eafb70002770 SHA512 481bcf13630975ed8c5c5c08f3dc952fda80d6f40f61b7153414a6e9f06ab97dbcd22a8ba90e67dcf18ed5b6851e639498026b8db2f027e0913462cc52fa2918
+EBUILD tbb-4.4.20160803.ebuild 3387 BLAKE2B 17e64dd187002b351aaa55673186928d85eb3150d34245f7611840da3d5da47187b1fb0b75edc5cd01b51af97dc185ca07d22921db1e422ba9ec9a75f5083be5 SHA512 e651def030a55e3dad14c8938d5e0f4a43dfd6fc9903ef8c938824e60e8e79b92cae9c480d18380b95c2695bf96726013b8ea4ac8bbf9ddf921caff13b35ff18
 MISC metadata.xml 687 BLAKE2B c094e0e1a7f9939540292663dceefcacf0468b91563cf051ce487edbdf27b7c07392102fedf6df18aa2852465eb1e6b6f72bbe93c0ca1669c1fba2bbc5840c48 SHA512 bfdebc9e52c9c46424854b519e8ff60f7b473e33189235a50e1110af1f8264c2ad2b4f71110be1147387491fc078ec6c9e451347b47f69d0f2b15e60ad2e9a0b
diff --git a/dev-cpp/tbb/files/tbb-2017.20161128-build.patch b/dev-cpp/tbb/files/tbb-2017.20161128-build.patch
index 0806d6a522b7..e952bfbc434e 100644
--- a/dev-cpp/tbb/files/tbb-2017.20161128-build.patch
+++ b/dev-cpp/tbb/files/tbb-2017.20161128-build.patch
@@ -1,5 +1,3 @@
-diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc
-index e93f8f4..2b43c51 100644
 --- a/build/FreeBSD.gcc.inc
 +++ b/build/FreeBSD.gcc.inc
 @@ -28,8 +28,8 @@ WARNING_KEY = -Wall
@@ -46,8 +44,6 @@ index e93f8f4..2b43c51 100644
      TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
      MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
  endif 
-diff --git a/build/linux.clang.inc b/build/linux.clang.inc
-index 237caae..8d6914e 100644
 --- a/build/linux.clang.inc
 +++ b/build/linux.clang.inc
 @@ -31,15 +31,15 @@ DYLIB_KEY = -shared
@@ -107,8 +103,6 @@ index 237caae..8d6914e 100644
  ifeq ($(cfg),debug)
      ASM_FLAGS += -g
  endif
-diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc
-index b7ed0c5..a8e8f85 100644
 --- a/build/linux.gcc.inc
 +++ b/build/linux.gcc.inc
 @@ -32,12 +32,12 @@ DYLIB_KEY = -shared
diff --git a/dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch b/dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch
deleted file mode 100644
index 5935017a325e..000000000000
--- a/dev-cpp/tbb/files/tbb-2017.20161128-underlinking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=418447
-
---- a/build/Makefile.test
-+++ b/build/Makefile.test
-@@ -44,8 +44,8 @@
-     USE_PROXY_FLAG = $(DEFINE_KEY)HARNESS_USE_PROXY
-     CPLUS_FLAGS += $(USE_PROXY_FLAG)
-     LINK_TBB.LIB = $(PROXY.LIB)
--    LIBS += $(LIBDL)
--endif
-+endif
-+LIBS += $(LIBDL)
- 
- TEST_SUFFIXES=secondary compiler_builtins pic
- include $(tbb_root)/build/common_rules.inc
diff --git a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
index 099bb39d2143..ed318cab8386 100644
--- a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
+++ b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
@@ -5,8 +5,8 @@ Subject: build system
 fix underlinking in test phase
 wrt https://bugs.gentoo.org/show_bug.cgi?id=418447
 
---- build/Makefile.test
-+++ build/Makefile.test
+--- a/build/Makefile.test
++++ b/build/Makefile.test
 @@ -48,8 +48,8 @@
      USE_PROXY_FLAG = $(DEFINE_KEY)HARNESS_USE_PROXY
      CPLUS_FLAGS += $(USE_PROXY_FLAG)
diff --git a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
index 42a8bae4640a..8f806989e443 100644
--- a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
+++ b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
@@ -1,10 +1,3 @@
- build/FreeBSD.gcc.inc | 18 ++++--------------
- build/linux.clang.inc | 26 +++-----------------------
- build/linux.gcc.inc   | 38 +++++++-------------------------------
- 3 files changed, 14 insertions(+), 68 deletions(-)
-
-diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc
-index 20f0027..8bbdeba 100644
 --- a/build/FreeBSD.gcc.inc
 +++ b/build/FreeBSD.gcc.inc
 @@ -28,14 +28,14 @@ WARNING_KEY = -Wall
@@ -49,8 +42,6 @@ index 20f0027..8bbdeba 100644
      TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
      MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
  endif 
-diff --git a/build/linux.clang.inc b/build/linux.clang.inc
-index de9aee5..3a366f1 100644
 --- a/build/linux.clang.inc
 +++ b/build/linux.clang.inc
 @@ -31,15 +31,15 @@ DYLIB_KEY = -shared
@@ -110,8 +101,6 @@ index de9aee5..3a366f1 100644
  ifeq ($(cfg),debug)
      ASM_FLAGS += -g
  endif
-diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc
-index 4b7122b..e8ba711 100644
 --- a/build/linux.gcc.inc
 +++ b/build/linux.gcc.inc
 @@ -32,12 +32,12 @@ DYLIB_KEY = -shared
diff --git a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
index 9c66c132fffa..f4af5de9e50d 100644
--- a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
+++ b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
@@ -1,5 +1,3 @@
-diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc
-index dc22ca3..65dfb6e 100644
 --- a/build/FreeBSD.gcc.inc
 +++ b/build/FreeBSD.gcc.inc
 @@ -28,8 +28,8 @@ WARNING_KEY = -Wall
@@ -46,8 +44,6 @@ index dc22ca3..65dfb6e 100644
      TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
      MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
  endif 
-diff --git a/build/linux.clang.inc b/build/linux.clang.inc
-index fc8d7de..21ad5d4 100644
 --- a/build/linux.clang.inc
 +++ b/build/linux.clang.inc
 @@ -31,15 +31,15 @@ DYLIB_KEY = -shared
@@ -107,8 +103,6 @@ index fc8d7de..21ad5d4 100644
  ifeq ($(cfg),debug)
      ASM_FLAGS += -g
  endif
-diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc
-index f9b483d..1e69789 100644
 --- a/build/linux.gcc.inc
 +++ b/build/linux.gcc.inc
 @@ -32,12 +32,12 @@ DYLIB_KEY = -shared
diff --git a/dev-cpp/tbb/tbb-2017.20161128.ebuild b/dev-cpp/tbb/tbb-2017.20161128.ebuild
index f88fe9559185..42598e74ad85 100644
--- a/dev-cpp/tbb/tbb-2017.20161128.ebuild
+++ b/dev-cpp/tbb/tbb-2017.20161128.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,8 +22,8 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MYP}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch
+	"${FILESDIR}"/${PN}-2017.20161128-build.patch
 )
 
 src_prepare() {
diff --git a/dev-cpp/tbb/tbb-4.4.20160803.ebuild b/dev-cpp/tbb/tbb-4.4.20160803.ebuild
index c05b5cccc889..fb62b61be4a1 100644
--- a/dev-cpp/tbb/tbb-4.4.20160803.ebuild
+++ b/dev-cpp/tbb/tbb-4.4.20160803.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,8 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MYP}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch
+	"${FILESDIR}"/${PN}-4.4.20160803-build.patch
 )
 
 src_prepare() {