gentoo resync : 07.07.2018

4 files changed, 101 insertions, 10 deletions

diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index c06a24dd87fa..2a020b96b685 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,4 +1,6 @@
 DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
-EBUILD lorcon-0.0_p20150109.ebuild 1333 BLAKE2B 01035c713636accf57eda0827ef368e14a5c19d1603cfa175b008e031368f8b40021a180e6b33b060da77fae1570b5d3f7299332a9f2ff86f708517f1b41a4a6 SHA512 e59ba0d7bdb915f63ff2bd29c1a3eb87fabe6c0413c518588773da010b0a066057cc3e88cbab885c58a273c218f658fb30db60e7a0d82934a068e723cbbca6d0
-EBUILD lorcon-9999.ebuild 1337 BLAKE2B 1cc9d43594443219355da6fa8252db445c92298a158c5abc140bca185d4276b38da14ebf59b3448b9f13fcb9f3819476ae2829fc4b686937edd646b1ce4d186a SHA512 753e28a6f06c438449bbcc1c308d45f141bdbf2167319b16b9c25be29a6f8b8c738b65430cf6024cc84d264cd90eec535fe1731862cdf3fbc865d275737b3b4d
+DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9
+EBUILD lorcon-0.0_p20150109.ebuild 1333 BLAKE2B 5546a5ca92fe15423699d82cf1b29638ca3e4e2b6a77ac752801a7a7dee397ae95fe9604f38ee642a348f848b208e2ec80ce696e7d9481efb9273f32ed4bfe85 SHA512 7061ee2bb8da455a0e6e451b4ca5cbf024ad0ad4012cc0f35db48d2c30f5ba46b10970479ec141e028675a978eb3fb7ea93f2a1af1b57c089f078f47d49ad856
+EBUILD lorcon-0.0_p20180409-r1.ebuild 1936 BLAKE2B 6aa0e6103ae4dcc4d2c0020275ee94e21a2f370a82505b006688640dfd12ceb794086675b729d241b7ad974c53541a3ef2341486d810052ad99fc86a5862dc46 SHA512 eb7fd09cbc17a18c1feb06000c448fe122a794c6e3ae427c970ea71075d98407bccc8d3f3c7e1dceeb199167e514c40e202b795d7f79030caae5081a610f8222
+EBUILD lorcon-9999.ebuild 1936 BLAKE2B 6aa0e6103ae4dcc4d2c0020275ee94e21a2f370a82505b006688640dfd12ceb794086675b729d241b7ad974c53541a3ef2341486d810052ad99fc86a5862dc46 SHA512 eb7fd09cbc17a18c1feb06000c448fe122a794c6e3ae427c970ea71075d98407bccc8d3f3c7e1dceeb199167e514c40e202b795d7f79030caae5081a610f8222
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index c10482d2cdfb..702bd34a3a2d 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
new file mode 100644
index 000000000000..0348df635401
--- /dev/null
+++ b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+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
+	KEYWORDS=""
+	S="${WORKDIR}"/${P}
+else
+	GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
+	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~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} )"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		cp -R "${S}/" "${WORKDIR}/all"
+	fi
+	default_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
+}
+
+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
+}
+
+src_test() {
+	:
+}
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index f0502097ecd1..0348df635401 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
@@ -9,14 +9,18 @@ DISTUTILS_OPTIONAL=1
 inherit distutils-r1
 
 DESCRIPTION="A generic library for injecting 802.11 frames"
-HOMEPAGE="http://802.11ninja.net/lorcon"
+HOMEPAGE="https://github.com/kismetwireless/lorcon"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://code.google.com/p/lorcon/"
+	#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
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
+	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
 	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
@@ -32,8 +36,6 @@ RDEPEND="${DEPEND}"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-S="${WORKDIR}"/${P}
-
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
 		git-r3_src_unpack
@@ -44,6 +46,12 @@ 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
 }