gentoo auto-resync : 19:03:2023 - 18:35:20

4 files changed, 33 insertions, 45 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index b0a2011ec0e0..16a831412cca 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index 3362e5c348d9..8380276f21e2 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,6 +1,6 @@
 DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
 DIST lorcon-2020.06.06_p20220216.tar.gz 506368 BLAKE2B 2881af0130f331b2f648c0d29b0d70516770b833ba18b5f9bf6d4eb9eaab2192034ecc840f5e2b323c0e0fb8737dd1e29525b237d95825d60e78e3200f4ac929 SHA512 3f7d5967a1af840f8f6f05872c06d908ce426e7827046b8d86267770da044b48973554ff7a0415756522332055496f00ad078fa6a25a1898d640c925834111ef
 EBUILD lorcon-0.0_p20200214.ebuild 1499 BLAKE2B 637707b9e019c511e79ca6efd72bc7a0d53f8e6ac90aa107fd520bab1c8bd77b8cbb080ce1a34342cd2786e613950c52fe3ae83dafb4ff048d3cf169bebae98f SHA512 7a2a60d8fbf3735371581b01b31210970ca94ae06bf3469715224a3797436c20d4163c129d15880b98242d12c64e71264ec7979c9d79c4caadc35b3a41ae3f67
-EBUILD lorcon-2020.06.06_p20220216-r1.ebuild 1554 BLAKE2B 7d3bb2da4f3ed81cc7e7ee70043000cfd20462261602898ca39202fd0de9b5cbf838579aa62f4cd911a6e4f28a133aaae9d08874b712fff1e482da6d90525c33 SHA512 2e25e68fab165e0854bfc300aff298d9835306a6d0f886aa96d4cd44fed7f1b47c8b613153fbf485c1ac68f7bffbc270faf1193d326a8fadc59b136fdf3cb8da
-EBUILD lorcon-9999.ebuild 1554 BLAKE2B 7d3bb2da4f3ed81cc7e7ee70043000cfd20462261602898ca39202fd0de9b5cbf838579aa62f4cd911a6e4f28a133aaae9d08874b712fff1e482da6d90525c33 SHA512 2e25e68fab165e0854bfc300aff298d9835306a6d0f886aa96d4cd44fed7f1b47c8b613153fbf485c1ac68f7bffbc270faf1193d326a8fadc59b136fdf3cb8da
+EBUILD lorcon-2020.06.06_p20220216-r2.ebuild 1451 BLAKE2B 8bb3cd6631df9cdac745ed14040b0d5f0187e8896071560ddfe8a365ea09a011feb34b839ef1e849d8c7e00ea68167194be4abdeda1f1a9e0f4f21830c09cc79 SHA512 31177cda443a9b59255bdd04e8ae8c90819624c5713b55aa32112855ab781d79463ab81efd6f6d51009a0fb05d370ad51e862d9273536ee0b100d5ce5fde467f
+EBUILD lorcon-9999.ebuild 1403 BLAKE2B d1567b69b9c970e0c2fad6b6f0dedad42ca60c5d27d042791c29a1a1bd514d8c3087f909504cd6f1c480c16cf103642534ae33b92782e9cf69b650c2f7185d15 SHA512 3f5f0a656a8911a0787abb5ccc96da2b63f2baa350e240f6421c585b4870aaf723ce8f71bf1e00bb7eb941bc7f66b8cf47cb4872a50bfbbeb63dc43864130c71
 MISC metadata.xml 242 BLAKE2B 759698f297aa1433159cc8d44fc0f8e77e3b9d1e812a023acbd581f105ed1e9d69eb5117e3da5961fb59e9120af6e584b92b0ae554518a6c4cfc171ae16ad48e SHA512 f80486dfc128933ad7de3d0105385fad5cc3566b4f901c3faa58168fcfef2d2827c9599e5b4d1fd164ee61609a9ec20730c8e11fa1ae010ee5862e6e5510e5dc
diff --git a/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r1.ebuild b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild
index 1508abca7594..19a7dbbdd451 100644
--- a/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r1.ebuild
+++ b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild
@@ -4,71 +4,66 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1
+inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="A generic library for injecting 802.11 frames"
 HOMEPAGE="https://github.com/kismetwireless/lorcon"
 
-if [[ ${PV} == "9999" ]] ; then
+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="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
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/libnl:3=
 	net-libs/libpcap
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
-BDEPEND="python? ( ${DISTUTILS_DEPS} )"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( ${DISTUTILS_DEPS} )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cp -R "${S}/" "${WORKDIR}/all" || die
-	fi
-	default_src_unpack
-}
+PATCHES=( "${FILESDIR}"/${P}-C99-decls.patch )
 
 src_prepare() {
 	default
 	use python && distutils-r1_src_prepare
 }
 
-src_configure() {
-	econf --disable-static
-}
-
 src_compile() {
-	default_src_compile
+	default
+
 	if use python; then
-		LDFLAGS+=" -L${S}/.libs/"
+		append-ldflags "-L${S}/.libs/"
 		cd pylorcon2 || die
 		distutils-r1_src_compile
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+
 	if use python; then
 		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 1508abca7594..b7e75c806c22 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -4,71 +4,64 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1
+inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="A generic library for injecting 802.11 frames"
 HOMEPAGE="https://github.com/kismetwireless/lorcon"
 
-if [[ ${PV} == "9999" ]] ; then
+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="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
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/libnl:3=
 	net-libs/libpcap
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
-BDEPEND="python? ( ${DISTUTILS_DEPS} )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cp -R "${S}/" "${WORKDIR}/all" || die
-	fi
-	default_src_unpack
-}
+BDEPEND="
+	virtual/pkgconfig
+	python? ( ${DISTUTILS_DEPS} )"
 
 src_prepare() {
 	default
 	use python && distutils-r1_src_prepare
 }
 
-src_configure() {
-	econf --disable-static
-}
-
 src_compile() {
-	default_src_compile
+	default
+
 	if use python; then
-		LDFLAGS+=" -L${S}/.libs/"
+		append-ldflags "-L${S}/.libs/"
 		cd pylorcon2 || die
 		distutils-r1_src_compile
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+
 	if use python; then
 		cd pylorcon2 || die
 		distutils-r1_src_install
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }