diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-wireless/uhd | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-wireless/uhd')
| -rw-r--r-- | net-wireless/uhd/Manifest | 2 | ||||
| -rw-r--r-- | net-wireless/uhd/uhd-3.15.0.0-r1.ebuild (renamed from net-wireless/uhd/uhd-3.15.0.0.ebuild) | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index 2a7372f48d91..30413b10de47 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -24,5 +24,5 @@ EBUILD uhd-3.13.0.1.ebuild 3559 BLAKE2B 7f11665bda3d21539142bc9e76ea5b07063dada2 EBUILD uhd-3.13.1.0.ebuild 3559 BLAKE2B 400f807fd8627dd8cc9545c1e180058f9d4a3475fe24730a5aac571a8759ebdb80cfac9ca09bf73556bc83812d7679fc6929788e5abb1d70cfb8947543391c24 SHA512 61845e49ea0002cc82e1a4bc0d30e174f3148cc3b8d2e08d88beb518484a782446476274f9170c4a7ab6563ee2cd4d452193fad8b79228108990cab957a8e25e EBUILD uhd-3.14.0.0.ebuild 3559 BLAKE2B 400f807fd8627dd8cc9545c1e180058f9d4a3475fe24730a5aac571a8759ebdb80cfac9ca09bf73556bc83812d7679fc6929788e5abb1d70cfb8947543391c24 SHA512 61845e49ea0002cc82e1a4bc0d30e174f3148cc3b8d2e08d88beb518484a782446476274f9170c4a7ab6563ee2cd4d452193fad8b79228108990cab957a8e25e EBUILD uhd-3.14.1.1.ebuild 3560 BLAKE2B c1726a482dddd447c3fd7489327df27c347d10e5645e16589a58269573dee36d607b1495e4af8600e95a2b9a26ac9c9bf42445df86d6e6f42a57cea36bd7364a SHA512 c8d99f46a12d8c47565163cabc66da914a56db3a4d61c71ea02e4686ffb719fa12465259c117bbd77449b297842ec6554635b436c5cb870ed926f1e29bc201c4 -EBUILD uhd-3.15.0.0.ebuild 3399 BLAKE2B 5feeb8f904ea3bca11e43eff040c9ca42f24e089199714a74b1f3f1acb30db82f8aa680c95ba35275419fe30d4ce0aa10dea16ebeadacddd8ea1c1d99ac948d1 SHA512 55cbca459b5ae0c12f7ecf00ffaec05ce7ffdc8b7aac405c53e2c8c027b6c2c7ff295cc4da557b60c3a93111bcbe8d885111af307cabff8afb86c57a279e7902 +EBUILD uhd-3.15.0.0-r1.ebuild 3869 BLAKE2B a9fa5020e023c1a216f9a7c719a0f81642bec090b932c55affbd87489b1c5fbe9366c8609d61665ff89b63c6ddcf456f14996019817e37d85feb27d378989c05 SHA512 767734c0377c2163238dbabfe16672ed6552d06e32068b215cede6ca38ce2f2332bbcc8b311be3f2ef7f1a9021ed9b15871a281a03a926ad2c106789a7932ab5 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777 diff --git a/net-wireless/uhd/uhd-3.15.0.0.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild index c73dca778cdb..0bc67971a97c 100644 --- a/net-wireless/uhd/uhd-3.15.0.0.ebuild +++ b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild @@ -33,11 +33,20 @@ RDEPEND="${PYTHON_DEPS} usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] + $(python_gen_cond_dep ' + || ( + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ) + dev-python/requests[${PYTHON_MULTI_USEDEP}] + ') " DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) - dev-python/mako + $(python_gen_cond_dep ' + dev-python/mako[${PYTHON_MULTI_USEDEP}] + ') app-arch/unzip app-arch/gzip " @@ -58,6 +67,9 @@ src_prepare() { #this may not be needed in 3.4.3 and above, please verify sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die + + #rpath is set for apple and no one else, just remove the conditional + sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die } src_configure() { @@ -83,11 +95,14 @@ src_configure() { -DENABLE_N230="$(usex n230)" -DENABLE_MPMD="$(usex mpmd)" -DENABLE_OCTOCLOCK="$(usex octoclock)" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" ) cmake-utils_src_configure } src_install() { cmake-utils_src_install + python_optimize use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ if [ "${PV}" != "9999" ]; then rm -rf "${ED}/usr/bin/uhd_images_downloader" |