diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-12-02 07:29:10 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-12-02 07:29:10 +0000 |
commit | 19b5f7c95a34d9f7271841efec33b43f8af19944 (patch) | |
tree | effd7ff47287d6e8b406b34a856610d171297c7b /sys-fs | |
parent | Use ids-update.pl from systemd tarball to regenerate udev.bin binary formatte... (diff) | |
download | historical-19b5f7c95a34d9f7271841efec33b43f8af19944.tar.gz historical-19b5f7c95a34d9f7271841efec33b43f8af19944.tar.bz2 historical-19b5f7c95a34d9f7271841efec33b43f8af19944.zip |
New toys
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/udev/ChangeLog | 12 | ||||
-rw-r--r-- | sys-fs/udev/Manifest | 19 | ||||
-rw-r--r-- | sys-fs/udev/udev-196-r1.ebuild | 397 | ||||
-rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 12 |
4 files changed, 420 insertions, 20 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 081847b328da..ca7942fd9ee5 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.748 2012/12/02 06:05:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.749 2012/12/02 07:29:05 ssuominen Exp $ - 02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> udev-196.ebuild, +*udev-196-r1 (02 Dec 2012) + + 02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> +udev-196-r1.ebuild, udev-9999.ebuild: - Install hwdb.d files to /usr/lib/udev/hwdb.d and run udevadm hwdb --update in - pkg_postinst() to refresh /etc/udev/udev.bin + USE="hwdb" will now pull in sys-apps/hwids with USE="udev" enabled to gain + pci.ids, usb.ids and oui.txt to generate /etc/udev/udev.bin from. + Run udevadm hwdb --update too. Thanks to Flameeyes for co-operating with + this one. *udev-196 (02 Dec 2012) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 3bf28fa76ec7..fceb37705238 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -28,19 +28,20 @@ EBUILD udev-151-r4.ebuild 16804 SHA256 7315f6e89edd97ef057259e64465aa669b53fe020 EBUILD udev-164-r2.ebuild 15179 SHA256 e957e7d9bb99f29a20de5f5666c19db0e645fdf70751741926819cf85dfe8365 SHA512 8c9143207389a70ff3919753d250ef1d68bbdae6b4ca224d43a3f3314a5f80e2617d4b0af4678bf1d08afb7ada6984459d1bc10ec502bf278f093e058c6fde8e WHIRLPOOL e778db14702ae5e9559afef46b70315829f7c0d0f4c40a1e85c8af5a6ef9be7ab2e8e15274f2f82b363f75123dfee631ced2aa56c7c0997babb4d25ba702c064 EBUILD udev-171-r9.ebuild 16105 SHA256 1b21d6b2fd4af6382ab5cf3c255cb6c2b2f026ffbfbd808db8662b958de30f1b SHA512 efce00bbb87120a476fc2bfd497a460b3656024389fc2ac999dcaac8e95e2450d101038b0838d0a9f8dbc948c4b1f42e6cc3819df2857839564806f7293e5af9 WHIRLPOOL 7e73e343a7778bffdb5002fa0994a3d4e55972d230877d6501afc777717244eb81b16a50e9a28ed698b8842c8b5c44b182825ac9c551217a2401009eb31b1761 EBUILD udev-195.ebuild 11412 SHA256 f653139c9ea79bc7c743c9991febf1e74fc38e04aa487698492e0e34c2b278f7 SHA512 88d74d73158f3a7d4d2f24935abbfd60afae80c9778493d30558555852762b0356625e67ed2327baf1d0c9bb4ade41911b19ffc702ae4153e1f0a17d1b683f51 WHIRLPOOL 113a3d56da645744dbfc8c8278dd429807dae42f2179c502725412dec155681c0e70fe4d36d0420c3506a69bedc6523c344a258e4510d0349439108484394314 +EBUILD udev-196-r1.ebuild 10269 SHA256 67af44b5bb9a2cb5c739c1648220c389b193d573d3de73ec2e48b04a5e55535f SHA512 ffd974a9a2e80608badc70ac5d0a7163f9281c72077b43a49619a758c123bc3dc6e135389e7526507a679b1ffacaa5f9df63801a279e42f81d2f8df51397af09 WHIRLPOOL 0dc8ea4ecd4088d50fd4c7d76c9c0e599ed23948557cc66ac5956f33124e88e29e78e9bf880ac224bfc4070ad42c00e56056c883e285376ae4c5ba80f80bb025 EBUILD udev-196.ebuild 10254 SHA256 e460a6611f914ff86a5a08343e0ea756ffe809de068f73271653cf1a48e1ce47 SHA512 5131692ef301192cf61182bd2f9d4a5e9dfe5ac2a5bed15681b5f6c02f20c4da275e9bd0731081e548f47cbb968d73d962621c2c080ac6e00163ecc31b2a4868 WHIRLPOOL 72eb74931a292e8edd8cd28dcb433d71c9e8301498cc4b44992d9739ad14ae643a169791fbce98bd4812b0861bf33d63d25af789227b9f2a9251b11e9d55201a -EBUILD udev-9999.ebuild 10272 SHA256 1dbc83985c96d9419ac4b9b720fad26ab1bae037ed5b63eef73bc7fec5f69bf7 SHA512 ad85ceb8733b84814d515d452d168b638c9a409f7cc5c6aa655a1ecb3c5f6858bc48c489f68ddab1c33c4ee3ce71cc8304ccb6da121769d742f9679bdbcdeaf5 WHIRLPOOL 12858059eeb2e70c4c4e99551600e5a1d571f94fcda69b80314013a6ec1b7ca310da8757302c8d0c55cef383427a9fc68987846be2bb2a956e6b96fc8e4463ff -MISC ChangeLog 44880 SHA256 4a2e5e68f705c8c7ab3296be65a48e789da1e0bd69f505e200b9c5c8c20f0c56 SHA512 ca64732da8bc0314857d9ce6a3f545dcd08bf2a2c40afd42f923ff3126f806cd30edf7ba8a114c41dfb2c5a7cbcbfafee71b83618f4e5af27a895fb4f1ed2949 WHIRLPOOL 6ae699536537cad9abac6e0be59e89243fa178b3720a8bb952181614ee246f3bebc66b2a5ce615b2be174fc3e4da103eaccddf11e0131291a8e8cbb9c9984769 +EBUILD udev-9999.ebuild 10284 SHA256 b57c1f2f963d357ef1083d8939dbbb43223c355bc799d76d3b2a15a3f2abc0d1 SHA512 f848d0935c48f3d675524cbb37d75e2f039f74dac93069a1a23d1ad0558a66cd6e766184d9a8662b82bd0839084eb58bec265b3ec0397c0b7f62c5f23d9a551b WHIRLPOOL a467f944c3de75034e61009de95d3f75bc9c83222fb93391e7d4036855901ea8c2cbbbb356d07d8d8b5f5f5271c893d68fc168b2face759c988aff00df7afc77 +MISC ChangeLog 45017 SHA256 e84ad1d3c4d44abb5e70347cb24fddb72892274ae3c05855dff073aa10d8edc0 SHA512 0222c42d8640b01ed254b301c864cce62568be273858e51100ca8c6bab931fa5ddec6dfb8e24e72e37475f119b08903d16d962438d331877d446a468457385d3 WHIRLPOOL aaced491043c82acaea79686ef627a2285bc3454cdd3bed2c114dc1c41bd970c049804900610fbd82daadfcf24a14f6da0ff813ac2a5d75d946d86844d8af1c0 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5 MISC metadata.xml 1219 SHA256 0ae3dd9577e914a82f647c359681a278220520270fe4ae1a4dbd7ea0c0071945 SHA512 bab691cd1183391798ef4bb1997c995573a30213afdd2565fbf3f33c9dd7953a915e40a9a8a2963b47f8950e97707e0204f41847f891e99cac8ec0db067d7b57 WHIRLPOOL fb116da30e0c1fbd84ec8eda60d2677ed9972a2144138f4b3e6bddb11d2a38b117522417f3c7c445801bfe9461cb870560a4019df1c7fd36b646ee0ebf9a06a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQuu+1AAoJEEdUh39IaPFNjUUH/AjpnMI1FZ9YlsBpsxmzkcNO -LngAnKiAAnSgkITPHn1ZI46TEfSq4lc+qcxb4OJ9NVRHWw24veNAOqMmgiaIAMeB -Ob2ak/0J1jzwWsrB4KvyJKYAXDfhy4a42sM1Q8kxbKJQY7EipF4SRd1g1/zeo8El -sF0GYb9qtBVqh5aeLIR3KHDJghT7ECKKBss0ff/XRXR+56IPvVYGaqQIBqdBiG+l -cinFs9ZONX80C9w+47e18IxLFSUXROCI3nE43auLoEc/dorjcIcTnL62Sj6xFq8Q -Z7nApcGTp4tv6NGI7UI+DQIDEe0hxBweRK2AVZD3EnrCpvjUGgboXOqUygKLq5g= -=smTz +iQEcBAEBCAAGBQJQuwNCAAoJEEdUh39IaPFN+KIH/RZU13n9OXu1g5AShoPRvv/3 +I3/3AYpI5FxUiIf4oGqimni+GG1Y5uu1iReIbEiR6y9CiUCj8bSJuffuQ74Ewqf8 +WeNCOBFv8ZdwdYZtbo0poMpT+snDmuRRHQz0rAPRv/GCTy8UT1JtGNRwDmnCm00N +ZBGJkt1UTzzqQGn7/ZFie23MqJxb6P/U3fXFsLiYiepOK2CHVuWiyICfpvfSsYxD +897G9oRGwcAK3Bridetzb8VQkdOUmHYBH8f/WFab6JuEuV5CeCryLRUWRBXZ3sQQ +4DD5ZOckDX/1w2/BwQlt3EqyqZxghMjJ+vxhsvjQ+DHQ2+KOuqGwRbAi4TA9mFE= +=N+2I -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/udev-196-r1.ebuild b/sys-fs/udev/udev-196-r1.ebuild new file mode 100644 index 000000000000..dcb8e70972e9 --- /dev/null +++ b/sys-fs/udev/udev-196-r1.ebuild @@ -0,0 +1,397 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-196-r1.ebuild,v 1.1 2012/12/02 07:29:05 ssuominen Exp $ + +EAPI=4 + +KV_min=2.6.39 + +inherit autotools eutils linux-info + +if [[ ${PV} = 9999* ]] +then + EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" + inherit git-2 +else + patchset=1 + SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" + if [[ -n "${patchset}" ]] + then + SRC_URI="${SRC_URI} + mirror://gentoo/${PN}-195-patches-${patchset}.tar.bz2" + fi + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl doc gudev hwdb introspection keymap +openrc selinux static-libs" + +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/kmod-11-r3 + >=sys-apps/util-linux-2.20 + acl? ( sys-apps/acl ) + gudev? ( >=dev-libs/glib-2 ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) + selinux? ( sys-libs/libselinux ) + !<sys-libs/glibc-2.11" + +DEPEND="${COMMON_DEPEND} + dev-util/gperf + >=dev-util/intltool-0.50 + virtual/os-headers + virtual/pkgconfig + !<sys-kernel/linux-headers-${KV_min} + doc? ( dev-util/gtk-doc ) + hwdb? ( >=sys-apps/hwids-20121202.2[udev] )" + +if [[ ${PV} = 9999* ]] +then + DEPEND="${DEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt" +fi + +RDEPEND="${COMMON_DEPEND} + openrc? ( >=sys-fs/udev-init-scripts-16 + !<sys-apps/openrc-0.9.9 ) + !sys-apps/coldplug + !<sys-fs/lvm2-2.02.45 + !sys-fs/device-mapper + !<sys-fs/udev-init-scripts-16 + !<sys-kernel/dracut-017-r1 + !<sys-kernel/genkernel-3.4.25" + +PDEPEND=">=virtual/udev-180" + +S=${WORKDIR}/systemd-${PV} + +QA_MULTILIB_PATHS="usr/lib/systemd/systemd-udevd" + +udev_check_KV() +{ + if kernel_is lt ${KV_min//./ } + then + return 1 + fi + return 0 +} + +check_default_rules() +{ + # Make sure there are no sudden changes to upstream rules file + # (more for my own needs than anything else ...) + local udev_rules_md5=66bb698deeae64ab444b710baf54a412 + MD5=$(md5sum < "${S}"/rules/50-udev-default.rules) + MD5=${MD5/ -/} + if [[ ${MD5} != ${udev_rules_md5} ]] + then + eerror "50-udev-default.rules has been updated, please validate!" + eerror "md5sum: ${MD5}" + die "50-udev-default.rules has been updated, please validate!" + fi +} + +pkg_setup() +{ + # required kernel options + CONFIG_CHECK="~DEVTMPFS" + ERROR_DEVTMPFS="DEVTMPFS is not set in this kernel. Udev will not run." + + linux-info_pkg_setup + + if ! udev_check_KV + then + eerror "Your kernel version (${KV_FULL}) is too old to run ${P}" + eerror "It must be at least ${KV_min}!" + fi + + KV_FULL_SRC=${KV_FULL} + get_running_version + if ! udev_check_KV + then + eerror + eerror "Your running kernel version (${KV_FULL}) is too old" + eerror "for this version of udev." + eerror "You must upgrade your kernel or downgrade udev." + fi +} + +src_prepare() +{ + # backport some patches + if [[ -n "${patchset}" ]] + then + EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch + fi + + # change rules back to group uucp instead of dialout for now + sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ + -i rules/*.rules \ + || die "failed to change group dialout to uucp" + + if [[ ! -e configure ]] + then + if use doc + then + gtkdocize --docdir docs || die "gtkdocize failed" + else + echo 'EXTRA_DIST =' > docs/gtk-doc.make + fi + eautoreconf + else + check_default_rules + elibtoolize + fi +} + +src_configure() +{ + local econf_args + + econf_args=( + ac_cv_search_cap_init= + ac_cv_header_sys_capability_h=yes + DBUS_CFLAGS=' ' + DBUS_LIBS=' ' + --docdir=/usr/share/doc/${PF} + --libdir=/usr/$(get_libdir) + --with-distro=gentoo + --with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware:/lib/firmware/updates:/lib/firmware + --with-html-dir=/usr/share/doc/${PF}/html + --with-rootlibdir=/usr/$(get_libdir) + --with-rootprefix=/usr + --disable-audit + --disable-coredump + --disable-hostnamed + --disable-ima + --disable-libcryptsetup + --disable-localed + --disable-logind + --disable-nls + --disable-pam + --disable-quotacheck + --disable-readahead + --enable-split-usr + --disable-tcpwrap + --disable-timedated + --disable-xz + $(use_enable acl) + $(use_enable doc gtk-doc) + $(use_enable gudev) + $(use_enable introspection) + $(use_enable keymap) + $(use_enable selinux) + $(use_enable static-libs static) + ) + econf "${econf_args[@]}" +} + +src_compile() +{ + echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra + emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES + local targets=( + systemd-udevd + udevadm + libudev.la + ata_id + cdrom_id + collect + scsi_id + v4l_id + accelerometer + mtd_probe + man/udev.7 + man/udevadm.8 + man/systemd-udevd.8 + man/systemd-udevd.service.8 + ) + use keymap && targets+=( keymap ) + use gudev && targets+=( libgudev-1.0.la ) + + emake "${targets[@]}" + if use doc + then + emake -C docs/libudev + use gudev && emake -C docs/gudev + fi +} + +src_install() +{ + local lib_LTLIBRARIES=libudev.la \ + pkgconfiglib_DATA=src/libudev/libudev.pc + + local targets=( + install-libLTLIBRARIES + install-includeHEADERS + install-libgudev_includeHEADERS + install-binPROGRAMS + install-rootlibexecPROGRAMS + install-udevlibexecPROGRAMS + install-dist_systemunitDATA + install-dist_udevconfDATA + install-dist_udevhomeSCRIPTS + install-dist_udevkeymapDATA + install-dist_udevkeymapforcerelDATA + install-dist_udevrulesDATA + install-girDATA + install-man7 + install-man8 + install-nodist_systemunitDATA + install-pkgconfiglibDATA + install-sharepkgconfigDATA + install-typelibsDATA + install-dist_docDATA + udev-confdirs + systemd-install-hook + ) + + if use gudev + then + lib_LTLIBRARIES+=" libgudev-1.0.la" + pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc" + fi + + # add final values of variables: + targets+=( + rootlibexec_PROGRAMS=systemd-udevd + bin_PROGRAMS=udevadm + lib_LTLIBRARIES="${lib_LTLIBRARIES}" + MANPAGES="man/udev.7 man/udevadm.8 man/systemd-udevd.service.8" + MANPAGES_ALIAS="man/systemd-udevd.8" + dist_systemunit_DATA="units/systemd-udevd-control.socket \ + units/systemd-udevd-kernel.socket" + nodist_systemunit_DATA="units/systemd-udevd.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service" + pkgconfiglib_DATA="${pkgconfiglib_DATA}" + ) + emake DESTDIR="${D}" "${targets[@]}" + if use doc + then + emake -C docs/libudev DESTDIR="${D}" install + use gudev && emake -C docs/gudev DESTDIR="${D}" install + fi + dodoc TODO + + prune_libtool_files --all + rm -f "${D}"/usr/lib/udev/rules.d/99-systemd.rules + rm -rf "${D}"/usr/share/doc/${PF}/LICENSE.* + + # install gentoo-specific rules + insinto /usr/lib/udev/rules.d + doins "${FILESDIR}"/40-gentoo.rules + + # install udevadm symlink + dosym ../usr/bin/udevadm /sbin/udevadm +} + +pkg_preinst() +{ + local htmldir + for htmldir in gudev libudev; do + if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]] + then + rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir} + fi + if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]] + then + dosym ../../doc/${PF}/html/${htmldir} \ + /usr/share/gtk-doc/html/${htmldir} + fi + done + preserve_old_lib /$(get_libdir)/libudev.so.0 +} + +# This function determines if a directory is a mount point. +# It was lifted from dracut. +ismounted() +{ + while read a m a; do + [[ $m = $1 ]] && return 0 + done < "${ROOT}"/proc/mounts + return 1 +} + +pkg_postinst() +{ + mkdir -p "${ROOT}"/run + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${ROOT}"/dev/loop 2>/dev/null + if [[ -d ${ROOT}/dev/loop ]] + then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + # 64-device-mapper.rules now gets installed by sys-fs/device-mapper + # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007 + if [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules + einfo "Removed unneeded file 64-device-mapper.rules" + fi + + if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 189 ]]; then + ewarn + ewarn "Upstream has removed the persistent-net and persistent-cd rules" + ewarn "generator. If you need persistent names for these devices," + ewarn "place udev rules for them in ${ROOT}etc/udev/rules.d." + ewarn "Be aware that you cannot directly swap device names, so persistent" + ewarn "rules for network devices should be like the ones at the following" + ewarn "URL:" + ewarn "http://bugs.gentoo.org/show_bug.cgi?id=433746#c1" + fi + + if ismounted /usr + then + ewarn + ewarn "Your system has /usr on a separate partition. This means" + ewarn "you will need to use an initramfs to pre-mount /usr before" + ewarn "udev runs." + ewarn "This must be set up before your next reboot, or you may" + ewarn "experience failures which are very difficult to troubleshoot." + ewarn "For a more detailed explanation, see the following URL:" + ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken" + ewarn + ewarn "For more information on setting up an initramfs, see the" + ewarn "following URL:" + ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml" + fi + + if [[ -d ${ROOT}lib/udev ]] + then + ewarn + ewarn "This version of udev moves the files which were installed in" + ewarn "/lib/udev to /usr/lib/udev. We include a backward compatibility" + ewarn "patch for gentoo to allow the rules in /lib/udev/rules.d to be" + ewarn "read; however, bugs should be filed against packages which are" + ewarn "installing things in /lib/udev so they can be fixed." + fi + + ewarn + ewarn "You need to restart udev as soon as possible to make the upgrade go" + ewarn "into effect." + ewarn "The method you use to do this depends on your init system." + + preserve_old_lib_notify /$(get_libdir)/libudev.so.0 + + elog + elog "For more information on udev on Gentoo, writing udev rules, and" + elog " fixing known issues visit:" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" + + use hwdb && udevadm hwdb --update +} diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index f40553f6ed02..a29019df195d 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.121 2012/12/02 06:05:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.122 2012/12/02 07:29:05 ssuominen Exp $ EAPI=4 @@ -28,7 +28,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" LICENSE="LGPL-2.1 MIT GPL-2" SLOT="0" -IUSE="acl doc gudev introspection keymap +openrc selinux static-libs" +IUSE="acl doc gudev hwdb introspection keymap +openrc selinux static-libs" RESTRICT="test" @@ -46,7 +46,8 @@ DEPEND="${COMMON_DEPEND} virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-${KV_min} - doc? ( dev-util/gtk-doc )" + doc? ( dev-util/gtk-doc ) + hwdb? ( >=sys-apps/hwids-20121202.2[udev] )" if [[ ${PV} = 9999* ]] then @@ -289,9 +290,6 @@ src_install() # install udevadm symlink dosym ../usr/bin/udevadm /sbin/udevadm - - insinto /usr/lib/udev/hwdb.d - doins hwdb/*.hwdb } pkg_preinst() @@ -395,5 +393,5 @@ pkg_postinst() elog " fixing known issues visit:" elog " http://www.gentoo.org/doc/en/udev-guide.xml" - udevadm hwdb --update + use hwdb && udevadm hwdb --update } |