From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 467B3138334 for ; Wed, 6 Jun 2018 08:14:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91C67E09FB; Wed, 6 Jun 2018 08:13:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3218DE09DB for ; Wed, 6 Jun 2018 08:13:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4422335C8C for ; Wed, 6 Jun 2018 08:13:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBF092D6 for ; Wed, 6 Jun 2018 08:13:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1528272666.8d2de4e17c178c9635b839528a4f5e86bad5666a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/uhd/Manifest net-wireless/uhd/files/uhd-3.9.6-tinfo.patch net-wireless/uhd/uhd-3.9.6.ebuild X-VCS-Directories: net-wireless/uhd/files/ net-wireless/uhd/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8d2de4e17c178c9635b839528a4f5e86bad5666a X-VCS-Branch: master Date: Wed, 6 Jun 2018 08:13:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b022e05d-7ab2-44d3-ab25-94c969ae8712 X-Archives-Hash: 9f9fb8f368988c7dca66ab9b2e3dc3ac commit: 8d2de4e17c178c9635b839528a4f5e86bad5666a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 3 12:43:44 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 6 08:11:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d2de4e1 net-wireless/uhd: Drop old Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-wireless/uhd/Manifest | 2 - net-wireless/uhd/files/uhd-3.9.6-tinfo.patch | 34 ----------------- net-wireless/uhd/uhd-3.9.6.ebuild | 56 ---------------------------- 3 files changed, 92 deletions(-) diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index d260b3955ce..e7a1b9c0023 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -1,6 +1,4 @@ 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.9.6.tar.gz 2458419 BLAKE2B 39859c9c7a520b91fd0ad11b82a454ae267d0e04bbb3d3f474ab31ea8daac69c03e5abe4ed54f3eec5810d180d00aa700e67b10d989295fdedf73cb198ae324d SHA512 f8e89f67659e9509d90fb63a91c75b7a5fe037821ccd2f33313ac0b20d856cbdc2cab79715f7fca035ba0e28b240c73408d6764cb09b01700c4ddbdcafa71da1 -DIST uhd-images_003.009.006-release.zip 26268656 BLAKE2B 7d8c1b0bbd627a0180d5e2de996eb68b1fb995ea2c28ed12fa73705cda680d6304ff013a80cfd4ea5928137c16ac128546bdb9ed3cf932a837faa6dfe0866ffa SHA512 3b07a054583a55424edeb37d3ee70b9bd8c7b6cb4c83a10faf4dd518aa148be17af7cb8b5e4fb7cbb643eae32d7a3295a94d9a0eb031823ccf1f414da0cef631 DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7 DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8 diff --git a/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch b/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch deleted file mode 100644 index 511bc3c13fc..00000000000 --- a/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- uhd-release_003_009_006/host/utils/latency/CMakeLists.txt.orig 2017-05-11 19:44:54.824946672 +0300 -+++ uhd-release_003_009_006/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) - ---- uhd-release_003_009_006/host/examples/CMakeLists.txt.orig 2017-05-11 19:41:02.322302577 +0300 -+++ uhd-release_003_009_006/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) - ---- uhd-release_003_009_006/host/CMakeLists.txt.orig 2017-05-11 19:36:38.944798634 +0300 -+++ uhd-release_003_009_006/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/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild deleted file mode 100644 index d7bf1683325..00000000000 --- a/net-wireless/uhd/uhd-3.9.6.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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).00$(get_version_component_range 2).00$(get_version_component_range 3)-release -SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).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 - " -DEPEND="${RDEPEND} - dev-python/mako - dev-python/cheetah - app-arch/unzip" - -S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host - -PATCHES=( "${FILESDIR}/${P}-tinfo.patch" ) - -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 -}