| 1 |
ssuominen 12/12/02 07:21:00 |
| 2 |
|
| 3 |
Modified: hwids-99999999.ebuild ChangeLog |
| 4 |
hwids-20121202.2.ebuild |
| 5 |
Log: |
| 6 |
Use ids-update.pl from systemd tarball to regenerate udev.bin binary formatted database from files: pci.ids, usb.ids and oui.txt |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.5 sys-apps/hwids/hwids-99999999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild?rev=1.5&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild?rev=1.5&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild?r1=1.4&r2=1.5 |
| 16 |
|
| 17 |
Index: hwids-99999999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v |
| 20 |
retrieving revision 1.4 |
| 21 |
retrieving revision 1.5 |
| 22 |
diff -u -r1.4 -r1.5 |
| 23 |
--- hwids-99999999.ebuild 2 Dec 2012 06:47:35 -0000 1.4 |
| 24 |
+++ hwids-99999999.ebuild 2 Dec 2012 07:21:00 -0000 1.5 |
| 25 |
@@ -1,8 +1,9 @@ |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.4 2012/12/02 06:47:35 ssuominen Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.5 2012/12/02 07:21:00 ssuominen Exp $ |
| 30 |
|
| 31 |
-EAPI="4" |
| 32 |
+EAPI=5 |
| 33 |
+inherit udev |
| 34 |
|
| 35 |
DESCRIPTION="Hardware (PCI, USB) IDs databases" |
| 36 |
HOMEPAGE="https://github.com/gentoo/hwids" |
| 37 |
@@ -11,11 +12,12 @@ |
| 38 |
LICENSE="|| ( GPL-2 BSD ) freedist" |
| 39 |
SLOT="0" |
| 40 |
KEYWORDS="" |
| 41 |
-IUSE="" |
| 42 |
+IUSE="+udev" |
| 43 |
|
| 44 |
-S="${WORKDIR}" |
| 45 |
+S=${WORKDIR} |
| 46 |
|
| 47 |
-DEPEND="net-misc/wget" |
| 48 |
+DEPEND="net-misc/wget |
| 49 |
+ udev? ( dev-lang/perl !=sys-fs/udev-196 )" |
| 50 |
RDEPEND="!<sys-apps/pciutils-3.1.9-r2 |
| 51 |
!<sys-apps/usbutils-005-r1" |
| 52 |
|
| 53 |
@@ -25,9 +27,25 @@ |
| 54 |
for file in {usb,pci}.ids; do |
| 55 |
zcat ${file}.gz > ${file} || die |
| 56 |
done |
| 57 |
+ |
| 58 |
+ if use udev; then |
| 59 |
+ wget http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/ids-update.pl -O ids-update-${PV}.pl || die |
| 60 |
+ perl "${DISTDIR}"/ids-update-${PV}.pl &>/dev/null || die |
| 61 |
+ fi |
| 62 |
} |
| 63 |
|
| 64 |
src_install() { |
| 65 |
insinto /usr/share/misc |
| 66 |
doins {usb,pci}.ids{,.gz} oui.txt |
| 67 |
+ |
| 68 |
+ if use udev; then |
| 69 |
+ insinto "$(udev_get_udevdir)"/hwdb.d |
| 70 |
+ doins *.hwdb |
| 71 |
+ fi |
| 72 |
+} |
| 73 |
+ |
| 74 |
+pkg_postinst() { |
| 75 |
+ if use udev && has_version '>=virtual/udev-180'; then |
| 76 |
+ udevadm hwdb --update |
| 77 |
+ fi |
| 78 |
} |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.46 sys-apps/hwids/ChangeLog |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/ChangeLog?rev=1.46&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/ChangeLog?rev=1.46&content-type=text/plain |
| 86 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/ChangeLog?r1=1.45&r2=1.46 |
| 87 |
|
| 88 |
Index: ChangeLog |
| 89 |
=================================================================== |
| 90 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v |
| 91 |
retrieving revision 1.45 |
| 92 |
retrieving revision 1.46 |
| 93 |
diff -u -r1.45 -r1.46 |
| 94 |
--- ChangeLog 2 Dec 2012 06:42:35 -0000 1.45 |
| 95 |
+++ ChangeLog 2 Dec 2012 07:21:00 -0000 1.46 |
| 96 |
@@ -1,6 +1,11 @@ |
| 97 |
# ChangeLog for sys-apps/hwids |
| 98 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 99 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.45 2012/12/02 06:42:35 flameeyes Exp $ |
| 100 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.46 2012/12/02 07:21:00 ssuominen Exp $ |
| 101 |
+ |
| 102 |
+ 02 Dec 2012; Samuli Suominen <ssuominen@g.o> hwids-20121202.2.ebuild, |
| 103 |
+ hwids-99999999.ebuild: |
| 104 |
+ Use ids-update.pl from systemd tarball to regenerate udev.bin binary |
| 105 |
+ formatted database from files: pci.ids, usb.ids and oui.txt |
| 106 |
|
| 107 |
*hwids-20121202.2 (02 Dec 2012) |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
|
| 112 |
1.3 sys-apps/hwids/hwids-20121202.2.ebuild |
| 113 |
|
| 114 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20121202.2.ebuild?rev=1.3&view=markup |
| 115 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20121202.2.ebuild?rev=1.3&content-type=text/plain |
| 116 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20121202.2.ebuild?r1=1.2&r2=1.3 |
| 117 |
|
| 118 |
Index: hwids-20121202.2.ebuild |
| 119 |
=================================================================== |
| 120 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20121202.2.ebuild,v |
| 121 |
retrieving revision 1.2 |
| 122 |
retrieving revision 1.3 |
| 123 |
diff -u -r1.2 -r1.3 |
| 124 |
--- hwids-20121202.2.ebuild 2 Dec 2012 06:47:35 -0000 1.2 |
| 125 |
+++ hwids-20121202.2.ebuild 2 Dec 2012 07:21:00 -0000 1.3 |
| 126 |
@@ -1,29 +1,37 @@ |
| 127 |
# Copyright 1999-2012 Gentoo Foundation |
| 128 |
# Distributed under the terms of the GNU General Public License v2 |
| 129 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20121202.2.ebuild,v 1.2 2012/12/02 06:47:35 ssuominen Exp $ |
| 130 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20121202.2.ebuild,v 1.3 2012/12/02 07:21:00 ssuominen Exp $ |
| 131 |
|
| 132 |
-EAPI="4" |
| 133 |
+EAPI=5 |
| 134 |
+inherit udev |
| 135 |
|
| 136 |
DESCRIPTION="Hardware (PCI, USB, OUI) IDs databases" |
| 137 |
HOMEPAGE="https://github.com/gentoo/hwids" |
| 138 |
-SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz" |
| 139 |
+SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz |
| 140 |
+ http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/ids-update.pl -> ids-update-${PV}.pl" |
| 141 |
|
| 142 |
# freedist is for oui.txt, and it's mostly wishful thinking |
| 143 |
LICENSE="|| ( GPL-2 BSD ) freedist" |
| 144 |
SLOT="0" |
| 145 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
| 146 |
-IUSE="" |
| 147 |
+IUSE="+udev" |
| 148 |
|
| 149 |
-DEPEND="" |
| 150 |
+DEPEND="udev? ( dev-lang/perl !=sys-fs/udev-196 )" |
| 151 |
RDEPEND="!<sys-apps/pciutils-3.1.9-r2 |
| 152 |
!<sys-apps/usbutils-005-r1" |
| 153 |
|
| 154 |
-S="${WORKDIR}/hwids-${P}" |
| 155 |
+S=${WORKDIR}/hwids-${P} |
| 156 |
+ |
| 157 |
+src_unpack() { unpack ${P}.tar.gz; } |
| 158 |
|
| 159 |
src_compile() { |
| 160 |
for file in {usb,pci}.ids; do |
| 161 |
gzip -c ${file} > ${file}.gz || die |
| 162 |
done |
| 163 |
+ |
| 164 |
+ if use udev; then |
| 165 |
+ perl "${DISTDIR}"/ids-update-${PV}.pl &>/dev/null || die |
| 166 |
+ fi |
| 167 |
} |
| 168 |
|
| 169 |
src_install() { |
| 170 |
@@ -31,4 +39,15 @@ |
| 171 |
doins {usb,pci}.ids{,.gz} oui.txt |
| 172 |
|
| 173 |
dodoc README.md |
| 174 |
+ |
| 175 |
+ if use udev; then |
| 176 |
+ insinto "$(udev_get_udevdir)"/hwdb.d |
| 177 |
+ doins *.hwdb |
| 178 |
+ fi |
| 179 |
+} |
| 180 |
+ |
| 181 |
+pkg_postinst() { |
| 182 |
+ if use udev && has_version '>=virtual/udev-180'; then |
| 183 |
+ udevadm hwdb --update |
| 184 |
+ fi |
| 185 |
} |
Archives