net-wireless/lorcon: update, bump snapshot

Package-Manager: Portage-2.3.41, Repoman-2.3.9

diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index a17a6921ca70bf676f2b3fd074eb47a2ccf5f431..94c11c88bc68d017a4ead1d5e04e0012649dedf0 100644 (file)
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1 +1 @@
-DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
+DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9

diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20180409.ebuild
similarity index 61%
rename from net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
rename to net-wireless/lorcon/lorcon-0.0_p20180409.ebuild
index c10482d2cdfbba4ff9f15b4721cd576fda802c92..9a0cf320d69ed02e4d30155e01e0b132589a219a 100644 (file)
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20180409.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,15 +9,19 @@ 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"
-       KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+       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"
@@ -32,7 +36,6 @@ RDEPEND="${DEPEND}"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-S="${WORKDIR}"/${P}
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
@@ -44,6 +47,9 @@ src_unpack() {
 
 src_prepare() {
        sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
+       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
 }
 

diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index f0502097ecd13024b677a6b880b5219b9695da98..9a0cf320d69ed02e4d30155e01e0b132589a219a 100644 (file)
--- 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,7 +36,6 @@ RDEPEND="${DEPEND}"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-S="${WORKDIR}"/${P}
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
@@ -44,6 +47,9 @@ src_unpack() {
 
 src_prepare() {
        sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
+       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
 }