1 |
commit: e6f565c38efb10d21de27c82ef3713eb8f6aa962 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 18 21:57:35 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 18 21:58:08 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f565c3 |
7 |
|
8 |
sys-apps/hwids: bump to 20190818 |
9 |
|
10 |
Package-Manager: Portage-2.3.71_p6, Repoman-2.3.17_p5 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
sys-apps/hwids/Manifest | 1 + |
14 |
.../hwids/{hwids-99999999.ebuild => hwids-20190818.ebuild} | 11 +++++------ |
15 |
sys-apps/hwids/hwids-99999999.ebuild | 11 +++++------ |
16 |
3 files changed, 11 insertions(+), 12 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest |
19 |
index 33753201246..9cd679929af 100644 |
20 |
--- a/sys-apps/hwids/Manifest |
21 |
+++ b/sys-apps/hwids/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a |
24 |
DIST hwids-20180917.tar.gz 3211960 BLAKE2B d1dc00994a63a6cb6f7c41c73267dcc38b59a46b9e627fac9d6df285b8d1abf5d1335c02c047bff2b09c9ed9f8e4a1c79329c1bd7dd932949d3db2bbb5b9b2e6 SHA512 9fdcd5a7b3adca1bed886aa83e9cf3944391a819fc9f09b673bd815d95e6e70cecf40d8e87287207e34bfeb58c888188fc61b1c0ac13c1ecab0efbdb5100f8d9 |
25 |
DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e |
26 |
+DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2 |
27 |
|
28 |
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-20190818.ebuild |
29 |
similarity index 89% |
30 |
copy from sys-apps/hwids/hwids-99999999.ebuild |
31 |
copy to sys-apps/hwids/hwids-20190818.ebuild |
32 |
index 17e5beb8c71..fc424a668c7 100644 |
33 |
--- a/sys-apps/hwids/hwids-99999999.ebuild |
34 |
+++ b/sys-apps/hwids/hwids-20190818.ebuild |
35 |
@@ -1,13 +1,13 @@ |
36 |
# Copyright 2012-2019 Gentoo Authors |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
-EAPI="6" |
40 |
+EAPI=7 |
41 |
|
42 |
inherit udev |
43 |
|
44 |
DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" |
45 |
HOMEPAGE="https://github.com/gentoo/hwids" |
46 |
-if [[ ${PV} == "99999999" ]]; then |
47 |
+if [[ ${PV} == 99999999 ]]; then |
48 |
PYTHON_COMPAT=( python3_{6,7} ) |
49 |
inherit git-r3 python-any-r1 |
50 |
EGIT_REPO_URI="${HOMEPAGE}.git" |
51 |
@@ -20,7 +20,6 @@ LICENSE="|| ( GPL-2 BSD ) public-domain" |
52 |
SLOT="0" |
53 |
IUSE="+net +pci +udev +usb" |
54 |
|
55 |
-DEPEND="" |
56 |
RDEPEND=" |
57 |
udev? ( virtual/udev ) |
58 |
!<sys-apps/pciutils-3.1.9-r2 |
59 |
@@ -28,13 +27,13 @@ RDEPEND=" |
60 |
" |
61 |
|
62 |
if [[ ${PV} == 99999999 ]]; then |
63 |
- DEPEND+=" |
64 |
+ BDEPEND=" |
65 |
net-misc/curl |
66 |
udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') ) |
67 |
" |
68 |
python_check_deps() { |
69 |
if use udev; then |
70 |
- has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]" |
71 |
+ has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" |
72 |
fi |
73 |
} |
74 |
else |
75 |
@@ -87,6 +86,6 @@ src_install() { |
76 |
|
77 |
pkg_postinst() { |
78 |
if use udev; then |
79 |
- udevadm hwdb --update --root="${ROOT%/}" |
80 |
+ udevadm hwdb --update --root="${ROOT}" |
81 |
fi |
82 |
} |
83 |
|
84 |
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild |
85 |
index 17e5beb8c71..fc424a668c7 100644 |
86 |
--- a/sys-apps/hwids/hwids-99999999.ebuild |
87 |
+++ b/sys-apps/hwids/hwids-99999999.ebuild |
88 |
@@ -1,13 +1,13 @@ |
89 |
# Copyright 2012-2019 Gentoo Authors |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
|
92 |
-EAPI="6" |
93 |
+EAPI=7 |
94 |
|
95 |
inherit udev |
96 |
|
97 |
DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" |
98 |
HOMEPAGE="https://github.com/gentoo/hwids" |
99 |
-if [[ ${PV} == "99999999" ]]; then |
100 |
+if [[ ${PV} == 99999999 ]]; then |
101 |
PYTHON_COMPAT=( python3_{6,7} ) |
102 |
inherit git-r3 python-any-r1 |
103 |
EGIT_REPO_URI="${HOMEPAGE}.git" |
104 |
@@ -20,7 +20,6 @@ LICENSE="|| ( GPL-2 BSD ) public-domain" |
105 |
SLOT="0" |
106 |
IUSE="+net +pci +udev +usb" |
107 |
|
108 |
-DEPEND="" |
109 |
RDEPEND=" |
110 |
udev? ( virtual/udev ) |
111 |
!<sys-apps/pciutils-3.1.9-r2 |
112 |
@@ -28,13 +27,13 @@ RDEPEND=" |
113 |
" |
114 |
|
115 |
if [[ ${PV} == 99999999 ]]; then |
116 |
- DEPEND+=" |
117 |
+ BDEPEND=" |
118 |
net-misc/curl |
119 |
udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') ) |
120 |
" |
121 |
python_check_deps() { |
122 |
if use udev; then |
123 |
- has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]" |
124 |
+ has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" |
125 |
fi |
126 |
} |
127 |
else |
128 |
@@ -87,6 +86,6 @@ src_install() { |
129 |
|
130 |
pkg_postinst() { |
131 |
if use udev; then |
132 |
- udevadm hwdb --update --root="${ROOT%/}" |
133 |
+ udevadm hwdb --update --root="${ROOT}" |
134 |
fi |
135 |
} |