gentoo resync : 17.02.2020

3 files changed, 81 insertions, 16 deletions

diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index e65b4d77c0aa..b8fdf4a5791a 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,6 +1,8 @@
 DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
 DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9
+DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
 EBUILD lorcon-0.0_p20150109.ebuild 1323 BLAKE2B b6339a31e80485e9169453e69c2311f964eb2995e613001ffb033cac40581868124d1635f56d627291224dcc2346778c269d0c5e4f65682c7e4b99cfc01e02d2 SHA512 1933c94718b830c9c5a24a78dec8835f82b5c30c43bd6fde38bfa994c8916c19eba7b3b49912ef9f7f5e7b5313fcdd55a127b81f88126c6c31ad7ada4d0b5927
 EBUILD lorcon-0.0_p20180409-r1.ebuild 1930 BLAKE2B 30ef4dec066a7edd7b2c1656571a7cbb211eb95dfe27d7fc44fff303e3dbfc21f95532c5ef197107e64d8f90c9a5cfd326b7c0fa539ea4d40223fa28c8c83d9c SHA512 d94e57cf76f0e0f2d313fcf1bfefd9f48f44335f7d77f9c43e24f492cfe48abefd02f711349a2c12dfc4a84c1e971255f8045999192c3ad33594327dab7ed260
-EBUILD lorcon-9999.ebuild 1930 BLAKE2B 30ef4dec066a7edd7b2c1656571a7cbb211eb95dfe27d7fc44fff303e3dbfc21f95532c5ef197107e64d8f90c9a5cfd326b7c0fa539ea4d40223fa28c8c83d9c SHA512 d94e57cf76f0e0f2d313fcf1bfefd9f48f44335f7d77f9c43e24f492cfe48abefd02f711349a2c12dfc4a84c1e971255f8045999192c3ad33594327dab7ed260
+EBUILD lorcon-0.0_p20200214.ebuild 1509 BLAKE2B 1788e3e7b00088dbd528baf2a933a9da9246a81cc7274b57c8badd03f42b03faa8ccf12c29ab2f8ed06cc650c3a6c61bb8b2cddb66f85a41a40eda1c9f4b122f SHA512 2e080e821430dc34c8be88cc717ebc7b854e617bf374748cf1fb6fae5d00d0f215540ec6c1b18b282709ab5a84c1671fe834fe2a4d9cb4323622ef10601ef88c
+EBUILD lorcon-9999.ebuild 1509 BLAKE2B 1788e3e7b00088dbd528baf2a933a9da9246a81cc7274b57c8badd03f42b03faa8ccf12c29ab2f8ed06cc650c3a6c61bb8b2cddb66f85a41a40eda1c9f4b122f SHA512 2e080e821430dc34c8be88cc717ebc7b854e617bf374748cf1fb6fae5d00d0f215540ec6c1b18b282709ab5a84c1671fe834fe2a4d9cb4323622ef10601ef88c
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
new file mode 100644
index 000000000000..7e81f8596710
--- /dev/null
+++ b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8})
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A generic library for injecting 802.11 frames"
+HOMEPAGE="https://github.com/kismetwireless/lorcon"
+
+if [[ ${PV} == "9999" ]] ; then
+	#EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
+	EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
+	inherit git-r3
+	S="${WORKDIR}"/${P}
+else
+	GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
+	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"
+
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+	dev-libs/libnl:3=
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		cp -R "${S}/" "${WORKDIR}/all"
+	fi
+	default_src_unpack
+}
+
+src_prepare() {
+	default
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	default_src_configure
+}
+
+src_compile() {
+	default_src_compile
+	if use python; then
+		LDFLAGS+=" -L${S}/.libs/"
+		cd pylorcon2 || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	if use python; then
+		cd pylorcon2 || die
+		distutils-r1_src_install
+	fi
+	find "${D}" -xtype f -name '*.la' -delete || die
+}
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index d9ac3ecfbee9..7e81f8596710 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8})
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1
@@ -15,10 +15,9 @@ if [[ ${PV} == "9999" ]] ; then
 	#EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
 	EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
 	inherit git-r3
-	KEYWORDS=""
 	S="${WORKDIR}"/${P}
 else
-	GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
+	GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
 	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"
@@ -35,6 +34,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -45,12 +45,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.h
-	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h
-	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h
 	default
 	use python && distutils-r1_src_prepare
 }
@@ -74,8 +68,5 @@ src_install() {
 		cd pylorcon2 || die
 		distutils-r1_src_install
 	fi
-}
-
-src_test() {
-	:
+	find "${D}" -xtype f -name '*.la' -delete || die
 }