commit: 8c3907423ae9c3802049cb7fc00e2651869d032c Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Mar 12 11:29:50 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Mar 12 11:29:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c390742
net-wireless/airspy: update EAPI 7 -> 8 Bug: https://bugs.gentoo.org/725142 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-wireless/airspy/airspy-1.0.10.ebuild | 20 ++++++----- net-wireless/airspy/airspy-9999.ebuild | 20 ++++++----- .../files/airspy-1.0.10-remove-static-libs.patch | 41 ++++++++++++++++++++++ 3 files changed, 65 insertions(+), 16 deletions(-) diff --git a/net-wireless/airspy/airspy-1.0.10.ebuild b/net-wireless/airspy/airspy-1.0.10.ebuild index d214c535ef76..710503c6cb91 100644 --- a/net-wireless/airspy/airspy-1.0.10.ebuild +++ b/net-wireless/airspy/airspy-1.0.10.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev DESCRIPTION="Usemode driver and associated tools for airspy" HOMEPAGE="http://www.airspy.com"; -if [[ ${PV} == 9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/airspy/host.git"; else SRC_URI="https://github.com/airspy/host/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/airspyone_host-${PV}" + KEYWORDS="~amd64 ~arm ~x86" fi @@ -21,9 +22,12 @@ LICENSE="GPL-2+" SLOT="0" IUSE="+udev" -DEPEND="virtual/udev - virtual/libusb:1" -RDEPEND="${DEPEND}" +RDEPEND=" + virtual/udev + virtual/libusb:1" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-1.0.10-remove-static-libs.patch ) src_configure() { local mycmakeargs=( @@ -36,8 +40,8 @@ src_install() { cmake_src_install if use udev; then - udev_newrules "${ED}/etc/udev/rules.d/52-airspy.rules" 52-airspy.rules - rm -rf "${ED}/etc" + udev_newrules "${ED}"/etc/udev/rules.d/52-airspy.rules 52-airspy.rules + rm -r "${ED}"/etc || die fi } diff --git a/net-wireless/airspy/airspy-9999.ebuild b/net-wireless/airspy/airspy-9999.ebuild index d214c535ef76..710503c6cb91 100644 --- a/net-wireless/airspy/airspy-9999.ebuild +++ b/net-wireless/airspy/airspy-9999.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev DESCRIPTION="Usemode driver and associated tools for airspy" HOMEPAGE="http://www.airspy.com"; -if [[ ${PV} == 9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/airspy/host.git"; else SRC_URI="https://github.com/airspy/host/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/airspyone_host-${PV}" + KEYWORDS="~amd64 ~arm ~x86" fi @@ -21,9 +22,12 @@ LICENSE="GPL-2+" SLOT="0" IUSE="+udev" -DEPEND="virtual/udev - virtual/libusb:1" -RDEPEND="${DEPEND}" +RDEPEND=" + virtual/udev + virtual/libusb:1" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-1.0.10-remove-static-libs.patch ) src_configure() { local mycmakeargs=( @@ -36,8 +40,8 @@ src_install() { cmake_src_install if use udev; then - udev_newrules "${ED}/etc/udev/rules.d/52-airspy.rules" 52-airspy.rules - rm -rf "${ED}/etc" + udev_newrules "${ED}"/etc/udev/rules.d/52-airspy.rules 52-airspy.rules + rm -r "${ED}"/etc || die fi } diff --git a/net-wireless/airspy/files/airspy-1.0.10-remove-static-libs.patch b/net-wireless/airspy/files/airspy-1.0.10-remove-static-libs.patch new file mode 100644 index 000000000000..ce4befc6cc29 --- /dev/null +++ b/net-wireless/airspy/files/airspy-1.0.10-remove-static-libs.patch @@ -0,0 +1,41 @@ +--- a/libairspy/src/CMakeLists.txt ++++ b/libairspy/src/CMakeLists.txt +@@ -57,16 +57,7 @@ + ) + endif( ${WIN32} ) + +-# Static library +-add_library(airspy-static STATIC ${c_sources}) +-if(MSVC) +- set_target_properties(airspy-static PROPERTIES OUTPUT_NAME "airspy_static") +-else() +- set_target_properties(airspy-static PROPERTIES OUTPUT_NAME "airspy") +-endif() +- + set_target_properties(airspy PROPERTIES CLEAN_DIRECT_OUTPUT 1) +-set_target_properties(airspy-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + + # Dependencies + target_link_libraries(airspy ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -82,10 +73,6 @@ + LIBRARY DESTINATION lib${LIB_SUFFIX} + COMPONENT sharedlibs + ) +- install(TARGETS airspy-static +- ARCHIVE DESTINATION lib${LIB_SUFFIX} +- COMPONENT staticlibs +- ) + install(FILES ${c_headers} + DESTINATION include/${PROJECT_NAME} + COMPONENT headers +@@ -97,10 +84,6 @@ + DESTINATION bin + COMPONENT sharedlibs + ) +- install(TARGETS airspy-static +- DESTINATION bin +- COMPONENT staticlibs +- ) + install(FILES ${c_headers} + DESTINATION include/${PROJECT_NAME} + COMPONENT headers
