commit:     3e02ccff5769f8750cb3260282f8da33d3bc5072
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  2 14:04:43 2023 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Oct  2 14:06:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e02ccff

net-wireless/kismet: 2023.07.1 build fix

I still honestly don't know what causes this, and I can't replicate
myself.  That said, I had a tester confirm this fixes it for them so
hopefully it fixes it for everyone.

Closes: https://bugs.gentoo.org/911193
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/kismet/Manifest                | 1 +
 net-wireless/kismet/kismet-2023.07.1.ebuild | 7 +++++--
 net-wireless/kismet/kismet-9999.ebuild      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index d9cc8c51b9c9..1d6244935ae7 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,2 +1,3 @@
 DIST kismet-2022-08-R1.tar.xz 10700692 BLAKE2B 
9f6b3a651eca34b90e34b8a8357be493a8966cdd5c54f5f1c38383cc3ad74f2c78ab265df882b0a5b985bed98ad61f4741ead7b443d9b79f2769ca7edc72427f
 SHA512 
befca2dcd7016d96a17e97babbd6d88195fa61750ed616d104d10a85828ec160672c33bd2a1eae554d375feb55ea45a040a3e53c4410a3ff8c9bfa4b5c8bcdb1
 DIST kismet-2023-07-R1.tar.xz 11144120 BLAKE2B 
c43f0665c784ff9245289e624e23cb3eb4ffcb79f050deede50129cf6b07662e817f9c9aaf6cc608395045b5b449b87d22ff314d7dbc8f04b29db2df86dc5f84
 SHA512 
b8b320b8e09be5be582848ce8a1a66f71a96eccc3c78f52d3f1f18122abbe614ff3b5a55b5fcedf3e6a1fc959a72838adc0d7278ffd6c25a1c179a1caf5584ce
+DIST kismet-2023.07.1-stdint-fix.patch 144077 BLAKE2B 
77a4ca3da4ed54e567d21c7d8d0a718751802827bcefc1122318c989cde93a2132753c910e6f503e74dac30024111edc788d9df65ef4c4749ab918485d818ee3
 SHA512 
cb9220cdd5e14d030ef303e28a32dced61916ff64aa5960c412c2355c1b714dc423e34b33ef701e1daa2a22c9562a85a739dc130c4ec5761924338ffb462286b

diff --git a/net-wireless/kismet/kismet-2023.07.1.ebuild 
b/net-wireless/kismet/kismet-2023.07.1.ebuild
index 12ccc414e920..4fcac1c602f0 100644
--- a/net-wireless/kismet/kismet-2023.07.1.ebuild
+++ b/net-wireless/kismet/kismet-2023.07.1.ebuild
@@ -18,13 +18,16 @@ else
        S=${WORKDIR}/${MY_P/BETA/beta}
 
        #normally we want an official release
-       SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz";
+       SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz
+               
https://dev.gentoo.org/~zerochaos/distfiles/${P}-stdint-fix.patch";
 
        #but sometimes we want a git commit
        #COMMIT="9ca7e469cf115469f392db7436816151867e1654"
        
#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
        #S="${WORKDIR}/${PN}-${COMMIT}"
 
+       PATCHES=( "${DISTDIR}/${P}-stdint-fix.patch" )
+
        KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 fi
 
@@ -103,7 +106,7 @@ src_prepare() {
        #       log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \
        #       trackedelement.h trackedelement_workers.h
 
-       eapply_user
+       default
 
        if [ "${PV}" = "9999" ]; then
                eautoreconf

diff --git a/net-wireless/kismet/kismet-9999.ebuild 
b/net-wireless/kismet/kismet-9999.ebuild
index aefd9559e78a..f89567fabd66 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -104,7 +104,7 @@ src_prepare() {
        #       log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \
        #       trackedelement.h trackedelement_workers.h
 
-       eapply_user
+       default
 
        if [ "${PV}" = "9999" ]; then
                eautoreconf

Reply via email to