[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ipv6toolkit/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     71dc15d56f1741567451d7ca886a0bfd9cb7aa2d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 01:12:32 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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
 }