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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 88E75158086 for ; Sun, 28 Nov 2021 20:09:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9096C2BC04D; Sun, 28 Nov 2021 20:08:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A76B2BC04D for ; Sun, 28 Nov 2021 20:08:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F82E342BE2 for ; Sun, 28 Nov 2021 20:08:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CCE1200 for ; Sun, 28 Nov 2021 20:08:55 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1638129244.71dc15d56f1741567451d7ca886a0bfd9cb7aa2d.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ipv6toolkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild X-VCS-Directories: net-analyzer/ipv6toolkit/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 71dc15d56f1741567451d7ca886a0bfd9cb7aa2d X-VCS-Branch: master Date: Sun, 28 Nov 2021 20:08:55 +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: 35d28828-6159-491b-902d-4d329f13e3db X-Archives-Hash: 338121a00199c3d70448d44548decc49 commit: 71dc15d56f1741567451d7ca886a0bfd9cb7aa2d Author: Mike Gilbert gentoo org> AuthorDate: Thu Nov 25 01:12:32 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Nov 28 19:54:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71dc15d5 net-analyzer/ipv6toolkit: migrate to hwdata Signed-off-by: Mike Gilbert gentoo.org> ...412.ebuild => ipv6toolkit-2.1_p20200412-r1.ebuild} | 19 +++++++------------ net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild | 19 +++++++------------ 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild similarity index 58% rename from net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild rename to net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild index 2d692fb0ea06..afe8e856acea 100644 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild +++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,27 +19,22 @@ DEPEND=" " RDEPEND=" ${DEPEND} - sys-apps/hwids + sys-apps/hwdata " -HWIDS_OUI_PATH=/usr/share/misc/oui.txt - src_prepare() { default - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - manuals/ipv6toolkit.conf.5 } + src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr" + sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die } src_install() { dodir /etc - emake install DESTDIR="${ED}" PREFIX=/usr + emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" #remove the included oui file - rm -f "${D}"/usr/share/ipv6toolkit/oui.txt - #fix the conf file to use the one from sys-apps/hwids - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - "${ED}"/etc/ipv6toolkit.conf + rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die dodoc CHANGES.TXT README.TXT } diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild index 8a862e677183..78d911dcf494 100644 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild +++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,27 +17,22 @@ DEPEND=" " RDEPEND=" ${DEPEND} - sys-apps/hwids + sys-apps/hwdata " -HWIDS_OUI_PATH=/usr/share/misc/oui.txt - src_prepare() { default - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - manuals/ipv6toolkit.conf.5 } + src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr" + sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die } src_install() { dodir /etc - emake install DESTDIR="${ED}" PREFIX=/usr + emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" #remove the included oui file - rm -f "${D}"/usr/share/ipv6toolkit/oui.txt - #fix the conf file to use the one from sys-apps/hwids - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - "${ED}"/etc/ipv6toolkit.conf + rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die dodoc CHANGES.TXT README.TXT }