public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/
Date: Sun, 19 Mar 2023 17:14:13 +0000 (UTC)	[thread overview]
Message-ID: <1679246036.242d5ec7dab26446b124f4d3abf214c6db8019ca.soap@gentoo> (raw)

commit:     242d5ec7dab26446b124f4d3abf214c6db8019ca
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 17:13:56 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 17:13:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242d5ec7

net-wireless/lorcon: fix clang16 build

Closes: https://bugs.gentoo.org/843698
Closes: https://bugs.gentoo.org/875401
Closes: https://bugs.gentoo.org/897182
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...build => lorcon-2020.06.06_p20220216-r2.ebuild} | 37 ++++++++++------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r1.ebuild b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild
similarity index 73%
rename from net-wireless/lorcon/lorcon-2020.06.06_p20220216-r1.ebuild
rename to 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
 }


             reply	other threads:[~2023-03-19 17:14 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-19 17:14 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-08-19 13:41 [gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/ Rick Farina
2023-08-19 13:41 Rick Farina
2023-08-19 13:41 Rick Farina
2023-04-19 10:16 Arthur Zamarin
2023-04-19 10:16 Arthur Zamarin
2023-04-19  9:46 Sam James
2023-04-19  9:43 Sam James
2023-03-19 17:14 David Seifert
2022-04-07 14:46 Rick Farina
2022-02-16 16:08 Rick Farina
2022-02-16 16:08 Rick Farina
2022-01-13  1:53 Rick Farina
2022-01-13  1:53 Rick Farina
2021-02-17 16:10 Rick Farina
2021-02-17 15:34 Rick Farina
2020-11-14 20:22 David Seifert
2020-11-08  0:32 Michał Górny
2020-10-03 14:57 Sam James
2020-10-01 23:06 Sergei Trofimovich
2020-02-14 19:40 Rick Farina
2019-05-19 22:33 Stephen Klimaszewski
2018-07-06 14:33 Richard Farina
2018-07-06 14:27 Richard Farina
2018-07-05 18:28 Richard Farina
2018-07-05 18:28 Richard Farina
2017-10-04  9:15 Michał Górny
2017-08-20 19:48 Hans de Graaff
2016-11-06 15:25 Hans de Graaff
2016-07-22  7:05 Hans de Graaff
2015-09-07  9:55 Manuel Rüger
2015-09-07  9:50 Agostino Sarubbo
2015-08-31 18:52 Richard Farina
2015-08-31 17:09 Richard Farina

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1679246036.242d5ec7dab26446b124f4d3abf214c6db8019ca.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox