gentoo resync : 18.08.2019

5 files changed, 14 insertions, 297 deletions

diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 324478a9b56f..247c75d1f41f 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -3,14 +3,10 @@ AUX tbb-4.0.297-underlinking.patch 479 BLAKE2B c4e0410c4651bb7db99494c6746eb43cd
 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 tbb-2018.20180312.tar.gz 2911740 BLAKE2B 5c6dab4a892f3b61ed0b02ea36dc41bebd5b33a22bcc3d5f2960f21e134f2eb9bccf1466193a573489e12638c0bb0bccc2da83f699968ffd62417f2d0f093289 SHA512 7ac74e714122e25f7704630d3d52992dbea54d1e761b5e487251a771f401aa864f78b8ddf11d78f38758088df387abb6987f6a2db562c86cbb28ba8f33a25680
+DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8
 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 3333 BLAKE2B d3e32b2301f40af1e7b4476561a4dc4503b707327fa95caab7e68f031edd916dba23a8aec6f3b1fd357a62b3b9497c6f283c273b8436541a706f6a598464f05b SHA512 217f88d3fe819e1d04cb56826b6a9a3318b705a8612a5511f038dc0e350a370d9b4be7bafaa1e67725e23a035637a12f75598988e774668a53a67bd32dbab791
-EBUILD tbb-2017.20170226.ebuild 3334 BLAKE2B f97e0e3e14e046584402a8d9fd57c7bb096c90a45e4e98f3e6707c9da1606e9e35fe02f9edfae1b8a10e865ef1c58ffb04200f69288b0ca6ce69209980a8380b SHA512 2c5a763a58b62fba4b747f545569687ef933dc6621e9592277f9372079f1250cea5a36a479ba344652c5538caf19d0f0b9433fd0c62498eef612a199dda5d6d9
 EBUILD tbb-2018.20180312.ebuild 3334 BLAKE2B 5374ec095170838a99b8ed31b4611e4952433a74c6849788b22355e6b3aff817768422a16454a2d946991256a2da943f121b64aca91027d1350d0c332716968a SHA512 b2f132cb7ddf47207c41cb636fd3b174e49227a1d17dd9098774e447f36571b16161a582e958da6bab4f4d8f4b75c20a8ae0f294d684793b4a630e69fce144c4
-EBUILD tbb-4.3.20150611.ebuild 3142 BLAKE2B 638aad3506c71cd234972b5e1eb49a28e9240cdf63a7bac7f1131c84ab8188c95dbe24aa57df36d5dcb365817baf72a7b5092eb51610d055f1ea1eef8573cdfe SHA512 e78b598c1560212db0bb4f5c4c2962f1e42efcad30f1c90af05327c3d6dfd53781c8efd2237bf3012349a9d550d3f28399bbb548d341d6dd8a9a2b9f670c2c1c
-EBUILD tbb-4.4.20160803.ebuild 3389 BLAKE2B ca12e1447cd2c6c680bc47ed590a4fa3a35c48447cb2a41ead76746f2a68ded582c481ab44be084b81a5d6e880b57d57c5c5847090b401d7277818f6cf91beb9 SHA512 913335b0777eb11ff6038bf63088e45cf15947ed84a7651504c1e364ec2eb1bee631a46f95f0c94a0a46aedc8a5a329d242914b2ba118e3d877268f1b195e0a6
-MISC metadata.xml 687 BLAKE2B c094e0e1a7f9939540292663dceefcacf0468b91563cf051ce487edbdf27b7c07392102fedf6df18aa2852465eb1e6b6f72bbe93c0ca1669c1fba2bbc5840c48 SHA512 bfdebc9e52c9c46424854b519e8ff60f7b473e33189235a50e1110af1f8264c2ad2b4f71110be1147387491fc078ec6c9e451347b47f69d0f2b15e60ad2e9a0b
+EBUILD tbb-2019.8.ebuild 3237 BLAKE2B 3b42204dd4dd1285c4a97e97509bf19adbca1f4cb83615a2e6a35f6d67e5907f94ac36a19b3157470e39bbee8028abdd0d5152a7b1bbfa4501b35b8036884833 SHA512 0a1c30af9bec420aad49e4bc11541b1fb52fa485febeefff73f688b534f93a4e92f9035147c5e9b443caeef6f266dfc05c3a5ac41cdc08c7b178c479a320ac9a
+MISC metadata.xml 687 BLAKE2B 34a74bdff790f94b7e32c295833aa986d0d72fc646af900be059d2c5cb55d91af0cf255ad76f0250edd6f6464227c28f19b412243c5f45cc2d3b34a95d5b87d8 SHA512 3db464f32be8e3d79b189da232ab3ce4f8e8694fd1044149b7fc608deb60742886ced2be6bac924bbcd9695cd88747d47297d55f180d87d3340cc589b1bc7f13
diff --git a/dev-cpp/tbb/metadata.xml b/dev-cpp/tbb/metadata.xml
index 1d44ed7098fc..1e4e905a8844 100644
--- a/dev-cpp/tbb/metadata.xml
+++ b/dev-cpp/tbb/metadata.xml
@@ -13,6 +13,6 @@
   for performance and scalability.
   </longdescription>
   <upstream>
-    <remote-id type="github">01org/tbb</remote-id>
+    <remote-id type="github">intel/tbb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-cpp/tbb/tbb-2017.20170226.ebuild b/dev-cpp/tbb/tbb-2019.8.ebuild
index 34be8b2f6e90..fd77782aba4e 100644
--- a/dev-cpp/tbb/tbb-2017.20170226.ebuild
+++ b/dev-cpp/tbb/tbb-2019.8.ebuild
@@ -1,30 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs versionator
+inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs
 
-PV1="$(get_version_component_range 1)"
-PV2=5
+PV1="$(ver_cut 1)"
+PV2="$(ver_cut 2)"
 MY_PV="${PV1}_U${PV2}"
 
 DESCRIPTION="High level abstract threading library"
 HOMEPAGE="https://www.threadingbuildingblocks.org"
-SRC_URI="https://github.com/01org/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
+IUSE="debug examples"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch
-	"${FILESDIR}"/${PN}-2017.20161128-build.patch
-)
+DOCS=( CHANGES README README.md doc/Release_Notes.txt )
 
 src_prepare() {
 	default
@@ -132,13 +129,13 @@ multilib_src_install() {
 multilib_src_install_all() {
 	doheader -r include/*
 
-	dodoc README CHANGES doc/Release_Notes.txt
-	use doc && dohtml -r doc/html/*
+	einstalldocs
 
 	if use examples ; then
 		insinto /usr/share/doc/${PF}/examples/build
 		doins build/*.inc
 		insinto /usr/share/doc/${PF}/examples
 		doins -r examples
+		docompress -x "/usr/share/doc/${PF}/examples"
 	fi
 }
diff --git a/dev-cpp/tbb/tbb-4.3.20150611.ebuild b/dev-cpp/tbb/tbb-4.3.20150611.ebuild
deleted file mode 100644
index d5efb48803d2..000000000000
--- a/dev-cpp/tbb/tbb-4.3.20150611.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator
-
-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="https://www.threadingbuildingblocks.org"
-SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch \
-		"${FILESDIR}"/${P}-build.patch
-
-	find include -name \*.html -delete || die
-
-	# Give it a soname on FreeBSD
-	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
-	# Set proper versionning on FreeBSD
-	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
-
-	use debug || sed -i -e '/_debug/d' Makefile
-}
-
-multilib_src_configure() {
-	# pc files are for debian and fedora compatibility
-	# some deps use them
-	cat <<-EOF > ${PN}.pc.template
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Cflags: -I\${includedir}
-	EOF
-	cp ${PN}.pc.template ${PN}.pc || die
-	cat <<-EOF >> ${PN}.pc
-		Libs: -L\${libdir} -ltbb
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc.pc || die
-	cat <<-EOF >> ${PN}malloc.pc
-		Libs: -L\${libdir} -ltbbmalloc
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
-	cat <<-EOF >> ${PN}malloc_proxy.pc
-		Libs: -L\${libdir} -ltbbmalloc_proxy
-		Libs.private: -lrt
-		Requires: tbbmalloc
-	EOF
-}
-
-local_src_compile() {
-	cd "${S}"
-
-	local comp arch
-
-	case ${MULTILIB_ABI_FLAG} in
-		abi_x86_64) arch=x86_64 ;;
-		abi_x86_32) arch=ia32 ;;
-	esac
-
-	case "$(tc-getCXX)" in
-		*g++*) comp="gcc" ;;
-		*ic*c) comp="icc" ;;
-		*clang*) comp="clang" ;;
-		*) die "compiler $(tc-getCXX) not supported by build system" ;;
-	esac
-
-	CXX="$(tc-getCXX)" \
-	CC="$(tc-getCC)" \
-	AS="$(tc-getAS)" \
-	arch=${arch} \
-	CPLUS_FLAGS="${CXXFLAGS}" \
-	emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
-}
-
-multilib_src_compile() {
-	local_src_compile tbb tbbmalloc
-}
-
-multilib_src_test() {
-	CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
-	local_src_compile -j1 test
-}
-
-multilib_src_install() {
-	cd "${BUILD_DIR}_release" || die
-	local l
-	for l in $(find . -name lib\*.so.\*); do
-		dolib.so ${l}
-		local bl=$(basename ${l})
-		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-	done
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins *.pc
-}
-
-multilib_src_install_all() {
-	doheader -r include/*
-
-	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
-}
diff --git a/dev-cpp/tbb/tbb-4.4.20160803.ebuild b/dev-cpp/tbb/tbb-4.4.20160803.ebuild
deleted file mode 100644
index d1d21c561ce0..000000000000
--- a/dev-cpp/tbb/tbb-4.4.20160803.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator
-
-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="https://www.threadingbuildingblocks.org"
-SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch
-	"${FILESDIR}"/${PN}-4.4.20160803-build.patch
-)
-
-src_prepare() {
-	default
-
-	find include -name \*.html -delete || die
-
-	# Give it a soname on FreeBSD
-	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
-	# Set proper versionning on FreeBSD
-	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
-
-	use debug || sed -i -e '/_debug/d' Makefile
-}
-
-multilib_src_configure() {
-	# pc files are for debian and fedora compatibility
-	# some deps use them
-	cat <<-EOF > ${PN}.pc.template
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Cflags: -I\${includedir}
-	EOF
-	cp ${PN}.pc.template ${PN}.pc || die
-	cat <<-EOF >> ${PN}.pc
-		Libs: -L\${libdir} -ltbb
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc.pc || die
-	cat <<-EOF >> ${PN}malloc.pc
-		Libs: -L\${libdir} -ltbbmalloc
-		Libs.private: -lm -lrt
-	EOF
-	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
-	cat <<-EOF >> ${PN}malloc_proxy.pc
-		Libs: -L\${libdir} -ltbbmalloc_proxy
-		Libs.private: -lrt
-		Requires: tbbmalloc
-	EOF
-}
-
-local_src_compile() {
-	cd "${S}"
-
-	local comp arch
-
-	case ${MULTILIB_ABI_FLAG} in
-		abi_x86_64) arch=x86_64 ;;
-		abi_x86_32) arch=ia32 ;;
-#		abi_ppc_64) arch=ppc64 ;;
-#		abi_ppc_32) arch=ppc32 ;;
-	esac
-
-	case "$(tc-getCXX)" in
-		*g++*) comp="gcc" ;;
-		*ic*c) comp="icc" ;;
-		*clang*) comp="clang" ;;
-		*) die "compiler $(tc-getCXX) not supported by build system" ;;
-	esac
-
-	CXX="$(tc-getCXX)" \
-	CC="$(tc-getCC)" \
-	AS="$(tc-getAS)" \
-	arch=${arch} \
-	CPLUS_FLAGS="${CXXFLAGS}" \
-	emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
-}
-
-multilib_src_compile() {
-	local_src_compile tbb tbbmalloc
-}
-
-multilib_src_test() {
-	CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
-	local_src_compile -j1 test
-}
-
-multilib_src_install() {
-	local bt
-	local buildtypes
-	if use debug ; then
-		buildtypes="release debug"
-	else
-		buildtypes="release"
-	fi
-	for bt in ${buildtypes}; do
-		cd "${BUILD_DIR}_${bt}" || die
-		local l
-		for l in $(find . -name lib\*.so.\*); do
-			dolib.so ${l}
-			local bl=$(basename ${l})
-			dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-		done
-	done
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins *.pc
-}
-
-multilib_src_install_all() {
-	doheader -r include/*
-
-	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
-}