From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E3AFB138350 for ; Fri, 14 Feb 2020 19:40:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92B84E08A2; Fri, 14 Feb 2020 19:40:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61C1FE0895 for ; Fri, 14 Feb 2020 19:40:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A3F134EDB5 for ; Fri, 14 Feb 2020 19:40:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5682BAF for ; Fri, 14 Feb 2020 19:40:51 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1581709226.b6bdaf21bdc13cf857390684db076540b1fca0ae.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/lorcon/Manifest net-wireless/lorcon/lorcon-0.0_p20200214.ebuild net-wireless/lorcon/lorcon-9999.ebuild X-VCS-Directories: net-wireless/lorcon/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: b6bdaf21bdc13cf857390684db076540b1fca0ae X-VCS-Branch: master Date: Fri, 14 Feb 2020 19:40:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2c8836f9-5cac-4e52-9b1b-87095ae4a4cf X-Archives-Hash: 5991a5938975477fa72e0aad2395f279 commit: b6bdaf21bdc13cf857390684db076540b1fca0ae Author: Rick Farina gentoo org> AuthorDate: Fri Feb 14 19:31:56 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Fri Feb 14 19:40:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6bdaf21 net-wireless/lorcon: python3 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Rick Farina gentoo.org> net-wireless/lorcon/Manifest | 1 + ...rcon-9999.ebuild => lorcon-0.0_p20200214.ebuild} | 21 ++++++--------------- net-wireless/lorcon/lorcon-9999.ebuild | 21 ++++++--------------- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest index 9b556bcf187..c781f71b031 100644 --- a/net-wireless/lorcon/Manifest +++ b/net-wireless/lorcon/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild similarity index 68% copy from net-wireless/lorcon/lorcon-9999.ebuild copy to net-wireless/lorcon/lorcon-0.0_p20200214.ebuild index d9ac3ecfbee..7e81f859671 100644 --- a/net-wireless/lorcon/lorcon-9999.ebuild +++ b/net-wireless/lorcon/lorcon-0.0_p20200214.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##"../lorcon.h"#' pylorcon2/PyLorcon2.c - sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.h - sed -i 's##"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c - sed -i 's##"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h - sed -i 's##"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c - sed -i 's##"../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 } diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild index d9ac3ecfbee..7e81f859671 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##"../lorcon.h"#' pylorcon2/PyLorcon2.c - sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.h - sed -i 's##"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c - sed -i 's##"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h - sed -i 's##"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c - sed -i 's##"../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 }