commit: 2257d1f32b6301fd4f232e6c8e7667aa81169c24 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Nov 4 01:47:59 2016 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Nov 4 01:48:13 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2257d1f3
sys-apps/hwids: bump to 20161103 Package-Manager: portage-2.3.2_p4 sys-apps/hwids/Manifest | 1 + ...hwids-99999999.ebuild => hwids-20161103.ebuild} | 31 +++++++++++----------- sys-apps/hwids/hwids-99999999.ebuild | 31 +++++++++++----------- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest index df5b40d..709d2e1 100644 --- a/sys-apps/hwids/Manifest +++ b/sys-apps/hwids/Manifest @@ -2,3 +2,4 @@ DIST hwids-20150717.tar.gz 1745565 SHA256 5a4769cd0e57a96c2693e7ec3d48f53e493afa DIST hwids-20160306.tar.gz 1900745 SHA256 d5ae6937e87c4ae0a4dad84b8a917434831eda15b0bfcc5a8444bfca84279645 SHA512 766736ed2586ea163b0ea97654d6b73314bacc822d26f9d823dcd9de8661747a0372b0cd754b3c2605c6b1795440f87df126beafc391cf64577f461bd27b5e6c WHIRLPOOL 9a5d38fb4afa232917f69aa8d1fde3e55e20674d740941a392ee7cfa3f7d64d679a6e0a96553fb6c327bf5c98a1c3e8f6eff902dda99751dd5a15c6c20585022 DIST hwids-20160421.tar.gz 1916501 SHA256 dcdfbb732e08ca3822c98599dc0a04c6dad092ee46441f9afec9e42d9a978d5f SHA512 7097dc74cd1db3e9695502d4ca49ff0c3a59d169cd15dd6d03841900a9c5e13f89becc12bbc1a673386c6f7620a916e0edb7c5704990991beb21fc21d5deb673 WHIRLPOOL 42641b19601ba62d2f136d263342a39e56147cb89f557408677868215b83cf8466a8d5bb9127f28113c6097d08e05a194b4e78c8e6dd2222371f180d1b3cff24 DIST hwids-20160801.tar.gz 1957408 SHA256 404c1fca03d11c90e21de9e3bec10600b0bbaefede1dcb71ff520bff8dfb6aec SHA512 c233f9a44e813efbef302c0d7aefff9168b8bb6f48e537ae6568ca89944f69cde3fd9d618019fdd8fbe442ef4a85bfcfe762b9837fea82d8f219155ff5551f77 WHIRLPOOL b24da4e6e6c9b5a8894e2b42cf29ae2ee8c40ea198290aa87e622b2db16f50c6c0f4e059aa8f2501e2a8ebc6e5e04372ea224bdf17bdcadbe94f6f73470c30ec +DIST hwids-20161103.tar.gz 2000437 SHA256 3353680623b97ffb3e73486dac7e9d61cb58889544aeefd6bbe12d51189e4313 SHA512 8bdd01a27b18661a186d9f04a5e30b28d73c13c8b1f10f26ccb8103857dcd7f74ebde228f0be8c7b87cc29087315c60e56bfedaab934f51cb78f8b710057961a WHIRLPOOL d2bcb220f9bbdce0e567c5da968c8980d336d2716b7974e5cf4ff477e5c87892f6fd5a9ca5b07620ba789d70c4cc75870d42f3efab9d05629c34161a2ececa6a diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-20161103.ebuild similarity index 64% copy from sys-apps/hwids/hwids-99999999.ebuild copy to sys-apps/hwids/hwids-20161103.ebuild index 3ed137f..2b7cac3 100644 --- a/sys-apps/hwids/hwids-99999999.ebuild +++ b/sys-apps/hwids/hwids-20161103.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" inherit udev eutils DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" HOMEPAGE="https://github.com/gentoo/hwids"; if [[ ${PV} == "99999999" ]]; then + inherit git-r3 EGIT_REPO_URI="${HOMEPAGE}.git" - inherit git-2 else SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz" 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" @@ -27,20 +27,23 @@ DEPEND="udev? ( RDEPEND="!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1" -S=${WORKDIR}/hwids-${P} +if [[ ${PV} != 99999999 ]]; then + S=${WORKDIR}/hwids-${P} +fi -src_prepare() { - [[ ${PV} == "99999999" ]] && emake fetch +src_unpack() { + if [[ ${PV} == 99999999 ]]; then + git-r3_src_unpack + cd "${S}" || die + emake fetch + else + default + fi +} +src_prepare() { + default sed -i -e '/udevadm hwdb/d' Makefile || die - - # Create a rules file compatible with older udev. - sed -e 's/evdev:name/keyboard:name/' \ - -e 's/evdev:atkbd:dmi/keyboard:dmi/' \ - -e 's/evdev:input:b\([^v]*\)v\([^p]*\)p\([^e]*\)\(e.*\)\?/keyboard:usb:v\2p\3/' \ - -e 's/keyboard:usb:v046DpC52D\*/keyboard:usb:v046DpC52Dd*dc*dsc*dp*ic*isc*ip*in00*/' \ - -e 's/keyboard:usb:v0458p0708\*/keyboard:usb:v0458p0708d*dc*dsc*dp*ic*isc*ip*in01*/' \ - udev/60-keyboard.hwdb > udev/61-oldkeyboard.hwdb || die } _emake() { @@ -67,7 +70,5 @@ src_install() { pkg_postinst() { if use udev; then udevadm hwdb --update --root="${ROOT%/}" - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - [ "${ROOT:-/}" = "/" ] && udevadm control --reload fi } diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild index 3ed137f..2b7cac3 100644 --- a/sys-apps/hwids/hwids-99999999.ebuild +++ b/sys-apps/hwids/hwids-99999999.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" inherit udev eutils DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" HOMEPAGE="https://github.com/gentoo/hwids"; if [[ ${PV} == "99999999" ]]; then + inherit git-r3 EGIT_REPO_URI="${HOMEPAGE}.git" - inherit git-2 else SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz" 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" @@ -27,20 +27,23 @@ DEPEND="udev? ( RDEPEND="!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1" -S=${WORKDIR}/hwids-${P} +if [[ ${PV} != 99999999 ]]; then + S=${WORKDIR}/hwids-${P} +fi -src_prepare() { - [[ ${PV} == "99999999" ]] && emake fetch +src_unpack() { + if [[ ${PV} == 99999999 ]]; then + git-r3_src_unpack + cd "${S}" || die + emake fetch + else + default + fi +} +src_prepare() { + default sed -i -e '/udevadm hwdb/d' Makefile || die - - # Create a rules file compatible with older udev. - sed -e 's/evdev:name/keyboard:name/' \ - -e 's/evdev:atkbd:dmi/keyboard:dmi/' \ - -e 's/evdev:input:b\([^v]*\)v\([^p]*\)p\([^e]*\)\(e.*\)\?/keyboard:usb:v\2p\3/' \ - -e 's/keyboard:usb:v046DpC52D\*/keyboard:usb:v046DpC52Dd*dc*dsc*dp*ic*isc*ip*in00*/' \ - -e 's/keyboard:usb:v0458p0708\*/keyboard:usb:v0458p0708d*dc*dsc*dp*ic*isc*ip*in01*/' \ - udev/60-keyboard.hwdb > udev/61-oldkeyboard.hwdb || die } _emake() { @@ -67,7 +70,5 @@ src_install() { pkg_postinst() { if use udev; then udevadm hwdb --update --root="${ROOT%/}" - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - [ "${ROOT:-/}" = "/" ] && udevadm control --reload fi }
