gentoo resync : 05.12.2021

3 files changed, 16 insertions, 26 deletions

diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest
index b0d51e4c4d05..a33b61a879b6 100644
--- a/net-analyzer/ipv6toolkit/Manifest
+++ b/net-analyzer/ipv6toolkit/Manifest
@@ -1,4 +1,4 @@
 DIST ipv6toolkit-2.1_p20200412.tar.gz 987247 BLAKE2B 7fcb07c0cbb22e377618f62b69a16e4a5aeda3b3ebc32bd216cf9fa3beb2d8775cec6543482609361bb23304e3284e770ae82ada053fb172c432adfe360e09ba SHA512 480245e4f5ed31d6de726467ab8e1726285ccc7eeb6c84bd75caf62af35409ebf5ea63a29567200b387592317a5d5989c76ad38d3f0842ebdf5392f28e81be9f
-EBUILD ipv6toolkit-2.1_p20200412.ebuild 1158 BLAKE2B 69d0efa873b40f8a7fc99712e0016430c66e4645cdcba74f59279045f692e5e8e4c06545a364b32e11326949d300dc349bf596ff5e7d22a5e6da4951673da226 SHA512 bd1b16447f98146e93ec9735c01fd6b63232b82fb8eade13ab472d5ecd75a4a9b3a72ce91af0a24b33e5d47fc09539bcdd6ac0ac398bcb515c45b3f99ff4345a
-EBUILD ipv6toolkit-99999999.ebuild 1029 BLAKE2B da79779c2bb84b817aa197e86931e8fdc8a14597916a867bd01cc211b770425e485bfb19f28345a85a62b60e8bea8f5c2065c26b5e89699d67e306f5746d2a3c SHA512 376b1b2b881e0285f084b8edad8f4aefc83683d3f4c947e3ca4ada0518bc9291ed8f09bc3bbd275e27f32532857ef33ae2006277c6341adf800a5471274d39c1
+EBUILD ipv6toolkit-2.1_p20200412-r1.ebuild 1012 BLAKE2B 1a0319bac28e17163bac42e43ae460d6293f7c09edb34b49f8c9e2639be6c63fdf5d46edfb3727cb67596d37420ddfee0d7e3eb8f545d3f5030dc8151aae060e SHA512 a609584063f4ca1ee3a9a26939b1400010a91f8b0e56bcf52edbd30741aa00cc2abb5141dc7316b1810b51be1a7fc504fa47bdd9fb6719aecd0d6ee9ca669184
+EBUILD ipv6toolkit-99999999.ebuild 883 BLAKE2B bbd8f3401f03f5b62f10e39c080c8bafdd606a9ba9e48e1109d6b424e64a378c9a783cc86b96c8f0430de71f585d1a02a5972c42e37e152ac57a17f5e3796d3d SHA512 4f732cf3be9ed616d0be0b35c83bbe60bd5dcd30acdbe091c471a73b00446c9dd222bf9b8fb1e2aa1dcac7f45f5f5b0eb7f056a61124030a107dd0686717bf89
 MISC metadata.xml 363 BLAKE2B 7f21a55a7ad34ab0f3ec1ace13f8587a2953d92f38472103a3e719bc0eccf76611875ab8840724dea5be0b6429d1a7a980a87556a5f41d8a4ae6c1978523900e SHA512 b87dddd052f2ea042bf918df0808eb4b3892e511361027878fe774b71ca2b687771dd74bd8ec7dc51ef24d2a8e4a3d486ef45c8f1480f06cacd1ed770c319a58
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild b/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
 }