| 1 |
commit: 2257d1f32b6301fd4f232e6c8e7667aa81169c24 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 4 01:47:59 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 4 01:48:13 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2257d1f3 |
| 7 |
|
| 8 |
sys-apps/hwids: bump to 20161103 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2_p4 |
| 11 |
|
| 12 |
sys-apps/hwids/Manifest | 1 + |
| 13 |
...hwids-99999999.ebuild => hwids-20161103.ebuild} | 31 +++++++++++----------- |
| 14 |
sys-apps/hwids/hwids-99999999.ebuild | 31 +++++++++++----------- |
| 15 |
3 files changed, 33 insertions(+), 30 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest |
| 18 |
index df5b40d..709d2e1 100644 |
| 19 |
--- a/sys-apps/hwids/Manifest |
| 20 |
+++ b/sys-apps/hwids/Manifest |
| 21 |
@@ -2,3 +2,4 @@ DIST hwids-20150717.tar.gz 1745565 SHA256 5a4769cd0e57a96c2693e7ec3d48f53e493afa |
| 22 |
DIST hwids-20160306.tar.gz 1900745 SHA256 d5ae6937e87c4ae0a4dad84b8a917434831eda15b0bfcc5a8444bfca84279645 SHA512 766736ed2586ea163b0ea97654d6b73314bacc822d26f9d823dcd9de8661747a0372b0cd754b3c2605c6b1795440f87df126beafc391cf64577f461bd27b5e6c WHIRLPOOL 9a5d38fb4afa232917f69aa8d1fde3e55e20674d740941a392ee7cfa3f7d64d679a6e0a96553fb6c327bf5c98a1c3e8f6eff902dda99751dd5a15c6c20585022 |
| 23 |
DIST hwids-20160421.tar.gz 1916501 SHA256 dcdfbb732e08ca3822c98599dc0a04c6dad092ee46441f9afec9e42d9a978d5f SHA512 7097dc74cd1db3e9695502d4ca49ff0c3a59d169cd15dd6d03841900a9c5e13f89becc12bbc1a673386c6f7620a916e0edb7c5704990991beb21fc21d5deb673 WHIRLPOOL 42641b19601ba62d2f136d263342a39e56147cb89f557408677868215b83cf8466a8d5bb9127f28113c6097d08e05a194b4e78c8e6dd2222371f180d1b3cff24 |
| 24 |
DIST hwids-20160801.tar.gz 1957408 SHA256 404c1fca03d11c90e21de9e3bec10600b0bbaefede1dcb71ff520bff8dfb6aec SHA512 c233f9a44e813efbef302c0d7aefff9168b8bb6f48e537ae6568ca89944f69cde3fd9d618019fdd8fbe442ef4a85bfcfe762b9837fea82d8f219155ff5551f77 WHIRLPOOL b24da4e6e6c9b5a8894e2b42cf29ae2ee8c40ea198290aa87e622b2db16f50c6c0f4e059aa8f2501e2a8ebc6e5e04372ea224bdf17bdcadbe94f6f73470c30ec |
| 25 |
+DIST hwids-20161103.tar.gz 2000437 SHA256 3353680623b97ffb3e73486dac7e9d61cb58889544aeefd6bbe12d51189e4313 SHA512 8bdd01a27b18661a186d9f04a5e30b28d73c13c8b1f10f26ccb8103857dcd7f74ebde228f0be8c7b87cc29087315c60e56bfedaab934f51cb78f8b710057961a WHIRLPOOL d2bcb220f9bbdce0e567c5da968c8980d336d2716b7974e5cf4ff477e5c87892f6fd5a9ca5b07620ba789d70c4cc75870d42f3efab9d05629c34161a2ececa6a |
| 26 |
|
| 27 |
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-20161103.ebuild |
| 28 |
similarity index 64% |
| 29 |
copy from sys-apps/hwids/hwids-99999999.ebuild |
| 30 |
copy to sys-apps/hwids/hwids-20161103.ebuild |
| 31 |
index 3ed137f..2b7cac3 100644 |
| 32 |
--- a/sys-apps/hwids/hwids-99999999.ebuild |
| 33 |
+++ b/sys-apps/hwids/hwids-20161103.ebuild |
| 34 |
@@ -1,15 +1,15 @@ |
| 35 |
# Copyright 1999-2016 Gentoo Foundation |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI="5" |
| 39 |
+EAPI="6" |
| 40 |
|
| 41 |
inherit udev eutils |
| 42 |
|
| 43 |
DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" |
| 44 |
HOMEPAGE="https://github.com/gentoo/hwids" |
| 45 |
if [[ ${PV} == "99999999" ]]; then |
| 46 |
+ inherit git-r3 |
| 47 |
EGIT_REPO_URI="${HOMEPAGE}.git" |
| 48 |
- inherit git-2 |
| 49 |
else |
| 50 |
SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz" |
| 51 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux" |
| 52 |
@@ -27,20 +27,23 @@ DEPEND="udev? ( |
| 53 |
RDEPEND="!<sys-apps/pciutils-3.1.9-r2 |
| 54 |
!<sys-apps/usbutils-005-r1" |
| 55 |
|
| 56 |
-S=${WORKDIR}/hwids-${P} |
| 57 |
+if [[ ${PV} != 99999999 ]]; then |
| 58 |
+ S=${WORKDIR}/hwids-${P} |
| 59 |
+fi |
| 60 |
|
| 61 |
-src_prepare() { |
| 62 |
- [[ ${PV} == "99999999" ]] && emake fetch |
| 63 |
+src_unpack() { |
| 64 |
+ if [[ ${PV} == 99999999 ]]; then |
| 65 |
+ git-r3_src_unpack |
| 66 |
+ cd "${S}" || die |
| 67 |
+ emake fetch |
| 68 |
+ else |
| 69 |
+ default |
| 70 |
+ fi |
| 71 |
+} |
| 72 |
|
| 73 |
+src_prepare() { |
| 74 |
+ default |
| 75 |
sed -i -e '/udevadm hwdb/d' Makefile || die |
| 76 |
- |
| 77 |
- # Create a rules file compatible with older udev. |
| 78 |
- sed -e 's/evdev:name/keyboard:name/' \ |
| 79 |
- -e 's/evdev:atkbd:dmi/keyboard:dmi/' \ |
| 80 |
- -e 's/evdev:input:b\([^v]*\)v\([^p]*\)p\([^e]*\)\(e.*\)\?/keyboard:usb:v\2p\3/' \ |
| 81 |
- -e 's/keyboard:usb:v046DpC52D\*/keyboard:usb:v046DpC52Dd*dc*dsc*dp*ic*isc*ip*in00*/' \ |
| 82 |
- -e 's/keyboard:usb:v0458p0708\*/keyboard:usb:v0458p0708d*dc*dsc*dp*ic*isc*ip*in01*/' \ |
| 83 |
- udev/60-keyboard.hwdb > udev/61-oldkeyboard.hwdb || die |
| 84 |
} |
| 85 |
|
| 86 |
_emake() { |
| 87 |
@@ -67,7 +70,5 @@ src_install() { |
| 88 |
pkg_postinst() { |
| 89 |
if use udev; then |
| 90 |
udevadm hwdb --update --root="${ROOT%/}" |
| 91 |
- # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda |
| 92 |
- [ "${ROOT:-/}" = "/" ] && udevadm control --reload |
| 93 |
fi |
| 94 |
} |
| 95 |
|
| 96 |
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild |
| 97 |
index 3ed137f..2b7cac3 100644 |
| 98 |
--- a/sys-apps/hwids/hwids-99999999.ebuild |
| 99 |
+++ b/sys-apps/hwids/hwids-99999999.ebuild |
| 100 |
@@ -1,15 +1,15 @@ |
| 101 |
# Copyright 1999-2016 Gentoo Foundation |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
|
| 104 |
-EAPI="5" |
| 105 |
+EAPI="6" |
| 106 |
|
| 107 |
inherit udev eutils |
| 108 |
|
| 109 |
DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" |
| 110 |
HOMEPAGE="https://github.com/gentoo/hwids" |
| 111 |
if [[ ${PV} == "99999999" ]]; then |
| 112 |
+ inherit git-r3 |
| 113 |
EGIT_REPO_URI="${HOMEPAGE}.git" |
| 114 |
- inherit git-2 |
| 115 |
else |
| 116 |
SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz" |
| 117 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux" |
| 118 |
@@ -27,20 +27,23 @@ DEPEND="udev? ( |
| 119 |
RDEPEND="!<sys-apps/pciutils-3.1.9-r2 |
| 120 |
!<sys-apps/usbutils-005-r1" |
| 121 |
|
| 122 |
-S=${WORKDIR}/hwids-${P} |
| 123 |
+if [[ ${PV} != 99999999 ]]; then |
| 124 |
+ S=${WORKDIR}/hwids-${P} |
| 125 |
+fi |
| 126 |
|
| 127 |
-src_prepare() { |
| 128 |
- [[ ${PV} == "99999999" ]] && emake fetch |
| 129 |
+src_unpack() { |
| 130 |
+ if [[ ${PV} == 99999999 ]]; then |
| 131 |
+ git-r3_src_unpack |
| 132 |
+ cd "${S}" || die |
| 133 |
+ emake fetch |
| 134 |
+ else |
| 135 |
+ default |
| 136 |
+ fi |
| 137 |
+} |
| 138 |
|
| 139 |
+src_prepare() { |
| 140 |
+ default |
| 141 |
sed -i -e '/udevadm hwdb/d' Makefile || die |
| 142 |
- |
| 143 |
- # Create a rules file compatible with older udev. |
| 144 |
- sed -e 's/evdev:name/keyboard:name/' \ |
| 145 |
- -e 's/evdev:atkbd:dmi/keyboard:dmi/' \ |
| 146 |
- -e 's/evdev:input:b\([^v]*\)v\([^p]*\)p\([^e]*\)\(e.*\)\?/keyboard:usb:v\2p\3/' \ |
| 147 |
- -e 's/keyboard:usb:v046DpC52D\*/keyboard:usb:v046DpC52Dd*dc*dsc*dp*ic*isc*ip*in00*/' \ |
| 148 |
- -e 's/keyboard:usb:v0458p0708\*/keyboard:usb:v0458p0708d*dc*dsc*dp*ic*isc*ip*in01*/' \ |
| 149 |
- udev/60-keyboard.hwdb > udev/61-oldkeyboard.hwdb || die |
| 150 |
} |
| 151 |
|
| 152 |
_emake() { |
| 153 |
@@ -67,7 +70,5 @@ src_install() { |
| 154 |
pkg_postinst() { |
| 155 |
if use udev; then |
| 156 |
udevadm hwdb --update --root="${ROOT%/}" |
| 157 |
- # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda |
| 158 |
- [ "${ROOT:-/}" = "/" ] && udevadm control --reload |
| 159 |
fi |
| 160 |
} |
Archives