From 71dc15d56f1741567451d7ca886a0bfd9cb7aa2d Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 24 Nov 2021 20:12:32 -0500
Subject: net-analyzer/ipv6toolkit: migrate to hwdata

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 .../ipv6toolkit-2.1_p20200412-r1.ebuild            | 40 +++++++++++++++++++
 .../ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild   | 45 ----------------------
 .../ipv6toolkit/ipv6toolkit-99999999.ebuild        | 19 ++++-----
 3 files changed, 47 insertions(+), 57 deletions(-)
 create mode 100644 net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild
 delete mode 100644 net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild

(limited to 'net-analyzer/ipv6toolkit')

diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild
new file mode 100644
index 000000000000..afe8e856acea
--- /dev/null
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets"
+HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/"
+SNAPSHOT="623a0fbc0422cdc0a4b833d7b5ec58a2eaa9bddf"
+SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	net-libs/libpcap[ipv6(+)]
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwdata
+"
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	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="${D}" PREFIX="${EPREFIX}/usr"
+	#remove the included oui file
+	rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die
+	dodoc CHANGES.TXT README.TXT
+}
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild
deleted file mode 100644
index 2d692fb0ea06..000000000000
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets"
-HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/"
-SNAPSHOT="623a0fbc0422cdc0a4b833d7b5ec58a2eaa9bddf"
-SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	net-libs/libpcap[ipv6(+)]
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/hwids
-"
-
-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
-}
-
-src_install() {
-	dodir /etc
-	emake install DESTDIR="${ED}" PREFIX=/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
-	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
 }
-- 
cgit v1.2.3-65-gdbad