Gentoo Archives: gentoo-commits

From: Rick Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/
Date: Fri, 14 Feb 2020 19:40:56
Message-Id: 1581709226.b6bdaf21bdc13cf857390684db076540b1fca0ae.zerochaos@gentoo
1 commit: b6bdaf21bdc13cf857390684db076540b1fca0ae
2 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 14 19:31:56 2020 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 14 19:40:26 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6bdaf21
7
8 net-wireless/lorcon: python3
9
10 Package-Manager: Portage-2.3.88, Repoman-2.3.20
11 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
12
13 net-wireless/lorcon/Manifest | 1 +
14 ...rcon-9999.ebuild => lorcon-0.0_p20200214.ebuild} | 21 ++++++---------------
15 net-wireless/lorcon/lorcon-9999.ebuild | 21 ++++++---------------
16 3 files changed, 13 insertions(+), 30 deletions(-)
17
18 diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
19 index 9b556bcf187..c781f71b031 100644
20 --- a/net-wireless/lorcon/Manifest
21 +++ b/net-wireless/lorcon/Manifest
22 @@ -1,2 +1,3 @@
23 DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
24 DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9
25 +DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
26
27 diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
28 similarity index 68%
29 copy from net-wireless/lorcon/lorcon-9999.ebuild
30 copy to net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
31 index d9ac3ecfbee..7e81f859671 100644
32 --- a/net-wireless/lorcon/lorcon-9999.ebuild
33 +++ b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
34 @@ -1,9 +1,9 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 +# Copyright 1999-2020 Gentoo Authors
37 # Distributed under the terms of the GNU General Public License v2
38
39 -EAPI=6
40 +EAPI=7
41
42 -PYTHON_COMPAT=( python2_7 )
43 +PYTHON_COMPAT=( python3_{6,7,8})
44 DISTUTILS_OPTIONAL=1
45
46 inherit distutils-r1
47 @@ -15,10 +15,9 @@ if [[ ${PV} == "9999" ]] ; then
48 #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
49 EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
50 inherit git-r3
51 - KEYWORDS=""
52 S="${WORKDIR}"/${P}
53 else
54 - GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
55 + GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
56 SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
57 S="${WORKDIR}"/"${PN}-${GIT_HASH}"
58 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
59 @@ -35,6 +34,7 @@ DEPEND="
60 RDEPEND="${DEPEND}"
61
62 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
63 +RESTRICT="test"
64
65 src_unpack() {
66 if [[ ${PV} == "9999" ]] ; then
67 @@ -45,12 +45,6 @@ src_unpack() {
68 }
69
70 src_prepare() {
71 - sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
72 - sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.h
73 - sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c
74 - sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h
75 - sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c
76 - sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h
77 default
78 use python && distutils-r1_src_prepare
79 }
80 @@ -74,8 +68,5 @@ src_install() {
81 cd pylorcon2 || die
82 distutils-r1_src_install
83 fi
84 -}
85 -
86 -src_test() {
87 - :
88 + find "${D}" -xtype f -name '*.la' -delete || die
89 }
90
91 diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
92 index d9ac3ecfbee..7e81f859671 100644
93 --- a/net-wireless/lorcon/lorcon-9999.ebuild
94 +++ b/net-wireless/lorcon/lorcon-9999.ebuild
95 @@ -1,9 +1,9 @@
96 -# Copyright 1999-2019 Gentoo Authors
97 +# Copyright 1999-2020 Gentoo Authors
98 # Distributed under the terms of the GNU General Public License v2
99
100 -EAPI=6
101 +EAPI=7
102
103 -PYTHON_COMPAT=( python2_7 )
104 +PYTHON_COMPAT=( python3_{6,7,8})
105 DISTUTILS_OPTIONAL=1
106
107 inherit distutils-r1
108 @@ -15,10 +15,9 @@ if [[ ${PV} == "9999" ]] ; then
109 #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
110 EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
111 inherit git-r3
112 - KEYWORDS=""
113 S="${WORKDIR}"/${P}
114 else
115 - GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
116 + GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
117 SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
118 S="${WORKDIR}"/"${PN}-${GIT_HASH}"
119 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
120 @@ -35,6 +34,7 @@ DEPEND="
121 RDEPEND="${DEPEND}"
122
123 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
124 +RESTRICT="test"
125
126 src_unpack() {
127 if [[ ${PV} == "9999" ]] ; then
128 @@ -45,12 +45,6 @@ src_unpack() {
129 }
130
131 src_prepare() {
132 - sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
133 - sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.h
134 - sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c
135 - sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h
136 - sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c
137 - sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h
138 default
139 use python && distutils-r1_src_prepare
140 }
141 @@ -74,8 +68,5 @@ src_install() {
142 cd pylorcon2 || die
143 distutils-r1_src_install
144 fi
145 -}
146 -
147 -src_test() {
148 - :
149 + find "${D}" -xtype f -name '*.la' -delete || die
150 }