diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
| commit | 71deace00d1a2b091313fe137ab7092418c6f87c (patch) | |
| tree | 9f1f0dee23e13658e52f49437befe78427148c51 /media-libs/opencv | |
| parent | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff) | |
gentoo resync : 10.02.2020
Diffstat (limited to 'media-libs/opencv')
| -rw-r--r-- | media-libs/opencv/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.4.13-r4.ebuild (renamed from media-libs/opencv/opencv-2.4.13-r3.ebuild) | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 28a8fad17acd..18f3994454bb 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -27,7 +27,7 @@ DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 -EBUILD opencv-2.4.13-r3.ebuild 5981 BLAKE2B 82922ac811bc4a27fabbd4ee329b6646066211707496be14c86dc044395daaceb5fa3d0683d5e5eeb73d4ba765d2e8a62dd3323b257612e32d0afef2326ca83f SHA512 c62c40a50aadd992142ffaf389c5ea895f55a87d693928f74cf6b4ac9bc2363dd5e6729cb3cab06ba8141eafd8853d194f252de532322fa625a3d8de852aafac +EBUILD opencv-2.4.13-r4.ebuild 6028 BLAKE2B 49e634cf091fdbaf69e518f2fde2f3916bdaf39b0fed413d253c22f3c823ef132d49c2c7891b2c6d73e3a7c9b1e3b8efe999940d4d5aff50844b4ad9a5728eb6 SHA512 464e49cf782cabe002d3d5c499932c31cde6ec69658330a8040eb7cbd8a56e94f94ca3cf073780665066e34ee06c338dadbddc18602c6f900a9922ae1edcba74 EBUILD opencv-3.4.1-r7.ebuild 18644 BLAKE2B 636275f9a39e3fef49f59d2d93e4fe288e73de35e210aec8ec7982058e1f0c98d25a7e7e9ffd85aeccf088225058357c2d7e23330d4a912e3f345a501735a030 SHA512 eba05037ccbdf8858aa799dddad2ddbc031677a69ed808d324e4aa2ae10a29f7f6c0424f92892ea8cdbcf3915da4b47f2a97227bfa35fe390e43c3f5d0439cb5 EBUILD opencv-4.1.2-r1.ebuild 18329 BLAKE2B f917c45b9d91c362c1470f41ef6f4ad72b5c45d4c3c2c2901a714ebe5898cc3a742ae8a7d15646399d3568bff70b32e63d5d5f82cb6da12864aab88ca98e8cfb SHA512 4ee76673c4284546aa9018cdde1e2b2278e64650695fac63d1677c79beae28dd18b696c19dea7e30d661a9a2dcca22b11bd272c736a582a5b2049029497c4269 EBUILD opencv-4.1.2-r2.ebuild 18370 BLAKE2B 347aad52543221205f22bf1672b540bb67eb917065b9cb2c9f1dc113ecb4ba967851912ba7abeb48c00a2d3ae076e0a46d51c8a8e682ef8e12401b88627fa8e3 SHA512 c9b204281dee9ca4ba73ee2bca2dfe54d837944a05f8f4f890ec8b82a4177e5d2095c31adbd9a64cf58679f23ebe68cbcb728d3cd8aa0cfe0d0484f8bff29c5a diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r4.ebuild index caceec0fd66e..e678316f625b 100644 --- a/media-libs/opencv/opencv-2.4.13-r3.ebuild +++ b/media-libs/opencv/opencv-2.4.13-r4.ebuild @@ -53,10 +53,12 @@ RDEPEND=" png? ( media-libs/libpng:0= ) python? ( ${PYTHON_DEPS} - || ( - dev-python/numpy-python2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep ' + || ( + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ) + ') ) qt5? ( dev-qt/qtconcurrent:5 |