gentoo resync : 12.01.2019

3 files changed, 179 insertions, 0 deletions

diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 63b97292c7bc..2342e6634392 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,14 +1,18 @@
 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
 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 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_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 3902 BLAKE2B 34d21ac5fca3a00b255bb0dbae36d5930416013d79a7544d0c365c0f3cdd6df5a9418cc5a4196968e15b469312522545ce6c360103bfd76191aa6595a777e5fe SHA512 1ee713c893dbf749851df9a4e628504b7a3bd907b3a9f06de3444656e101d63ab6f85a0b201658da3afce3a03389dba027fde92b09076976289694cb091ab498
 EBUILD uhd-3.12.0.0.ebuild 3535 BLAKE2B cde3b15683186acf7f2eb877609df487c83afb924718076b591e5670eee32634867e658088d88edab7ebf3b3346572b4c3a19b070169e5e78a9e72962a35bf90 SHA512 6e6cb73b52e631dc7ac6274f77756846d5252e73e7b95c28b639ff1713be1bbca0ab333aaecd971553433fe49ebbd61ab18f9be04b2ff0b81bdf9a45e0ceb8c8
 EBUILD uhd-3.13.0.1.ebuild 3535 BLAKE2B cde3b15683186acf7f2eb877609df487c83afb924718076b591e5670eee32634867e658088d88edab7ebf3b3346572b4c3a19b070169e5e78a9e72962a35bf90 SHA512 6e6cb73b52e631dc7ac6274f77756846d5252e73e7b95c28b639ff1713be1bbca0ab333aaecd971553433fe49ebbd61ab18f9be04b2ff0b81bdf9a45e0ceb8c8
+EBUILD uhd-3.13.1.0.ebuild 3532 BLAKE2B db3b8f22560bb2897c4ef4445addbfa5b715f3be9ba14c21a61d5eb4bd7f8eeb597eeaa9ca86b6acf14cdf752626c66e4727df61f157f2cd1478a6a7456945d1 SHA512 c59999e1df4420385d242ffe8a3b326d39688b1a160d31c3eff479aea43a9f9ec5f8f0deea762a7955af045b1d7169e18edee3c6778d7e3d8a2b40b8121a3c68
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch b/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch
new file mode 100644
index 000000000000..de165e9deebf
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch
@@ -0,0 +1,45 @@
+diff --git host/CMakeLists.txt host/CMakeLists.txt
+index 2337396e7..3a77776a0 100644
+--- host/CMakeLists.txt
++++ host/CMakeLists.txt
+@@ -531,6 +531,9 @@ endforeach(Boost_Comp)
+ if(ENABLE_USB)
+     list(APPEND UHD_LINK_LIST_STATIC "usb-1.0")
+ endif(ENABLE_USB)
++
++LIST(APPEND UHD_LINK_LIST_STATIC "tinfo")
++
+ # UHDConfig.cmake also needs UHD_RFNOC_FOUND
+ if(ENABLE_RFNOC)
+     set(UHD_RFNOC_FOUND "TRUE")
+diff --git host/examples/CMakeLists.txt host/examples/CMakeLists.txt
+index b384d978c..402aded94 100644
+--- host/examples/CMakeLists.txt
++++ host/examples/CMakeLists.txt
+@@ -58,11 +58,11 @@ find_package(Curses)
+ 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)
+ 
+     add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp)
+-    target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES})
++    target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES})
+     UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
+ endif(CURSES_FOUND)
+ 
+diff --git host/utils/latency/CMakeLists.txt host/utils/latency/CMakeLists.txt
+index 05bacd77a..d3b1449a6 100644
+--- host/utils/latency/CMakeLists.txt
++++ host/utils/latency/CMakeLists.txt
+@@ -25,7 +25,7 @@ if(CURSES_FOUND)
+         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} tinfo ${CURSES_LIBRARIES})
+     	UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name})
+     endforeach(source)
+ 
diff --git a/net-wireless/uhd/uhd-3.13.1.0.ebuild b/net-wireless/uhd/uhd-3.13.1.0.ebuild
new file mode 100644
index 000000000000..3d955335e62c
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.13.1.0.ebuild
@@ -0,0 +1,130 @@
+# 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"
+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"
+}