[gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/

[Rick Farina]

commit:     32ad6624e94619f5574d5002cf151b8c61308486
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 15:38:17 2022 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:08:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32ad6624

net-wireless/lorcon: fix musl support

Closes: https://bugs.gentoo.org/660484
Sent patch to upstream and shipping snapshot due to additional desired
fixes

Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/lorcon/Manifest                               |  2 +-
 ...020.06.06.ebuild => lorcon-2020.06.06_p20220216.ebuild} | 14 ++++++++------
 net-wireless/lorcon/lorcon-9999.ebuild                     | 12 ++++++------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index 39bee0406da5..88649157bbed 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,2 +1,2 @@
 DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 
07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda
 SHA512 
794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
-DIST lorcon-2020.06.06.tar.gz 506144 BLAKE2B 
6fe0d3578b8f91ed9ed0ea12ce110afc6764b694c78c57935b835e4fb8e4c4c81e07f7a8b069583382e91ef760a07bdcf3f9aa51167add052ac1f3f8c0758155
 SHA512 
1f51dc221d01356b59fd615ebccabb6d00f1999fd9450f6f092f6234635e162f0407e203df9dde4f0f942691cd9395df30377478ec677c910c2d1603228cef30
+DIST lorcon-2020.06.06_p20220216.tar.gz 506368 BLAKE2B 
2881af0130f331b2f648c0d29b0d70516770b833ba18b5f9bf6d4eb9eaab2192034ecc840f5e2b323c0e0fb8737dd1e29525b237d95825d60e78e3200f4ac929
 SHA512 
3f7d5967a1af840f8f6f05872c06d908ce426e7827046b8d86267770da044b48973554ff7a0415756522332055496f00ad078fa6a25a1898d640c925834111ef

diff --git a/net-wireless/lorcon/lorcon-2020.06.06.ebuild 
b/net-wireless/lorcon/lorcon-2020.06.06_p20220216.ebuild
similarity index 80%
rename from net-wireless/lorcon/lorcon-2020.06.06.ebuild
rename to net-wireless/lorcon/lorcon-2020.06.06_p20220216.ebuild
index c43251b94d5d..2f5368187970 100644
--- a/net-wireless/lorcon/lorcon-2020.06.06.ebuild
+++ b/net-wireless/lorcon/lorcon-2020.06.06_p20220216.ebuild
@@ -12,12 +12,16 @@ DESCRIPTION="A generic library for injecting 802.11 frames"
 HOMEPAGE="https://github.com/kismetwireless/lorcon";
 
 if [[ ${PV} == "9999" ]] ; then
+       #main repo
        #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git";
+       #reliable mirror
        EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git";
        inherit git-r3
        S="${WORKDIR}"/${P}
 else
-       SRC_URI="https://github.com/kismetwireless/lorcon/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
+       GIT_HASH="4a81d6aaa2c6ac7253ecd182ffe97c6c89411196"
+       
SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> 
${P}.tar.gz"
+       S="${WORKDIR}"/"${PN}-${GIT_HASH}"
        KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -25,19 +29,18 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="python"
 
-DEPEND="
+RDEPEND="
        python? ( ${PYTHON_DEPS} )
        dev-libs/libnl:3=
        net-libs/libpcap"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
                git-r3_src_unpack
-               cp -R "${S}/" "${WORKDIR}/all"
+               cp -R "${S}/" "${WORKDIR}/all" || die
        fi
        default_src_unpack
 }
@@ -66,5 +69,4 @@ src_install() {
                cd pylorcon2 || die
                distutils-r1_src_install
        fi
-       find "${ED}" -name '*.la' -delete || die
 }

diff --git a/net-wireless/lorcon/lorcon-9999.ebuild 
b/net-wireless/lorcon/lorcon-9999.ebuild
index dfe0a1417ae1..2f5368187970 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -12,12 +12,14 @@ DESCRIPTION="A generic library for injecting 802.11 frames"
 HOMEPAGE="https://github.com/kismetwireless/lorcon";
 
 if [[ ${PV} == "9999" ]] ; then
+       #main repo
        #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git";
+       #reliable mirror
        EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git";
        inherit git-r3
        S="${WORKDIR}"/${P}
 else
-       GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
+       GIT_HASH="4a81d6aaa2c6ac7253ecd182ffe97c6c89411196"
        
SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> 
${P}.tar.gz"
        S="${WORKDIR}"/"${PN}-${GIT_HASH}"
        KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -27,19 +29,18 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="python"
 
-DEPEND="
+RDEPEND="
        python? ( ${PYTHON_DEPS} )
        dev-libs/libnl:3=
        net-libs/libpcap"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
                git-r3_src_unpack
-               cp -R "${S}/" "${WORKDIR}/all"
+               cp -R "${S}/" "${WORKDIR}/all" || die
        fi
        default_src_unpack
 }
@@ -68,5 +69,4 @@ src_install() {
                cd pylorcon2 || die
                distutils-r1_src_install
        fi
-       find "${ED}" -name '*.la' -delete || die
 }