gentoo resync : 10.11.2019

11 files changed, 10 insertions, 405 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index d8305c807ec1..b4e64dcfe082 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/sourcetrail/Manifest b/dev-cpp/sourcetrail/Manifest
index 85edc83bdcd8..fddd1aafe861 100644
--- a/dev-cpp/sourcetrail/Manifest
+++ b/dev-cpp/sourcetrail/Manifest
@@ -2,9 +2,9 @@ DIST sourcetrail-2018.3.55.tar.gz 74278615 BLAKE2B e046acfb90cdb495ff28c3dcf4530
 DIST sourcetrail-2019.1.11.tar.gz 76120891 BLAKE2B 865c8a510a544705e130e3ec7bc82f1e7ca16d4dee2fa27849dd3530a92a20ef47ed909765ac08c8106ee0e992e3b4a03e79ef7094fb1593c4088b7d8e356423 SHA512 9022873572aef796fcbacf079c37b916d645aacd1479cc79fcddbfd8c561d0004c97202c46812b60d8c539dae3d68bd805da101678ebd1518ce13c3e58009ac9
 DIST sourcetrail-2019.2.39.tar.gz 84960185 BLAKE2B a515da1a0c6a061d7db843b9bef3b1d419fdbea361c4f5465d32a4a9bfc018575a334de739354de2e249facb7ea6d342329c445990173303fce4fb818da8131d SHA512 5603d7c2fe84c58a13dc682bad6bdbd807b15a9fd7c73c6633f8a7d9e051a660916b3a03b9a5244e2cb4243492586d555a98f0cc464f7405c02f36ef655c8959
 DIST sourcetrail-2019.3.46.tar.gz 108528120 BLAKE2B f36e4e2eb98c28a4d4aa245df3cbd2febd524a3370111d77cc79c2220e6a6227509c9fb9ba9c8d8e0d286719ab55a858adcaee4c983233ee72daebddb62c9467 SHA512 032e9299430c4333115ececedfeb85f39a374d14366c06130becb395a71fc43af9ad9ee09258c4a3ba2d0c2daa0997d5054ad48f0701654fe48eea055ebec666
-EBUILD sourcetrail-2018.3.55-r1.ebuild 2645 BLAKE2B 068f43ee9af82004cb42f0e208f181908fd9d4a915ccdb4f2ce7b1ab7e0c1330cf047d2e0f3d3e68c2a30e4bf8596620c0a876120713d2100b8c8cfd43fb9876 SHA512 52016969c9b16fad78b45081dcf8415a1b64906ab5396585f3528d6bf5599de466c230101186577c3ce26f8091ff4fca979ea32b5c77f82e16ba6ec579847716
-EBUILD sourcetrail-2019.1.11.ebuild 2645 BLAKE2B 068f43ee9af82004cb42f0e208f181908fd9d4a915ccdb4f2ce7b1ab7e0c1330cf047d2e0f3d3e68c2a30e4bf8596620c0a876120713d2100b8c8cfd43fb9876 SHA512 52016969c9b16fad78b45081dcf8415a1b64906ab5396585f3528d6bf5599de466c230101186577c3ce26f8091ff4fca979ea32b5c77f82e16ba6ec579847716
-EBUILD sourcetrail-2019.2.39.ebuild 2631 BLAKE2B eb34b9af6e122ff8b07385ca66b2708a293c04c1c667dd19f1deab233e5c8524868a4b8c5e5be810954e06fcc466706d5279b6c3f6a396b6e7504c271420d5b4 SHA512 60eec98c2839717f02af04f785de4d2cea3f58d3b06036ebe1f4a5e917721bb6d78b7a02e7937c710c0ba0eefed03cc8ef3ccfedadf07a7283ccd981a31b17ac
-EBUILD sourcetrail-2019.3.46-r1.ebuild 2657 BLAKE2B 19a55fdce216fee044e3d2e28771fab4ba9b08eccd92a7c7c65deba64a50c3c39dc31beb22e9d2ae06698e06234830af416b3bb68d9997045826c4100e24e8b7 SHA512 9aae1760178b75b30fd83a9543263dac9aae2dce09b0a16200fff98f9bab854c42fa9d4e07c9ee1517d85e55b210fc92dc7f9655e10dd0a0ce6dc93ff64f5233
-EBUILD sourcetrail-2019.3.46.ebuild 2631 BLAKE2B eb34b9af6e122ff8b07385ca66b2708a293c04c1c667dd19f1deab233e5c8524868a4b8c5e5be810954e06fcc466706d5279b6c3f6a396b6e7504c271420d5b4 SHA512 60eec98c2839717f02af04f785de4d2cea3f58d3b06036ebe1f4a5e917721bb6d78b7a02e7937c710c0ba0eefed03cc8ef3ccfedadf07a7283ccd981a31b17ac
+EBUILD sourcetrail-2018.3.55-r1.ebuild 2652 BLAKE2B 202b8f41f4403064f3b2c13548b8b6e09d2a75f1cc78b5a3f84bd7a7ec27af9ef911a092094cbd23182aa94b794255847b0c29e0a7970966a2f35f9bc08d75a4 SHA512 5f5bbd16184efe46b8965831fec85075a14b72adc903ec37e07ba2aa7f48d1aa85fbee3d9e09371523e0f15dbcd91739bbec56a301ee35e876f3bcc08480d0c9
+EBUILD sourcetrail-2019.1.11.ebuild 2652 BLAKE2B 202b8f41f4403064f3b2c13548b8b6e09d2a75f1cc78b5a3f84bd7a7ec27af9ef911a092094cbd23182aa94b794255847b0c29e0a7970966a2f35f9bc08d75a4 SHA512 5f5bbd16184efe46b8965831fec85075a14b72adc903ec37e07ba2aa7f48d1aa85fbee3d9e09371523e0f15dbcd91739bbec56a301ee35e876f3bcc08480d0c9
+EBUILD sourcetrail-2019.2.39.ebuild 2638 BLAKE2B 95c9853821f4dc592376fb894a3d92a4cae528558b5c47183bd83c5fa84fdd11cb6f36039586c82b865cbf0f57935de6833bc88bc5d292e8af2bf1400f985842 SHA512 c76ccdf3f8834692e4368d34c87f76aa5f6c8045096d19e68747d6c7ce8875bd021c7d2a2860595677c12f8d39c07c3ad35346d374bcf17fbd047c0e7cc838cd
+EBUILD sourcetrail-2019.3.46-r2.ebuild 2664 BLAKE2B bf39e2d1bb2dd1999ce4e1ae69999cd144e231213c63e06a9711c83997d3526f06b2dcd407bdd0a23dd13303b52185bf7073d3ef451ed94615ce1adcd7d64805 SHA512 08b126153a86d7cc2d39adfb6849ec3fcb406ee4df2d4854711e223b6f54effecfdc4b37598b5524bad9c9cdfa22ffac831cb6a4b50a34212aa38bfc7a67c544
+EBUILD sourcetrail-2019.3.46.ebuild 2638 BLAKE2B 95c9853821f4dc592376fb894a3d92a4cae528558b5c47183bd83c5fa84fdd11cb6f36039586c82b865cbf0f57935de6833bc88bc5d292e8af2bf1400f985842 SHA512 c76ccdf3f8834692e4368d34c87f76aa5f6c8045096d19e68747d6c7ce8875bd021c7d2a2860595677c12f8d39c07c3ad35346d374bcf17fbd047c0e7cc838cd
 MISC metadata.xml 445 BLAKE2B d04d2bd24a8c19606568123ce7a5f5b35a68bafd35728972b887232dd0bf501902ec4e91ebd2c782396d8a945fa6a456765c974dd45f7c004d5b543ff5e8e9e1 SHA512 d3682126116eb02bb50564213649fcac41f0c44fbcf481016bdcc0193fff7b71a64631883a2df21113c85d141f7c5fea3d463dd8c5a102ef24d9b69e1029b677
diff --git a/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild b/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild
index 1e5bf5c07ace..55f38a5d224e 100644
--- a/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild
+++ b/dev-cpp/sourcetrail/sourcetrail-2018.3.55-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	)
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/libpng:1.2
+	media-libs/libpng-compat:1.2
 	sys-libs/libudev-compat
 	virtual/opengl
 	x11-libs/libdrm
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
index 1e5bf5c07ace..55f38a5d224e 100644
--- a/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
+++ b/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	)
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/libpng:1.2
+	media-libs/libpng-compat:1.2
 	sys-libs/libudev-compat
 	virtual/opengl
 	x11-libs/libdrm
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild
index 3989b699749e..d84567ac9a33 100644
--- a/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild
+++ b/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	)
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/libpng:1.2
+	media-libs/libpng-compat:1.2
 	sys-libs/libudev-compat
 	virtual/opengl
 	x11-libs/libdrm
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.3.46-r1.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.3.46-r2.ebuild
index e2d02701ebca..ed6b052e69b5 100644
--- a/dev-cpp/sourcetrail/sourcetrail-2019.3.46-r1.ebuild
+++ b/dev-cpp/sourcetrail/sourcetrail-2019.3.46-r2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/libffi-compat:6
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/libpng:1.2
+	media-libs/libpng-compat:1.2
 	sys-libs/libudev-compat
 	virtual/opengl
 	x11-libs/libdrm
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.3.46.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.3.46.ebuild
index 3989b699749e..d84567ac9a33 100644
--- a/dev-cpp/sourcetrail/sourcetrail-2019.3.46.ebuild
+++ b/dev-cpp/sourcetrail/sourcetrail-2019.3.46.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	)
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/libpng:1.2
+	media-libs/libpng-compat:1.2
 	sys-libs/libudev-compat
 	virtual/opengl
 	x11-libs/libdrm
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index de17bfac7f39..fb3971d774a4 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,7 +1,4 @@
 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-2018.20180312.tar.gz 2911740 BLAKE2B 5c6dab4a892f3b61ed0b02ea36dc41bebd5b33a22bcc3d5f2960f21e134f2eb9bccf1466193a573489e12638c0bb0bccc2da83f699968ffd62417f2d0f093289 SHA512 7ac74e714122e25f7704630d3d52992dbea54d1e761b5e487251a771f401aa864f78b8ddf11d78f38758088df387abb6987f6a2db562c86cbb28ba8f33a25680
 DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8
diff --git a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch b/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
deleted file mode 100644
index ed318cab8386..000000000000
--- a/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu May 31 21:37:47 UTC 2012
-Subject: build system
-
-fix underlinking in test phase
-wrt https://bugs.gentoo.org/show_bug.cgi?id=418447
-
---- 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)
-     LINK_TBB.LIB = $(PROXY.LIB)
--    LIBS += $(LIBDL)
--endif
-+endif
-+LIBS += $(LIBDL)
- 
- include $(tbb_root)/build/common_rules.inc
- 
diff --git a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
deleted file mode 100644
index 8f806989e443..000000000000
--- a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch
+++ /dev/null
@@ -1,185 +0,0 @@
---- a/build/FreeBSD.gcc.inc
-+++ b/build/FreeBSD.gcc.inc
-@@ -28,14 +28,14 @@ WARNING_KEY = -Wall
- DYLIB_KEY = -shared
- WARNING_SUPPRESS = -Wno-parentheses
- 
--CPLUS = g++ 
--CONLY = gcc
-+CPLUS = $(CXX)
-+CONLY = $(CC)
- LIB_LINK_FLAGS = -shared
- LIBS = -lpthread 
- C_FLAGS = $(CPLUS_FLAGS)
- 
- ifeq ($(cfg), release)
--        CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
-         CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
-@@ -52,22 +52,12 @@ ifeq (ia64,$(arch))
-     CPLUS_FLAGS += $(PIC_KEY)
- endif 
- 
--ifeq (intel64,$(arch))
--    CPLUS_FLAGS += -m64
--    LIB_LINK_FLAGS += -m64
--endif 
--
--ifeq (ia32,$(arch))
--    CPLUS_FLAGS += -m32
--    LIB_LINK_FLAGS += -m32
--endif 
--
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASSEMBLY_SOURCE=$(arch)-gas
- ifeq (ia64,$(arch))
--    ASM=as
-+    ASM=$(AS)
-     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 
---- a/build/linux.clang.inc
-+++ b/build/linux.clang.inc
-@@ -31,15 +31,15 @@ DYLIB_KEY = -shared
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
- 
--CPLUS = clang++
--CONLY = clang
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
- C_FLAGS = $(CPLUS_FLAGS)
- 
- ifeq ($(cfg), release)
--        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
-         CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -61,24 +61,10 @@ MALLOC_ASM.OBJ=
- 
- ifeq (intel64,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
--    CPLUS_FLAGS += -m64
--    LIB_LINK_FLAGS += -m64
- endif
- 
- ifeq (ia32,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
--    CPLUS_FLAGS += -m32 -march=pentium4
--    LIB_LINK_FLAGS += -m32
--endif
--
--ifeq (ppc64,$(arch))
--    CPLUS_FLAGS += -m64
--    LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ppc32,$(arch))
--    CPLUS_FLAGS += -m32
--    LIB_LINK_FLAGS += -m32
- endif
- 
- ifeq (bg,$(arch))
-@@ -90,12 +76,6 @@ endif
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASM = as
--ifeq (intel64,$(arch))
--    ASM_FLAGS += --64
--endif
--ifeq (ia32,$(arch))
--    ASM_FLAGS += --32
--endif
- ifeq ($(cfg),debug)
-     ASM_FLAGS += -g
- endif
---- a/build/linux.gcc.inc
-+++ b/build/linux.gcc.inc
-@@ -32,12 +32,12 @@ DYLIB_KEY = -shared
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
- 
--CPLUS = g++
--CONLY = gcc
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
--C_FLAGS = $(CPLUS_FLAGS)
-+C_FLAGS := $(CPLUS_FLAGS)
- # gcc 4.4 and higher support -std=c++0x
- ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[4-9]|[5-9])"))
-     CPP11_FLAGS = -std=c++0x -D_TBB_CPP0X
-@@ -54,7 +54,7 @@ ifneq (,$(shell gcc -dumpversion | egrep  "^4\.[8-9]"))
- endif
- 
- ifeq ($(cfg), release)
--        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
-         CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -74,24 +74,12 @@ endif
- 
- ifeq (intel64,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
--    CPLUS_FLAGS += -m64 $(RTM_KEY)
--    LIB_LINK_FLAGS += -m64
-+    CPLUS_FLAGS += $(RTM_KEY)
- endif
- 
- ifeq (ia32,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
--    CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
--    LIB_LINK_FLAGS += -m32
--endif
--
--ifeq (ppc64,$(arch))
--    CPLUS_FLAGS += -m64
--    LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ppc32,$(arch))
--    CPLUS_FLAGS += -m32
--    LIB_LINK_FLAGS += -m32
-+    CPLUS_FLAGS += $(RTM_KEY)
- endif
- 
- ifeq (bg,$(arch))
-@@ -99,12 +87,6 @@ ifeq (bg,$(arch))
-     CONLY = $(firstword $(notdir $(shell which powerpc{64,32,}-bg{z..a}-linux-gcc 2>/dev/null)))
- endif
- 
--# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify)
--ifeq (sparc,$(arch))
--    CPLUS_FLAGS    += -mcpu=v9 -m64
--    LIB_LINK_FLAGS += -mcpu=v9 -m64
--endif
--
- # automatically generate "IT" instructions when compiling for Thumb ISA
- ifeq (armv7,$(arch))
-     CPLUS_FLAGS    += -Wa,-mimplicit-it=thumb
-@@ -113,13 +95,7 @@ endif
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
--ASM = as
--ifeq (intel64,$(arch))
--    ASM_FLAGS += --64
--endif
--ifeq (ia32,$(arch))
--    ASM_FLAGS += --32
--endif
-+ASM := $(AS)
- ifeq ($(cfg),debug)
-     ASM_FLAGS += -g
- endif
diff --git a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch b/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
deleted file mode 100644
index f4af5de9e50d..000000000000
--- a/dev-cpp/tbb/files/tbb-4.4.20160803-build.patch
+++ /dev/null
@@ -1,187 +0,0 @@
---- a/build/FreeBSD.gcc.inc
-+++ b/build/FreeBSD.gcc.inc
-@@ -28,8 +28,8 @@ WARNING_KEY = -Wall
- DYLIB_KEY = -shared
- WARNING_SUPPRESS = -Wno-parentheses
- 
--CPLUS = g++ 
--CONLY = gcc
-+CPLUS = $(CXX)
-+CONLY = $(CC)
- LIB_LINK_FLAGS = -shared
- LIBS = -lpthread 
- C_FLAGS = $(CPLUS_FLAGS)
-@@ -42,7 +42,7 @@ ifneq (,$(shell gcc -dumpversion | egrep  "^([6-9])"))
- endif
- 
- ifeq ($(cfg), release)
--        CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
-         CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
-@@ -59,22 +59,12 @@ ifeq (ia64,$(arch))
-     CPLUS_FLAGS += $(PIC_KEY)
- endif 
- 
--ifeq (intel64,$(arch))
--    CPLUS_FLAGS += -m64
--    LIB_LINK_FLAGS += -m64
--endif 
--
--ifeq (ia32,$(arch))
--    CPLUS_FLAGS += -m32
--    LIB_LINK_FLAGS += -m32
--endif 
--
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASSEMBLY_SOURCE=$(arch)-gas
- ifeq (ia64,$(arch))
--    ASM=as
-+    ASM=$(AS)
-     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 
---- a/build/linux.clang.inc
-+++ b/build/linux.clang.inc
-@@ -31,15 +31,15 @@ DYLIB_KEY = -shared
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
- 
--CPLUS = clang++
--CONLY = clang
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
- C_FLAGS = $(CPLUS_FLAGS)
- 
- ifeq ($(cfg), release)
--        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
-         CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -55,24 +55,10 @@ MALLOC_ASM.OBJ=
- 
- ifeq (intel64,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
--    CPLUS_FLAGS += -m64
--    LIB_LINK_FLAGS += -m64
- endif
- 
- ifeq (ia32,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
--    CPLUS_FLAGS += -m32 -march=pentium4
--    LIB_LINK_FLAGS += -m32
--endif
--
--ifeq (ppc64,$(arch))
--    CPLUS_FLAGS += -m64
--    LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ppc32,$(arch))
--    CPLUS_FLAGS += -m32
--    LIB_LINK_FLAGS += -m32
- endif
- 
- ifeq (bg,$(arch))
-@@ -84,12 +70,6 @@ endif
- # Setting assembler data.
- #------------------------------------------------------------------------------
- ASM = as
--ifeq (intel64,$(arch))
--    ASM_FLAGS += --64
--endif
--ifeq (ia32,$(arch))
--    ASM_FLAGS += --32
--endif
- ifeq ($(cfg),debug)
-     ASM_FLAGS += -g
- endif
---- a/build/linux.gcc.inc
-+++ b/build/linux.gcc.inc
-@@ -32,12 +32,12 @@ DYLIB_KEY = -shared
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
- 
--CPLUS = g++
--CONLY = gcc
-+CPLUS := $(CXX)
-+CONLY := $(CC)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
--C_FLAGS = $(CPLUS_FLAGS)
-+C_FLAGS := $(CPLUS_FLAGS)
- 
- # gcc 4.2 and higher support OpenMP
- ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[2-9]|[5-9])"))
-@@ -57,7 +57,7 @@ ifneq (,$(shell gcc -dumpversion | egrep  "^([6-9])"))
- endif
- 
- ifeq ($(cfg), release)
--        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-+        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
- endif
- ifeq ($(cfg), debug)
-         CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
-@@ -73,24 +73,12 @@ endif
- 
- ifeq (intel64,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
--    CPLUS_FLAGS += -m64 $(RTM_KEY)
--    LIB_LINK_FLAGS += -m64
-+    CPLUS_FLAGS += $(RTM_KEY)
- endif
- 
- ifeq (ia32,$(arch))
-     ITT_NOTIFY = -DDO_ITT_NOTIFY
--    CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
--    LIB_LINK_FLAGS += -m32
--endif
--
--ifeq (ppc64,$(arch))
--    CPLUS_FLAGS += -m64
--    LIB_LINK_FLAGS += -m64
--endif
--
--ifeq (ppc32,$(arch))
--    CPLUS_FLAGS += -m32
--    LIB_LINK_FLAGS += -m32
-+    CPLUS_FLAGS += $(RTM_KEY)
- endif
- 
- ifeq (bg,$(arch))
-@@ -98,12 +86,6 @@ ifeq (bg,$(arch))
-     CONLY = $(firstword $(notdir $(shell which powerpc{64,32,}-bg{z..a}-linux-gcc 2>/dev/null)))
- endif
- 
--# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify)
--ifeq (sparc,$(arch))
--    CPLUS_FLAGS    += -mcpu=v9 -m64
--    LIB_LINK_FLAGS += -mcpu=v9 -m64
--endif
--
- # automatically generate "IT" instructions when compiling for Thumb ISA
- ifeq (armv7,$(arch))
-     CPLUS_FLAGS    += -Wa,-mimplicit-it=thumb
-@@ -112,13 +94,7 @@ endif
- #------------------------------------------------------------------------------
- # Setting assembler data.
- #------------------------------------------------------------------------------
--ASM = as
--ifeq (intel64,$(arch))
--    ASM_FLAGS += --64
--endif
--ifeq (ia32,$(arch))
--    ASM_FLAGS += --32
--endif
-+ASM := $(AS)
- ifeq ($(cfg),debug)
-     ASM_FLAGS += -g
- endif