1 |
commit: 3b9fc3c8c6cad2b327f8d5969856415533f9a499 |
2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 5 18:27:22 2018 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 5 18:28:34 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9fc3c8 |
7 |
|
8 |
net-wireless/lorcon: update, bump snapshot |
9 |
|
10 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
11 |
|
12 |
net-wireless/lorcon/Manifest | 2 +- |
13 |
..._p20150109.ebuild => lorcon-0.0_p20180409.ebuild} | 20 +++++++++++++------- |
14 |
net-wireless/lorcon/lorcon-9999.ebuild | 18 ++++++++++++------ |
15 |
3 files changed, 26 insertions(+), 14 deletions(-) |
16 |
|
17 |
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest |
18 |
index a17a6921ca7..94c11c88bc6 100644 |
19 |
--- a/net-wireless/lorcon/Manifest |
20 |
+++ b/net-wireless/lorcon/Manifest |
21 |
@@ -1 +1 @@ |
22 |
-DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b |
23 |
+DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9 |
24 |
|
25 |
diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20180409.ebuild |
26 |
similarity index 61% |
27 |
rename from net-wireless/lorcon/lorcon-0.0_p20150109.ebuild |
28 |
rename to net-wireless/lorcon/lorcon-0.0_p20180409.ebuild |
29 |
index c10482d2cdf..9a0cf320d69 100644 |
30 |
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild |
31 |
+++ b/net-wireless/lorcon/lorcon-0.0_p20180409.ebuild |
32 |
@@ -1,7 +1,7 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
# Distributed under the terms of the GNU General Public License v2 |
36 |
|
37 |
-EAPI=5 |
38 |
+EAPI=6 |
39 |
|
40 |
PYTHON_COMPAT=( python2_7 ) |
41 |
DISTUTILS_OPTIONAL=1 |
42 |
@@ -9,15 +9,19 @@ DISTUTILS_OPTIONAL=1 |
43 |
inherit distutils-r1 |
44 |
|
45 |
DESCRIPTION="A generic library for injecting 802.11 frames" |
46 |
-HOMEPAGE="http://802.11ninja.net/lorcon" |
47 |
+HOMEPAGE="https://github.com/kismetwireless/lorcon" |
48 |
|
49 |
if [[ ${PV} == "9999" ]] ; then |
50 |
- EGIT_REPO_URI="https://code.google.com/p/lorcon/" |
51 |
+ #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git" |
52 |
+ EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git" |
53 |
inherit git-r3 |
54 |
KEYWORDS="" |
55 |
+ S="${WORKDIR}"/${P} |
56 |
else |
57 |
- SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz" |
58 |
- KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
59 |
+ GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83" |
60 |
+ SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz" |
61 |
+ S="${WORKDIR}"/"${PN}-${GIT_HASH}" |
62 |
+ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
63 |
fi |
64 |
|
65 |
LICENSE="GPL-2" |
66 |
@@ -32,7 +36,6 @@ RDEPEND="${DEPEND}" |
67 |
|
68 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
69 |
|
70 |
-S="${WORKDIR}"/${P} |
71 |
|
72 |
src_unpack() { |
73 |
if [[ ${PV} == "9999" ]] ; then |
74 |
@@ -44,6 +47,9 @@ src_unpack() { |
75 |
|
76 |
src_prepare() { |
77 |
sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c |
78 |
+ sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c |
79 |
+ sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h |
80 |
+ default |
81 |
use python && distutils-r1_src_prepare |
82 |
} |
83 |
|
84 |
|
85 |
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild |
86 |
index f0502097ecd..9a0cf320d69 100644 |
87 |
--- a/net-wireless/lorcon/lorcon-9999.ebuild |
88 |
+++ b/net-wireless/lorcon/lorcon-9999.ebuild |
89 |
@@ -1,7 +1,7 @@ |
90 |
-# Copyright 1999-2017 Gentoo Foundation |
91 |
+# Copyright 1999-2018 Gentoo Foundation |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
|
94 |
-EAPI=5 |
95 |
+EAPI=6 |
96 |
|
97 |
PYTHON_COMPAT=( python2_7 ) |
98 |
DISTUTILS_OPTIONAL=1 |
99 |
@@ -9,14 +9,18 @@ DISTUTILS_OPTIONAL=1 |
100 |
inherit distutils-r1 |
101 |
|
102 |
DESCRIPTION="A generic library for injecting 802.11 frames" |
103 |
-HOMEPAGE="http://802.11ninja.net/lorcon" |
104 |
+HOMEPAGE="https://github.com/kismetwireless/lorcon" |
105 |
|
106 |
if [[ ${PV} == "9999" ]] ; then |
107 |
- EGIT_REPO_URI="https://code.google.com/p/lorcon/" |
108 |
+ #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git" |
109 |
+ EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git" |
110 |
inherit git-r3 |
111 |
KEYWORDS="" |
112 |
+ S="${WORKDIR}"/${P} |
113 |
else |
114 |
- SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz" |
115 |
+ GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83" |
116 |
+ SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz" |
117 |
+ S="${WORKDIR}"/"${PN}-${GIT_HASH}" |
118 |
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
119 |
fi |
120 |
|
121 |
@@ -32,7 +36,6 @@ RDEPEND="${DEPEND}" |
122 |
|
123 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
124 |
|
125 |
-S="${WORKDIR}"/${P} |
126 |
|
127 |
src_unpack() { |
128 |
if [[ ${PV} == "9999" ]] ; then |
129 |
@@ -44,6 +47,9 @@ src_unpack() { |
130 |
|
131 |
src_prepare() { |
132 |
sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c |
133 |
+ sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c |
134 |
+ sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h |
135 |
+ default |
136 |
use python && distutils-r1_src_prepare |
137 |
} |