diff options
Diffstat (limited to 'sci-libs')
36 files changed, 134 insertions, 1362 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex e2c3520dec8f..4cf33e46fd0b 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest index fc97d5f4475b..3409c608e6b0 100644 --- a/sci-libs/ViSP/Manifest +++ b/sci-libs/ViSP/Manifest @@ -1,5 +1,5 @@ AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4 AUX ViSP-3.2.0-ocv.patch 1065 BLAKE2B 830cecf11df2d9c5c909ab5e2b5e7430e953355feeea77e40b77d53f24d2f1799a529c8dfda061ca6a276a1e150d10fee475f63e798511ce0296e8fde1fd75a8 SHA512 35fbb672da815fd404bd483800bf3f27b4f62d41b1173b10292a964d23129f4ec8afd530f8de913500214633a425a1a7567341b6da317b9e74720cf9414f3eff DIST visp-3.3.0.tar.gz 60822186 BLAKE2B 559698af352b4eac227ab2cdb8d66be31c04d2e2ac2d30ce07cef5022501162211ff9bfc9ed4970ac8b825321b8fc34241a6ca7a29b3d78fb70fa79ac429f7ab SHA512 f96b017353240e63059ef1e514a64198b6a50b95b5a08405c16e99589fd2110071e2d558921a674e538f9cdea07fde8e653ca630e3c12c38bf91f7a83057afe2 -EBUILD ViSP-3.3.0.ebuild 2893 BLAKE2B 3cf9f8d816e203500378b19a6236e9146ea34168ddbb11ab2991b7ffa9c54d17081759fa7531da3c70dfefd2ea425dfad741a367c90079968ce5309fdabc7e2c SHA512 77512224d4baeea9199f5fe3d4414b9069e3e51247a5104dfef57c25331c3958cf542edaf1e8b6ed0694994c04e1c1c695599d7b0157c4a4f8253683f011bad5 +EBUILD ViSP-3.3.0.ebuild 2896 BLAKE2B fdf5beca31ed141f6234d0b667dbb6c0be0f88024cb98d3d98bf475c626b42b33be104dd6d20e4f0a7ca17d07baa506170ea902cac80ba683da1accafc471c58 SHA512 8413c455785ddee48b3345f75e119e0f521b75e64971abcd8c34148cf897462232ce8bd573947b592345c1fe1f890c2cf8de1ffe3a2e6a2857a5d178894b46d2 MISC metadata.xml 1383 BLAKE2B 0bc8f34d0babc7ca62c664babe0422443b0819e9c63bc850705c1de9d81b428b650ae19ddc0ae50bae28344f23058ff08247c1a0504e73c3bc419d972d3dcb27 SHA512 f562e0b6d262bd5de4f6e6f3eb5496ad9e8b4b4089a209e3614c5f0c3c531b4076d7a2af7b1317fa4fe9473a8241db1b44d343e2ca051e798c6948a86036562a diff --git a/sci-libs/ViSP/ViSP-3.3.0.ebuild b/sci-libs/ViSP/ViSP-3.3.0.ebuild index 7b2cda09c8a4..371f228d24b0 100644 --- a/sci-libs/ViSP/ViSP-3.3.0.ebuild +++ b/sci-libs/ViSP/ViSP-3.3.0.ebuild @@ -27,7 +27,7 @@ COMMON_DEPEND=" ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl ) - ieee1394? ( media-libs/libdc1394 ) + ieee1394? ( media-libs/libdc1394:2= ) jpeg? ( virtual/jpeg:0 ) motif? ( media-libs/SoXt ) ogre? ( diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest index 9dbcc5759efc..95fbb5828a6f 100644 --- a/sci-libs/cartopy/Manifest +++ b/sci-libs/cartopy/Manifest @@ -1,5 +1,3 @@ DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f -DIST cartopy-0.18.0_beta1.tar.gz 14215372 BLAKE2B 5bb1e98f18fdf57c0459202bfe77d4e4a476a3008e2f21a77cf643711cc3c438626915c31ee48886e980466f952985503987e3ed571295e2beb6c12754b382c4 SHA512 95d3bd87e57bea89eb2c25d6a709285ba59fb0f994abc3b37faf29b272b73647d0bc8979a25b1480f48bb55c957f4183ac3c3ad49b830ce686e931227c797abe -EBUILD cartopy-0.18.0.ebuild 1666 BLAKE2B c6dce73d39a0d0278e00362fa7475048e0e64061f2fe02a66863972e1782a9ebe09d24a76cb4f4d86349675d73603a064df38e9c6a7c43122bbeef625334ffcb SHA512 4206796d8def5cc9bf36f260ea5df748af6fe04b6ce24d777cd409b8b4d41255b15a15c5d4a5a20888a833ee50330ca86ac703ddf82183985d91ff96f4697b0d -EBUILD cartopy-0.18.0_beta1.ebuild 1666 BLAKE2B c6dce73d39a0d0278e00362fa7475048e0e64061f2fe02a66863972e1782a9ebe09d24a76cb4f4d86349675d73603a064df38e9c6a7c43122bbeef625334ffcb SHA512 4206796d8def5cc9bf36f260ea5df748af6fe04b6ce24d777cd409b8b4d41255b15a15c5d4a5a20888a833ee50330ca86ac703ddf82183985d91ff96f4697b0d +EBUILD cartopy-0.18.0.ebuild 1671 BLAKE2B c5173cc9d7ed78e1b8c98765736fd85a7fc2eea14569d8ac00965ddef6c29bec4c67922d30b19cd2d641e76fc8714b44cf449d649178bf36a48e2a6165f1cb7b SHA512 60a2cca32b03fe1081a24a908d9fc79dd5dc9d2986806822739bd1a3b73fb426eb49163c27837f6ca18c1bcf5f731bae5ca636519dbf4daeaafcd4281fdf2a85 MISC metadata.xml 602 BLAKE2B 92e179b5503c84c6e567e7adb48917ca6140a7c04a0f5613b5aa3a9c19623d61abed95c325b41ca0d5a99b046c2891511796de49c3117c4ce9c969069bb2c5f0 SHA512 8677cb5685dee0b5868c1b14ffc13ac93e3b26ab741ceb684c7c48caf02f159a7a6613402e0396b9b0bc256c39b6446cbb7779521324447d96ed524fb8ca664d diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild index 0be07b470778..0e8e4f590af7 100644 --- a/sci-libs/cartopy/cartopy-0.18.0.ebuild +++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild @@ -28,7 +28,7 @@ RDEPEND=" dev-python/six[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pillow[jpeg,${PYTHON_USEDEP}] sci-libs/gdal[python,${PYTHON_USEDEP}] " diff --git a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild deleted file mode 100644 index 0be07b470778..000000000000 --- a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 virtualx - -MY_PV=${PV/_beta/b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Python package for geospatial data processing and analysis" -HOMEPAGE="https://scitools.org.uk/cartopy" -SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/pyshp[${PYTHON_USEDEP}] - sci-libs/Shapely[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - sci-libs/gdal[python,${PYTHON_USEDEP}] -" - -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - sci-libs/geos - sci-libs/proj -" - -distutils_enable_tests pytest - -DEPEND+="test? ( - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # drop test file requiring network access, which got not covered by markers - rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die - # prepare matplotlib backend for test suite - export MPLCONFIGDIR="${T}" - echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die - distutils-r1_python_prepare_all -} - -python_test() { - cd "${BUILD_DIR}" - # drop all tests needing network access - virtx pytest -vv -m "not network and not natural_earth" || die "test failed" -} diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest index 9c7fc1cf9096..ce4aace094d4 100644 --- a/sci-libs/libsigrok/Manifest +++ b/sci-libs/libsigrok/Manifest @@ -5,6 +5,6 @@ AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff1 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df SHA512 b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092 EBUILD libsigrok-0.3.0.ebuild 1732 BLAKE2B f3f00fd50eeedfdf542d4205c633433d70cd3a3638932505cc6576eef7216a27b5ba677aa2281d692f250df458f1b4b33a67cf7f0ca3355ac52f4269623be20e SHA512 aa54d6ef4f33da4498432d84fdfd390134b7ccc2715af7e74ae91a7307348eeec73b5787fe39dd20a35572fa8316a0d504bea9ea413e71821f9fb4d974d58b5e -EBUILD libsigrok-0.5.2.ebuild 3879 BLAKE2B d7fc2234bb89bad437a60d27e71d47dd17d0ee7ce7b6455391e3f982e103c8fba15ffd6beb682fb4e56d1ee082335dffbb443b70f010b189d1bb3ab489c7a916 SHA512 91ff1e2ac0eb21bfd2769cc7c2bfc3a793edd27fd4e225d66b8bedf2b0051845c05d344be603847284021a18b2c3306757375ec10e29976e277a95957f68faf3 +EBUILD libsigrok-0.5.2.ebuild 3878 BLAKE2B 469ae6df2e16a1d6d26f65631f8ed4c4587533c72f0b9f4c4846f04ecb7c094680aeb62e3ef4412f5dbb34d6d4ccc81e53deb0a21bd1765a9359918e79115dca SHA512 bd48c7fb6f8e6b49e86886153add093039adc1c939ee0dd0666973b0c2caa8417c2a775b88946b3e7915faf1df0f22c9e2ba878c90a2ff687eef7782f815f333 EBUILD libsigrok-9999.ebuild 3679 BLAKE2B 7c80f57e327ebac43dbda70a5f07147d49db55bc6640f7f22a82709bc0527cc76a8744ca314b79952ee6fc291462b988668d6ca7ad297246932a4f92c720c0dd SHA512 0182a0ba019d158e2c1c66889e8d97c0857f946357fa2704946b024bece3e43d4410b8d147cbd71c82506264f7b3d38f98a165558e3a515522724f1575ff41fb MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild index 7ee8b26cb480..6f9692c6488b 100644 --- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild +++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 autotools else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" fi DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support" diff --git a/sci-libs/mpfi/Manifest b/sci-libs/mpfi/Manifest index 5c87eeddbcb1..7e83527dfe12 100644 --- a/sci-libs/mpfi/Manifest +++ b/sci-libs/mpfi/Manifest @@ -1,3 +1,3 @@ DIST mpfi-1.5.3.tar.bz2 447256 BLAKE2B 67bb9af362ec96c015571cbdaba09befc2241e0113b6177dd76eec97b619bbf9c924ba4d16583df664cafdb1a78c8700712e30633e91e5ae6f1d5e084c3ede5c SHA512 9c3cdf665fccff8b383c96827f4acb7aa62efdf7854cff271455273f00f8e7ecf84fbe191b02e5f51fe067aaae564fd2a0add062070ff5c1f542d61a021f967d -EBUILD mpfi-1.5.3.ebuild 640 BLAKE2B 4e6651f2fd8d8e8890c49424bd447779ed1ec8a5c8ea27ae7b456e1a8d82f10709675b896b8d1909ac3d3a1a3082737d939a679b10ac387e350232032e1c0972 SHA512 d7662f1590b4bc9acec7725b34e0c4306206cb608cf58893a4e55d0e4ddef72cec3ccc5f0c663436f358ba82b31923164c8d6080676adb91df934c227e144e95 +EBUILD mpfi-1.5.3.ebuild 647 BLAKE2B 9788b4f8d72e957544908117e0e8409530dd6c772ba4e8c1b730afe165e2cd88c945c3c709368372c4f7046d188c6419e0a360a437de9512bfea5d0be04012d2 SHA512 4e4a192a512b263522eca48b5fab60414bc5bfa6286c29d62cbe64f21560e57c7ba8aebec3d0686fe32e38e27c9bf0cb2485a878475daf2df2ccecffd5052efe MISC metadata.xml 1029 BLAKE2B 51b40066219be20a21939a82e93c095573e3cadaf288430db3c0a46c83a6045dccb3b940505b6ee189d426a0e1e57b9135df202a6185848546a9f5a1e8316d7b SHA512 870810149f2a547a0db4df6c7997fadfeaee91d0a8a1d456fafba76c7c48e0e59e8a0415a10b46b89bf4930e1880b94d3b6d3f28443dda2bb7ea45a62fa3c8b4 diff --git a/sci-libs/mpfi/mpfi-1.5.3.ebuild b/sci-libs/mpfi/mpfi-1.5.3.ebuild index d84acb228b35..557131c75ace 100644 --- a/sci-libs/mpfi/mpfi-1.5.3.ebuild +++ b/sci-libs/mpfi/mpfi-1.5.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/37331/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" DEPEND=" >=dev-libs/gmp-4.1.2:0= diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 457203a6cbbc..37c68e8c938b 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1,4 +1,6 @@ DIST pcl-1.11.0.tar.gz 67091890 BLAKE2B 77dcaf99e19cd3042a01176e57441a38e7f5095d7bd9b08c9ad4464384eb6c603eab9734a6bcbb52eff9da55c3aaa69b3744a10137b8264e5729c2432a678f71 SHA512 1cde48349b2630d1bb89fa50b2844054802fe02d22c810516bc41a712823a26cd5fa1b14297718f517b88c371a637567b31fb8c4c9b4908e94fb3a7208095127 +DIST pcl-1.11.1.tar.gz 68515312 BLAKE2B b6e8810861ca715acd9e97ad2b7d62ba9bf18b6a5ce3f13d7e2967f994ac39c42ba08aca83e1ae2186b986e4caf065d25d80d16d2c81a33838bde29326657e7a SHA512 93dd3180443a1a26f019bfd1e34855014619b3b74326ae93806a2711dba392b1c76f2aa682cc3955c651a45ce829a0c89d1cae7cef09cdea60fcb671aefe4da2 EBUILD pcl-1.11.0.ebuild 2174 BLAKE2B 0e8893788a3c82015da257ee9a06bd89cf065ca5eaaeefb4a7988f98fc289d8dfd44c74c1eddfe23e062c434fb6a425d0b1572232eea0a1d6f362b06a4e142c0 SHA512 86b6eeeaa5c3b2da5f0458cd53bd3b370554fe2ce4583c3b2618b8f1d4362c648d05ea7328bc6504bd1d7aec169add0c414dac1162743acb361e3bf7601a22f9 +EBUILD pcl-1.11.1.ebuild 2174 BLAKE2B 0e8893788a3c82015da257ee9a06bd89cf065ca5eaaeefb4a7988f98fc289d8dfd44c74c1eddfe23e062c434fb6a425d0b1572232eea0a1d6f362b06a4e142c0 SHA512 86b6eeeaa5c3b2da5f0458cd53bd3b370554fe2ce4583c3b2618b8f1d4362c648d05ea7328bc6504bd1d7aec169add0c414dac1162743acb361e3bf7601a22f9 EBUILD pcl-9999.ebuild 2174 BLAKE2B 0e8893788a3c82015da257ee9a06bd89cf065ca5eaaeefb4a7988f98fc289d8dfd44c74c1eddfe23e062c434fb6a425d0b1572232eea0a1d6f362b06a4e142c0 SHA512 86b6eeeaa5c3b2da5f0458cd53bd3b370554fe2ce4583c3b2618b8f1d4362c648d05ea7328bc6504bd1d7aec169add0c414dac1162743acb361e3bf7601a22f9 MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf diff --git a/sci-libs/pcl/pcl-1.11.1.ebuild b/sci-libs/pcl/pcl-1.11.1.ebuild new file mode 100644 index 000000000000..04c17c371e91 --- /dev/null +++ b/sci-libs/pcl/pcl-1.11.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl" +fi + +inherit ${SCM} cmake-utils multilib + +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" + SRC_URI="" +else + KEYWORDS="~amd64 ~arm" + SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz" + S="${WORKDIR}/${PN}-${P}" +fi + +HOMEPAGE="https://pointclouds.org/" +DESCRIPTION="2D/3D image and point cloud processing" +LICENSE="BSD" +SLOT="0/1.11" +IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=sci-libs/flann-1.7.1 + dev-libs/boost:=[threads] + dev-cpp/eigen:3 + opengl? ( virtual/opengl media-libs/freeglut ) + openni? ( dev-libs/OpenNI ) + openni2? ( dev-libs/OpenNI2 ) + pcap? ( net-libs/libpcap ) + png? ( media-libs/libpng:0= ) + qhull? ( media-libs/qhull ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtopengl:5 + ) + usb? ( virtual/libusb:1 ) + vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) +" +DEPEND="${RDEPEND} + !!dev-cpp/metslib + test? ( >=dev-cpp/gtest-1.6.0 ) +" +BDEPEND=" + doc? ( app-doc/doxygen ) + tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink ) + virtual/pkgconfig" + +REQUIRED_USE=" + openni? ( usb ) + openni2? ( usb ) + tutorials? ( doc ) +" + +src_configure() { + local mycmakeargs=( + "-DLIB_INSTALL_DIR=$(get_libdir)" + "-DWITH_CUDA=$(usex cuda TRUE FALSE)" + "-DWITH_LIBUSB=$(usex usb TRUE FALSE)" + "-DWITH_OPENGL=$(usex opengl TRUE FALSE)" + "-DWITH_PNG=$(usex png TRUE FALSE)" + "-DWITH_QHULL=$(usex qhull TRUE FALSE)" + "-DWITH_QT=$(usex qt5 TRUE FALSE)" + "-DWITH_VTK=$(usex vtk TRUE FALSE)" + "-DWITH_PCAP=$(usex pcap TRUE FALSE)" + "-DWITH_OPENNI=$(usex openni TRUE FALSE)" + "-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)" + "-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)" + "-DWITH_DOCS=$(usex doc TRUE FALSE)" + "-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)" + "-DBUILD_TESTS=$(usex test TRUE FALSE)" + ) + cmake-utils_src_configure +} diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest index a421547a037f..e5552b5236ea 100644 --- a/sci-libs/pyshp/Manifest +++ b/sci-libs/pyshp/Manifest @@ -1,5 +1,3 @@ -DIST pyshp-1.2.0.tar.gz 58993 BLAKE2B f7cb69976b6dd089be45d7984765f803ce94300dc19df1b99a11ba876365f49659fb37a5ebfa36ebe3ce6de4df9f0b80f628160ace9b11a66a247f9a57ac0a80 SHA512 c77e19f258ba9d2e2c480b82c342d2bbeae4b5855627aa98777fbf590e904d50045edecaa0e5ec2e03ddaaf49bf7261944fb77bcd26bf6d21e50c90c30cd0b43 DIST pyshp-2.1.0.tar.gz 215360 BLAKE2B 2b32a3db242b90f801abdbc31f3c930bc40c3ad0606433d90f62c6b9af3c0459e8c8467d60aec1075368779e5a4fffa9e3985e1875d82edf732faf982359c605 SHA512 ab0c7832f7e480ec3cdbf94ec29f84b590486625bde3d5cf465e5dc6ddca02998b99510b6c14d5ba005816c5b091044badc1e68988fd971f9e18266096ad86cb -EBUILD pyshp-1.2.0.ebuild 590 BLAKE2B 331661c6e5e7cb380fa36822c7ae6f9c3b1e2a3b36362ee7c6cb25ac3f52c3b196a19f93968657a07f435ea95c77bfaf9296fa598a2689c2ef518ca73cd2c36c SHA512 03ff5d90f4b896fe0d40f783a24879b2f33a725d3d9d67c6cac60a21542cfe530f48e5aaa8304a32405fee603048c3e5a72026b235b028cf82f5bb1ce16f6f45 EBUILD pyshp-2.1.0.ebuild 549 BLAKE2B 34a54b03e748fae8daad52154dce55d32be41d1638242c183210007015945eba8acb5ba6a09c8d274334543e4ee8c939f669079555b748f7e8e8afff38612914 SHA512 7dfcab869adfc8aca9c706c2e63f9b80baa4f61efa59f0c10299644a7fccc9c867dee781e4c52914b8eeca6961ccf6b85793fd2ca1210e369689a477086041c0 MISC metadata.xml 327 BLAKE2B 48f3a2409f354b39c05d8111f78f1bce40425f79db30c83d345f81a081d2098bdf42dfc49e47854ec788cf75841cb9427a5c2eb9b71dd139f3fbe398e1380346 SHA512 3b9fdbf92fc5ad41b8afe4b315bad42806062c974b37496875fcc861af525905cc8d4b81e0a4d20d3e9333ea38c57c7aae6764c64537ef9e27386a53168299b4 diff --git a/sci-libs/pyshp/pyshp-1.2.0.ebuild b/sci-libs/pyshp/pyshp-1.2.0.ebuild deleted file mode 100644 index 708ad5092d3f..000000000000 --- a/sci-libs/pyshp/pyshp-1.2.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Pure Python read/write support for ESRI Shapefile format" -HOMEPAGE="https://pypi.org/project/pyshp/" - -if [[ ${PV} == "9999" ]] ; then - SRC_URI="" - ESVN_REPO_URI="https://${PN}.googlecode.com/svn/trunk" - inherit subversion -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index b00e0bb91474..1e7d482f8f16 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1,10 +1,5 @@ -AUX boost173.patch 738 BLAKE2B c4e21499dc6b279ac1216c1e076df5b902a57c36fa33325622af6da667a2c1f7298f07ab864a5cc9f498543b05d454fba9ad436383f4274bca295fd06565fb61 SHA512 e0d754d4adb636ad83445b98ba0b42b82ed77537cd7d3e84d7db8d540b83c13933667d31ae279caf4c5d2c5021719d777868771949d89bb2574e926038caacf6 -AUX ocv.patch 958 BLAKE2B 8614bf90f25363fea34374e2fb0294ecf7779aa795f91d4b0e9156c4c3413698344c458c1dc5895007b30affc3b2db2294c3cff8fbd22c7518c12282a28573bf SHA512 57bbffb34ad7f7d67c668c9a48cab21f826ce7ddbb719ae0815d6238a784d327ec7644c78a3b437e7d813181d201f60cfeba91f93067355cdb41a20770f95a13 -AUX ocv4.patch 698 BLAKE2B 4ec82ff9d08b3051181cd44b157b9097783e4128e5bb09debbd844ec574455c5f9a5e153d643f209f96bf0f2a92474d189d5b8449a17fbe171dc5cee395748b3 SHA512 83814e1fa862c1eb8f23d0865a4f36d2067512af57a12c3569697b12559d27027915b888d9c1cb845d08bd82bdabffd3a06594234b23a68f04a6c723d00265b4 -AUX pcl111.patch 1824 BLAKE2B 45bfbf7bb7a1459c126ebf13e47ed4519383a8e6088980bc83ff87ab66e7a2f8168ec02f39ecdef95bce3c83bc329c5dc698ab0d150acc08f43b7795615e3f29 SHA512 3342bf908ef9d4abf9fd49c2840d3498b26ec95e61b725a94049f3dc7958642c7a24bd41686191e57137f3e9166160c48cde53dfdadbb7a740d5d79dbbe70926 -DIST rtabmap-0.19.3.tar.gz 19818629 BLAKE2B f732a02db6ef8434b1457234211a128e3050236590e0f6a1e08e36bbb5899b9d3de9409d7d7329f346d29874d440bd86835c1501fb638e3802e2663907e7b04d SHA512 bda72596911b1c35d757322c7e5acd7e43ec1f4e984bfb0599cfb39597bee79e470d1bc11b492f244f39c35812ae570d023848cdcbd011eeb78e347727045509 -DIST rtabmap-0.19.7.tar.gz 19936131 BLAKE2B ec640bb8dddb2acac9eb70e828edc88e76d90b287dc5be0c99f0943dac3df448b0a06bde79b1288e0b84a1b2a022e5713346f87e68f11a6f25be486e3122b62a SHA512 d02fec1db427092867b32d464e4b2450a729923260088b75dd0a813fc6d3e2539b3694035cddffc33b8fcd5a56a2a5c3dedb7c7a998b72f2094e1916f2a99084 -EBUILD rtabmap-0.19.3-r1.ebuild 1473 BLAKE2B 2a8c64e81f3077cc3440294ccd1fe605a4dd4211b50639414913fb34671486b6cca15ad1483a9b3a63852295c06e108b9fe74358505c5a0e262844df15392fe4 SHA512 1d1c479c484c811b44e8f088add28daa00e7154c2e6db25960e263f2eede05b9e939dc2190d8d9cb337f3fddd82c35a471df17bb0f3a54bd1bebe963aa03b3ac -EBUILD rtabmap-0.19.7.ebuild 1531 BLAKE2B e05cd3506738e0fc124e16607b1b6e43dd583cd10353e8e7ffa85e46ebffd28b3a02b9412a3286f1bf34ebb72e407fcaf5df07812b7cb99d2ccc66295b6c59ca SHA512 ca14572df16837ce1bab93e4f4911b7bbc6f276f0097613ee94ab022b09b94c7e3598dffb4223d5c9a7940336eabca4963c29f0159a744ab6cf89808d507b806 -EBUILD rtabmap-9999.ebuild 1436 BLAKE2B 058a4f207d6ff2c0f2b05a4126dbf7ebae67de82bdf956b0abdd5ba6f8285b3cd61f60ae086ca2036f9523f62b90ad61c462f98a983e05b7207643ba16f80a1e SHA512 139f504b42598b3c0c9894a87f32f7980873122a2959e3ca1b1764a77e7e0c3bc7c7af360494422b629ee01c0ee711b974312388d412007b47ed545b8e8928ed +AUX pcl.patch 1093 BLAKE2B 16faab539f13f54db1518babe02d208b438d984fd462098ac4c1babc9b6f509e14b307c58f59e66a177e66bdaadd8ccc3e509aac9da4c207104f0a967e790843 SHA512 5a5b97f9c028adff316ad50cf4e002b54d8603f3394d631330109c986b7184aaae6cba08e2bbcc1c21f9b97f77fbabe2fab344fa1119b47a1c24a774ed637bd6 +DIST rtabmap-0.20.3.tar.gz 20008545 BLAKE2B d50a66034905243473d26f66a09f1e1408477908cca9337d77227d8e38ba6b571d5720a5391495903cd784742dd11ccaa035b2ed03568c9917e85c46681bdfe1 SHA512 2f8837e00f89210b270dbd863e1088d9786774a8fcf3db593efe35384251c2bb92bd97b261f823e4aee90312e30c886b42241ed22042a540091a218a2d1819f7 +EBUILD rtabmap-0.20.3.ebuild 1475 BLAKE2B 285587eaefbd1fb7f90cb4b91c5c52d883467f659247427722048ec098974ebdf1cb2ce70ad25a4ca652a1e785336c8425fb9fe6f65cdaf650785092e9ae0a32 SHA512 369371740d24305e9466381bda18f7c7f65325cf0a01050c42fcd43e02b78ca326824db45120181d10ca0fb143353a0d98d22c56fc4e8eca729cd85e64d5c3d8 +EBUILD rtabmap-9999.ebuild 1439 BLAKE2B 9f889c2cceffd44463e20627ad414dc1b6d2b4b7d3fc1776cc9e7fdb8d6020aea63fcd6735778218973a12c7e0bbe130b0e9f7aefc0c9e86954d5aca205fbb3f SHA512 e7a0d3cda93b7df313beb6027d8e3daec01e54fe97344d5ae1f282d7e4760467634b345c8f7f09be586411692d51b342cc3de248b232d574fa78594b6d31ea88 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81 diff --git a/sci-libs/rtabmap/files/boost173.patch b/sci-libs/rtabmap/files/boost173.patch deleted file mode 100644 index 4549e9bc8426..000000000000 --- a/sci-libs/rtabmap/files/boost173.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: rtabmap-0.19.7/corelib/src/camera/CameraOpenni.cpp -=================================================================== ---- rtabmap-0.19.7.orig/corelib/src/camera/CameraOpenni.cpp -+++ rtabmap-0.19.7/corelib/src/camera/CameraOpenni.cpp -@@ -126,7 +126,7 @@ bool CameraOpenni::init(const std::strin - boost::function<void (
- const boost::shared_ptr<openni_wrapper::Image>&,
- const boost::shared_ptr<openni_wrapper::DepthImage>&,
-- float)> f = boost::bind (&CameraOpenni::image_cb, this, _1, _2, _3);
-+ float)> f = boost::bind (&CameraOpenni::image_cb, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3);
- connection_ = interface_->registerCallback (f);
-
- interface_->start ();
diff --git a/sci-libs/rtabmap/files/ocv.patch b/sci-libs/rtabmap/files/ocv.patch deleted file mode 100644 index 0802b7899a26..000000000000 --- a/sci-libs/rtabmap/files/ocv.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7041d5fd34fb34851ad3287891aa5c383d73b5c2 Mon Sep 17 00:00:00 2001 -From: matlabbe <matlabbe@gmail.com> -Date: Sun, 3 May 2020 22:59:35 -0400 -Subject: [PATCH] Fixed #541 - ---- - corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h | 3 --- - 1 file changed, 3 deletions(-) - -Index: rtabmap-0.19.7/corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h -=================================================================== ---- rtabmap-0.19.7.orig/corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h -+++ rtabmap-0.19.7/corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h -@@ -37,10 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI - #include <opencv2/calib3d/calib3d_c.h> - - #if CV_MAJOR_VERSION >= 4 -- --#if CV_MINOR_VERSION >= 3 - #include <opencv2/core/core_c.h> --#endif - - // Opencv4 doesn't expose those functions below anymore, we should recopy all of them! - int cvRodrigues2( const CvMat* src, CvMat* dst, CvMat* jacobian CV_DEFAULT(0)) diff --git a/sci-libs/rtabmap/files/ocv4.patch b/sci-libs/rtabmap/files/ocv4.patch deleted file mode 100644 index 465b364ef013..000000000000 --- a/sci-libs/rtabmap/files/ocv4.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d5b4b252870e4225ed00bd544a102015e5172c85 Mon Sep 17 00:00:00 2001 -From: matlabbe <matlabbe@gmail.com> -Date: Fri, 9 Aug 2019 15:31:47 -0400 -Subject: [PATCH] updated ORBExtractor opencv include (compatibility issue - https://github.com/introlab/rtabmap_ros/issues/333) - ---- - corelib/src/opencv/ORBextractor.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/corelib/src/opencv/ORBextractor.h b/corelib/src/opencv/ORBextractor.h -index 0f06c395..58619a15 100644 ---- a/corelib/src/opencv/ORBextractor.h -+++ b/corelib/src/opencv/ORBextractor.h -@@ -31,7 +31,7 @@ - - #include <vector> - #include <list> --#include <opencv/cv.h> -+#include <opencv2/core/core_c.h> - - - namespace rtabmap diff --git a/sci-libs/rtabmap/files/pcl.patch b/sci-libs/rtabmap/files/pcl.patch new file mode 100644 index 000000000000..249d93d1c595 --- /dev/null +++ b/sci-libs/rtabmap/files/pcl.patch @@ -0,0 +1,22 @@ +From 24052a6ebe65fb260ee1d838ca5305b12b15d928 Mon Sep 17 00:00:00 2001 +From: matlabbe <matlabbe@gmail.com> +Date: Tue, 25 Aug 2020 10:56:30 -0400 +Subject: [PATCH] fixed pcl::getAngle3D not found error on latest pcl version + (https://github.com/PointCloudLibrary/pcl/commit/6df3e602a72ea16657f901c9a6911d95b263ba08#diff-8e08415b9972a447d115dbca3f8fa0a1) + +--- + corelib/src/pcl18/surface/impl/texture_mapping.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/corelib/src/pcl18/surface/impl/texture_mapping.hpp b/corelib/src/pcl18/surface/impl/texture_mapping.hpp +index a30f5766f..fbeedb221 100644 +--- a/corelib/src/pcl18/surface/impl/texture_mapping.hpp ++++ b/corelib/src/pcl18/surface/impl/texture_mapping.hpp +@@ -41,6 +41,7 @@ + #include <pcl/common/distances.h> + #include <pcl18/surface/texture_mapping.h> + #include <pcl/search/octree.h> ++#include <pcl/common/common.h> // for getAngle3D + + /////////////////////////////////////////////////////////////////////////////////////////////// + template<typename PointInT> std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> > diff --git a/sci-libs/rtabmap/files/pcl111.patch b/sci-libs/rtabmap/files/pcl111.patch deleted file mode 100644 index 3ff5d6be452d..000000000000 --- a/sci-libs/rtabmap/files/pcl111.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: rtabmap-0.19.7/corelib/src/Graph.cpp -=================================================================== ---- rtabmap-0.19.7.orig/corelib/src/Graph.cpp -+++ rtabmap-0.19.7/corelib/src/Graph.cpp -@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI - #include <pcl/search/kdtree.h> - #include <pcl/common/eigen.h> - #include <pcl/common/common.h> -+#include <pcl/common/point_tests.h> - #include <set> - #include <queue> - #include <fstream> -Index: rtabmap-0.19.7/corelib/src/clams/frame_projector.cpp -=================================================================== ---- rtabmap-0.19.7.orig/corelib/src/clams/frame_projector.cpp -+++ rtabmap-0.19.7/corelib/src/clams/frame_projector.cpp -@@ -33,6 +33,7 @@ RTAB-Map integration: Mathieu Labbe - #include <rtabmap/core/util3d.h> - #include <opencv2/highgui/highgui.hpp> - #include <opencv2/imgproc/imgproc.hpp> -+#include <pcl/common/point_tests.h> - - using namespace std; - using namespace Eigen; -Index: rtabmap-0.19.7/corelib/src/util3d_correspondences.cpp -=================================================================== ---- rtabmap-0.19.7.orig/corelib/src/util3d_correspondences.cpp -+++ rtabmap-0.19.7/corelib/src/util3d_correspondences.cpp -@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI - #include <rtabmap/core/EpipolarGeometry.h> - #include <opencv2/calib3d/calib3d.hpp> - #include <pcl/search/kdtree.h> -+#include <pcl/common/point_tests.h> - - namespace rtabmap - { -Index: rtabmap-0.19.7/corelib/src/util3d_features.cpp -=================================================================== ---- rtabmap-0.19.7.orig/corelib/src/util3d_features.cpp -+++ rtabmap-0.19.7/corelib/src/util3d_features.cpp -@@ -42,6 +42,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI - - #include <opencv2/video/tracking.hpp> - -+#include <pcl/common/point_tests.h> -+ - namespace rtabmap - { - diff --git a/sci-libs/rtabmap/rtabmap-0.19.7.ebuild b/sci-libs/rtabmap/rtabmap-0.19.7.ebuild deleted file mode 100644 index 4640d13e9cf0..000000000000 --- a/sci-libs/rtabmap/rtabmap-0.19.7.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/introlab/rtabmap" -fi - -inherit ${SCM} cmake-utils multilib - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P}" -fi - -DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" -HOMEPAGE="http://introlab.github.io/rtabmap/" -LICENSE="BSD" -SLOT="0" -IUSE="examples ieee1394 openni2 qt5" - -RDEPEND=" - media-libs/opencv:=[qt5(-)?] - sci-libs/pcl:=[openni,vtk,qt5(-)?] - sci-libs/vtk:=[qt5(-)?] - sys-libs/zlib - sci-libs/octomap:= - dev-libs/boost:= - ieee1394? ( media-libs/libdc1394 ) - openni2? ( dev-libs/OpenNI2 ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}/pcl111.patch" - "${FILESDIR}/boost173.patch" - "${FILESDIR}/ocv.patch" -) - -src_configure() { - local mycmakeargs=( - "-DWITH_QT=$(usex qt5 ON OFF)" - "-DWITH_DC1394=$(usex ieee1394 ON OFF)" - "-DWITH_OPENNI2=$(usex openni2 ON OFF)" - "-DBUILD_EXAMPLES=$(usex examples ON OFF)" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - # Needed since we force ros crawling to be done only in - # /usr/share/ros_packages/ - insinto /usr/share/ros_packages/${PN} - doins "${ED}/usr/share/${PN}/package.xml" -} diff --git a/sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild b/sci-libs/rtabmap/rtabmap-0.20.3.ebuild index df3b781baf72..1fd30dc27ec8 100644 --- a/sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild +++ b/sci-libs/rtabmap/rtabmap-0.20.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ RDEPEND=" sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= - ieee1394? ( media-libs/libdc1394 ) + ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 @@ -44,7 +44,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/ocv4.patch" ) +PATCHES=( "${FILESDIR}/pcl.patch" ) src_configure() { local mycmakeargs=( diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild index 24cbe5a01b96..5519717519d9 100644 --- a/sci-libs/rtabmap/rtabmap-9999.ebuild +++ b/sci-libs/rtabmap/rtabmap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ RDEPEND=" sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= - ieee1394? ( media-libs/libdc1394 ) + ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest index afc872e6b59e..28fe36575037 100644 --- a/sci-libs/symengine/Manifest +++ b/sci-libs/symengine/Manifest @@ -1,5 +1,3 @@ -DIST symengine-0.5.0.tar.gz 761321 BLAKE2B ddff0e756188f375e966b92e6e7796936b8b6fe1a884c036066dc09d46183f157761c9813fe27366e625b7cc070381332964a12f14617be66b0f38f536c0518d SHA512 0b94b531f71adf9129440e0664a5b5ce23453de6c8d22ed385958b38cda9bc2b356a0182a80076f47b217e9f6b5a57f059b040fddf7d69694d5bd5857b0a046b DIST symengine-0.6.0.tar.gz 763481 BLAKE2B 37fe94ad08463b31c7387ab296b201a4dda821ba59dfa548d0c42e70d23958bae24df3f035bd3fffb46cc08cc010d13a25e607a9e0644e9b3c0602fa0eb363b3 SHA512 cc6f0468534e5bcd466a810d44f9884b17858ca6c7151cdcadb3af0f7d8faf0d96697d5887ab65fc9094de80df825f8243dabc54e3f5c387be544880f49b482b -EBUILD symengine-0.5.0-r1.ebuild 2193 BLAKE2B 775daf836fc5fc1a0860645201ca905184383f5409e95c482b702cdc4891658f2fcd70e99ef8c5667d536598f5025616398405f0670ec69ddaf42549bef7c00d SHA512 b966d73b297cea26f9b7f1d85014f8753ec009a268844e777a8f453934e13c352803bca48d855933450529c64471da1f09b6fba1d828928187ceed2a71171b92 -EBUILD symengine-0.6.0.ebuild 2195 BLAKE2B d74c674072f87c95abf92e484989ded7e44907ca9da851713570259db4200683a1ddb7c51bf2caa88867eab8fb6de02d6b0dd10bebd839a3f75ed33ac9c45cfa SHA512 b1c283aac862460b2f6a250855a05164445ecd6949e1021ddb119cc429de955dca8134c5f919ecc4d025af028aecd5923142a6925bfc1681fb25e1f003da71be +EBUILD symengine-0.6.0.ebuild 2193 BLAKE2B 775daf836fc5fc1a0860645201ca905184383f5409e95c482b702cdc4891658f2fcd70e99ef8c5667d536598f5025616398405f0670ec69ddaf42549bef7c00d SHA512 b966d73b297cea26f9b7f1d85014f8753ec009a268844e777a8f453934e13c352803bca48d855933450529c64471da1f09b6fba1d828928187ceed2a71171b92 MISC metadata.xml 1265 BLAKE2B f91a4783ae464dee61dbca5f532bb73a217600b49633f0c80ee46f7650f27f2e37e32cd4f5e14e171e6a47eb4c612d686f883034378afb73520ed0c22862d564 SHA512 f2a634346a9f703565959b48d7648df6abb088a479819aa3f9818ae941df168dbfa3cb1867f48673fce9f24dc890d05134689d93edb0d6761f2a54f4c802037e diff --git a/sci-libs/symengine/symengine-0.5.0-r1.ebuild b/sci-libs/symengine/symengine-0.5.0-r1.ebuild deleted file mode 100644 index 2c9b5a766fd4..000000000000 --- a/sci-libs/symengine/symengine-0.5.0-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_BUILD_TYPE=Release -inherit cmake flag-o-matic toolchain-funcs - -DESCRIPTION="Fast symbolic manipulation library, written in C++" -HOMEPAGE="https://github.com/sympy/symengine" -SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/0.4" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/gmp:= - sys-libs/binutils-libs:= - arb? ( sci-mathematics/arb:= ) - boost? ( dev-libs/boost:= ) - ecm? ( sci-mathematics/gmp-ecm ) - flint? ( sci-mathematics/flint:= ) - mpc? ( dev-libs/mpc:= ) - tcmalloc? ( dev-util/google-perftools ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) -" - -pkg_pretend() { - use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp -} - -src_prepare() { - cmake_src_prepare - sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \ - -e "s|/lib|/$(get_libdir)|g" \ - -e "s|lib/|$(get_libdir)/|g" \ - -e "/DESTINATION/s|lib|$(get_libdir)|g" \ - -i CMakeLists.txt symengine/CMakeLists.txt \ - symengine/utilities/teuchos/CMakeLists.txt || die -} - -src_configure() { - # not in portage yet: piranha - local int_class - if use arb || use flint; then - int_class=flint - elif use mpfr; then - int_class=gmpxx - elif use boost; then - int_class=boostmp - else - int_class=gmp - fi - local mycmakeargs=( - -DINTEGER_CLASS="${int_class}" - -DBUILD_BENCHMARKS="$(usex benchmarks)" - -DBUILD_DOXYGEN="$(usex doc)" - -DBUILD_TESTS="$(usex test)" - -DWITH_ARB="$(usex arb)" - -DWITH_BFD="$(usex debug)" - -DWITH_SYMENGINE_ASSERT="$(usex debug)" - -DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)" - -DWITH_FLINT="$(usex flint)" - -DWITH_OPENMP="$(usex openmp)" - -DWITH_MPFR="$(usex mpfr)" - -DWITH_MPC="$(usex mpc)" - -DWITH_LLVM="$(usex llvm)" - -DWITH_PTHREAD="$(usex threads)" - -DWITH_TCMALLOC="$(usex tcmalloc)" - -DWITH_ECM="$(usex ecm)" - ) - use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" ) - - test-flag-CXX -std=c++11 && append-cxxflags -std=c++11 - cmake_src_configure -} diff --git a/sci-libs/symengine/symengine-0.6.0.ebuild b/sci-libs/symengine/symengine-0.6.0.ebuild index f1f0af9df4f9..2c9b5a766fd4 100644 --- a/sci-libs/symengine/symengine-0.6.0.ebuild +++ b/sci-libs/symengine/symengine-0.6.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0/0.4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads" RESTRICT="!test? ( test )" diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest index c2f00271feff..0ace811524d4 100644 --- a/sci-libs/tensorflow-estimator/Manifest +++ b/sci-libs/tensorflow-estimator/Manifest @@ -1,12 +1,8 @@ DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAKE2B 0bbcc2b3fefb8df84d9f72b13da59c377fcd657ead378f85f80a587f8750302236212ae5c58819933015e62425126bead0733d2924a567fb9c5cb14fb75271a8 SHA512 1818c555504ba89afff88d75fe8b4e1386b3665a3ad477c26b4e9504c8f52f398b6aaedbad41a4ab8b8d9b3f86e0992e7c83a6da70241685d7b79ba177af1035 DIST bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip 159656 BLAKE2B c2ebed5165907e5452db2e8797253ce17fb39a00d3ca3aab11dec475399821dd529629d710af6f9892b74d0654293bd7989fa2be24caf5836490e8df566c7c18 SHA512 deecf484f5e888db345a57c3b557d6548e4e71fd4c62ea10b4dc9c47be9d303df55c03bb446158675b131064c4eccb401bf217e131e78d629c8fc1836600cb51 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c -DIST tensorflow-estimator-1.15.1.tar.gz 696316 BLAKE2B 7797ae13fa5f56920df912f7d0eaef214a381acb25632dc2d21c6bbf5744bcc36b32f21e30b18be16d37f7a1deb30b2139d58c2c0f97a1de7a5f767a8a5462d8 SHA512 ae42057870cfb0e19d45ee59bd99c110ecfb3ae43cd5a5536711c7d2528b429c433b0f594e462eae9c40b34dd7813f3b14b1282cbf2edc725e13c45e93da818d -DIST tensorflow-estimator-2.0.1.tar.gz 618583 BLAKE2B d4ae6225cb8a56febc9ffa64d5f811fc41db462534361a183095f724ce6deb17fa22edbd13bacd2d556adcc023dff1daeb7bf7338360b3cb49b19dc3bc3e97d0 SHA512 d7aa35784aa2726c49039be50b73cc957e7f883414bb43101527918bacfa55632df89e6f54cfc58a096512fc49a6ea7524aea87af0579c2a52db2ca7f5ee4bc2 DIST tensorflow-estimator-2.1.tar.gz 622792 BLAKE2B d1c8abb22d90c789ebfadaf78ca932f87428274afe6e1ac20670bf6d2b4c1c6ea8f367b1eb7ee64ff9f6e9b8ecdc2f64113924e7e2286e3f4e3d2c36cb101794 SHA512 4aaa21969299b02443e9396c238ef4c03af3bde1d0142a81c04d9706f18b02bfd125f3aaf8ffb47e0a3ffad949c3d3bca3909375f12a1c1e4c55ca1cc7930d51 DIST tensorflow-estimator-2.2.0.tar.gz 627362 BLAKE2B 125792fc2167b8af837a99b08a9a26943bc5c1fda8ab3690b01c0d49a6dd39142ff4a063867dfe1bee3b99fb018981d0e4ee45d194caac2cd96a829ad22db0ad SHA512 aaf743835e2c606439fcccb56742997e930ba0e72c01d51633ce86824bbfaacd64607dc1fd7fb9604cc444feb65ebae60c2266be084e1b49ef2a1a9ca5a3d60d -EBUILD tensorflow-estimator-1.15.1.ebuild 1328 BLAKE2B b629259c42c606f8620f3efb2b56c253dca488c59c5c4df52a241c1e279856484e8fc289cc011044fff2ad4d80138234a20782d9a396ce84716f453530cacdbe SHA512 722e5579e71df900c0702980197e1eb532ace50817769363b42d9ba413037c339eeae61e625b6fdf53efbd95d821fc83ea7ed12a62e77a1bcc945abcc8916148 -EBUILD tensorflow-estimator-2.0.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615 EBUILD tensorflow-estimator-2.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615 EBUILD tensorflow-estimator-2.2.0-r1.ebuild 1978 BLAKE2B 790ff6c1a2facc9e5b652b346a9ad24b445494f156a90465d3fa278e49376122da03f182fd4264f2e1f17488f326353e58810122996fbd33b4deabb7ed1986b1 SHA512 419fdbe02e00fdabe285f122be8ac574181366fc5f48fcf56616a37c69867cf6b530ea7dae8f5cfd8c6114a1ccb945699e4e4674ea7a14ad4d6bc14619c6693c MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild deleted file mode 100644 index 37a74e0d4193..000000000000 --- a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7} ) -MY_PN="estimator" -MY_PV=${PV/_rc/-rc} -MY_P=${MY_PN}-${MY_PV} - -inherit bazel distutils-r1 flag-o-matic toolchain-funcs - -DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming" -HOMEPAGE="https://www.tensorflow.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-java/java-config" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CONTRIBUTING.md README.md ) - -src_prepare() { - sed -i "/^_VERSION/s/'[0-9.]*'/'${PV}'/" tensorflow_estimator/tools/pip_package/setup.py || die - bazel_setup_bazelrc - default -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) - - ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package - ebazel shutdown - - local srcdir="${T}/src" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die -} - -src_install() { - do_install() { - cd "${T}/src" || die - esetup.py install - python_optimize - } - python_foreach_impl do_install - - cd "${S}" || die - einstalldocs -} diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.1.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.1.ebuild deleted file mode 100644 index 32a54df07f94..000000000000 --- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7} ) -MY_PN="estimator" -MY_PV=${PV/_rc/-rc} -MY_P=${MY_PN}-${MY_PV} - -inherit bazel distutils-r1 flag-o-matic toolchain-funcs - -DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming" -HOMEPAGE="https://www.tensorflow.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -bazel_external_uris=" - https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip - https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - -SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - ${bazel_external_uris}" - -RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-java/java-config" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CONTRIBUTING.md README.md ) - -src_unpack() { - unpack "${P}.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - bazel_setup_bazelrc - default -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) - - ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package - ebazel shutdown - - local srcdir="${T}/src" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die -} - -src_install() { - do_install() { - cd "${T}/src" || die - esetup.py install - python_optimize - } - python_foreach_impl do_install - - cd "${S}" || die - einstalldocs -} diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest index a79e689884bf..02f40be563be 100644 --- a/sci-libs/tensorflow/Manifest +++ b/sci-libs/tensorflow/Manifest @@ -1,12 +1,8 @@ -AUX tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch 1188 BLAKE2B dcebed9a89be6ff70f073c432e5e02ab80c0fc9e69cea2b1255a5620d456eec39f717fef3dec062a7dee5d33ce2eb45712d578de9f5ecb00360bb26004cc949c SHA512 d47a98015c424fd61adea6c8f5ed5115ca35c807636530e737963f002f02380d80d30e0f0cf3c6cf3e00914157fce62739da60ae30a4fb533321822a4fa45b2d -AUX tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch 2370 BLAKE2B 87c60e70e929ade64cae24ae6f6d2d9168b0f5b93093206755fb66033b198e7226b7157a6aa15cb051cd9cd42bec8743ec7b96334ea3b9184445afff5e61c257 SHA512 2469fc0f9c9365c2e1191c68b61ba9ed54f0d240e34bb431ba6efadb9a4a63ae5b579e22b693df41fbbee55e4119bf8dcbdcdec6d7be81e36d1b48da8ff88c7b -AUX tensorflow-2.1.0-cuda_10.2_support_bin2c.patch 518 BLAKE2B 945a7e2a4b0379c05a274bbc2582fabf37b3447282d14dc28725b8d3b4e8d0a17bada117775e22697f9c2ba5549223a89c4849c49cf007e10ab9da3933255051 SHA512 01f4e5a02b2c68bc39b5be251257a2a484aa66aabaeca33a3e4ab9d434928cb63fb3846fa8870c565a40706acc686d3522e953ae3cc9fbd41d49d27c27838d8d DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9 DIST abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz 1281523 BLAKE2B 955802c74ed9baf222dcd824d2940147ae89edbc88f12bb8f54839776fe18bb18c0fde23b0d3142bb3be65a57930c96d03fdd243e8da07435eeb04329c31483d SHA512 c2ae1bd789251ec70cd0baafd92521e48fb1648aee8d9d84a8269436300848b6a9d7aead6bef8a12d3a9040f19535ac725ae961f12566500d309bc13dfee26a4 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826 DIST bazel-skylib.0.8.0.tar.gz 72941 BLAKE2B 1928989d3e5dc338fee974c5592a524adb492db172b1d2a849ed5f14f91dbb76606335d369e4b15c4eec41adfe3a23cdc5b4f3b2f1351a5e9c25103c002b96a2 SHA512 4729941cedca8ddb876a621b28221d3c17dbb5dd72af27e55f48274208f21db986c5e7cb8adb742c42124bfa8073eb782b49e2557cb3f3f95ca56833fef925c0 DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6 -DIST bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz 505681 BLAKE2B f16225eb11859f487335bddca115c9c2a05731f4bfe4240609a47e17b706d9a25b6b363b61404b4d5df0471e4dd9b4b9befbf78dbcb1c7c11e3f590039ff92b2 SHA512 7723baf2c710adb063375a33fd64e3941fae7e98c824764c266d5554cc0b0cbb1c91a5c2a9058bb4c8766ec404ca556199ce22965a6de4baee09cb740b7671c9 DIST bazel_skylib-0.9.0.tar.gz 84644 BLAKE2B 40b69a524e632ea00d34b9cf805b882ac4c549dd465ef37f28e54729ff1b614a7610a4895cede4e0c938edba5b19f781f3c0bfdb62bde628ee0af21d6b679546 SHA512 af4bcb641fed05d15f2d0ffe0e3abdfe9c7a5deb9c53064992d6605d224ded1648b1bdfa293e161028913f9f2c178c68cc38bc16028892ca5b0f52b4e645209d DIST bazelbuild-apple_support.0.7.1.tar.gz 20070 BLAKE2B e72098fc5017e3371b6af0f33f392a42da18376052f30db5dd602c5ccc0176c1ac8002cca3f598845c5cb33406b4fd8d30c5ea47c69add6c530b75dc6566a4b0 SHA512 bbab25c229404123d7d424fa261480cf887c749ae729cc1a00bd6c2554d4b4b3fa81e0eaa670542b3a5d3301f3bd5dcd7727d011ba854f13dbbf4f65895e4b08 DIST bazelbuild-rules_apple.0.18.0.tar.gz 1333446 BLAKE2B c7667e05c236f4de44573707c795d31c980242a2ea6eb69261403e7b1b7cc852d899c9b76cba347df1b1006542f9d532d78586a3bf5f831d37f8f0c0cd79a8eb SHA512 209b21856642b03dc7d54c0c82826224167df7da4c6dda3d29490e0661cdfe35ad9abe763288e0ff80af4d681a361efb22e0ca45ead6fb96fd38f211bcb4435d @@ -16,12 +12,9 @@ DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 46 DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c DIST bazelbuild-rules_python-0.0.1.tar.gz 2302092 BLAKE2B 1db52eebf2461d779f764f2afdd070d1d0dd65eb2b83ccd98c2831da1784614ca281b114064729a9f257c64eceb62975aac8362d231c84f32abdf19aee7a1852 SHA512 40fa069a4482e2f83e29dc8e109652d14d187b2ec8efdcd36e98d117de93d66a938ed74999b42a2293fcb6eccc0a111cbbcf65c5c155579214bb1b96644280a5 -DIST bazelbuild-rules_swift.0.11.1.tar.gz 107453 BLAKE2B 8cd686b945b5c9de9c8bfcaca38cd7c513bb8b55b4584bc569463997e7c5abcac3be4a5a31ccf95a494d17f3078ec9b1052497dba228fa3159a0c0be2a83eb88 SHA512 3479d6d8ce9111a39b9ef2e014399abc904e432841570dd0380104d80e4d3a74b6ff5cc6d2b250bcd15b152efa29d08f9ed092f70fd8bafa6deaa6f847d7f626 DIST bazelbuild-rules_swift.0.12.1.tar.gz 111674 BLAKE2B 7c116d6098aa0725034dce4c83628c31c85c36a6331b44636deb2efe0f689a5baee8081b33d65e3727a83bca865bcabedd6f8fa1fdb60e901a9b60840c52c018 SHA512 6136feb3dc0074f82500000cf5335f046f21ea3a1edcb4dcb22228c82b56ed6a334e4b03e4e26a4d25549581abcf7df22b60a2bccf823a51bf270051fe18d489 DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed DIST dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz 39637 BLAKE2B 532a3ce3d0e354a73c19433f0210a64ecbf00d9134d06a0ee7462baaff3f2b981524aa630cf250595671d6673105724482c7d69e803179aac247f2020c883bd0 SHA512 3728db5213e887fd946f64ba5dc0c336be9a72a0966ee83f146148749ffc93ddb342e0735df6117d7943874c18f87de5791a28e4a57ea420bb8a4e2a5b7338bc -DIST eigen-049af2f56331.tar.gz 2485848 BLAKE2B 9d8a91782c9d40b7a6df101d2f43df25b5a3622bc02a7b9576929afb1f2f3d7c8b80671d24f1e31670883003b60c4cc0f3c9dadff0430d2ee047eb5122805edd SHA512 ab37106e9dfebbb42d7919c16b301887607080345b7ed63c8e3b8568489cfdc2c3ca0117a77905162cb3ba8324753040c841d2c96521fa4b9486f0778f1962df -DIST eigen-49177915a14a.tar.gz 2496808 BLAKE2B 4e89b72a2ca121e9d1951a7179434c9eb70104ad45e63ae9811e10e28e32d51386acd2fe6938970404dcada8a377d1b3c07a68a98a68a036a6e85b2cf9ff4b48 SHA512 eb036225b41ffd8cc61ef99d2d22030c0d1e0f87eefcea4dd2b1fdb16a5316e0f4f17527983a00a8a684067654bf1f87c82cfaed5764829778660485ebbfa4b5 DIST eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz 2580537 BLAKE2B 927897c80f3529da40a76ddde26113403926d730fa4539aa9e4121406e8d3852abcfdbc55d178723300e9daa26176f6170db06bb49a59cb190e8c7e6dfdea4dd SHA512 d5461e615044aa94b6ac9ab2815536f4bdf2b9ccfeb578cc7bc62554ba928b4192450f72f1350f3231ed44d2bb90e95218de9a5d0bcee9ec02867499a6dc5db0 DIST eigen-52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c.tar.gz 2585583 BLAKE2B a2ce9da5f962f891cba748f46ce43667ae2b7fef54d4cc83411eafbc24b331e586c44fb135a2c3597c77fe62b0c8ff1172ae5ce6876f00ddd6f6ef2eca802d9c SHA512 65a73d26474547db83b9b40a133dd2a021e0f5a459104f63124461b4aac28bf3579dc81475441b3576901f28f704d6d4624939b22ecfbfbec896148c4c38da7c DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00 @@ -29,8 +22,6 @@ DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1d DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b DIST llvm-387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz 115936989 BLAKE2B 624b4a898321e62002cbf3955f844755b3ba6b1c8acf9a310ddac19cf21f9627902eb0b3684e42bac1fe835be972322a5cc667f78a6e2b0e699f956e0cab81e8 SHA512 09ec39ec7a25703bbb47befb406be3de6d15232c971fa186e33dff80192876a827e35523a9782365e26a90abd42b32b9a2ee1443af71cc23cd825b3ff05df629 -DIST llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz 50144723 BLAKE2B b744756c9782e5506fd6628531409e305bd9ce9a79f1776c4fe674cec5b01a86ab1793dc602f704d295587c3d769d622402a4fe07c0d66269c7f610178693bce SHA512 43f185c8dd38ae7cb048bb9c98fb94e1f43ce66764b43a7141a06a1a0b011389fa139f34b7eaee72c39b8f44aeeff3e7a2189c11d10f8f8a93e9792a1acf2b5f -DIST llvm-b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz 49997477 BLAKE2B 66cbd71a4ad65768fb39fd622efd54a7821b83eb105871e82e0b99074960cb4ebd8197ef984b0be29d5178a7ce3c0d4839d2d611c96fe1507227f7f28fd7e156 SHA512 79c6d4986cedfc132f085d2794f295fdbefa772cb53d3870963d4851ea15ce8e2863aa50c903930abaff53d818ad97acfe8acd1c923ccbe26e3a99ac2397ae9f DIST llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz 115788302 BLAKE2B ea18d6cb3cc8311a78e543996d88831e1ecf1dec58b7c890a80cd8fce86e1c52244b9cfc0d7ce0867480465c2d914555c16cf003bfdcf90056d63e8f4e0ea0c0 SHA512 5422762ffe1022ad4588bcf2bdce1a041c37b5edffed70fcefdd911b2dbf8b52cba9ec57670d48d7b69be6b71e354d333d6eaa5ac5260df56ed8ab18fd98fe88 DIST nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz 107044 BLAKE2B fd018b1d40977add357e98382f41e3fa6456bdc9a181e2d6cc7a3bc7fb98d242b3216b5ed0c40323bbcc006ab5221b49819ebc1dccd0c8dd700d9504f085eed1 SHA512 e66f323abb68feeec41927cc23e3a85d82fd1b7105a6232626edba95acb9eb22b3fb8b28d1a7adb536c47c936f68271fe5d8f66d3059e3128608ad826dd7622e DIST nvidia-nccl-3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz 123898 BLAKE2B 9a268e089877fde9ac900b43bbf829f7dedfa701b017568647e3564670d5457dc18c96846a2cc8674b243c0c7d97d322e7466167c322588af3ad4f2d189b175b SHA512 9b090a963213eb088edf247e72b51a6cc79669f507831b88205c75a006a43f3d2257c4e75a34c33987c7d95c421e2273642db4c716b02907e8de1b1ef5d080f0 @@ -39,14 +30,10 @@ DIST pybind11-v2.3.0.tar.gz 564520 BLAKE2B a7c1485aa8f63a00eccd3103cf9f531a080b0 DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450 DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B cd66dc8a0b4ad3ea586a79ef588c8d68e4f05b6ea89e6d8119b5ee338b9046c11a747ca57c2f80a3c90fab119c05e85f5965571c9e522ccb8a312b95804d1a36 SHA512 b819d050bb38246b503f1eb3d6e7d878d0f166f3602ae3c327749b1f6ddc2b1d6ac7f768b1f1d055b98b7b98812e4643a75bcebc9728c7f615d67ca739761b3e DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856 -DIST tensorflow-1.15.0.tar.gz 46183168 BLAKE2B 5ccd87d5b53d6c543728e9c7ef96f12149bd8729620838b07a28f752fd5c57ef88350c2b62e8c44ec3561469eda38d8a64cbfca5e1ac7850674e1dd2c4d605d6 SHA512 f8683a950be6a3fa234d42e0f46bd9e049280e0c1d203c5c00ad44cf4728d894f2c301939d6d71203f815130a1ead53127adcc7565009589ff5aafc878b4dba7 -DIST tensorflow-2.0.0.tar.gz 46176997 BLAKE2B 761e91a774f61b50459240a83fe52f723a76c2cc3eaf7c371684849cb7365b94fb3743ab8de9adffe64bef0f70da2bb0b7e6426a3f402e436eff841d3edefe8d SHA512 c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6 DIST tensorflow-2.2.0.tar.gz 42100791 BLAKE2B 8b773ae9945ca267af33a34d86f6aef02310976bea1cdd98858d1405e8da845640b72a073b71fcfccb2b73f08600a5eada2c2332a8d9480bba71e9f25dbb2220 SHA512 94a2663497d333d543f363e9fea94fbcfdcdbbc0dfbaf009ba9181a808713aeb78f9b8805f56bea5fd3925a36f105427b3996795750589f378d8afbdadc2b86d DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed -DIST tensorflow-patches-2.2.0.tar.bz2 3197 BLAKE2B e88211e6eaed9818e63680aaa451cad1a0b53e6087e2d8a1c34126e539d509ed5180ce1bdd902f0a0acd357a4e334bb30638d18d15a585465881abf1ecfbb830 SHA512 5370700df4b3741e4f41629684c8bdba28182b5d488df241a8f4f55ba821797d38ef98676b30712c1716310054307fbec03db406d1cf17a7f3430697e8378d2c -EBUILD tensorflow-1.15.0.ebuild 11856 BLAKE2B cfebe23380544388cca0d97bc9b8999deb335a936d8dc5fae86c303bcc1a62fadc024d43e5d60ea931d4cc54130806797252e40269521e7854e027c8c74a2bb2 SHA512 86a012782ea9cbb1af070d4e33497570e557e91c4693956a58e32808e384c5018f5580e45327abba16a5daa485193453cbd08b6c0608a0e0f0299875936470fe -EBUILD tensorflow-2.0.0.ebuild 11912 BLAKE2B 513fb292684c12279384d6642dbde445d9bf01d5ff3086d9251b425a4b0bcd70cf7e80e5c37720528c212158bab1e5f3eb0b822b5a3d2fe8e2a555ff86ee1072 SHA512 dac4c3536e0fbb076395759d3f212fd235915949b5fe5274cfab3ec2597aa6781d279d321617845d697b97ffea64a32e118e4a10e97c97f1e0855166a7ffb20e +DIST tensorflow-patches-2.2.0-r1.tar.bz2 3890 BLAKE2B cf4e0d579992cd09136fe3a11c5016e7b996ea959dad9f3a1ccff2fa623c2c4eab1c6673dfaf08b3b01220fd00c9edd5966e1162049f6d1e4fe5af280f491850 SHA512 8d07c9351b75faf90a137f65c2e6147d884744c5ab9b0bacadfa7bdc7b66ec2ec92920c7d23396bb70f7f4fb290f3f818591f23c6a4e91ab1a79290cb4ea1533 EBUILD tensorflow-2.1.0.ebuild 12365 BLAKE2B d895256b37ee79be36d83745545e6515366b64121c0bd5ec79544827a4492a327ca26593d06ec0b42745ef9bfa213a251eef2bd7c9093d8b461b744035d18cf7 SHA512 d710ea279a2e0b73749a0b4a947a98753e11a6ac14799b9d5e45e3e63afd776aa8047d44d66b831d49df686fea65f0663133f8639080f722fbbd6254d6025b46 -EBUILD tensorflow-2.2.0.ebuild 13469 BLAKE2B 3a94324d6e34b74072cb8df43d9f0f3576e6366ed9dab50436410ddaed2500d03708bb7be799a824798811ff03f384e6eb4a8e494b63e6afcf7a4cfce4e1c87c SHA512 198ee6bf9c0e96fb4b12edf0a703a937b8cc2bf636de5bed47c38658b597f3b5c30fdd3b293c07b57aee6c8b55cfb9e7ee7b453302ffd17cf21c70159a60f297 +EBUILD tensorflow-2.2.0-r1.ebuild 13506 BLAKE2B 075b271e2e559ca7640f1cb86f7392b4bd40a53d518d42f295ae762bcb465498b901fdd24805de76f8e50e5abacc1b47f00397553c471a7b5393ea8eb5dcb8fe SHA512 eb845b0233eab0782fc1213375b091a7a8be54df6796f46cae4863bcb4be92cd7028a30cacc43d9347bf04c14471283aaa0fbb6c56052fa0dd6cb6195b86ca94 MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30 diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch deleted file mode 100644 index 08c7458f7700..000000000000 --- a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9a44d8e10d726cae992e611575b9dcb1627beede Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Wed, 11 Sep 2019 12:08:34 +0800 -Subject: [PATCH 1/2] WORKSPACE: add rules-docker http_archive, - bazel-toolchains uses git_repo - -git_repository() rules cannot pull from --distdir and fail when building -without internet access. Use http_archive instead and pin the sha256 -hash as well. - -Signed-off-by: Jason Zaman <jason@perfinion.com> ---- - WORKSPACE | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/WORKSPACE b/WORKSPACE -index 74ea14d0fd..ccff2ba30f 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -12,6 +12,15 @@ http_archive( - ], - ) - -+http_archive( -+ name = "io_bazel_rules_docker", -+ sha256 = "7d453450e1eb70e238eea6b31f4115607ec1200e91afea01c25f9804f37e39c8", -+ strip_prefix = "rules_docker-0.10.0", -+ urls = [ -+ "https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz", -+ ], -+) -+ - # Load tf_repositories() before loading dependencies for other repository so - # that dependencies like com_google_protobuf won't be overridden. - load("//tensorflow:workspace.bzl", "tf_repositories") --- -2.21.0 - diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch deleted file mode 100644 index f8b72daddfc4..000000000000 --- a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 05f57f785aeb58146b3873d4a0c614d897c56293 Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Wed, 11 Sep 2019 18:18:42 +0800 -Subject: [PATCH 2/2] systemlibs: unbundle functools32 - -Signed-off-by: Jason Zaman <jason@perfinion.com> ---- - tensorflow/workspace.bzl | 1 + - third_party/systemlibs/functools32.BUILD | 15 +++++++++++++++ - third_party/systemlibs/syslibs_configure.bzl | 1 + - 3 files changed, 17 insertions(+) - create mode 100644 third_party/systemlibs/functools32.BUILD - -diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl -index d9fadc1030..760b7cd905 100755 ---- a/tensorflow/workspace.bzl -+++ b/tensorflow/workspace.bzl -@@ -325,6 +325,7 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""): - build_file = clean_dep("//third_party:functools32.BUILD"), - sha256 = "f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d", - strip_prefix = "functools32-3.2.3-2", -+ system_build_file = clean_dep("//third_party/systemlibs:functools32.BUILD"), - urls = [ - "https://storage.googleapis.com/mirror.tensorflow.org/pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz", - "https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz", -diff --git a/third_party/systemlibs/functools32.BUILD b/third_party/systemlibs/functools32.BUILD -new file mode 100644 -index 0000000000..5567ef6943 ---- /dev/null -+++ b/third_party/systemlibs/functools32.BUILD -@@ -0,0 +1,15 @@ -+# Description: -+# functools32 provides a backport of the functools module for Python 2. -+ -+licenses(["notice"]) # Python 2.0 -+ -+package(default_visibility = ["//visibility:public"]) -+ -+filegroup( -+ name = "LICENSE", -+) -+ -+py_library( -+ name = "functools32", -+ srcs_version = "PY2AND3", -+) -diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl -index f83c0dd3d5..0884be8416 100644 ---- a/third_party/systemlibs/syslibs_configure.bzl -+++ b/third_party/systemlibs/syslibs_configure.bzl -@@ -22,6 +22,7 @@ VALID_LIBS = [ - "double_conversion", - "enum34_archive", - "flatbuffers", -+ "functools32_archive", - "gast_archive", - "gif_archive", - "grpc", --- -2.21.0 - diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch deleted file mode 100644 index 4cc2f608d5dc..000000000000 --- a/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/third_party/nccl/build_defs.bzl.tpl b/third_party/nccl/build_defs.bzl.tpl -index 5719139855..5f5c3a1008 100644 ---- a/third_party/nccl/build_defs.bzl.tpl -+++ b/third_party/nccl/build_defs.bzl.tpl -@@ -113,7 +113,6 @@ def _device_link_impl(ctx): - "--cmdline=--compile-only", - "--link", - "--compress-all", -- "--bin2c-path=%s" % bin2c.dirname, - "--create=%s" % tmp_fatbin.path, - "--embedded-fatbin=%s" % fatbin_h.path, - ] + images, diff --git a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild deleted file mode 100644 index 8190ff5d464a..000000000000 --- a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{3_6,3_7} ) -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} - -inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs - -DESCRIPTION="Computation framework using data flow graphs for scalable machine learning" -HOMEPAGE="https://www.tensorflow.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda mpi +python xla" -CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4" -for i in $CPU_USE_FLAGS_X86; do - IUSE+=" cpu_flags_x86_$i" -done - -# distfiles that bazel uses for the workspace, will be copied to basel-distdir -bazel_external_uris=" - http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz - https://bitbucket.org/eigen/eigen/get/49177915a14a.tar.gz -> eigen-49177915a14a.tar.gz - https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz - https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz - https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz - https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz - https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz - https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/rules_swift.0.11.1.tar.gz -> bazelbuild-rules_swift.0.11.1.tar.gz - https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz - https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip - https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz - https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz - https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz - https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz - https://github.com/llvm-mirror/llvm/archive/7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz -> llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz - cuda? ( - https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz - https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip - ) - python? ( - https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz - https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt - https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz - )" - -SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - ${bazel_external_uris}" - -RDEPEND=" - app-arch/snappy - dev-db/lmdb - dev-db/sqlite - dev-libs/double-conversion - dev-libs/icu - ~dev-libs/jsoncpp-1.9.1 - dev-libs/libpcre - dev-libs/nsync - dev-libs/openssl:0= - >=dev-libs/protobuf-3.6.1:= - >=dev-libs/re2-0.2018.04.01 - media-libs/giflib - media-libs/libjpeg-turbo - media-libs/libpng:0 - >=net-libs/grpc-1.22.0 - net-misc/curl - sys-libs/zlib - >=sys-apps/hwloc-2 - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - dev-libs/cudnn - ) - mpi? ( virtual/mpi ) - python? ( - ${PYTHON_DEPS} - >=dev-libs/flatbuffers-1.8.0 - dev-python/absl-py[${PYTHON_USEDEP}] - >=dev-python/astor-0.7.1[${PYTHON_USEDEP}] - dev-python/gast[${PYTHON_USEDEP}] - >=dev-python/numpy-1.16[${PYTHON_USEDEP}] - dev-python/google-pasta[${PYTHON_USEDEP}] - dev-python/opt-einsum[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - >=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}] - >=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}] - >=net-libs/google-cloud-cpp-0.10.0 - >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] - >=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}] - =sci-visualization/tensorboard-1*[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - dev-python/mock" -PDEPEND="python? ( - =sci-libs/tensorflow-estimator-1*[${PYTHON_USEDEP}] - )" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.6.0 - dev-java/java-config - dev-python/mock - dev-lang/swig - dev-python/cython - || ( - =dev-util/bazel-0.24* - =dev-util/bazel-0.27* - ) - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - ) - !python? ( dev-lang/python ) - python? ( - >=dev-python/grpcio-tools-1.22.0 - )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch" - "${FILESDIR}/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch" -) -DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) -CHECKREQS_MEMORY="5G" -CHECKREQS_DISK_BUILD="5G" - -get-cpu-flags() { - local i f=() - # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc. - for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do - use cpu_flags_x86_${i} && f+=( -m${i/_/.} ) - done - use cpu_flags_x86_fma3 && f+=( -mfma ) - echo "${f[*]}" -} - -pkg_setup() { - local num_pythons_enabled - num_pythons_enabled=0 - count_impls(){ - num_pythons_enabled=$((${num_pythons_enabled} + 1)) - } - use python && python_foreach_impl count_impls - - # 5 G to build C/C++ libs, 5G per python impl - CHECKREQS_DISK_BUILD="$((5 + 5 * $num_pythons_enabled))G" - check-reqs_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack "${P}.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - append-flags $(get-cpu-flags) - bazel_setup_bazelrc - - if ver_test "$(cuda_toolkit_version)" -ge "10.2"; then - eapply "${FILESDIR}/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch" - fi - - default - use python && python_copy_sources - - use cuda && cuda_add_sandbox -} - -src_configure() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - do_configure() { - export CC_OPT_FLAGS=" " - export TF_ENABLE_XLA=$(usex xla 1 0) - export TF_NEED_OPENCL_SYCL=0 - export TF_NEED_OPENCL=0 - export TF_NEED_COMPUTECPP=0 - export TF_NEED_ROCM=0 - export TF_NEED_MPI=$(usex mpi 1 0) - export TF_SET_ANDROID_WORKSPACE=0 - - if use python; then - export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="$(python_get_sitedir)" - else - export PYTHON_BIN_PATH="$(which python)" - export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" - fi - - export TF_NEED_CUDA=$(usex cuda 1 0) - export TF_DOWNLOAD_CLANG=0 - export TF_CUDA_CLANG=0 - export TF_NEED_TENSORRT=0 - if use cuda; then - export TF_CUDA_PATHS="${EPREFIX}/opt/cuda" - export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" - export TF_CUDA_VERSION="$(cuda_toolkit_version)" - export TF_CUDNN_VERSION="$(cuda_cudnn_version)" - einfo "Setting CUDA version: $TF_CUDA_VERSION" - einfo "Setting CUDNN version: $TF_CUDNN_VERSION" - - if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then - ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0." - ewarn "These may not be optimal for your GPU." - ewarn "" - ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU," - ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow." - ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5" - ewarn "" - ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" - ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" - fi - fi - - local SYSLIBS=( - absl_py - astor_archive - boringssl - com_github_googleapis_googleapis - com_github_googlecloudplatform_google_cloud_cpp - com_google_protobuf - com_googlesource_code_re2 - curl - cython - double_conversion - enum34_archive - flatbuffers - functools32_archive - gast_archive - gif_archive - grpc - hwloc - icu - jpeg - jsoncpp_git - keras_applications_archive - lmdb - nasm - nsync - opt_einsum_archive - org_sqlite - pasta - pcre - png_archive - six_archive - snappy - swig - termcolor_archive - wrapt - zlib_archive - ) - - export TF_SYSTEM_LIBS="${SYSLIBS[@]}" - export TF_IGNORE_MAX_BAZEL_VERSION=1 - - # This is not autoconf - ./configure || die - - echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die - echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die - echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die - } - if use python; then - python_foreach_impl run_in_build_dir do_configure - else - do_configure - fi -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - if use python; then - python_setup - BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" - fi - - # fail early if any deps are missing - ebazel build --nobuild \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so \ - //tensorflow:libtensorflow_cc.so \ - $(usex python '//tensorflow/tools/pip_package:build_pip_package' '') - - ebazel build \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so - ebazel build //tensorflow:libtensorflow_cc.so - - do_compile() { - ebazel build //tensorflow/tools/pip_package:build_pip_package - } - BUILD_DIR="${S}" - cd "${BUILD_DIR}" - use python && python_foreach_impl run_in_build_dir do_compile - ebazel shutdown -} - -src_install() { - local i j - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - do_install() { - einfo "Installing ${EPYTHON} files" - local srcdir="${T}/src-${MULTIBUILD_VARIANT}" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die - cd "${srcdir}" || die - esetup.py install - - # libtensorflow_framework.so is in /usr/lib already - rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die - python_optimize - } - - if use python; then - python_foreach_impl run_in_build_dir do_install - - # Symlink to python-exec scripts - for i in "${ED}"/usr/lib/python-exec/*/*; do - n="${i##*/}" - [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}" - done - - python_setup - local BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" || die - fi - - einfo "Installing headers" - ebazel build //tensorflow:install_headers - ebazel shutdown - insinto /usr/include/${PN}/ - doins -r bazel-genfiles/tensorflow/include/* - - einfo "Installing libs" - # Generate pkg-config file - ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc ${PN}_cc.pc - - for l in libtensorflow{,_framework,_cc}.so; do - dolib.so bazel-bin/tensorflow/${l} - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1) - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3) - done - - einstalldocs -} diff --git a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild deleted file mode 100644 index 4e04d4e51c6d..000000000000 --- a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild +++ /dev/null @@ -1,359 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{3_6,3_7} ) -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} - -inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs - -DESCRIPTION="Computation framework using data flow graphs for scalable machine learning" -HOMEPAGE="https://www.tensorflow.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda mpi +python xla" -CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4" -for i in $CPU_USE_FLAGS_X86; do - IUSE+=" cpu_flags_x86_$i" -done - -# distfiles that bazel uses for the workspace, will be copied to basel-distdir -bazel_external_uris=" - https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz - https://bitbucket.org/eigen/eigen/get/049af2f56331.tar.gz -> eigen-049af2f56331.tar.gz - https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz - https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz - https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz - https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz - https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz - https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/rules_swift.0.11.1.tar.gz -> bazelbuild-rules_swift.0.11.1.tar.gz - https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz - https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip - https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz - https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz - https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz - https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz - https://github.com/llvm-mirror/llvm/archive/b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz -> llvm-b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz - cuda? ( - https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz - https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip - ) - python? ( - https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz - https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt - https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz - )" - -SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - ${bazel_external_uris}" - -RDEPEND=" - app-arch/snappy - dev-db/lmdb - dev-db/sqlite - dev-libs/double-conversion - dev-libs/icu - ~dev-libs/jsoncpp-1.9.1 - dev-libs/libpcre - dev-libs/nsync - dev-libs/openssl:0= - >=dev-libs/protobuf-3.6.1:= - >=dev-libs/re2-0.2018.04.01 - media-libs/giflib - media-libs/libjpeg-turbo - media-libs/libpng:0 - >=net-libs/grpc-1.22.0 - net-misc/curl - sys-libs/zlib - >=sys-apps/hwloc-2 - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - dev-libs/cudnn - ) - mpi? ( virtual/mpi ) - python? ( - ${PYTHON_DEPS} - >=dev-libs/flatbuffers-1.8.0 - dev-python/absl-py[${PYTHON_USEDEP}] - >=dev-python/astor-0.7.1[${PYTHON_USEDEP}] - dev-python/gast[${PYTHON_USEDEP}] - >=dev-python/numpy-1.16[${PYTHON_USEDEP}] - dev-python/google-pasta[${PYTHON_USEDEP}] - dev-python/opt-einsum[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - >=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}] - >=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}] - >=net-libs/google-cloud-cpp-0.10.0 - >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] - >=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}] - >=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - dev-python/mock" -PDEPEND="python? ( - >=sci-libs/tensorflow-estimator-2.0.0[${PYTHON_USEDEP}] - )" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.6.0 - dev-java/java-config - dev-python/mock - dev-lang/swig - dev-python/cython - || ( - =dev-util/bazel-0.24* - =dev-util/bazel-0.27* - ) - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - ) - !python? ( dev-lang/python ) - python? ( - >=dev-python/grpcio-tools-1.22.0 - )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch" -) -DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) -CHECKREQS_MEMORY="5G" -CHECKREQS_DISK_BUILD="5G" - -get-cpu-flags() { - local i f=() - # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc. - for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do - use cpu_flags_x86_${i} && f+=( -m${i/_/.} ) - done - use cpu_flags_x86_fma3 && f+=( -mfma ) - echo "${f[*]}" -} - -pkg_setup() { - ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities" - ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:" - ewarn "https://www.tensorflow.org/guide/migrate" - - local num_pythons_enabled - num_pythons_enabled=0 - count_impls(){ - num_pythons_enabled=$((${num_pythons_enabled} + 1)) - } - use python && python_foreach_impl count_impls - - # 5G to build C/C++ libs, 5G per python impl - CHECKREQS_DISK_BUILD="$((5 + 5 * ${num_pythons_enabled}))G" - check-reqs_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack "${P}.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - append-flags $(get-cpu-flags) - bazel_setup_bazelrc - - default - use python && python_copy_sources - - use cuda && cuda_add_sandbox -} - -src_configure() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - do_configure() { - export CC_OPT_FLAGS=" " - export TF_ENABLE_XLA=$(usex xla 1 0) - export TF_NEED_OPENCL_SYCL=0 - export TF_NEED_OPENCL=0 - export TF_NEED_COMPUTECPP=0 - export TF_NEED_ROCM=0 - export TF_NEED_MPI=$(usex mpi 1 0) - export TF_SET_ANDROID_WORKSPACE=0 - - if use python; then - export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="$(python_get_sitedir)" - else - export PYTHON_BIN_PATH="$(which python)" - export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" - fi - - export TF_NEED_CUDA=$(usex cuda 1 0) - export TF_DOWNLOAD_CLANG=0 - export TF_CUDA_CLANG=0 - export TF_NEED_TENSORRT=0 - if use cuda; then - export TF_CUDA_PATHS="${EPREFIX}/opt/cuda" - export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" - export TF_CUDA_VERSION="$(cuda_toolkit_version)" - export TF_CUDNN_VERSION="$(cuda_cudnn_version)" - einfo "Setting CUDA version: $TF_CUDA_VERSION" - einfo "Setting CUDNN version: $TF_CUDNN_VERSION" - - if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then - ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0." - ewarn "These may not be optimal for your GPU." - ewarn "" - ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU," - ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow." - ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5" - ewarn "" - ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" - ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" - fi - fi - - local SYSLIBS=( - absl_py - astor_archive - boringssl - com_github_googleapis_googleapis - com_github_googlecloudplatform_google_cloud_cpp - com_google_protobuf - com_googlesource_code_re2 - curl - cython - double_conversion - enum34_archive - flatbuffers - functools32_archive - gast_archive - gif_archive - grpc - hwloc - icu - jpeg - jsoncpp_git - keras_applications_archive - lmdb - nasm - nsync - opt_einsum_archive - org_sqlite - pasta - pcre - png_archive - six_archive - snappy - swig - termcolor_archive - wrapt - zlib_archive - ) - - export TF_SYSTEM_LIBS="${SYSLIBS[@]}" - export TF_IGNORE_MAX_BAZEL_VERSION=1 - - # This is not autoconf - ./configure || die - - echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die - echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die - echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die - } - if use python; then - python_foreach_impl run_in_build_dir do_configure - else - do_configure - fi -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - if use python; then - python_setup - BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" - fi - - # fail early if any deps are missing - ebazel build --nobuild \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so \ - //tensorflow:libtensorflow_cc.so \ - $(usex python '//tensorflow/tools/pip_package:build_pip_package' '') - - ebazel build \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so - ebazel build //tensorflow:libtensorflow_cc.so - - do_compile() { - ebazel build //tensorflow/tools/pip_package:build_pip_package - } - BUILD_DIR="${S}" - cd "${BUILD_DIR}" - use python && python_foreach_impl run_in_build_dir do_compile - ebazel shutdown -} - -src_install() { - local i j - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - do_install() { - einfo "Installing ${EPYTHON} files" - local srcdir="${T}/src-${MULTIBUILD_VARIANT}" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die - cd "${srcdir}" || die - esetup.py install - - # libtensorflow_framework.so is in /usr/lib already - rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die - python_optimize - } - - if use python; then - python_foreach_impl run_in_build_dir do_install - - # Symlink to python-exec scripts - for i in "${ED}"/usr/lib/python-exec/*/*; do - n="${i##*/}" - [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}" - done - - python_setup - local BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" || die - fi - - einfo "Installing headers" - ebazel build //tensorflow:install_headers - ebazel shutdown - insinto /usr/include/${PN}/ - doins -r bazel-genfiles/tensorflow/include/* - - einfo "Installing libs" - # Generate pkg-config file - ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc ${PN}_cc.pc - - for l in libtensorflow{,_framework,_cc}.so; do - dolib.so bazel-bin/tensorflow/${l} - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1) - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3) - done - - einstalldocs -} diff --git a/sci-libs/tensorflow/tensorflow-2.2.0.ebuild b/sci-libs/tensorflow/tensorflow-2.2.0-r1.ebuild index 7abd3707e97f..cefe66efecad 100644 --- a/sci-libs/tensorflow/tensorflow-2.2.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-2.2.0-r1.ebuild @@ -85,12 +85,13 @@ RDEPEND=" mpi? ( virtual/mpi ) python? ( ${PYTHON_DEPS} - >=dev-libs/flatbuffers-1.8.0 + >=dev-libs/flatbuffers-1.12.0 dev-python/absl-py[${PYTHON_USEDEP}] >=dev-python/astor-0.7.1[${PYTHON_USEDEP}] dev-python/astunparse[${PYTHON_USEDEP}] >=dev-python/gast-0.3.3[${PYTHON_USEDEP}] - >=dev-python/numpy-1.16[${PYTHON_USEDEP}] + dev-python/h5py[${PYTHON_USEDEP}] + >=dev-python/numpy-1.19[${PYTHON_USEDEP}] >=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}] dev-python/opt-einsum[${PYTHON_USEDEP}] >=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}] @@ -101,7 +102,7 @@ RDEPEND=" >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] >=sci-libs/keras-preprocessing-1.1.0[${PYTHON_USEDEP}] - >=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}] + >=sci-visualization/tensorboard-2.2.0[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} python? ( @@ -109,7 +110,7 @@ DEPEND="${RDEPEND} dev-python/setuptools )" PDEPEND="python? ( - >=sci-libs/tensorflow-estimator-2.0.0[${PYTHON_USEDEP}] + >=sci-libs/tensorflow-estimator-2.2.0[${PYTHON_USEDEP}] )" BDEPEND=" app-arch/unzip |