064-r1 release

(Portage version: 2.0.51.22-r2)

5 files changed, 483 insertions, 16 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9a7f6284dc0f..f8dbb1e2c9e0 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.125 2005/07/26 18:56:43 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.126 2005/07/31 07:01:29 gregkh Exp $
+
+*udev-064-r1 (31 Jul 2005)
+
+  31 Jul 2005; Greg Kroah-Hartman <gregkh@gentoo.org>
+  +files/udev.rules-064-r1, +udev-064-r1.ebuild:
+  Start moving to a sane /dev naming scheme.
+  This release removes the devfs names for the tty and consolde devices, and the
+  symlinks that were implementing the LSB standard names.  We only implement the
+  LSB names now, which saves over 3Mb of RAM on /dev.
+  
+  This rule change also speeds up udev init time by a order of magnitude 
+  (my slow box went from 5 seconds to .5 seconds, your mileage will vary, 
+  'time udevstart' as root before and after this release to see your difference.)
 
 *udev-064 (26 Jul 2005)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 33de9a800102..290096295e6e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,32 +1,35 @@
 MD5 a0d4f578f2c6fa23ea1a414a934aa263 ChangeLog 22967
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 43820d124485c872fbebc855051bbe4a udev-030.ebuild 3525
+MD5 9189ff86ab535dfff8bd6718860b40f2 udev-060.ebuild 5779
 MD5 8853cecf2a4fc6d2306d420947923ad9 udev-062.ebuild 5811
 MD5 448faa811f8b84803d2caef1c229666a udev-063.ebuild 5811
-MD5 7f59495ae7dd268fe374638d4239079b udev-045.ebuild 3615
-MD5 e2a53fca2d5528fb8fd8830f52833c35 udev-064.ebuild 5876
+MD5 43820d124485c872fbebc855051bbe4a udev-030.ebuild 3525
 MD5 274d69058f9dc59364249e2baf27705b udev-056.ebuild 4380
 MD5 1a5f0127787af194bf038bc3f2338a6b udev-058.ebuild 5158
 MD5 601369394beab8a50bd959614a33b261 udev-059.ebuild 5779
-MD5 9189ff86ab535dfff8bd6718860b40f2 udev-060.ebuild 5779
+MD5 e2a53fca2d5528fb8fd8830f52833c35 udev-064.ebuild 5876
+MD5 a35e83c616136ebae500cd18a3994faf udev-064-r1.ebuild 6008
+MD5 7f59495ae7dd268fe374638d4239079b udev-045.ebuild 3615
+MD5 6b567c4f93075da2ae54aa4512173624 files/udev.conf.post_050 1070
+MD5 7b0a35c905183730e4dfdcf29f5a1816 files/udev-050-udev_volume_id.patch 388
 MD5 691dace731323137de690d8f677c582f files/digest-udev-060 61
-MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
 MD5 4bc32861744372ee3db7d0141a7f28e6 files/digest-udev-062 61
-MD5 c38ac07766ab6fffea0720beb0e465f6 files/digest-udev-063 61
-MD5 c104f1a0b8423e8f410aaa2fb7b6c745 files/digest-udev-045 61
-MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064 61
+MD5 e6bf08ab2e77d344f5cd03e30e38ba9a files/udev.conf.post_059 730
+MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
 MD5 ce48708bcbf9e1e3fcfb02c02e412f54 files/digest-udev-056 61
-MD5 69f45078068718e7c200b067da9a50e6 files/digest-udev-058 61
-MD5 38f3e2a01ee1ecea5233bf47176fe9fd files/digest-udev-059 61
 MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
-MD5 7b0a35c905183730e4dfdcf29f5a1816 files/udev-050-udev_volume_id.patch 388
 MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
 MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
-MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
-MD5 6b567c4f93075da2ae54aa4512173624 files/udev.conf.post_050 1070
-MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
 MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
 MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
 MD5 6df9e08cd088f74720689640de2ffcd6 files/udev.rules-018 4365
 MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
-MD5 e6bf08ab2e77d344f5cd03e30e38ba9a files/udev.conf.post_059 730
+MD5 69f45078068718e7c200b067da9a50e6 files/digest-udev-058 61
+MD5 38f3e2a01ee1ecea5233bf47176fe9fd files/digest-udev-059 61
+MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
+MD5 c38ac07766ab6fffea0720beb0e465f6 files/digest-udev-063 61
+MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064 61
+MD5 3aad55bdfbf9067a104a325e23dda0f4 files/udev.rules-064-r1 9146
+MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064-r1 61
+MD5 c104f1a0b8423e8f410aaa2fb7b6c745 files/digest-udev-045 61
+MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
diff --git a/sys-fs/udev/files/digest-udev-064-r1 b/sys-fs/udev/files/digest-udev-064-r1
new file mode 100644
index 000000000000..9cd718ba9c55
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-064-r1
@@ -0,0 +1 @@
+MD5 589a5fd80ca2c85874e81cc767e6fdeb udev-064.tar.bz2 438189
diff --git a/sys-fs/udev/files/udev.rules-064-r1 b/sys-fs/udev/files/udev.rules-064-r1
new file mode 100644
index 000000000000..75c192ffaa27
--- /dev/null
+++ b/sys-fs/udev/files/udev.rules-064-r1
@@ -0,0 +1,252 @@
+# /etc/udev/rules/50-udev.rules:  device naming rules for udev
+#
+# Gentoo specific rules
+#
+# There are a number of modifiers that are allowed to be used in some of the
+# fields.  See the udev man page for a full description of them.
+#
+# Try not to modify this file, if you wish to change things, create a new rule
+# file that can be run before this one.
+#
+
+
+# console
+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",	OPTIONS="last_rule"
+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",	OPTIONS="last_rule"
+KERNEL=="vcs*",                 NAME="%k", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="vcsa*",                NAME="%k", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="tty",                  NAME="%k", GROUP="tty", MODE="0666",	OPTIONS="last_rule"
+KERNEL=="tty[0-9]",             NAME="%k", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="tty[0-9][0-9]",        NAME="%k", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="console",		NAME="%k", GROUP="tty", MODE="0600"
+KERNEL=="ptmx",			NAME="%k", GROUP="tty", MODE="0666"
+
+# tty devices
+KERNEL=="ttyS[0-9]*",	NAME="tts/%n", SYMLINK+="%k", GROUP="tty"
+KERNEL=="ttyUSB[0-9]*",	NAME="tts/USB%n", GROUP="tty", MODE="0660"
+KERNEL=="ippp0",	NAME="%k", GROUP="tty"
+KERNEL=="isdn*"		NAME="%k", GROUP="tty"
+KERNEL=="dcbri*",	NAME="%k", GROUP="tty"
+KERNEL=="ircomm*",	NAME="%k", GROUP="tty"
+
+# all block devices
+SUBSYSTEM=="block", GROUP="disk"
+
+# cdrom symlinks and other good cdrom naming
+BUS=="ide",  KERNEL="hd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+BUS=="scsi", KERNEL="sr[0-9]*", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+BUS=="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+
+# devfs-names for ide-devices (uncomment only one)
+#  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
+BUS=="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK+="%c{1} %c{2}", GROUP="%c{3}"
+
+# disk devices
+KERNEL=="sd*",		NAME="%k", GROUP="disk"
+KERNEL=="dasd*",	NAME="%k", GROUP="disk"
+KERNEL=="ataraid*",	NAME="%k", GROUP="disk"
+
+# compaq smart array
+KERNEL=="cciss*",	PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
+KERNEL=="ida*",		PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
+
+# mylex
+KERNEL=="rd*",		PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
+
+# dri devices
+KERNEL=="card*",	NAME="dri/card%n", GROUP="video"
+KERNEL=="nvidia*",	NAME="%k", GROUP="video"
+KERNEL=="3dfx*",	NAME="%k", GROUP="video"
+
+# alsa devices
+SUBSYSTEM=="sound", GROUP="audio"
+KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+KERNEL=="hw[CD0-9]*",		NAME="snd/%k"
+KERNEL=="pcm[CD0-9cp]*",	NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
+KERNEL=="timer",		NAME="snd/%k"
+KERNEL=="seq",			NAME="snd/%k"
+
+# capi devices
+KERNEL=="capi",		NAME="capi20", SYMLINK+="isdn/capi20", GROUP="dialout"
+KERNEL=="capi*",	NAME="capi/%n", GROUP="dialout"
+
+# cpu devices
+KERNEL=="cpu[0-9]*",	NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",	NAME="cpu/%n/msr"
+KERNEL=="microcode",	NAME="cpu/microcode"
+
+# dm devices (ignore them)
+KERNEL=="dm-[0-9]*",	OPTIONS="ignore_device"
+# create a symlink named after the device map name
+# note devmap_name comes with extras/multipath
+#KERNEL=="dm-[0-9]*",	PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+# fb devices
+KERNEL=="fb[0-9]*",	NAME="fb/%n", SYMLINK+="%k", GROUP="video"
+
+# floppy devices
+KERNEL=="fd[0-9]*",	NAME="floppy/%n", SYMLINK+="%k", GROUP="floppy"
+
+# i2c devices
+KERNEL=="i2c-[0-9]*",	NAME="i2c/%n", SYMLINK+="%k"
+
+# input devices
+KERNEL=="mice",		NAME="input/%k", MODE="0644"
+KERNEL=="mouse*",	NAME="input/%k", MODE="0644"
+KERNEL=="event*",	NAME="input/%k", MODE="0600"
+KERNEL=="js*",		NAME="input/%k", MODE="664"
+KERNEL=="ts*",		NAME="input/%k", MODE="0600"
+
+# loop devices
+KERNEL=="loop[0-9]*",	NAME="loop/%n", SYMLINK+="%k", GROUP="disk"
+
+# md block devices
+KERNEL=="md[0-9]*",	NAME="md/%n", SYMLINK+="%k", GROUP="disk"
+
+# aoe char devices,
+SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k", GROUP="disk", MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k", GROUP="disk", MODE="0440"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k", GROUP="disk", MODE="0220"
+
+# misc devices
+KERNEL=="agpgart",	NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="psaux",	NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="rtc",		NAME="misc/%k", SYMLINK+="%k", MODE="0664"
+KERNEL=="uinput",	NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="inotify",	NAME="misc/%k", SYMLINK+="%k", MODE="0666"
+
+# netlink devices
+KERNEL=="route",	NAME="netlink/%k"
+KERNEL=="skip",		NAME="netlink/%k"
+KERNEL=="usersock",	NAME="netlink/%k"
+KERNEL=="fwmonitor",	NAME="netlink/%k"
+KERNEL=="tcpdiag",	NAME="netlink/%k"
+KERNEL=="nflog",	NAME="netlink/%k"
+KERNEL=="xfrm",		NAME="netlink/%k"
+KERNEL=="arpd",		NAME="netlink/%k"
+KERNEL=="route6",	NAME="netlink/%k"
+KERNEL=="ip6_fw",	NAME="netlink/%k"
+KERNEL=="dnrtmsg",	NAME="netlink/%k"
+KERNEL=="tap*",		NAME="netlink/%k"
+
+# network devices
+KERNEL=="tun",		NAME="net/%k"
+
+# ramdisk devices
+KERNEL=="ram[0-9]*",	NAME="rd/%n", SYMLINK+="%k"
+
+# IEEE1394 (firewire) devices (must be before raw devices below)
+KERNEL=="raw1394",	NAME="%k",		GROUP="video"
+KERNEL=="dv1394*",	NAME="dv1394/%n",	GROUP="video"
+KERNEL=="video1394*",	NAME="video1394/%n",	GROUP="video"
+
+# raw devices
+KERNEL=="raw[0-9]*",	NAME="raw/%k", GROUP="disk"
+KERNEL=="ram*",		NAME="%k", GROUP="disk"
+
+# sound devices
+KERNEL=="adsp",			NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="adsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="audio",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="audio[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="dsp",			NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="dsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="mixer",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="mixer[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="sequencer",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="sequencer[0-9]*",	NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+
+# memory devices
+KERNEL=="random",	NAME="%k", MODE="0666"
+KERNEL=="urandom",	NAME="%k", MODE="0444"
+KERNEL=="mem",		NAME="%k", MODE="0640"
+KERNEL=="kmem",		NAME="%k", MODE="0640"
+KERNEL=="port",		NAME="%k", MODE="0640"
+KERNEL=="full",		NAME="%k", MODE="0666"
+KERNEL=="null",		NAME="%k", MODE="0666"
+KERNEL=="zero",		NAME="%k", MODE="0666"
+
+# usb devices
+KERNEL=="hiddev*",		NAME="usb/%k"
+KERNEL=="auer*",		NAME="usb/%k"
+KERNEL=="legousbtower*",	NAME="usb/%k", GROUP="usb"
+KERNEL=="dabusb*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k", GROUP="lp"
+
+# v4l devices
+KERNEL=="video[0-9]*",	NAME="v4l/video%n", SYMLINK+="video%n", GROUP="video"
+KERNEL=="radio[0-9]*",	NAME="v4l/radio%n", GROUP="video"
+KERNEL=="vbi[0-9]*",	NAME="v4l/vbi%n", SYMLINK+="vbi%n", GROUP="video"
+KERNEL=="vtx[0-9]*",	NAME="v4l/vtx%n", GROUP="video"
+
+# dvb devices
+KERNEL=="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", NAME="%c", GROUP="video", MODE="0660"
+
+# Asterisk Zaptel devices
+KERNEL=="zapctl",	NAME="zap/ctl"
+KERNEL=="zaptimer",	NAME="zap/timer"
+KERNEL=="zapchannel",	NAME="zap/channel"
+KERNEL=="zappseudo",	NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",	NAME="zap/%n"
+
+# pilot/palm devices
+KERNEL=="pilot",	NAME="%k", GROUP="uucp"
+
+# jaz devices
+KERNEL=="jaz*",		NAME="%k", GROUP="disk"
+
+# zip devices
+KERNEL=="pocketzip*",	NAME="%k", GROUP="disk"
+KERNEL=="zip*",		NAME="%k", GROUP="disk"
+
+# ls120 devices
+KERNEL=="ls120",	NAME="%k", GROUP="disk"
+
+# lp devices
+KERNEL=="lp*",		NAME="%k", GROUP="lp"
+KERNEL=="irlpt",	NAME="%k", GROUP="lp"
+KERNEL=="usblp",	NAME="%k", GROUP="lp"
+KERNEL=="lp*",		NAME="%k", GROUP="lp"
+
+# tape devices
+KERNEL=="ht*",		NAME="%k", GROUP="tape"
+KERNEL=="nht*",		NAME="%k", GROUP="tape"
+KERNEL=="pt*",		NAME="%k", GROUP="tape"
+KERNEL=="npt*",		NAME="%k", GROUP="tape"
+KERNEL=="st*",		NAME="%k", GROUP="tape"
+KERNEL=="nst*",		NAME="%k", GROUP="tape"
+KERNEL=="osst*",	NAME="%k", GROUP="tape"
+KERNEL=="nosst*",	NAME="%k", GROUP="tape"
+
+# diskonkey devices
+KERNEL=="diskonkey*",	NAME="%k", GROUP="disk"
+
+# rem_ide devices
+KERNEL=="microdrive*",	NAME="%k", GROUP="disk"
+
+# kbd devices
+KERNEL=="kbd",		NAME="%k", MODE="0664"
+
+# Sony Vaio Jogdial sonypi device
+KERNEL=="sonypi",	NAME="%k", MODE="0666"
+
+# packet devices
+KERNEL=="pktcdvd",		NAME="pktcdvd/control", GROUP="cdrw", MODE="0660"
+KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660"
+
+# infiniband devices
+KERNEL=="umad*",	NAME="infiniband/%k"
+KERNEL=="issm*",	NAME="infiniband/%k"
+
+# tpm devices
+KERNEL=="tpm*",	NAME="%k", OWNER="tss", GROUP="tss", MODE="0600"
+
+# be backward compatible for a while with the /etc/dev.d and /etc/hotplug.d/ systems
+# run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for udevstart
+ENV{UDEVD_EVENT}=="1", RUN+="/sbin/udev_run_hotplugd"
+
+# always run /etc/dev.d/ stuff for now.
+RUN+="/sbin/udev_run_devd"
+
diff --git a/sys-fs/udev/udev-064-r1.ebuild b/sys-fs/udev/udev-064-r1.ebuild
new file mode 100644
index 000000000000..3533e56675fb
--- /dev/null
+++ b/sys-fs/udev/udev-064-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-064-r1.ebuild,v 1.1 2005/07/31 07:01:29 gregkh Exp $
+
+inherit eutils
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static selinux"
+
+DEPEND="sys-apps/hotplug-base"
+RDEPEND="${DEPEND}
+	>=sys-apps/baselayout-1.8.6.12-r3"
+# We need some changes for devfs type layout
+PROVIDE="virtual/dev-manager"
+
+if use static
+then
+	USE_KLIBC=true
+else
+	USE_KLIBC=false
+fi
+export USE_KLIBC
+
+
+pkg_setup() {
+	[ "${USE_KLIBC}" = "true" ] && check_KV
+
+	return 0
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# patches go here...
+	#epatch ${FILESDIR}/${P}-udev_volume_id.patch
+
+	# No need to clutter the logs ...
+	sed -ie '/^DEBUG/ c\DEBUG = false' Makefile
+	# Do not use optimization flags from the package
+	sed -ie 's|$(OPTIMIZATION)||g' Makefile
+
+	# Make sure there is no sudden changes to udev.rules.gentoo
+	# (more for my own needs than anything else ...)
+	if [ "`md5sum < "${S}/etc/udev/gentoo/udev.rules"`" != \
+	     "e1f3c174a5592b0ffa02d1bc62864326  -" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+}
+
+src_compile() {
+	local myconf=
+	local extras="extras/scsi_id extras/volume_id extras/ata_id extras/run_directory extras/usb_id extras/floppy"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	# Do not work with emake
+	make \
+		EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		CROSS=${mycross} \
+		${myconf} || die
+}
+
+src_install() {
+	dobin udevinfo
+	dobin udevtest
+	into /
+	dosbin udev
+	dosbin udevd
+	dosbin udevsend
+	dosbin udevstart
+	dosbin extras/run_directory/udev_run_devd
+	dosbin extras/run_directory/udev_run_hotplugd
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+	doexe extras/scsi-devfs.sh
+	doexe extras/cdsymlinks.sh
+	doexe extras/dvb.sh
+	doexe extras/ata_id/ata_id
+	doexe extras/volume_id/vol_id
+	doexe extras/scsi_id/scsi_id
+	doexe extras/usb_id/usb_id
+	doexe extras/floppy/create_floppy_devices
+
+
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_059 udev.conf
+	doins extras/cdsymlinks.conf
+
+	# Our default /dev layout (no more devfs crap.)
+	insinto /etc/udev/rules.d/
+#	newins etc/udev/gentoo/udev.rules 50-udev.rules
+	# use our own rules for now, till upstream catches up.
+	newins ${FILESDIR}/udev.rules-064-r1 50-udev.rules
+
+	# Our own custom udev.permissions
+	#insinto /etc/udev/permissions.d/
+	#newins etc/udev/gentoo/udev.permissions 50-udev.permissions
+
+	# scsi_id configuration
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# set up symlinks in /etc/hotplug.d/default
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug
+
+	# set up the /etc/dev.d directory tree
+	dodir /etc/dev.d/default
+	dodir /etc/dev.d/net
+	exeinto /etc/dev.d/net
+	doexe etc/dev.d/net/hotplug.dev
+
+	doman *.8
+	doman extras/scsi_id/scsi_id.8
+
+	dodoc COPYING ChangeLog FAQ HOWTO-udev_for_dev README TODO RELEASE-NOTES
+	dodoc docs/{overview,udev_vs_devfs,RFC-dev.d,libsysfs.txt}
+	dodoc docs/persistent_naming/* docs/writing_udev_rules/*
+
+	newdoc extras/volume_id/README README_volume_id
+}
+
+pkg_preinst() {
+	if [ -f "${ROOT}/etc/udev/udev.config" -a \
+	     ! -f "${ROOT}/etc/udev/udev.rules" ]
+	then
+		mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules
+	fi
+
+	# delete the old udev.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+	ewarn "Note: If you are upgrading from a version of udev prior to 046"
+	ewarn "      and you rely on the output of udevinfo for anything, please"
+	ewarn "      either run 'udevstart' now, or reboot, in order to get a"
+	ewarn "      up-to-date udev database."
+	ewarn
+	ewarn "Note: If you are upgrading from a version of udev prior to 050"
+	ewarn "      and you had written some custom permissions rules, please"
+	ewarn "      realize that the permission rules are now part of the main"
+	ewarn "      udev rules files and are not stand-alone anymore.  This means"
+	ewarn "      you need to rewrite them."
+	ewarn
+	ewarn "Note: If you are upgrading from a version of udev prior to 057"
+	ewarn "      and you have written custom rules, and rely on the etc/dev.d/"
+	ewarn "      functionality, please read the RELEASE-NOTES file for details"
+	ewarn "      on what has changed with this feature, and how to change your"
+	ewarn "      rules to work properly."
+	ewarn
+	ewarn "Note: If you are upgrading from a version of udev prior to 059"
+	ewarn "      and you have written custom rules, and rely on the etc/dev.d/"
+	ewarn "      functionality, or the etc/hotplug.d functionality, or just"
+	ewarn "      want to write some very cool and power udev rules, please "
+	ewarn "      read the RELEASE-NOTES file for details on what has changed"
+	ewarn "      with this feature, and how to change your rules to work properly."
+
+	einfo
+	einfo "For more information on udev on Gentoo, writing udev rules, and"
+	einfo "         fixing known issues visit:"
+	einfo "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}