1 |
commit: 71dc15d56f1741567451d7ca886a0bfd9cb7aa2d |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 25 01:12:32 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 28 19:54:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71dc15d5 |
7 |
|
8 |
net-analyzer/ipv6toolkit: migrate to hwdata |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
...412.ebuild => ipv6toolkit-2.1_p20200412-r1.ebuild} | 19 +++++++------------ |
13 |
net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild | 19 +++++++------------ |
14 |
2 files changed, 14 insertions(+), 24 deletions(-) |
15 |
|
16 |
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild |
17 |
similarity index 58% |
18 |
rename from net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild |
19 |
rename to net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild |
20 |
index 2d692fb0ea06..afe8e856acea 100644 |
21 |
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild |
22 |
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2020 Gentoo Authors |
25 |
+# Copyright 1999-2021 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=7 |
29 |
@@ -19,27 +19,22 @@ DEPEND=" |
30 |
" |
31 |
RDEPEND=" |
32 |
${DEPEND} |
33 |
- sys-apps/hwids |
34 |
+ sys-apps/hwdata |
35 |
" |
36 |
|
37 |
-HWIDS_OUI_PATH=/usr/share/misc/oui.txt |
38 |
- |
39 |
src_prepare() { |
40 |
default |
41 |
- sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ |
42 |
- manuals/ipv6toolkit.conf.5 |
43 |
} |
44 |
+ |
45 |
src_compile() { |
46 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr |
47 |
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr" |
48 |
+ sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die |
49 |
} |
50 |
|
51 |
src_install() { |
52 |
dodir /etc |
53 |
- emake install DESTDIR="${ED}" PREFIX=/usr |
54 |
+ emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" |
55 |
#remove the included oui file |
56 |
- rm -f "${D}"/usr/share/ipv6toolkit/oui.txt |
57 |
- #fix the conf file to use the one from sys-apps/hwids |
58 |
- sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ |
59 |
- "${ED}"/etc/ipv6toolkit.conf |
60 |
+ rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die |
61 |
dodoc CHANGES.TXT README.TXT |
62 |
} |
63 |
|
64 |
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild |
65 |
index 8a862e677183..78d911dcf494 100644 |
66 |
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild |
67 |
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild |
68 |
@@ -1,4 +1,4 @@ |
69 |
-# Copyright 1999-2020 Gentoo Authors |
70 |
+# Copyright 1999-2021 Gentoo Authors |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
|
73 |
EAPI=7 |
74 |
@@ -17,27 +17,22 @@ DEPEND=" |
75 |
" |
76 |
RDEPEND=" |
77 |
${DEPEND} |
78 |
- sys-apps/hwids |
79 |
+ sys-apps/hwdata |
80 |
" |
81 |
|
82 |
-HWIDS_OUI_PATH=/usr/share/misc/oui.txt |
83 |
- |
84 |
src_prepare() { |
85 |
default |
86 |
- sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ |
87 |
- manuals/ipv6toolkit.conf.5 |
88 |
} |
89 |
+ |
90 |
src_compile() { |
91 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr |
92 |
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr" |
93 |
+ sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die |
94 |
} |
95 |
|
96 |
src_install() { |
97 |
dodir /etc |
98 |
- emake install DESTDIR="${ED}" PREFIX=/usr |
99 |
+ emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" |
100 |
#remove the included oui file |
101 |
- rm -f "${D}"/usr/share/ipv6toolkit/oui.txt |
102 |
- #fix the conf file to use the one from sys-apps/hwids |
103 |
- sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ |
104 |
- "${ED}"/etc/ipv6toolkit.conf |
105 |
+ rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die |
106 |
dodoc CHANGES.TXT README.TXT |
107 |
} |