udev version 022 update

5 files changed, 189 insertions, 16 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 881f4449103e..d926047128a3 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.38 2004/03/18 22:25:15 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.39 2004/03/21 00:13:33 gregkh Exp $
+
+*udev-022-r1 (20 Mar 2004)
+
+  20 Mar 2004; Greg Kroah-Hartman <gregkh@gentoo.org> metadata.xml,
+  udev-022-r1.ebuild:
+  Updated to version 022 of uevdev
 
 *udev-016-r2 (16 Mar 2004)
 *udev-017-r1 (16 Mar 2004)
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b029ace1a5db..bec289341d96 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,20 +1,14 @@
-MD5 700ae93a8388342731fbbe600a027d78 udev-018-r4.ebuild 3634
-MD5 747ac68ee7604c5c96bb33f6e189b1d1 udev-019-r3.ebuild 3884
-MD5 0a5fd647aa0c1cff0dda9c68d75c5a29 udev-021-r1.ebuild 3844
+MD5 6b08fb8506fefeae621c45fc55ee8c38 ChangeLog 8630
+MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 MD5 b1bbaa88170bd37fdd6af983e701cd90 udev-016-r2.ebuild 3727
-MD5 22c65e83f63ab0adc0b89c1a54ab479a udev-018-r3.ebuild 3910
 MD5 955749ba7774fe3a10a517e250f4399d udev-017-r1.ebuild 3640
-MD5 d6a005716788def549504def5d79adf7 udev-019-r2.ebuild 3784
+MD5 22c65e83f63ab0adc0b89c1a54ab479a udev-018-r3.ebuild 3910
+MD5 700ae93a8388342731fbbe600a027d78 udev-018-r4.ebuild 3634
 MD5 19a5c2b34b9827e7c914f438cf5f1ea2 udev-018-r5.ebuild 3715
-MD5 5a3f1f43c1829de54b70bc7a05909725 ChangeLog 8472
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
-MD5 d0a7b64f76b612bef576c02a48e83caf files/udev-017-no-wait-for-sleep.patch 1673
-MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550
-MD5 5a1604faa5c8a1b5cf7a6a66f13fe226 files/udev.rules.post_012 4185
-MD5 61060bbdbb2d023f1b3ed90beabd89de files/udev-016-logging-config-option.patch 4070
-MD5 ba39120cb35ab65a5b77b9036cc83beb files/udev.rules-018 4366
-MD5 073a6bdccda0208ab0e443dd3cb6561a files/udev-018-sysfs-build-fix.patch 3265
+MD5 d6a005716788def549504def5d79adf7 udev-019-r2.ebuild 3784
+MD5 747ac68ee7604c5c96bb33f6e189b1d1 udev-019-r3.ebuild 3884
+MD5 0a5fd647aa0c1cff0dda9c68d75c5a29 udev-021-r1.ebuild 3844
+MD5 3afe3ff3abb77817ae0986a494324b02 udev-022-r1.ebuild 3861
 MD5 a6c3a71920f59dc127d418d7ba3c6a77 files/digest-udev-016-r2 62
 MD5 c7b3c31e1f8d7843d2b3672cf5f120c1 files/digest-udev-017-r1 61
 MD5 6cf3f436068259264e186080dbdf6640 files/digest-udev-018-r3 61
@@ -23,7 +17,15 @@ MD5 6cf3f436068259264e186080dbdf6640 files/digest-udev-018-r5 61
 MD5 91f1152f7d02618431a13385f361049e files/digest-udev-019-r2 61
 MD5 91f1152f7d02618431a13385f361049e files/digest-udev-019-r3 61
 MD5 c646cc33c71e70ad05cc630273712533 files/digest-udev-021-r1 61
-MD5 ab89de7957a7c7e6435203022d1db98a files/udev.conf 1184
 MD5 cf9750c462c35531234ccb5f59b02e6b files/udev-015-no-wait-for-sleep.patch 1617
+MD5 61060bbdbb2d023f1b3ed90beabd89de files/udev-016-logging-config-option.patch 4070
+MD5 d0a7b64f76b612bef576c02a48e83caf files/udev-017-no-wait-for-sleep.patch 1673
+MD5 073a6bdccda0208ab0e443dd3cb6561a files/udev-018-sysfs-build-fix.patch 3265
 MD5 7c0242bfd86f0e0cb928dfb9f7f6edf3 files/udev-019-unlink-existing.patch 1963
+MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
+MD5 ab89de7957a7c7e6435203022d1db98a files/udev.conf 1184
+MD5 aba24cfb26a8f0b604a44a0d9ca7f830 files/udev.permissions 3550
 MD5 4c26691abc7f47b0329203056cbcbebc files/udev.rules 3554
+MD5 ba39120cb35ab65a5b77b9036cc83beb files/udev.rules-018 4366
+MD5 5a1604faa5c8a1b5cf7a6a66f13fe226 files/udev.rules.post_012 4185
+MD5 2307973356422a7496eea98636a8d667 files/digest-udev-022-r1 61
diff --git a/sys-fs/udev/files/digest-udev-022-r1 b/sys-fs/udev/files/digest-udev-022-r1
new file mode 100644
index 000000000000..c99cc8d0635a
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-022-r1
@@ -0,0 +1 @@
+MD5 cc14cf751ab4e0515d6388e3da66a8e0 udev-022.tar.bz2 328384
diff --git a/sys-fs/udev/metadata.xml b/sys-fs/udev/metadata.xml
index 96a2d586367d..1e43b9dfc9ff 100644
--- a/sys-fs/udev/metadata.xml
+++ b/sys-fs/udev/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<maintainer>
+  <email>gregkh@gentoo.org</email>
+  <name>Greg Kroah-Hartman</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/udev/udev-022-r1.ebuild b/sys-fs/udev/udev-022-r1.ebuild
new file mode 100644
index 000000000000..b221911e5a82
--- /dev/null
+++ b/sys-fs/udev/udev-022-r1.ebuild
@@ -0,0 +1,160 @@
+# 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-022-r1.ebuild,v 1.1 2004/03/21 00:13:33 gregkh Exp $
+
+# Note: Cannot use external libsysfs with klibc ..
+USE_KLIBC="no"
+USE_EXT_LIBSYSFS="no"
+
+inherit eutils
+
+DESCRIPTION="Linux dynamic and persistent 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 ~sparc ~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
+
+PROVIDE="virtual/dev-manager"
+
+pkg_setup() {
+	[ "${USE_KLIBC}" = "yes" ] && check_KV
+
+	return 0
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# epatch ${FILESDIR}/${P}-udev_add_c-gcc295-compat.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.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 udevd udevsend udevstart
+	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-018 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
+
+	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
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+}