summaryrefslogtreecommitdiff
path: root/net-wireless/uhd
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
commit9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-wireless/uhd
parentf516638b7fe9592837389826a6152a7e1b251c54 (diff)
gentoo resync : 13.06.2020
Diffstat (limited to 'net-wireless/uhd')
-rw-r--r--net-wireless/uhd/Manifest26
-rw-r--r--net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch34
-rw-r--r--net-wireless/uhd/files/uhd_man_pages_optional_compress.diff76
-rw-r--r--net-wireless/uhd/uhd-3.10.3.0.ebuild58
-rw-r--r--net-wireless/uhd/uhd-3.11.0.0.ebuild133
-rw-r--r--net-wireless/uhd/uhd-3.12.0.0.ebuild131
-rw-r--r--net-wireless/uhd/uhd-3.13.0.1.ebuild131
-rw-r--r--net-wireless/uhd/uhd-3.13.1.0.ebuild131
-rw-r--r--net-wireless/uhd/uhd-3.14.0.0.ebuild131
-rw-r--r--net-wireless/uhd/uhd-3.15.0.0-r1.ebuild3
-rw-r--r--net-wireless/uhd/uhd-3.15.0.0-r100.ebuild (renamed from net-wireless/uhd/uhd-3.14.1.1.ebuild)31
11 files changed, 22 insertions, 863 deletions
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 30413b10de47..dcc7ba884f91 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,28 +1,6 @@
-AUX uhd-3.10.3.0-tinfo.patch 1680 BLAKE2B 6b31b95c4b63d043e66e5fb41f75b3e73d0e9327d304a211d950bc982209f12425ee716ff2218ceace317ba978ddfe7d0b94961c9feeb0a08dd5454515df7505 SHA512 2c0e6163ddb005b5d02a380033030d111d1eff23f8327aff802e80e449594e48bdd8f2656ffd21c6281233a36ac89d52aa6833e2ea0349276baaef497c463cba
AUX uhd-3.13.1.0-tinfo.patch 2099 BLAKE2B d48ed54fbff7350aaf33a2551ae891384365a66406becf5b315ac14075675da5e3098c7ca8e64f056035e617d84c0ac6695d065c56665c8cc03c8db07bbef31b SHA512 170c77f04d759fd4a2148c04b85adb48c10d5b1ed6363aaf6c3a78ad79c8055ee65434eec7b26db4cb540a5405d2a6d902a2ef4cf60152032128f05ef1e0adf5
-AUX uhd_man_pages_optional_compress.diff 3357 BLAKE2B b1b46def45f4ddad84af04245b5a257bba9e9334ca40aa7712579b51f0f8094fd2a94bb0377368e16fc627d2164678f5aa11d729601b9732c51ac340947b6add SHA512 c5915d57366d50ccbad0cb4a57855a403e4951765595e5f8c9ab5f05fa4ef3b0f7778a242bc097f925f9e90d955ac04aea4d8a5af64d1bdefc19edf85c59d3ab
-DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
-DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
-DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
-DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B 69d84db2b908598545af8175304c19d00bde29d606b6af55e12ed2184d14a08bee7cb229b54dc5f339f587194b493e04f6f584685c2e836f81a9063ffc5e5799 SHA512 83196212326ab43f7996bf297677980f1e2cb2e51fc6479f086e010078d2ff6ee42ffd5af6bdcaaf0d6c45a3e773b117f8bdbf2e8e0add2b8dc6f3e19ad777cd
-DIST EttusResearch-UHD-3.13.1.0.tar.gz 11587157 BLAKE2B 44cd1759c9106c36e149431e655c673ba665b2a632e7bbf598b60950b31d4325921a1fe265d2fc47eb23dd3f90733b1407a6ed522f57ba975a0a4a5d9576c238 SHA512 3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
-DIST EttusResearch-UHD-3.14.0.0.tar.gz 12935658 BLAKE2B 8b5273ee3cd4c39ebb3848152116dc26caac951b3cea4c5e5efe37a90ac3a1e0580e7ed65af9145e4981abf7abd9ef748f9b3c823d87194ce7a4a5f9b799abec SHA512 c4754dbbd3540a41407a3bb31866a83c8ab319375db300113c0d13a3debbc4f0f820ccb83c30079c22388409edd032609cdb77bf6c098b37152b1985f773d1cb
-DIST EttusResearch-UHD-3.14.1.1.tar.gz 12960651 BLAKE2B 8a2a0ac4d1cf71177dad1334dcc7426dc78a0c6b8c1bd895d7eb1ca4e2eb5b9a4208998118ba084f1932edacc7503b49a5ebd78dd1b1d9acbac6fe83f503b9eb SHA512 461f9314dd0af5feed91b18196cccb7828cee91a712dec0bb8b59878d54500906beea9f6dd938a90eae041dca6a1f6b564b6924d8e53e4b2fb507f2ed7be0ff4
DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
-DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
-DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
-DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B 0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842 SHA512 94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
-DIST uhd-images_3.13.1.0.tar.xz 176004828 BLAKE2B 3a476337443f58a55773dd55f3605a37591d73ddd875a2cdb0459adfe93774ebc6c6f380aee7b00b70fd26ca5ac72730fdacd213f31239599227e19b24b9cc2a SHA512 3db7429c99823a7ef48253bb996e284c66f8f44913ed9d48baa3d7553a7d13724cbc1fe2df0032504491b677bdb3d609e3c6c01a580bd717cc311d54aa10d9fa
-DIST uhd-images_3.14.0.0.tar.xz 112971440 BLAKE2B b0aeb77251500c42ccaa753483b20d82113d55f1e2f2e1181a27cd95f6aec1768e8a02c9dbc65db612d04d43e7756c6b6e3d6f662a4e66043b3ec52b44bbeb77 SHA512 a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
-DIST uhd-images_3.14.1.1.tar.xz 113265248 BLAKE2B b1ac40435b8bce5cdc29bbdfd182f65d8d2f7d80b21a835202551e52cdc5d7f3b028faa73850121a79a1ff4df73620b8c36a5cab38cb2fed9c582a48429e0ee3 SHA512 d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd
DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
-DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
-EBUILD uhd-3.10.3.0.ebuild 2043 BLAKE2B 299a8f73dbabe40dafae728cca63636e29ba90b0ee48bec4637bbab4c61668fb2121f6a65808a44696a2c4f8bf5f2bc773d4485a2b6556bc6e7c3e819b5bf1cd SHA512 777d6d6fd40bd74816916dc94e712de0cecc9e5a4275bfff67d69cef63866e9ae75cdaf0ed75bf17591b8667e3f73fda35f513ab13070c40d855b807bc53d93e
-EBUILD uhd-3.11.0.0.ebuild 3926 BLAKE2B 11ff172917ab996d5b02d200ace57b65a6c0761a3c7a68eee8c951c179ac1036ea93b6b928f24a8681a5de885e603c17834667038c1b123f6e9e743281ad4f77 SHA512 3c59fb15a18589526cb6ec3a66ce18dd2ea84c4c5e8546f67e4a53bb2d2f1467840f8578e351b3d04e9b12df184c4316860620e86712b6ba568fd2d3adccbd85
-EBUILD uhd-3.12.0.0.ebuild 3559 BLAKE2B 7f11665bda3d21539142bc9e76ea5b07063dada252c28aa748988c2bec1763ed118772cf9f80b3824915b4e3f6988d33aaca5e6021356b3996c20d0cd6ca9360 SHA512 cdc2a0caadf7f4907a1f550d784e94ba5ca802bcb63203e3db6ea1e35adcf61ab47567a0a9865b02354d2b0342d61f62200dd9ebf625b837a085bf014fac0244
-EBUILD uhd-3.13.0.1.ebuild 3559 BLAKE2B 7f11665bda3d21539142bc9e76ea5b07063dada252c28aa748988c2bec1763ed118772cf9f80b3824915b4e3f6988d33aaca5e6021356b3996c20d0cd6ca9360 SHA512 cdc2a0caadf7f4907a1f550d784e94ba5ca802bcb63203e3db6ea1e35adcf61ab47567a0a9865b02354d2b0342d61f62200dd9ebf625b837a085bf014fac0244
-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-r1.ebuild 3869 BLAKE2B a9fa5020e023c1a216f9a7c719a0f81642bec090b932c55affbd87489b1c5fbe9366c8609d61665ff89b63c6ddcf456f14996019817e37d85feb27d378989c05 SHA512 767734c0377c2163238dbabfe16672ed6552d06e32068b215cede6ca38ce2f2332bbcc8b311be3f2ef7f1a9021ed9b15871a281a03a926ad2c106789a7932ab5
+EBUILD uhd-3.15.0.0-r1.ebuild 3857 BLAKE2B 951e6367365f2fe5e799ee1b8d5509f8adcd2f6a694055a0728bfbe090d010ebadb826f1f5e0d700c3da50d3075c2ef24d1ac44b3c96673a97eff639acb238e9 SHA512 1adaf9d6a7afc1953ecd40eeb47f754fdf10e47ea1aab5561e77dcd2ded6223f4c9414dbf8f1483c8ff32d6ae9cc8e7487c796b796bf3ffafde263fd816270b4
+EBUILD uhd-3.15.0.0-r100.ebuild 3863 BLAKE2B e8eefa884f15a0caf06f3f2a48b0db779eade762d9fc1acab56e0ee9e798c147f460edb0b4ede70e801e2ac74d1aacc3d39bb52e45b6644590860fadaafeaef8 SHA512 765e9f4f4d45ef666bb82f69ce29204a092f8b95ba167164596dfb9fa87789b419cd03cf67a129a793e54453a8f9d02f7f91a4feddc2c95cd1fa39673cc4267e
MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch b/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch
deleted file mode 100644
index ff9956fee41c..000000000000
--- a/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- host/utils/latency/CMakeLists.txt.orig 2017-05-11 19:44:54.824946672 +0300
-+++ host/utils/latency/CMakeLists.txt 2017-05-11 19:45:08.498880360 +0300
-@@ -35,7 +35,8 @@
- GET_FILENAME_COMPONENT(name ${source} NAME_WE)
- ADD_EXECUTABLE(${name} ${source} ${latency_lib_path})
- LIBUHD_APPEND_SOURCES(${name})
-- TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES})
-+ TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES}
-+ ${CURSES_LIBRARIES} tinfo)
- UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name})
- ENDFOREACH(source)
-
---- host/examples/CMakeLists.txt.orig 2017-05-11 19:41:02.322302577 +0300
-+++ host/examples/CMakeLists.txt 2017-05-11 19:44:32.604066325 +0300
-@@ -59,7 +59,7 @@
- IF(CURSES_FOUND)
- INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR})
- ADD_EXECUTABLE(rx_ascii_art_dft rx_ascii_art_dft.cpp)
-- TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES})
-+ TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES})
- UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
- ENDIF(CURSES_FOUND)
-
---- host/CMakeLists.txt.orig 2017-05-11 19:36:38.944798634 +0300
-+++ host/CMakeLists.txt 2017-05-11 19:36:40.819788408 +0300
-@@ -436,6 +436,8 @@
- LIST(APPEND UHD_LINK_LIST_STATIC "usb-1.0")
- ENDIF(ENABLE_USB)
-
-+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo")
-+
- CONFIGURE_FILE(
- ${CMAKE_SOURCE_DIR}/cmake/Modules/UHDConfigVersion.cmake.in
- ${CMAKE_BINARY_DIR}/cmake/Modules/UHDConfigVersion.cmake
diff --git a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
deleted file mode 100644
index 5847d50c66f0..000000000000
--- a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt
-index 240a534db..7a7108f00 100644
---- a/host/docs/CMakeLists.txt
-+++ b/host/docs/CMakeLists.txt
-@@ -144,34 +144,49 @@ set(man_page_sources
- ########################################################################
- # Setup man pages
- ########################################################################
--find_package(GZip)
-+option(ENABLE_MAN_PAGE_COMPRESSION "Compress man pages if installed." ON)
-
- # No elegant way in CMake to reverse a boolean
- if(NOT WIN32)
- set(NOT_WIN32 TRUE)
- endif(NOT WIN32)
-
--LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "GZIP_FOUND;NOT_WIN32" OFF OFF)
-+set(MAN_PAGES_DEPS "NOT_WIN32")
-+
-+message(STATUS "")
-+if(ENABLE_MAN_PAGE_COMPRESSION)
-+ message(STATUS "Compress man pages enabled; looking for compression program")
-+ find_package(GZip)
-+ list(APPEND MAN_PAGES_DEPS "GZIP_FOUND")
-+else(ENABLE_MAN_PAGE_COMPRESSION)
-+ message(STATUS "Compress man pages disabled")
-+endif(ENABLE_MAN_PAGE_COMPRESSION)
-+
-+LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "${MAN_PAGES_DEPS}" OFF OFF)
-
- if(ENABLE_MAN_PAGES)
-- #Generate man pages
-- foreach(manfile ${man_page_sources})
-- #make the gzip file depend on the text file
-- string(REPLACE ".1" "" PROGRAM_NAME "${manfile}")
-- set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz")
-- set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}")
-- add_custom_command(
-- OUTPUT ${gzfile}
-- DEPENDS ${manfile}
-- COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile}
-- COMMENT "Generating ${PROGRAM_NAME} man page"
-- )
--
-- #make the man page target depend on the gz file
-- list(APPEND man_page_gz_files ${gzfile})
-- UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
-- endforeach(manfile ${man_page_sources})
--
-- #make the man pages a build-time dependency
-- add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files})
-+ #Generate man pages; either compressed or not
-+ if(ENABLE_MAN_PAGE_COMPRESSION)
-+ # compress man pages
-+ foreach(manfile ${man_page_sources})
-+ #make the gzip file depend on the text file
-+ string(REPLACE ".1" "" PROGRAM_NAME "${manfile}")
-+ set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz")
-+ set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}")
-+ add_custom_command(
-+ OUTPUT ${gzfile}
-+ DEPENDS ${manfile}
-+ COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile}
-+ COMMENT "Generating ${PROGRAM_NAME} man page"
-+ )
-+ #make the man page target depend on the gz file
-+ list(APPEND man_page_gz_files ${gzfile})
-+ endforeach(manfile ${man_page_sources})
-+ #make the man pages a build-time dependency
-+ UHD_INSTALL(FILES ${man_page_gz_files} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
-+ add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files})
-+ else(ENABLE_MAN_PAGE_COMPRESSION)
-+ # uncompressed man pages; just install them
-+ UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
-+ endif(ENABLE_MAN_PAGE_COMPRESSION)
- endif(ENABLE_MAN_PAGES)
diff --git a/net-wireless/uhd/uhd-3.10.3.0.ebuild b/net-wireless/uhd/uhd-3.10.3.0.ebuild
deleted file mode 100644
index 9a1c22cdf241..000000000000
--- a/net-wireless/uhd/uhd-3.10.3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).$(get_version_component_range 4).tar.gz \
- http://files.ettus.com/binaries/images/${image_version}.zip"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- virtual/libusb:1
- dev-lang/orc
- dev-libs/boost:=
- sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
- dev-python/mako
- dev-python/cheetah
- app-arch/unzip
-"
-
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
-
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host
-
-src_prepare() {
- cmake-utils_src_prepare
-
- gnome2_environment_reset #534582
-
- #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
-}
-
-src_install() {
- cmake-utils_src_install
- python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- insinto /lib/udev/rules.d/
- doins "${S}"/utils/uhd-usrp.rules
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
-}
diff --git a/net-wireless/uhd/uhd-3.11.0.0.ebuild b/net-wireless/uhd/uhd-3.11.0.0.ebuild
deleted file mode 100644
index f24e3c0eb34d..000000000000
--- a/net-wireless/uhd/uhd-3.11.0.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
- https://github.com/EttusResearch/uhd/releases/download/release_003_011_000_000/uhd_${PV}_images.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- b100? ( usb )
- b200? ( usb )
- usrp1? ( usb )
- usrp2? ( usb )
- || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
- e300? ( virtual/udev )
- usb? ( virtual/libusb:1 )
- dev-libs/boost:=
- sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- dev-python/mako
- app-arch/unzip
- app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host"
-
-src_unpack() {
- unpack EttusResearch-UHD-${PV}.tar.gz
- mkdir images || die
- cd images || die
- unpack uhd_${PV}_images.tar.xz
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- gnome2_environment_reset #534582
-
- #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
-}
-
-src_configure() {
- mycmakeargs=(
- -DENABLE_LIBUHD=ON
- -DENABLE_C_API=ON
- -DENABLE_LIBERIO=OFF
- -DENABLE_MAN_PAGES=ON
- -DENABLE_GPSD=OFF
- -DENABLE_EXAMPLES="$(usex examples)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_USB="$(usex usb)"
- -DENABLE_UTILS="$(usex utils)"
- -DENABLE_MANUAL="$(usex doc)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_B100="$(usex b100)"
- -DENABLE_B200="$(usex b200)"
- -DENABLE_E300="$(usex e300)"
- -DENABLE_USRP1="$(usex usrp1)"
- -DENABLE_USRP2="$(usex usrp2)"
- -DENABLE_X300="$(usex x300)"
- -DENABLE_N230="$(usex n230)"
- -DENABLE_MPMD="$(usex mpmd)"
- -DENABLE_OCTOCLOCK="$(usex octoclock)"
- )
- cmake-utils_src_configure
-}
-src_install() {
- cmake-utils_src_install
- use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [ "${PV}" != "9999" ]; then
- rm -rf "${ED}/usr/bin/uhd_images_downloader"
- rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
- fi
-
- insinto /lib/udev/rules.d/
- doins "${S}/utils/uhd-usrp.rules"
-
- rm -rf "${WORKDIR}/images/winusb_driver"
- if ! use b100; then
- rm "${WORKDIR}"/images/usrp_b100* || die
- fi
- if ! use b200; then
- rm "${WORKDIR}"/images/usrp_b2[01]* || die
- fi
- if ! use e300; then
- rm "${WORKDIR}"/images/usrp_e3* || die
- fi
- if ! use mpmd; then
- rm "${WORKDIR}"/images/usrp_n310* || die
- fi
- if ! use n230; then
- rm "${WORKDIR}"/images/usrp_n230* || die
- fi
- if ! use octoclock; then
- rm "${WORKDIR}"/images/octoclock* || die
- fi
- if ! use usrp1; then
- rm "${WORKDIR}"/images/usrp1* || die
- fi
- if ! use usrp2; then
- rm "${WORKDIR}"/images/usrp2* || die
- rm "${WORKDIR}"/images/usrp_n2[01]* || die
- rm -r "${WORKDIR}"/images/bit || die
- fi
- if ! use x300; then
- rm "${WORKDIR}/"images/usrp_x3* || die
- fi
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.12.0.0.ebuild b/net-wireless/uhd/uhd-3.12.0.0.ebuild
deleted file mode 100644
index 35c0d6bfeb77..000000000000
--- a/net-wireless/uhd/uhd-3.12.0.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
- https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- b100? ( usb )
- b200? ( usb )
- usrp1? ( usb )
- usrp2? ( usb )
- || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
- e300? ( virtual/udev )
- usb? ( virtual/libusb:1 )
- dev-libs/boost:=
- sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- dev-python/mako
- app-arch/unzip
- app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
- default
- mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- gnome2_environment_reset #534582
-
- #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
-}
-
-src_configure() {
- mycmakeargs=(
- -DENABLE_LIBUHD=ON
- -DENABLE_C_API=ON
- -DENABLE_LIBERIO=OFF
- -DENABLE_MAN_PAGES=ON
- -DENABLE_GPSD=OFF
- -DENABLE_EXAMPLES="$(usex examples)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_USB="$(usex usb)"
- -DENABLE_UTILS="$(usex utils)"
- -DENABLE_MANUAL="$(usex doc)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_B100="$(usex b100)"
- -DENABLE_B200="$(usex b200)"
- -DENABLE_E300="$(usex e300)"
- -DENABLE_USRP1="$(usex usrp1)"
- -DENABLE_USRP2="$(usex usrp2)"
- -DENABLE_X300="$(usex x300)"
- -DENABLE_N230="$(usex n230)"
- -DENABLE_MPMD="$(usex mpmd)"
- -DENABLE_OCTOCLOCK="$(usex octoclock)"
- )
- cmake-utils_src_configure
-}
-src_install() {
- cmake-utils_src_install
- use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [ "${PV}" != "9999" ]; then
- rm -rf "${ED}/usr/bin/uhd_images_downloader"
- rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
- fi
-
- insinto /lib/udev/rules.d/
- doins "${S}/utils/uhd-usrp.rules"
-
- rm -rf "${WORKDIR}/images/winusb_driver"
- if ! use b100; then
- rm "${WORKDIR}"/images/usrp_b100* || die
- fi
- if ! use b200; then
- rm "${WORKDIR}"/images/usrp_b2[01]* || die
- fi
- if ! use e300; then
- rm "${WORKDIR}"/images/usrp_e3* || die
- fi
- if ! use mpmd; then
- rm "${WORKDIR}"/images/usrp_n310* || die
- fi
- if ! use n230; then
- rm "${WORKDIR}"/images/usrp_n230* || die
- fi
- if ! use octoclock; then
- rm "${WORKDIR}"/images/octoclock* || die
- fi
- if ! use usrp1; then
- rm "${WORKDIR}"/images/usrp1* || die
- fi
- if ! use usrp2; then
- rm "${WORKDIR}"/images/usrp2* || die
- rm "${WORKDIR}"/images/usrp_n2[01]* || die
- rm -r "${WORKDIR}"/images/bit || die
- fi
- if ! use x300; then
- rm "${WORKDIR}/"images/usrp_x3* || die
- fi
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.13.0.1.ebuild b/net-wireless/uhd/uhd-3.13.0.1.ebuild
deleted file mode 100644
index 35c0d6bfeb77..000000000000
--- a/net-wireless/uhd/uhd-3.13.0.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
- https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- b100? ( usb )
- b200? ( usb )
- usrp1? ( usb )
- usrp2? ( usb )
- || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
- e300? ( virtual/udev )
- usb? ( virtual/libusb:1 )
- dev-libs/boost:=
- sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- dev-python/mako
- app-arch/unzip
- app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
- default
- mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- gnome2_environment_reset #534582
-
- #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
-}
-
-src_configure() {
- mycmakeargs=(
- -DENABLE_LIBUHD=ON
- -DENABLE_C_API=ON
- -DENABLE_LIBERIO=OFF
- -DENABLE_MAN_PAGES=ON
- -DENABLE_GPSD=OFF
- -DENABLE_EXAMPLES="$(usex examples)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_USB="$(usex usb)"
- -DENABLE_UTILS="$(usex utils)"
- -DENABLE_MANUAL="$(usex doc)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_B100="$(usex b100)"
- -DENABLE_B200="$(usex b200)"
- -DENABLE_E300="$(usex e300)"
- -DENABLE_USRP1="$(usex usrp1)"
- -DENABLE_USRP2="$(usex usrp2)"
- -DENABLE_X300="$(usex x300)"
- -DENABLE_N230="$(usex n230)"
- -DENABLE_MPMD="$(usex mpmd)"
- -DENABLE_OCTOCLOCK="$(usex octoclock)"
- )
- cmake-utils_src_configure
-}
-src_install() {
- cmake-utils_src_install
- use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [ "${PV}" != "9999" ]; then
- rm -rf "${ED}/usr/bin/uhd_images_downloader"
- rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
- fi
-
- insinto /lib/udev/rules.d/
- doins "${S}/utils/uhd-usrp.rules"
-
- rm -rf "${WORKDIR}/images/winusb_driver"
- if ! use b100; then
- rm "${WORKDIR}"/images/usrp_b100* || die
- fi
- if ! use b200; then
- rm "${WORKDIR}"/images/usrp_b2[01]* || die
- fi
- if ! use e300; then
- rm "${WORKDIR}"/images/usrp_e3* || die
- fi
- if ! use mpmd; then
- rm "${WORKDIR}"/images/usrp_n310* || die
- fi
- if ! use n230; then
- rm "${WORKDIR}"/images/usrp_n230* || die
- fi
- if ! use octoclock; then
- rm "${WORKDIR}"/images/octoclock* || die
- fi
- if ! use usrp1; then
- rm "${WORKDIR}"/images/usrp1* || die
- fi
- if ! use usrp2; then
- rm "${WORKDIR}"/images/usrp2* || die
- rm "${WORKDIR}"/images/usrp_n2[01]* || die
- rm -r "${WORKDIR}"/images/bit || die
- fi
- if ! use x300; then
- rm "${WORKDIR}/"images/usrp_x3* || die
- fi
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.13.1.0.ebuild b/net-wireless/uhd/uhd-3.13.1.0.ebuild
deleted file mode 100644
index c0012fc33e0d..000000000000
--- a/net-wireless/uhd/uhd-3.13.1.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
- https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- b100? ( usb )
- b200? ( usb )
- usrp1? ( usb )
- usrp2? ( usb )
- || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
- e300? ( virtual/udev )
- usb? ( virtual/libusb:1 )
- dev-libs/boost:=
- sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- dev-python/mako
- app-arch/unzip
- app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
- default
- mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- gnome2_environment_reset #534582
-
- #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
-}
-
-src_configure() {
- mycmakeargs=(
- -DENABLE_LIBUHD=ON
- -DENABLE_C_API=ON
- -DENABLE_LIBERIO=OFF
- -DENABLE_MAN_PAGES=ON
- -DENABLE_GPSD=OFF
- -DENABLE_EXAMPLES="$(usex examples)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_USB="$(usex usb)"
- -DENABLE_UTILS="$(usex utils)"
- -DENABLE_MANUAL="$(usex doc)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_B100="$(usex b100)"
- -DENABLE_B200="$(usex b200)"
- -DENABLE_E300="$(usex e300)"
- -DENABLE_USRP1="$(usex usrp1)"
- -DENABLE_USRP2="$(usex usrp2)"
- -DENABLE_X300="$(usex x300)"
- -DENABLE_N230="$(usex n230)"
- -DENABLE_MPMD="$(usex mpmd)"
- -DENABLE_OCTOCLOCK="$(usex octoclock)"
- )
- cmake-utils_src_configure
-}
-src_install() {
- cmake-utils_src_install
- use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [ "${PV}" != "9999" ]; then
- rm -rf "${ED}/usr/bin/uhd_images_downloader"
- rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
- fi
-
- insinto /lib/udev/rules.d/
- doins "${S}/utils/uhd-usrp.rules"
-
- rm -rf "${WORKDIR}/images/winusb_driver"
- if ! use b100; then
- rm "${WORKDIR}"/images/usrp_b100* || die
- fi
- if ! use b200; then
- rm "${WORKDIR}"/images/usrp_b2[01]* || die
- fi
- if ! use e300; then
- rm "${WORKDIR}"/images/usrp_e3* || die
- fi
- if ! use mpmd; then
- rm "${WORKDIR}"/images/usrp_n310* || die
- fi
- if ! use n230; then
- rm "${WORKDIR}"/images/usrp_n230* || die
- fi
- if ! use octoclock; then
- rm "${WORKDIR}"/images/octoclock* || die
- fi
- if ! use usrp1; then
- rm "${WORKDIR}"/images/usrp1* || die
- fi
- if ! use usrp2; then
- rm "${WORKDIR}"/images/usrp2* || die
- rm "${WORKDIR}"/images/usrp_n2[01]* || die
- rm -r "${WORKDIR}"/images/bit || die
- fi
- if ! use x300; then
- rm "${WORKDIR}/"images/usrp_x3* || die
- fi
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.14.0.0.ebuild b/net-wireless/uhd/uhd-3.14.0.0.ebuild
deleted file mode 100644
index c0012fc33e0d..000000000000
--- a/net-wireless/uhd/uhd-3.14.0.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
- https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- b100? ( usb )
- b200? ( usb )
- usrp1? ( usb )
- usrp2? ( usb )
- || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
- e300? ( virtual/udev )
- usb? ( virtual/libusb:1 )
- dev-libs/boost:=
- sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- dev-python/mako
- app-arch/unzip
- app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
- default
- mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- gnome2_environment_reset #534582
-
- #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
-}
-
-src_configure() {
- mycmakeargs=(
- -DENABLE_LIBUHD=ON
- -DENABLE_C_API=ON
- -DENABLE_LIBERIO=OFF
- -DENABLE_MAN_PAGES=ON
- -DENABLE_GPSD=OFF
- -DENABLE_EXAMPLES="$(usex examples)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_USB="$(usex usb)"
- -DENABLE_UTILS="$(usex utils)"
- -DENABLE_MANUAL="$(usex doc)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_B100="$(usex b100)"
- -DENABLE_B200="$(usex b200)"
- -DENABLE_E300="$(usex e300)"
- -DENABLE_USRP1="$(usex usrp1)"
- -DENABLE_USRP2="$(usex usrp2)"
- -DENABLE_X300="$(usex x300)"
- -DENABLE_N230="$(usex n230)"
- -DENABLE_MPMD="$(usex mpmd)"
- -DENABLE_OCTOCLOCK="$(usex octoclock)"
- )
- cmake-utils_src_configure
-}
-src_install() {
- cmake-utils_src_install
- use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [ "${PV}" != "9999" ]; then
- rm -rf "${ED}/usr/bin/uhd_images_downloader"
- rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
- fi
-
- insinto /lib/udev/rules.d/
- doins "${S}/utils/uhd-usrp.rules"
-
- rm -rf "${WORKDIR}/images/winusb_driver"
- if ! use b100; then
- rm "${WORKDIR}"/images/usrp_b100* || die
- fi
- if ! use b200; then
- rm "${WORKDIR}"/images/usrp_b2[01]* || die
- fi
- if ! use e300; then
- rm "${WORKDIR}"/images/usrp_e3* || die
- fi
- if ! use mpmd; then
- rm "${WORKDIR}"/images/usrp_n310* || die
- fi
- if ! use n230; then
- rm "${WORKDIR}"/images/usrp_n230* || die
- fi
- if ! use octoclock; then
- rm "${WORKDIR}"/images/octoclock* || die
- fi
- if ! use usrp1; then
- rm "${WORKDIR}"/images/usrp1* || die
- fi
- if ! use usrp2; then
- rm "${WORKDIR}"/images/usrp2* || die
- rm "${WORKDIR}"/images/usrp_n2[01]* || die
- rm -r "${WORKDIR}"/images/bit || die
- fi
- if ! use x300; then
- rm "${WORKDIR}/"images/usrp_x3* || die
- fi
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}/images"
-}
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
index 0bc67971a97c..21c29ff40be4 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1-3)"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
b100? ( usb )
@@ -78,7 +78,6 @@ src_configure() {
-DENABLE_C_API=ON
-DENABLE_LIBERIO=OFF
-DENABLE_MAN_PAGES=ON
- -DENABLE_GPSD=OFF
-DENABLE_MAN_PAGE_COMPRESSION=OFF
-DENABLE_EXAMPLES="$(usex examples)"
-DENABLE_TESTS="$(usex test)"
diff --git a/net-wireless/uhd/uhd-3.14.1.1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 3d733a2b4f07..ea6367419269 100644
--- a/net-wireless/uhd/uhd-3.14.1.1.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
#not sure why, but eapi 7 fails
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1-3)"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
b100? ( usb )
@@ -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
"
@@ -52,16 +61,15 @@ src_unpack() {
}
src_prepare() {
- cd ..
- eapply "${FILESDIR}"/uhd_man_pages_optional_compress.diff
- cd host
-
cmake-utils_src_prepare
gnome2_environment_reset #534582
#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() {
@@ -70,7 +78,6 @@ src_configure() {
-DENABLE_C_API=ON
-DENABLE_LIBERIO=OFF
-DENABLE_MAN_PAGES=ON
- -DENABLE_GPSD=OFF
-DENABLE_MAN_PAGE_COMPRESSION=OFF
-DENABLE_EXAMPLES="$(usex examples)"
-DENABLE_TESTS="$(usex test)"
@@ -87,11 +94,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"
@@ -133,7 +143,4 @@ src_install() {
fi
insinto /usr/share/${PN}
doins -r "${WORKDIR}/images"
-
- #fix doc location
- mv "${ED}"/usr/share/doc/uhd "${ED}/usr/share/doc/${PF}" || die
}