Update version.

6 files changed, 296 insertions, 5 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9f40b147c26d..efd289899408 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.26 2004/02/13 20:12:40 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.27 2004/02/19 22:18:21 azarah Exp $
+
+*udev-018 (20 Feb 2004)
+
+  20 Feb 2004; Martin Schlemmer <azarah@gentoo.org> udev-017.ebuild,
+  udev-018.ebuild, files/udev.rules-018:
+  Update version.
 
 *udev-017 (13 Feb 2004)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index deb236f48dd3..93c87403295d 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,9 +1,11 @@
 MD5 39793fbef16989ec7c19fa8ba04370ee udev-013.ebuild 3343
-MD5 4c57d80c8c2dd5476d5262dc2a5e8bdf udev-017.ebuild 3602
+MD5 4c3d2496229d6a42575f0e5b39ce83ab udev-017.ebuild 3605
 MD5 813397f1f9255c1b8c5e05e67b182938 udev-013-r1.ebuild 3352
 MD5 122e3cea952a01a8717e24934328563f ChangeLog 6379
 MD5 a19af1e2e874cadb09ab486d2fd343bb udev-012.ebuild 3400
+MD5 44c68ac30e9c319dd1344c9f5c0996d1 udev-018.ebuild 3610
 MD5 1001a80c31740e12beee81fe73e95f37 udev-015.ebuild 3761
+MD5 ef6436d49e9cd1320719c15249073e1c .udev-018.ebuild.swp 20480
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 204e09f1b9ee17de6d9d8d665e40df15 udev-016-r1.ebuild 3695
 MD5 2c21cbe4ae8af4ccc55ddd95d6442bd7 udev-016.ebuild 3696
@@ -14,6 +16,7 @@ MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016 62
 MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016-r1 62
 MD5 4e0d7e033730bbe5544745788e7a13a8 files/udev-012-udev_c-gcc295-compat.patch 277
 MD5 d0a7b64f76b612bef576c02a48e83caf files/udev-017-no-wait-for-sleep.patch 1673
+MD5 6cf3f436068259264e186080dbdf6640 files/digest-udev-018 61
 MD5 194ac8ffc6c63327f8802eec5aeb7811 files/udev-015-sysbus-missing-include.patch 305
 MD5 35fcac8040808dde93580ddfe5ff5a18 files/digest-udev-012 62
 MD5 ea8dcace65aa8d8071236e48ec1684af files/udev-015-logging-config-option.patch 4332
diff --git a/sys-fs/udev/files/digest-udev-018 b/sys-fs/udev/files/digest-udev-018
new file mode 100644
index 000000000000..79abc30e3a8f
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-018
@@ -0,0 +1 @@
+MD5 d09f32eb7916ed86b687675899ee6a02 udev-018.tar.bz2 313898
diff --git a/sys-fs/udev/files/udev.rules-018 b/sys-fs/udev/files/udev.rules-018
new file mode 100644
index 000000000000..360e291402b1
--- /dev/null
+++ b/sys-fs/udev/files/udev.rules-018
@@ -0,0 +1,129 @@
+# /etc/udev/udev.rules:  device naming rules for udev
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.rules-018,v 1.1 2004/02/19 22:18:21 azarah Exp $
+#
+# 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.
+
+###########################################################
+#
+# Add your own rules here (examples are commented)
+#
+###########################################################
+
+# Looking for scsi bus id 42:0:0:1
+#BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c"
+
+# A usb camera.
+#BUS="usb", SYSFS_vendor="FUJIFILM", SYSFS_model="M100", NAME="camera%n"
+
+# USB Epson printer to be called lp_epson
+#BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
+
+# USB HP printer to be called lp_hp
+#BUS="usb", SYSFS_serial="W09090207101241330", NAME="lp_hp"
+
+# sound card with PCI bus id 00:0b.0 to be the first sound card
+#BUS="pci", ID="00:0b.0", NAME="dsp"
+
+# sound card with PCI bus id 00:07.1 to be the second sound card
+#BUS="pci", ID="00:07.1", NAME="dsp1"
+
+# USB mouse plugged into the third port of the first hub to be called mouse0
+#BUS="usb", PLACE="1.3", NAME="mouse0"
+
+# USB tablet plugged into the third port of the second hub to be called mouse1
+#BUS="usb", PLACE="2.3", NAME="mouse1"
+#BUS="usb", PLACE="2.4", NAME="mouse2"
+
+# ttyUSB1 should always be called visor
+#KERNEL="ttyUSB1", NAME="visor"
+#KERNEL="ttyUSB0", NAME="pl2303"
+
+
+###########################################################
+#
+# For devfs similar /dev layout (neater)
+#
+###########################################################
+
+# 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}"
+
+# alsa devices
+KERNEL="controlC[0-9]*", NAME="snd/%k"
+KERNEL="hw[CD0-9]*",     NAME="snd/%k"
+KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
+KERNEL="midi[CD0-9]*",   NAME="snd/%k"
+KERNEL="timer",          NAME="snd/%k"
+KERNEL="seq",            NAME="snd/%k"
+
+# dm devices (ignore them)
+KERNEL="dm-[0-9]*",     NAME=""
+# 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"
+
+# floppy devices
+KERNEL="fd[0-9]*", NAME="floppy/%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"
+KERNEL="js*",         NAME="input/%k"
+KERNEL="ts*",         NAME="input/%k"
+
+# loop devices
+KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
+
+# md block devices
+KERNEL="md[0-9]*", NAME="md/%n", SYMLINK="%k"
+
+# misc devices
+KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
+KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
+KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k"
+KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
+KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
+KERNEL="uinput",  NAME="misc/%k", SYMLINK="%k"
+
+# pty devices
+KERNEL="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k"
+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"
+KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
+
+# vc devices
+KERNEL="vcs",        NAME="vcc/0",   SYMLINK="%k"
+KERNEL="vcs[0-9]*",  NAME="vcc/%n",  SYMLINK="%k"
+KERNEL="vcsa",       NAME="vcc/a0",  SYMLINK="%k"
+KERNEL="vcsa[0-9]*", NAME="vcc/a%n", SYMLINK="%k"
+
+# v4l devices
+KERNEL="video[0-9]*", NAME="v4l/video%n"
+KERNEL="radio[0-9]*", NAME="v4l/radio%n"
+KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
+KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
+
diff --git a/sys-fs/udev/udev-017.ebuild b/sys-fs/udev/udev-017.ebuild
index 573ed3a35df1..ddb2d3be1895 100644
--- a/sys-fs/udev/udev-017.ebuild
+++ b/sys-fs/udev/udev-017.ebuild
@@ -1,6 +1,6 @@
 # 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-017.ebuild,v 1.1 2004/02/13 20:12:40 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-017.ebuild,v 1.2 2004/02/19 22:18:21 azarah Exp $
 
 # Note: Cannot use external libsysfs with klibc ..
 USE_KLIBC="no"
@@ -98,7 +98,7 @@ src_install() {
 	# *** Note that we do not yet use or install udevd and udevsend, ***
 	# *** as they seem to be still too buggy (udevsend do not even   ***
 	# *** start udevd over here ...                                  ***
-#	dosbin udevd udevsend
+	dosbin udevd udevsend
 	dosbin extras/scsi_id/scsi_id
 
 	exeinto /etc/udev/scripts
@@ -122,7 +122,7 @@ src_install() {
 	fi
 
 	dodir /etc/hotplug.d/default
-	dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug
+	dosym ../../../sbin/udevsend /etc/hotplug.d/default/udev.hotplug
 
 	doman *.8
 	doman extras/scsi_id/scsi_id.8
diff --git a/sys-fs/udev/udev-018.ebuild b/sys-fs/udev/udev-018.ebuild
new file mode 100644
index 000000000000..9cf7f6229b9b
--- /dev/null
+++ b/sys-fs/udev/udev-018.ebuild
@@ -0,0 +1,152 @@
+# 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-018.ebuild,v 1.1 2004/02/19 22:18:21 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 ~ppc ~hppa ~amd64"
+
+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"`" != \
+	     "6cac1f863e51de110aef311301f6d58c  -" ]
+	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
+}
+
+src_compile() {
+	local myconf=
+	local extras="extras/scsi_id"
+
+	# DBUS support?
+	if which pkg-config &>/dev/null && pkg-config dbus-1 &>/dev/null
+	then
+		myconf="USE_DBUS=true"
+	fi
+
+	# Device-mapper support?
+	if false
+	then
+		extras="${extras} extras/multipath"
+	fi
+
+	# Do not work with emake
+	if [ "${USE_EXT_LIBSYSFS}" = "yes" -a "${USE_KLIBC}" != "yes" ]
+	then
+		make EXTRAS="${extras}" \
+			udevdir="/dev/" \
+			ARCH_LIB_OBJS="-lsysfs" \
+			SYSFS="" \
+			${myconf} || die
+	else
+		make EXTRAS="${extras}" \
+			udevdir="/dev/" \
+			${myconf} || die
+	fi
+}
+
+src_install() {
+	dobin udevinfo
+	into /
+	dosbin udev
+	# *** Note that we do not yet use or install udevd and udevsend, ***
+	# *** as they seem to be still too buggy (udevsend do not even   ***
+	# *** start udevd over here ...                                  ***
+	#dosbin udevd udevsend
+	dosbin extras/scsi_id/scsi_id
+	# Device-mapper support?
+	if false
+	then
+		dosbin extras/multipath/{multipath,devmap_name}
+        exeinto /etc/hotplug.d/scsi/
+        doexe  extras/multipath/multipath.hotplug
+	fi
+
+	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/udevsend /etc/hotplug.d/default/udev.hotplug
+	dosym ../../../sbin/udev /etc/hotplug.d/default/udev.hotplug
+
+	doman *.8
+	doman extras/scsi_id/scsi_id.8
+
+	dodoc COPYING ChangeLog FAQ HOWTO-udev_for_dev 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
+}