Version bumped. Call volume-manager setup only for baselayout-1, Bug #171593. Blacklist eth1394 by default, Bug #128962.

Package-Manager: portage-2.1.2.5

6 files changed, 510 insertions, 8 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 0ecf55351c6d..af0d2b59f544 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.297 2007/04/25 14:42:08 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.298 2007/05/02 13:53:25 zzam Exp $
+
+*udev-110 (02 May 2007)
+
+  02 May 2007; Matthias Schwarzott <zzam@gentoo.org> +files/blacklist-110,
+  +files/udev-start-110.sh, +udev-110.ebuild:
+  Version bumped. Call volume-manager setup only for baselayout-1, Bug
+  #171593. Blacklist eth1394 by default, Bug #128962.
 
 *udev-109-r1 (25 Apr 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 83449c81c4c0..8f81dbf21ddc 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -41,6 +41,10 @@ AUX blacklist 601 RMD160 9410dacd33fc35e88cfa952a2b50bda2a4b0db43 SHA1 9db44ff47
 MD5 e9e7b3f04a6a2d86022a34c54cbcf2ac files/blacklist 601
 RMD160 9410dacd33fc35e88cfa952a2b50bda2a4b0db43 files/blacklist 601
 SHA256 29855c545ec060203d28532f766e9d757145c3d2d8c735bf20f4f0a555af97df files/blacklist 601
+AUX blacklist-110 854 RMD160 6cb0acd91dad5c86c47b41f06f74a8529de08b8e SHA1 aa2c3c8340517053151ee687d76d4de05e28ac51 SHA256 438020f3499a2e10a19ba8d3fe7d567572322093ea878e8c18336b067442bcdd
+MD5 da6f1b4d19a390e0daac1f858a5cb093 files/blacklist-110 854
+RMD160 6cb0acd91dad5c86c47b41f06f74a8529de08b8e files/blacklist-110 854
+SHA256 438020f3499a2e10a19ba8d3fe7d567572322093ea878e8c18336b067442bcdd files/blacklist-110 854
 AUX modprobe-104-r12.sh 916 RMD160 af55573a195a101c8462b8184685f9219285adc1 SHA1 b3d13cbdf196209c88e0181a73c0b233c5795b54 SHA256 a25bc7876ccdd227c7f4c69f2b1fbdf57ed9836078212dac08521e6696531116
 MD5 23c8ca5fdbe163a126588b14c12ad989 files/modprobe-104-r12.sh 916
 RMD160 af55573a195a101c8462b8184685f9219285adc1 files/modprobe-104-r12.sh 916
@@ -189,6 +193,10 @@ AUX udev-start-108-r1.sh 3935 RMD160 f65acd07a4edeb35eeed5468b4b0c30e6c1efc17 SH
 MD5 f0fde8cc31e129c9eb55e1954f42c288 files/udev-start-108-r1.sh 3935
 RMD160 f65acd07a4edeb35eeed5468b4b0c30e6c1efc17 files/udev-start-108-r1.sh 3935
 SHA256 16a7969ad8dcebc5893d1f04c0207db0344d24011f9630785518b954c47c06f3 files/udev-start-108-r1.sh 3935
+AUX udev-start-110.sh 4015 RMD160 bed5127fd51f849fce3027954a00847367d38882 SHA1 67b3594bd73bb3362260bdcf69ed57c33b3e0854 SHA256 838d3013b4449272e2013b418d256ad999037fe272349d296622404e128e082e
+MD5 efc34cdf21f760da256cf0cf25b48362 files/udev-start-110.sh 4015
+RMD160 bed5127fd51f849fce3027954a00847367d38882 files/udev-start-110.sh 4015
+SHA256 838d3013b4449272e2013b418d256ad999037fe272349d296622404e128e082e files/udev-start-110.sh 4015
 AUX udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c SHA1 2558e3265c9bed383198e2f263e10016ad6f34a0 SHA256 0527b03ac666dd9e4c94811b10d499f04b3f6f8ae2f03e6460727c1b570d985d
 MD5 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460
 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c files/udev-start.sh 2460
@@ -331,6 +339,7 @@ DIST udev-106.tar.bz2 188557 RMD160 2a01d06746b143c53d01b8c6aa97e635c062e9d3 SHA
 DIST udev-107.tar.bz2 189101 RMD160 ebc2722e0306aea3f3c0cd828861a61021609ac7 SHA1 78c208e2e446824dd967b7b9b36684578799aee8 SHA256 49c45315ba640547939b2e2949f9478af2279a3296e97328ee8f6a4b08f2eae9
 DIST udev-108.tar.bz2 187460 RMD160 cfc3885bdbb1a3611118c8503efe3ffe472b0f2d SHA1 4f1746dcfe51436a43b32c4db9af04f018a62bab SHA256 0956fd6e7388cbb9c3431db302e52f8ee03d7fad8a159359597878058d8632ec
 DIST udev-109.tar.bz2 188252 RMD160 8700365b2ea744e19f0133615a652ca85726d890 SHA1 d2fe21ecec90824518feb3e7c5fb3ee050b7790c SHA256 d16886d1d1791331f6cf949338b3c5aaf9f57c5a5b141531efa61c8b881b3330
+DIST udev-110.tar.bz2 188708 RMD160 6ad83cfa386a7eedb79fc642eca438071a396580 SHA1 29014f65eb0d42b1836928fa4114a2ebbf58ec0b SHA256 14532a4a563ad99c4631b5c3a1b4950337c3137d91a87825d6ae24b953f652ca
 EBUILD udev-079-r2.ebuild 7538 RMD160 855d8af681bf6ca8e38dcc3881b1c468d599bdfb SHA1 c4271b48dea89ca9a0e9860e9ede29a54a04275e SHA256 b972caef4241ca892aa25387dc56264a81b52c51821588b834a6f013c2984d1c
 MD5 b5b0e32721933ece54da4280b05386c5 udev-079-r2.ebuild 7538
 RMD160 855d8af681bf6ca8e38dcc3881b1c468d599bdfb udev-079-r2.ebuild 7538
@@ -419,10 +428,14 @@ EBUILD udev-109.ebuild 9854 RMD160 a75a5676d1f25dc7d9c85f7f83d31861c335884c SHA1
 MD5 4edd51d72db2d07d5aeceee955996ad0 udev-109.ebuild 9854
 RMD160 a75a5676d1f25dc7d9c85f7f83d31861c335884c udev-109.ebuild 9854
 SHA256 c71970cc99f0033209198bfbc6707f96f86fc216d27ffe64991b2248767cc390 udev-109.ebuild 9854
-MISC ChangeLog 57075 RMD160 6c26bdd0298df5d0d441db30f9ec5d87bdc14624 SHA1 38b123212f31fa507e4a39e39212829d6721d9d6 SHA256 f41ee1831fb9b8d47fa4fb5a6be6dd5d32c327bd5455b0fb2cf0721ea5024142
-MD5 adf44302abe1d611deb13fb471a3d1b0 ChangeLog 57075
-RMD160 6c26bdd0298df5d0d441db30f9ec5d87bdc14624 ChangeLog 57075
-SHA256 f41ee1831fb9b8d47fa4fb5a6be6dd5d32c327bd5455b0fb2cf0721ea5024142 ChangeLog 57075
+EBUILD udev-110.ebuild 9780 RMD160 e5e5c8d55473109a0372fe3fe20a37f8e31c4255 SHA1 7e43a7a9a0a2c58b13973a39eba79b20780cd0be SHA256 d7b9c8a645d4c705cf3c956ea9d6684cfad8d4317a4fd56b4f7e56c6c95fe39c
+MD5 02eda921b21fdf61e2e440cd7435fae8 udev-110.ebuild 9780
+RMD160 e5e5c8d55473109a0372fe3fe20a37f8e31c4255 udev-110.ebuild 9780
+SHA256 d7b9c8a645d4c705cf3c956ea9d6684cfad8d4317a4fd56b4f7e56c6c95fe39c udev-110.ebuild 9780
+MISC ChangeLog 57347 RMD160 e7c00da99c68e01512e5c510cde2cce3351c1660 SHA1 563bb8918cc4bb2437ffa3a7224995770c7af7d1 SHA256 67fbfc616b8d0370d349d060a2f84cecc348fddfa75d4cfd689e86c29162419d
+MD5 d1d1f2a27170eba1576964df506094a9 ChangeLog 57347
+RMD160 e7c00da99c68e01512e5c510cde2cce3351c1660 ChangeLog 57347
+SHA256 67fbfc616b8d0370d349d060a2f84cecc348fddfa75d4cfd689e86c29162419d ChangeLog 57347
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -493,10 +506,13 @@ SHA256 8dea85fc9892209ba9075aea974823c58c2bacc7f34c52861e4a00f9f89e5f98 files/di
 MD5 06dd85951af811c5b41062e59a3e0d29 files/digest-udev-109-r1 229
 RMD160 b69604bc7ad0380706666cdfd0c540092cecca03 files/digest-udev-109-r1 229
 SHA256 8dea85fc9892209ba9075aea974823c58c2bacc7f34c52861e4a00f9f89e5f98 files/digest-udev-109-r1 229
+MD5 2bed01dff144a7f267cc55a2eeb748e4 files/digest-udev-110 229
+RMD160 88d77d0fa4c3c670326891749d674ef3c73a4c94 files/digest-udev-110 229
+SHA256 69a1572d54ff5ba74652f37125d187171cc62f7d1cce3a09c4c11be16112a482 files/digest-udev-110 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGL2jHt2vP6XvVdOcRAtYwAJsEu8dpLwJzKMmAXqP0wo1qTDWv9ACgqZWL
-+yWOTTm7Ai+ukxuOVAAIDn8=
-=wT9T
+iD8DBQFGOJfkt2vP6XvVdOcRAhMfAKDcKReqxwCaA+Lf6SBYRLERfUt16wCfXyNK
+j/Nxp/mYvunueyzfHoXT0aA=
+=FwD2
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/blacklist-110 b/sys-fs/udev/files/blacklist-110
new file mode 100644
index 000000000000..1a1ee584ad08
--- /dev/null
+++ b/sys-fs/udev/files/blacklist-110
@@ -0,0 +1,26 @@
+# This file lists modules which will not be loaded by udev,
+# not at coldplugging and not on hotplug events.
+
+# Add your own entries to this file
+# in the format "blacklist <name of module>"
+
+# Some examples:
+# evbug is a debug tool and should be loaded explicitly
+blacklist evbug
+
+# Autoloading eth1394 most of the time re-orders your network
+# interfaces, and with buggy kernel 2.6.21, udev persistent-net
+# is not able to rename these devices, so you get eth?_rename devices
+# plus an exceeded 30sec boot timeout
+blacklist eth1394
+
+# You probably want this to not get the console beep loud on every tab :)
+#blacklist pcspkr
+
+# these drivers are very simple, the HID drivers are usually preferred
+#blacklist usbmouse
+#blacklist usbkbd
+
+# Sometimes loading a framebuffer driver at boot gets the console black
+#install pci:v*d*sv*sd*bc03sc*i* /bin/true
+
diff --git a/sys-fs/udev/files/digest-udev-110 b/sys-fs/udev/files/digest-udev-110
new file mode 100644
index 000000000000..47649e311d1c
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-110
@@ -0,0 +1,3 @@
+MD5 34c703949f7c22745f52ef5a56d5910c udev-110.tar.bz2 188708
+RMD160 6ad83cfa386a7eedb79fc642eca438071a396580 udev-110.tar.bz2 188708
+SHA256 14532a4a563ad99c4631b5c3a1b4950337c3137d91a87825d6ae24b953f652ca udev-110.tar.bz2 188708
diff --git a/sys-fs/udev/files/udev-start-110.sh b/sys-fs/udev/files/udev-start-110.sh
new file mode 100644
index 000000000000..2061ee2cffc5
--- /dev/null
+++ b/sys-fs/udev/files/udev-start-110.sh
@@ -0,0 +1,153 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+tmpfs_size="10M"
+
+[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf
+
+populate_udev() {
+	# populate /dev with devices already found by the kernel
+
+	# tell modprobe.sh to be verbose to $CONSOLE
+	echo CONSOLE=${CONSOLE} > /dev/.udev_populate
+
+	if get_bootparam "nocoldplug" ; then
+		RC_COLDPLUG="no"
+		ewarn "Skipping udev coldplug as requested in kernel cmdline"
+	fi
+
+	if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then
+		ebegin "Populating /dev with existing devices through uevents"
+		local opts=
+		[ "${RC_COLDPLUG}" != "yes" ] && opts="--attr-match=dev"
+		/sbin/udevtrigger ${opts}
+		eend $?
+	else
+		ebegin "Populating /dev with existing devices with udevstart"
+		/sbin/udevstart
+		eend $?
+	fi
+
+	# loop until everything is finished
+	# there's gotta be a better way...
+	ebegin "Letting udev process events"
+	/sbin/udevsettle --timeout=60
+	eend $?
+
+	rm -f /dev/.udev_populate
+	return 0
+}
+
+seed_dev() {
+	# Seed /dev with some things that we know we need
+	ebegin "Seeding /dev with needed nodes"
+
+	# creating /dev/console and /dev/tty1 to be able to write
+	# to $CONSOLE with/without bootsplash before udevd creates it
+	[ ! -c /dev/console ] && mknod /dev/console c 5 1
+	[ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1
+	
+	# udevd will dup its stdin/stdout/stderr to /dev/null
+	# and we do not want a file which gets buffered in ram
+	[ ! -c /dev/null ] && mknod /dev/null c 1 3
+
+	# copy over any persistant things
+	if [ -d /lib/udev/devices ] ; then
+		cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null
+	fi
+
+	# Not provided by sysfs but needed
+	ln -snf /proc/self/fd /dev/fd
+	ln -snf fd/0 /dev/stdin
+	ln -snf fd/1 /dev/stdout
+	ln -snf fd/2 /dev/stderr
+	[ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
+
+	# Create problematic directories
+	mkdir -p /dev/pts /dev/shm
+	eend 0
+}
+
+unpack_device_tarball() {
+	# Actually get udev rolling
+	if [ "${RC_DEVICE_TARBALL}" = "yes" ] && \
+	    [ -s /lib/udev/state/devices.tar.bz2 ] ; then
+		ebegin "Populating /dev with saved device nodes"
+		try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev
+		eend $?
+	fi
+}
+
+main() {
+	# Setup temporary storage for /dev
+	ebegin "Mounting /dev for udev"
+	if [ "${RC_USE_FSTAB}" = "yes" ] ; then
+		mntcmd=$(get_mount_fstab /dev)
+	else
+		unset mntcmd
+	fi
+	if [ -n "${mntcmd}" ] ; then
+		try mount -n ${mntcmd}
+	else
+		mntopts="exec,nosuid,mode=0755,size=${tmpfs_size}"
+		if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then
+			mntcmd="tmpfs"
+		else
+			mntcmd="ramfs"
+		fi
+		# many video drivers require exec access in /dev #92921
+		try mount -n -t "${mntcmd}" -o "${mntopts}" udev /dev
+	fi
+	eend $?
+
+	# Create a file so that our rc system knows it's still in sysinit.
+	# Existance means init scripts will not directly run.
+	# rc will remove the file when done with sysinit.
+	touch /dev/.rcsysinit
+
+	# Selinux lovin; /selinux should be mounted by selinux-patched init
+	if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then
+		restorecon /dev > /selinux/null
+	fi
+
+	unpack_device_tarball
+	seed_dev
+
+	# Setup hotplugging (if possible)
+	if [ -e /proc/sys/kernel/hotplug ] ; then
+		ebegin "Setting up proper hotplug agent"
+		eindent
+		if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then
+			einfo "Using netlink for hotplug events..."
+			echo "" > /proc/sys/kernel/hotplug
+		else
+			einfo "Setting /sbin/udevsend as hotplug agent ..."
+			echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
+		fi
+		eoutdent
+		eend 0
+	fi
+
+	ebegin "Starting udevd"
+	/sbin/udevd --daemon
+	eend $?
+
+	populate_udev
+
+	# Only do this for baselayout-1*
+	if [ ! -e /lib/librc.so ]; then
+
+		# Create nodes that udev can't
+		ebegin "Finalizing udev configuration"
+		[ -x /sbin/lvm ] && \
+			/sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
+		# Running evms_activate on a LiveCD causes lots of headaches
+		[ -z "${CDBOOT}" ] && [ -x /sbin/evms_activate ] && \
+			/sbin/evms_activate -q &>/dev/null
+		eend 0
+	fi
+}
+
+main
+
+# vim:ts=4
diff --git a/sys-fs/udev/udev-110.ebuild b/sys-fs/udev/udev-110.ebuild
new file mode 100644
index 000000000000..77fb8c3e06b8
--- /dev/null
+++ b/sys-fs/udev/udev-110.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-110.ebuild,v 1.1 2007/05/02 13:53:25 zzam Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-apps/coldplug"
+RDEPEND="${DEPEND} ${RDEPEND}
+	>=sys-apps/baselayout-1.12.5"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	#epatch ${FILESDIR}/${P}-udev_volume_id.patch
+	epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.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 ...)
+	MD5=`md5sum < "${S}/etc/udev/gentoo/50-udev.rules"`
+	MD5=${MD5/  -/}
+	if [ "${MD5}" != "04a8f3303a2b172affbed26973745f26" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+	local myconf=
+	local extras="extras/ata_id \
+				  extras/cdrom_id \
+				  extras/edd_id \
+				  extras/firmware \
+				  extras/floppy \
+				  extras/path_id \
+				  extras/scsi_id \
+				  extras/usb_id \
+				  extras/volume_id \
+				  extras/rule_generator"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	echo "get_libdir = $(get_libdir)"
+	emake \
+		EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		CROSS_COMPILE=${mycross} \
+		OPTFLAGS=""
+		${myconf} || die
+}
+
+src_install() {
+	# we install everything by "hand" and don't rely on the udev Makefile to do
+	# it for us (why? it's easier that way...)
+	dobin udevinfo		|| die "Required binary not installed properly"
+	dobin udevtest		|| die "Required binary not installed properly"
+	dobin udevmonitor	|| die "Required binary not installed properly"
+	into /
+	dosbin udevd		|| die "Required binary not installed properly"
+	dosbin udevstart	|| die "Required binary not installed properly"
+	dosbin udevtrigger	|| die "Required binary not installed properly"
+	dosbin udevcontrol	|| die "Required binary not installed properly"
+	dosbin udevsettle	|| die "Required binary not installed properly"
+
+	# Helpers
+	exeinto /lib/udev
+	doexe extras/ata_id/ata_id		|| die "Required helper not installed properly"
+	doexe extras/volume_id/vol_id	|| die "Required helper not installed properly"
+	doexe extras/scsi_id/scsi_id	|| die "Required helper not installed properly"
+	doexe extras/usb_id/usb_id		|| die "Required helper not installed properly"
+	doexe extras/path_id/path_id	|| die "Required helper not installed properly"
+	doexe extras/cdrom_id/cdrom_id	|| die "Required helper not installed properly"
+	doexe extras/edd_id/edd_id		|| die "Required helper not installed properly"
+	doexe extras/rule_generator/write_cd_rules	|| die "Required helper not installed properly"
+	doexe extras/rule_generator/write_net_rules	|| die "Required helper not installed properly"
+	doexe extras/rule_generator/rule_generator.functions	|| die "Required helper not installed properly"
+	keepdir /lib/udev/state
+	keepdir /lib/udev/devices
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym ../lib/udev/vol_id /sbin/vol_id
+	dosym ../lib/udev/scsi_id /sbin/scsi_id
+
+	# vol_id library (needed by mount and HAL)
+	dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so*
+	# move the .a files to /usr/lib
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a  "${D}"/usr/$(get_libdir)/
+
+	# handle static linking bug #4411
+	gen_usr_ldscript libvolume_id.so
+
+	# save pkgconfig info
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins extras/volume_id/lib/*.pc
+
+	#exeinto /etc/udev/scripts
+	exeinto /lib/udev
+	#doexe extras/ide-devfs.sh
+	#doexe extras/scsi-devfs.sh
+	#doexe extras/raid-devfs.sh
+	doexe extras/floppy/create_floppy_devices	|| die "Required binary not installed properly"
+	doexe extras/firmware/firmware.sh			|| die "Required binary not installed properly"
+	newexe ${FILESDIR}/net-104-r10.sh net.sh	|| die "Required binary not installed properly"
+	newexe ${FILESDIR}/modprobe-105.sh modprobe.sh	|| die "Required binary not installed properly"
+
+	# Our udev config file
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_108 udev.conf
+
+	# Our rules files
+	insinto /etc/udev/rules.d/
+	doins etc/udev/gentoo/??-*.rules
+	#newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules
+	#newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules
+	#doins ${FILESDIR}/95-udev-late.rules
+	# Special rules for device-mapper
+	#newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.rules
+	# Use upstream's persistent rules for devices
+	doins etc/udev/rules.d/60-*.rules
+	doins extras/rule_generator/75-*.rules || die "rules not installed properly"
+
+	# scsi_id configuration
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# all of the man pages
+	doman *.7
+	doman *.8
+	doman extras/ata_id/ata_id.8
+	doman extras/edd_id/edd_id.8
+	doman extras/scsi_id/scsi_id.8
+	doman extras/volume_id/vol_id.8
+	doman extras/cdrom_id/cdrom_id.8
+	# create a extra symlink for udevcontrol
+	dosym udevd.8 /usr/share/man/man8/udevcontrol.8
+
+	# our udev hooks into the rc system
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-110.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-108-r1.sh udev-stop.sh
+
+	# needed to compile latest Hal
+	insinto /usr/include
+	doins extras/volume_id/lib/libvolume_id.h
+
+	dodoc ChangeLog FAQ README TODO RELEASE-NOTES
+	dodoc docs/{overview,udev_vs_devfs}
+	dodoc docs/writing_udev_rules/*
+
+	newdoc extras/volume_id/README README_volume_id
+
+	insinto /etc/modprobe.d
+	newins ${FILESDIR}/blacklist-110 blacklist
+	doins ${FILESDIR}/pnp-aliases
+
+	if use s390; then
+		# s390 does not has persistent mac addresses
+		# and we only have persistence rules for mac.
+		# For now just remove the rules file.
+		rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules
+	fi
+
+}
+
+pkg_preinst() {
+	if [[ -d ${ROOT}/lib/udev-state ]] ; then
+		mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
+		rm -r "${ROOT}"/lib/udev-state
+	fi
+
+	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
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/10-udev.hotplug
+	fi
+
+	# is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind)
+	coldplug_stale=""
+	if [ -f "${ROOT}/etc/init.d/coldplug" ]
+	then
+		coldplug_stale="1"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == "/" ]] ; then
+		# check if root of init-process is identical to ours
+		if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then
+			einfo "restarting udevd now."
+			if [[ -n $(pidof udevd) ]] ; then
+				killall -15 udevd &>/dev/null
+				sleep 1
+				killall -9 udevd &>/dev/null
+			fi
+			/sbin/udevd --daemon
+		fi
+	fi
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	if [[ ${coldplug_stale} == "1" ]] ; then
+		ewarn "A stale coldplug init script found. You should run:"
+		ewarn
+		ewarn "      rc-update del coldplug"
+		ewarn "      rm -f /etc/init.d/coldplug"
+		ewarn
+		ewarn "udev now provides its own coldplug functionality."
+	fi
+
+	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
+	if has_version "=sys-fs/udev-103-r3"; then
+		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
+		then
+			ewarn "Deleting stray 40-scsi-hotplug.rules"
+			ewarn "installed by sys-fs/udev-103-r3"
+			rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules
+		fi
+	fi
+
+	# Removing some device-nodes we thought we need some time ago
+	if [[ -d "${ROOT}"/lib/udev/devices ]]; then
+		rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
+	fi
+
+	# Removing some old file
+	if has_version "<sys-fs/udev-104-r5"; then
+		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net
+	fi
+
+	if has_version "<sys-fs/udev-106-r5"; then
+		if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then
+			rm -f ${ROOT}/etc/udev/rules.d/95-net.rules
+		fi
+	fi
+
+	# Try to remove /etc/dev.d as that is obsolete
+	if [[ -d "${ROOT}"/etc/dev.d ]]; then
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d
+		if [[ -d "${ROOT}"/etc/dev.d ]]; then
+			ewarn "You still have the directory /etc/dev.d on your system."
+			ewarn "This is no longer used by udev and can be removed."
+		fi
+	fi
+
+	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"
+}