floppym 15/07/18 16:55:47 Modified: metadata.xml hwids-99999999.ebuild ChangeLog Added: hwids-20150717-r1.ebuild hwids-20150421-r1.ebuild Log: Add workaround for mapping change in 60-keyboard.hwdb, bug 555204, patch by axs. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.4 sys-apps/hwids/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/metadata.xml?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/metadata.xml?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/metadata.xml?r1=1.3&r2=1.4 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwids/metadata.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- metadata.xml 15 Jun 2015 19:13:51 -0000 1.3 +++ metadata.xml 18 Jul 2015 16:55:47 -0000 1.4 @@ -8,6 +8,9 @@ <maintainer> <email>[email protected]</email> </maintainer> + <maintainer> + <email>[email protected]</email> + </maintainer> <use> <flag name="net">Install the oui.txt and iab.txt databases</flag> <flag name="pci">Install the pci.ids database</flag> 1.26 sys-apps/hwids/hwids-99999999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild?rev=1.26&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild?rev=1.26&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild?r1=1.25&r2=1.26 Index: hwids-99999999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- hwids-99999999.ebuild 6 Jun 2014 18:20:05 -0000 1.25 +++ hwids-99999999.ebuild 18 Jul 2015 16:55:47 -0000 1.26 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.25 2014/06/06 18:20:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.26 2015/07/18 16:55:47 floppym Exp $ EAPI=5 inherit udev eutils @@ -33,6 +33,14 @@ [[ ${PV} == "99999999" ]] && emake fetch 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() { 1.171 sys-apps/hwids/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/ChangeLog?rev=1.171&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/ChangeLog?rev=1.171&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/ChangeLog?r1=1.170&r2=1.171 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- ChangeLog 18 Jul 2015 02:00:03 -0000 1.170 +++ ChangeLog 18 Jul 2015 16:55:47 -0000 1.171 @@ -1,6 +1,14 @@ # ChangeLog for sys-apps/hwids # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.170 2015/07/18 02:00:03 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.171 2015/07/18 16:55:47 floppym Exp $ + +*hwids-20150421-r1 (18 Jul 2015) +*hwids-20150717-r1 (18 Jul 2015) + + 18 Jul 2015; Mike Gilbert <[email protected]> +hwids-20150421-r1.ebuild, + +hwids-20150717-r1.ebuild, hwids-99999999.ebuild, metadata.xml: + Add workaround for mapping change in 60-keyboard.hwdb, bug 555204, patch by + axs. *hwids-20150717 (18 Jul 2015) 1.1 sys-apps/hwids/hwids-20150717-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20150717-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20150717-r1.ebuild?rev=1.1&content-type=text/plain Index: hwids-20150717-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20150717-r1.ebuild,v 1.1 2015/07/18 16:55:47 floppym Exp $ EAPI=5 inherit udev eutils DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" HOMEPAGE="https://github.com/gentoo/hwids"; if [[ ${PV} == "99999999" ]]; then 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" fi LICENSE="|| ( GPL-2 BSD ) public-domain" SLOT="0" IUSE="+net +pci +udev +usb" DEPEND="udev? ( dev-lang/perl >=virtual/udev-206 )" [[ ${PV} == "99999999" ]] && DEPEND+=" udev? ( net-misc/curl )" RDEPEND="!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1" S=${WORKDIR}/hwids-${P} src_prepare() { [[ ${PV} == "99999999" ]] && emake fetch 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() { emake \ NET=$(usex net) \ PCI=$(usex pci) \ UDEV=$(usex udev) \ USB=$(usex usb) \ "$@" } src_compile() { _emake } src_install() { _emake install \ DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ MISCDIR="${EPREFIX}/usr/share/misc" \ HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \ DESTDIR="${D}" } pkg_postinst() { if use udev; then udevadm hwdb --update --root="${ROOT%/}" # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda [ "${ROOT:-/}" = "/" ] && udevadm control --reload fi } 1.1 sys-apps/hwids/hwids-20150421-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20150421-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20150421-r1.ebuild?rev=1.1&content-type=text/plain Index: hwids-20150421-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20150421-r1.ebuild,v 1.1 2015/07/18 16:55:47 floppym Exp $ EAPI=5 inherit udev eutils DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" HOMEPAGE="https://github.com/gentoo/hwids"; if [[ ${PV} == "99999999" ]]; then 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" fi LICENSE="|| ( GPL-2 BSD ) public-domain" SLOT="0" IUSE="+net +pci +udev +usb" DEPEND="udev? ( dev-lang/perl >=virtual/udev-206 )" [[ ${PV} == "99999999" ]] && DEPEND+=" udev? ( net-misc/curl )" RDEPEND="!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1" S=${WORKDIR}/hwids-${P} src_prepare() { [[ ${PV} == "99999999" ]] && emake fetch 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() { emake \ NET=$(usex net) \ PCI=$(usex pci) \ UDEV=$(usex udev) \ USB=$(usex usb) \ "$@" } src_compile() { _emake } src_install() { _emake install \ DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ MISCDIR="${EPREFIX}/usr/share/misc" \ HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \ DESTDIR="${D}" } pkg_postinst() { if use udev; then udevadm hwdb --update --root="${ROOT%/}" # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda [ "${ROOT:-/}" = "/" ] && udevadm control --reload fi }
