Add sound/OSS and input devfs rules from Christophe Saout <christophe@saout.de>.

Bump revision to make sure previous and ide-devfs.sh changes gets in.

4 files changed, 154 insertions, 4 deletions

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index def249dc6c84..4eafacb61b22 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,6 +1,6 @@
 MD5 39793fbef16989ec7c19fa8ba04370ee udev-013.ebuild 3343
-MD5 39793fbef16989ec7c19fa8ba04370ee udev-013-r1.ebuild 3343
-MD5 8a5c1d2590f40ad2072b6ce3f86fd1ad ChangeLog 4730
+MD5 094d53c404aa8f37f7736b355ea7db45 udev-013-r1.ebuild 3346
+MD5 587f6b44601dba58a82992226948f9a7 ChangeLog 5015
 MD5 a19af1e2e874cadb09ab486d2fd343bb udev-012.ebuild 3400
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 dbe7dc643caeafddc845fe9269430123 files/udev-011-no-wait-for-sleep.patch 1053
@@ -9,6 +9,6 @@ MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013-r1 62
 MD5 4e0d7e033730bbe5544745788e7a13a8 files/udev-012-udev_c-gcc295-compat.patch 277
 MD5 35fcac8040808dde93580ddfe5ff5a18 files/digest-udev-012 62
 MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013 62
-MD5 0cbfae752b41708f46464420a9fa0414 files/udev.rules.post_012 4367
+MD5 8e183b484cd841ca7c3537c1cbd923a5 files/udev.rules.post_012 4367
 MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550
 MD5 4c26691abc7f47b0329203056cbcbebc files/udev.rules 3554
diff --git a/sys-fs/udev/files/digest-udev-013-r1 b/sys-fs/udev/files/digest-udev-013-r1
new file mode 100644
index 000000000000..fe0ccfac77ad
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-013-r1
@@ -0,0 +1 @@
+MD5 ed4ab84d635f4e71bf42bc18a7a4124c udev-013.tar.bz2 1007366
diff --git a/sys-fs/udev/files/udev.rules.post_012 b/sys-fs/udev/files/udev.rules.post_012
index ace97c1e433a..96b16c25176c 100644
--- a/sys-fs/udev/files/udev.rules.post_012
+++ b/sys-fs/udev/files/udev.rules.post_012
@@ -1,5 +1,5 @@
 # /etc/udev/udev.rules:  device naming rules for udev
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules.post_012,v 1.2 2004/01/16 17:43:00 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules.post_012,v 1.3 2004/01/16 18:57:29 azarah Exp $
 #
 # There are a number of modifiers that are allowed to be used in the NAME or PROGRAM fields.
 # They provide the following subsitutions:
@@ -80,6 +80,11 @@ KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
 # i2c devices
 KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
 
+# input devices
+KERNEL="mice",        NAME="input/mice"
+KERNEL="mouse[0-9]*", NAME="input/mouse%n"
+KERNEL="event[0-9]*", NAME="input/event%n"
+
 # loop devices
 KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
 
@@ -97,6 +102,14 @@ KERNEL="tty[p-za-e][0-9a-f]*", NAME="tty/s%n", SYMLINK="%k"
 # ramdisk devices
 KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
 
+# sound devices
+KERNEL="adsp",       NAME="sound/adsp"        SYMLINK="%k"
+KERNEL="audio",      NAME="sound/audio",      SYMLINK="%k"
+KERNEL="dsp",        NAME="sound/dsp",        SYMLINK="%k"
+KERNEL="mixer",      NAME="sound/mixer",      SYMLINK="%k"
+KERNEL="sequencer",  NAME="sound/sequencer",  SYMLINK="%k"
+KERNEL="sequencer2", NAME="sound/sequencer2", SYMLINK="%k"
+
 # tty devices
 KERNEL="tty[0-9]*",    NAME="vc/%n",  SYMLINK="%k"
 KERNEL="ttyS[0-9]*",   NAME="tts/%n", SYMLINK="%k"
diff --git a/sys-fs/udev/udev-013-r1.ebuild b/sys-fs/udev/udev-013-r1.ebuild
new file mode 100644
index 000000000000..0ec2d366170c
--- /dev/null
+++ b/sys-fs/udev/udev-013-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-013-r1.ebuild,v 1.1 2004/01/16 18:57:29 azarah Exp $
+
+# Note: Cannot use external libsysfs with klibc ..
+USE_KLIBC="no"
+USE_EXT_LIBSYSFS="no"
+
+inherit eutils
+
+DESCRIPTION="Linux dynamic device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-FAQ"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="virtual/glibc
+	>=sys-apps/hotplug-20030805-r1
+	>=sys-fs/sysfsutils-0.3.0"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/baselayout-1.8.6.12-r3"
+# We need some changes for devfs type layout
+
+pkg_setup() {
+	[ "${USE_KLIBC}" = "yes" ] && check_KV
+
+	return 0
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# 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.devfs
+	# (more for my own needs than anything else ...)
+	if [ "`md5sum < "${S}/etc/udev/udev.rules.devfs"`" != \
+	     "aca42692f862b0787212345f9dd8082c  -" ]
+	then
+		echo
+		eerror "udev.rules.devfs has been updated, please validate!"
+		die "udev.rules.devfs has been updated, please validate!"
+	fi
+
+	# Make sure we do not build included libsysfs, but link to
+	# one in sysfsutils ...
+	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
+	then
+		rm -rf ${S}/libsysfs
+		cp -Rd ${ROOT}/usr/include/sysfs ${S}/libsysfs
+	fi
+
+	# Setup things for klibc
+	if [ "${USE_KLIBC}" = "yes" ]
+	then
+		ln -snf ${ROOT}/usr/src/linux ${S}/klibc/linux
+	fi
+
+	# Do not sleep if UDEV_NO_SLEEP is set
+	epatch ${FILESDIR}/${PN}-011-no-wait-for-sleep.patch
+}
+
+src_compile() {
+	local myconf=
+
+	# DBUS support?
+	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+	then
+		myconf="USE_DBUS=true"
+	fi
+
+	# Do not work with emake
+	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
+	then
+		make EXTRAS="extras/scsi_id" \
+			udevdir="/dev/" \
+			ARCH_LIB_OBJS="-lsysfs" \
+			SYSFS="" \
+			${myconf} || die
+	else
+		make EXTRAS="extras/scsi_id" \
+			udevdir="/dev/" \
+			${myconf} || die
+	fi
+}
+
+src_install() {
+	into /
+	dosbin udev
+	dosbin extras/scsi_id/scsi_id
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+
+	insinto /etc/udev
+	doins ${FILESDIR}/udev.conf
+#	newins etc/udev/udev.rules udev.rules.example
+	# For devfs style layout
+	newins ${FILESDIR}/udev.rules.post_012 udev.rules
+	# Our own custom udev.permissions
+	doins ${FILESDIR}/udev.permissions
+#	doins etc/udev/udev.permissions
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+	# DBUS support?
+	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+	then
+		insinto /etc/dbus-1/system.d
+		doins etc/dbus-1/system.d/udev_sysbus_policy.conf
+	fi
+
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug
+
+	doman udev.8
+	doman extras/scsi_id/scsi_id.8
+
+	dodoc COPYING ChangeLog FAQ README TODO
+	dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs}
+}
+
+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
+}
+