diff options
| -rw-r--r-- | net-wireless/rtl_433/Manifest | 2 | ||||
| -rw-r--r-- | net-wireless/rtl_433/rtl_433-21.12.ebuild (renamed from net-wireless/rtl_433/rtl_433-21.05.ebuild) | 24 | ||||
| -rw-r--r-- | net-wireless/rtl_433/rtl_433-9999.ebuild | 19 |
3 files changed, 24 insertions, 21 deletions
diff --git a/net-wireless/rtl_433/Manifest b/net-wireless/rtl_433/Manifest index 9ddff570127a..d71875335a0b 100644 --- a/net-wireless/rtl_433/Manifest +++ b/net-wireless/rtl_433/Manifest @@ -1 +1 @@ -DIST rtl_433-21.05.tar.gz 841774 BLAKE2B 4a3c060c85233a85e951eff5fb210cc4ec5529a6cc868782fdbf7b3dad7372dcd7d428776c539d25105b9cfdf5f260bc031bbd5435eb2658e73b8b275f2040ee SHA512 fe0a26b14df97c679968536b5b3dfe41e5f8c6e0af00265461b4e1bf6312dd71cc1b1ccf2f5f78bc4d67b5f2effb17a88b743dc38db4a0a73f9f5b756868dba4 +DIST rtl_433-21.12.tar.gz 954628 BLAKE2B 7622cba1ff8d9ed46bcd9d7298b2278437aba3dca65985f27d44d20d3b79082cff04172d4593af07379928d42d5e422ff2857ada427156b16f1ba24a7bca57ed SHA512 8183887c1e09e94bee10b70190555d7fa0fa6675bba6130f78ab111b77428fef90696bc15a8e5abb07ae5ae3e492641a40acd6087d5bc413db5f2944878f03a3 diff --git a/net-wireless/rtl_433/rtl_433-21.05.ebuild b/net-wireless/rtl_433/rtl_433-21.12.ebuild index 5aa379a4bcba..1af88f9c6024 100644 --- a/net-wireless/rtl_433/rtl_433-21.05.ebuild +++ b/net-wireless/rtl_433/rtl_433-21.12.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -#this doesn't work in eapi 7, even with emake or cmake.eclass -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="Decode OOK modulated signals" HOMEPAGE="https://github.com/merbanan/rtl_433" @@ -12,31 +11,32 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/merbanan/rtl_433" else - COMMIT="105342a33271bac6837d06aa86c23eec9e9ecb6a" - SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - #SRC_URI="https://github.com/merbanan/rtl_433/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/merbanan/rtl_433/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2" SLOT="0" -IUSE="+rtlsdr soapysdr" +IUSE="+rtlsdr soapysdr test" DEPEND="rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) - soapysdr? ( net-wireless/soapysdr:= )" + soapysdr? ( net-wireless/soapysdr:= ) + dev-libs/openssl:=" RDEPEND="${DEPEND}" +# https://github.com/merbanan/rtl_433/issues/2010 +RESTRICT="test" src_configure() { mycmakeargs=( -DENABLE_RTLSDR="$(usex rtlsdr)" -DENABLE_SOAPYSDR="$(usex soapysdr)" + -DBUILD_TESTING="$(usex test)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install mv "${ED}/usr/etc" "${ED}/" || die } diff --git a/net-wireless/rtl_433/rtl_433-9999.ebuild b/net-wireless/rtl_433/rtl_433-9999.ebuild index 5aa379a4bcba..99a3058c63d4 100644 --- a/net-wireless/rtl_433/rtl_433-9999.ebuild +++ b/net-wireless/rtl_433/rtl_433-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -#this doesn't work in eapi 7, even with emake or cmake.eclass -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="Decode OOK modulated signals" HOMEPAGE="https://github.com/merbanan/rtl_433" @@ -21,22 +20,26 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+rtlsdr soapysdr" +IUSE="+rtlsdr soapysdr test" DEPEND="rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) - soapysdr? ( net-wireless/soapysdr:= )" + soapysdr? ( net-wireless/soapysdr:= ) + dev-libs/openssl:=" RDEPEND="${DEPEND}" +# https://github.com/merbanan/rtl_433/issues/2010 +RESTRICT="test" src_configure() { mycmakeargs=( -DENABLE_RTLSDR="$(usex rtlsdr)" -DENABLE_SOAPYSDR="$(usex soapysdr)" + -DBUILD_TESTING="$(usex test)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install mv "${ED}/usr/etc" "${ED}/" || die } |