Update version.

5 files changed, 222 insertions, 19 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index cb326092f6ef..9f40b147c26d 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.25 2004/02/08 16:59:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.26 2004/02/13 20:12:40 azarah Exp $
+
+*udev-017 (13 Feb 2004)
+
+  13 Feb 2004; Martin Schlemmer <azarah@gentoo.org> udev-017.ebuild,
+  files/udev-017-no-wait-for-sleep.patch:
+  Update version.
 
 *udev-016-r1 (08 Feb 2004)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index e3339942cf3e..deb236f48dd3 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,25 +1,27 @@
 MD5 39793fbef16989ec7c19fa8ba04370ee udev-013.ebuild 3343
-MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550
+MD5 4c57d80c8c2dd5476d5262dc2a5e8bdf udev-017.ebuild 3602
+MD5 813397f1f9255c1b8c5e05e67b182938 udev-013-r1.ebuild 3352
+MD5 122e3cea952a01a8717e24934328563f ChangeLog 6379
+MD5 a19af1e2e874cadb09ab486d2fd343bb udev-012.ebuild 3400
+MD5 1001a80c31740e12beee81fe73e95f37 udev-015.ebuild 3761
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 204e09f1b9ee17de6d9d8d665e40df15 udev-016-r1.ebuild 3695
+MD5 2c21cbe4ae8af4ccc55ddd95d6442bd7 udev-016.ebuild 3696
 MD5 dbe7dc643caeafddc845fe9269430123 files/udev-011-no-wait-for-sleep.patch 1053
-MD5 194ac8ffc6c63327f8802eec5aeb7811 files/udev-015-sysbus-missing-include.patch 305
-MD5 5a1604faa5c8a1b5cf7a6a66f13fe226 files/udev.rules.post_012 4185
-MD5 61060bbdbb2d023f1b3ed90beabd89de files/udev-016-logging-config-option.patch 4070
-MD5 4e0d7e033730bbe5544745788e7a13a8 files/udev-012-udev_c-gcc295-compat.patch 277
+MD5 ab89de7957a7c7e6435203022d1db98a files/udev.conf 1184
 MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013-r1 62
+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 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
-MD5 ab89de7957a7c7e6435203022d1db98a files/udev.conf 1184
+MD5 8b2a4466a30de6474690e3f93703457b files/digest-udev-015 62
+MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013 62
+MD5 5a1604faa5c8a1b5cf7a6a66f13fe226 files/udev.rules.post_012 4185
+MD5 c7b3c31e1f8d7843d2b3672cf5f120c1 files/digest-udev-017 61
+MD5 61060bbdbb2d023f1b3ed90beabd89de files/udev-016-logging-config-option.patch 4070
+MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550
 MD5 cf9750c462c35531234ccb5f59b02e6b files/udev-015-no-wait-for-sleep.patch 1617
 MD5 4c26691abc7f47b0329203056cbcbebc files/udev.rules 3554
-MD5 35fcac8040808dde93580ddfe5ff5a18 files/digest-udev-012 62
-MD5 8ee2274e54f304cb9dbbe9094982fe94 files/digest-udev-013 62
-MD5 8b2a4466a30de6474690e3f93703457b files/digest-udev-015 62
-MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016 62
-MD5 1001a80c31740e12beee81fe73e95f37 udev-015.ebuild 3761
-MD5 a19af1e2e874cadb09ab486d2fd343bb udev-012.ebuild 3400
-MD5 be959598bcfc4b16d7e3d6dcac4d64ce .#Manifest.1.20 1291
-MD5 813397f1f9255c1b8c5e05e67b182938 udev-013-r1.ebuild 3352
-MD5 38c6c935931841bba9ea1a48f9ce5067 ChangeLog 6224
-MD5 2c21cbe4ae8af4ccc55ddd95d6442bd7 udev-016.ebuild 3696
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 042750a014507dd2dfaa2d173b5a7159 udev-016-r1.ebuild 3698
diff --git a/sys-fs/udev/files/digest-udev-017 b/sys-fs/udev/files/digest-udev-017
new file mode 100644
index 000000000000..4937dd4650c8
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-017
@@ -0,0 +1 @@
+MD5 666679dfde71f098b0f607c49df69a38 udev-017.tar.bz2 309361
diff --git a/sys-fs/udev/files/udev-017-no-wait-for-sleep.patch b/sys-fs/udev/files/udev-017-no-wait-for-sleep.patch
new file mode 100644
index 000000000000..17812c7dd1ed
--- /dev/null
+++ b/sys-fs/udev/files/udev-017-no-wait-for-sleep.patch
@@ -0,0 +1,54 @@
+--- udev-015/namedev.c	2004-01-29 19:02:10.067218096 +0200
++++ udev-015.no_sleep/namedev.c	2004-01-29 19:10:21.440518000 +0200
+#@@ -285,6 +285,10 @@ static void wait_for_device_to_initializ
+# 	struct bus_file *b = &bus_files[0];
+# 	struct sysfs_attribute *tmpattr;
+# 	int loop;
+#+	int udev_wait = 1;
+#+	
+#+	if (getenv("UDEV_NO_SLEEP") != NULL)
+#+		udev_wait = 0;
+# 
+# 	while (1) {
+# 		if (b->bus == NULL)
+#@@ -300,7 +304,8 @@ static void wait_for_device_to_initializ
+# 					goto exit;
+# 				}
+# 				/* sleep to give the kernel a chance to create the file */
+#-				sleep(1);
+#+				if (udev_wait)
+#+					sleep(1);
+# 			}
+# 			dbg("timed out waiting for '%s' file, continuing on anyway...", b->file);
+# 			goto exit;
+@@ -524,6 +529,10 @@ static struct sysfs_device *get_sysfs_de
+ 	struct sysfs_class_device *class_dev_parent;
+ 	struct timespec tspec;
+ 	int loop;
++	int udev_wait = 1;
++
++	if (getenv("UDEV_NO_SLEEP") != NULL)
++		udev_wait = 0;
+ 
+ 	/* Figure out where the device symlink is at.  For char devices this will
+ 	 * always be in the class_dev->path.  But for block devices, it's different.
+@@ -542,7 +551,8 @@ static struct sysfs_device *get_sysfs_de
+ 	tspec.tv_nsec = 10000000;  /* sleep 10 millisec */
+ 	loop = 10;
+ 	while (loop--) {
+-		nanosleep(&tspec, NULL);
++		if (udev_wait)
++			nanosleep(&tspec, NULL);
+ 		if (class_dev_parent)
+ 			sysfs_device = sysfs_get_classdev_device(class_dev_parent);
+ 		else
+@@ -569,7 +579,8 @@ device_found:
+ 		loop = 10;
+ 		tspec.tv_nsec = 10000000;
+ 		while (loop--) {
+-			nanosleep(&tspec, NULL);
++			if (udev_wait)
++				nanosleep(&tspec, NULL);
+ 			sysfs_get_device_bus(sysfs_device);
+ 			
+ 			if (sysfs_device->bus[0] != '\0')
diff --git a/sys-fs/udev/udev-017.ebuild b/sys-fs/udev/udev-017.ebuild
new file mode 100644
index 000000000000..573ed3a35df1
--- /dev/null
+++ b/sys-fs/udev/udev-017.ebuild
@@ -0,0 +1,140 @@
+# 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 $
+
+# 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"`" != \
+	     "39311afa517b232c6a860371f009d2df  -" ]
+	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}/${P}-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() {
+	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
+
+	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 *.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
+}