From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD91C138350 for ; Wed, 15 Apr 2020 12:15:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C01CE089E; Wed, 15 Apr 2020 12:15:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A1FEE089E for ; Wed, 15 Apr 2020 12:15:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9027234EC2D for ; Wed, 15 Apr 2020 12:15:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5BAC1D6 for ; Wed, 15 Apr 2020 12:15:10 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1586952887.7bd9fb544802c50bbe378677b9a01207f3fc3f0e.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/tbb/Manifest dev-cpp/tbb/tbb-2017.20161128.ebuild dev-cpp/tbb/tbb-2018.20180312.ebuild dev-cpp/tbb/tbb-2020.1.ebuild X-VCS-Directories: dev-cpp/tbb/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: 7bd9fb544802c50bbe378677b9a01207f3fc3f0e X-VCS-Branch: master Date: Wed, 15 Apr 2020 12:15:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dfa831da-92fb-4bac-92dd-5c5c81280b00 X-Archives-Hash: a7ea430bdc4a7ba677e8169457b683c8 commit: 7bd9fb544802c50bbe378677b9a01207f3fc3f0e Author: Guilherme Amadio gentoo org> AuthorDate: Wed Apr 15 12:12:58 2020 +0000 Commit: Guilherme Amadio gentoo org> CommitDate: Wed Apr 15 12:14:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bd9fb54 dev-cpp/tbb: drop old Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Guilherme Amadio gentoo.org> dev-cpp/tbb/Manifest | 3 - dev-cpp/tbb/tbb-2017.20161128.ebuild | 144 --------------------------------- dev-cpp/tbb/tbb-2018.20180312.ebuild | 144 --------------------------------- dev-cpp/tbb/tbb-2020.1.ebuild | 151 ----------------------------------- 4 files changed, 442 deletions(-) diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index fd7b4501a2b..55a4e5475b0 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -1,5 +1,2 @@ -DIST tbb-2018.20180312.tar.gz 2911740 BLAKE2B 5c6dab4a892f3b61ed0b02ea36dc41bebd5b33a22bcc3d5f2960f21e134f2eb9bccf1466193a573489e12638c0bb0bccc2da83f699968ffd62417f2d0f093289 SHA512 7ac74e714122e25f7704630d3d52992dbea54d1e761b5e487251a771f401aa864f78b8ddf11d78f38758088df387abb6987f6a2db562c86cbb28ba8f33a25680 DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8 -DIST tbb-2020.1.tar.gz 2639115 BLAKE2B 058438351738eeab01c230ec10ff0a1dde77e5cc4fd77f292c31ee0320f41d079c8f90fc06f4640ffa375d5f0c0b5fbed13ac5a64a9cb9f1737cb66bc80442ea SHA512 79810c27c84bd3b3432bef471fa1c782f1f162a0d1038e88c03a77499cc7aeaa10d57317729fd23472e2d0f358395955f7570e8c679685a552a833eb45cf5f1d DIST tbb-2020.2.tar.gz 2637172 BLAKE2B 6b6e65732d3971f7374058513004ca3cfc3855b83c0a2dde59d50e08c26ff220470e31db86f4ab9f009c7e02e454a00a348730e63c829aa8d217320f7879cfc9 SHA512 6d7412fa6ce12d27736af3c8942c5ab5ea6945dd3ca93f309535c0dba3ff757d6507a5ffc3bcd73e6fdcda043cdedfa657631b25ae86fbf221d0f1d66a85b48f -DIST tbb2017_20161128oss_src.tgz 2965854 BLAKE2B 8c5aed6d8477297922767803617346feebb712d1f4b2df6d71a86f039b5563afc666454985e68a528a812aaad40b5fd0562bb91d357c45156fec46e5389ec542 SHA512 3c48ce196d2d3557e86cea7ede9dea456bbaeb29dbed34210f99c6f380406403a6056ccfa3d5befe6b29c4f8a9ee58ca6da545249cf4ec4ec85b463e04e4518c diff --git a/dev-cpp/tbb/tbb-2017.20161128.ebuild b/dev-cpp/tbb/tbb-2017.20161128.ebuild deleted file mode 100644 index 0297838dbef..00000000000 --- a/dev-cpp/tbb/tbb-2017.20161128.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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)" -MYP="${PN}${PV1}_${PV2}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="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="debug doc examples" - -DEPEND="" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${MYP}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch - "${FILESDIR}"/${PN}-2017.20161128-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 -} diff --git a/dev-cpp/tbb/tbb-2018.20180312.ebuild b/dev-cpp/tbb/tbb-2018.20180312.ebuild deleted file mode 100644 index 4a1386375cd..00000000000 --- a/dev-cpp/tbb/tbb-2018.20180312.ebuild +++ /dev/null @@ -1,144 +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 multilib toolchain-funcs versionator - -PV1="$(get_version_component_range 1)" -PV2=3 -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" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="debug doc examples" - -DEPEND="" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${MY_PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.4.20160803-underlinking.patch - "${FILESDIR}"/${PN}-2017.20161128-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\*$(get_libname \*)); do - dolib.so ${l} - local bl=$(basename ${l}) - dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname) - 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 -} diff --git a/dev-cpp/tbb/tbb-2020.1.ebuild b/dev-cpp/tbb/tbb-2020.1.ebuild deleted file mode 100644 index 4ed58041f01..00000000000 --- a/dev-cpp/tbb/tbb-2020.1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs - -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/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-linux ~x86-linux" -IUSE="debug examples" - -DEPEND="" -RDEPEND="${DEPEND}" -S="${WORKDIR}/oneTBB-${MY_PV}" - -DOCS=( CHANGES README README.md doc/Release_Notes.txt ) - -PATCHES=( "${FILESDIR}"/${P}-makefile-debug.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 - local bt buildtypes - - 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 - *clang*) comp="clang" ;; - *g++*) comp="gcc" ;; - *ic*c) comp="icc" ;; - *) die "compiler $(tc-getCXX) not supported by build system" ;; - esac - - if use debug ; then - buildtypes="release debug" - else - buildtypes="release" - fi - - for bt in ${buildtypes}; do - CXX="$(tc-getCXX)" \ - CC="$(tc-getCC)" \ - AS="$(tc-getAS)" \ - arch=${arch} \ - CPLUS_FLAGS="${CXXFLAGS}" \ - emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" cfg=${bt} $@ - done -} - -multilib_src_compile() { - local_src_compile tbb tbbmalloc -} - -multilib_src_test() { - local_src_compile 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\*$(get_libname \*)); do - dolib.so ${l} - local bl=$(basename ${l}) - dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname) - done - done - - cd "${BUILD_DIR}" || die - insinto /usr/$(get_libdir)/pkgconfig - doins *.pc -} - -multilib_src_install_all() { - doheader -r include/* - - 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 -}