commit: 6791726e7a7cf216007dc46c9bccfc6a888a6bef
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 1 17:53:22 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct 1 17:53:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6791726e
net-wireless/uhd: bump, minor QA
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 2 +
.../uhd/files/uhd_man_pages_optional_compress.diff | 76 ++++++++++++
net-wireless/uhd/uhd-3.14.1.1.ebuild | 138 +++++++++++++++++++++
3 files changed, 216 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 59017e8c6a0..ff210d1f574 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -4,9 +4,11 @@ DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B
7fdbef49482166d929952848d
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 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_3.11.0.0_images.tar.xz 73634376 BLAKE2B
1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e
SHA512
1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
diff --git a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
new file mode 100644
index 00000000000..5847d50c66f
--- /dev/null
+++ b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
@@ -0,0 +1,76 @@
+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.14.1.1.ebuild
b/net-wireless/uhd/uhd-3.14.1.1.ebuild
new file mode 100644
index 00000000000..8f61652cc09
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.14.1.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 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 )
+
+inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com";
+
+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/$(ver_cut 1-3)"
+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() {
+ 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
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_LIBUHD=ON
+ -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)"
+ -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"
+ 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"
+
+ #fix doc location
+ mv "${ED}"/usr/share/doc/uhd "${ED}/usr/share/doc/${PF}" || die
+}
