036 bump

4 files changed, 152 insertions, 2 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 1f7a02fa7a30..426aa1adfe4e 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.70 2004/10/12 00:36:38 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.71 2004/10/12 21:08:52 gregkh Exp $
+
+*udev-036 (12 Oct 2004)
+
+  12 Oct 2004; Greg Kroah-Hartman <gregkh@gentoo.org> +udev-036.ebuild:
+  036 bump.
+  Hopefully get a bit better error reporting out of wait_for_sysfs now.
 
 *udev-035 (11 Oct 2004)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c468fbdfd41c..35cedfb2a238 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,5 +1,5 @@
 MD5 64fc4b9c721739ca630358505e3b2aa0 udev-027.ebuild 3516
-MD5 d6157e968897d9892f5032147c177c95 ChangeLog 14235
+MD5 55f07c587b68e47f93838d4c4995bfba ChangeLog 14417
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 MD5 43108b1317adc4dabce5dc33766006a3 udev-029.ebuild 3517
 MD5 61627f421ee2c1603a7feda4a6a31787 udev-026-r1.ebuild 3518
@@ -13,6 +13,7 @@ MD5 61bb2401341b879f2ee89392d357c973 udev-034-r1.ebuild 3591
 MD5 22944a40778a8322963b150a2087138b udev-035.ebuild 3588
 MD5 c7a089cfa585cc48d2570f1350c17dc6 udev-024-r1.ebuild 3720
 MD5 54343e889ed8e1685908d27c9633dbb3 udev-025-r1.ebuild 3811
+MD5 7db4ad93365d330f2c7653c2da1360b3 udev-036.ebuild 3588
 MD5 3f3fd84a95d1fabbf66be0cba8057a29 files/digest-udev-032 61
 MD5 882b525738c554bce2449356cd1fb9c5 files/digest-udev-024-r1 61
 MD5 63c1b792a1470ccaa74195f5debacd2f files/digest-udev-025-r1 61
@@ -34,3 +35,4 @@ MD5 06f3915555a7c2524b0638337cfaccff files/digest-udev-034 61
 MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
 MD5 06f3915555a7c2524b0638337cfaccff files/digest-udev-034-r1 61
 MD5 f5238b4aac82b9740f1663faef808c06 files/digest-udev-035 61
+MD5 186bd762511bf62b129d67efabf76513 files/digest-udev-036 61
diff --git a/sys-fs/udev/files/digest-udev-036 b/sys-fs/udev/files/digest-udev-036
new file mode 100644
index 000000000000..eb12e2ade8b7
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-036
@@ -0,0 +1 @@
+MD5 1b29a39b4a3139449e76447a621456e4 udev-036.tar.bz2 370577
diff --git a/sys-fs/udev/udev-036.ebuild b/sys-fs/udev/udev-036.ebuild
new file mode 100644
index 000000000000..9ac6aee82495
--- /dev/null
+++ b/sys-fs/udev/udev-036.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-036.ebuild,v 1.1 2004/10/12 21:08:52 gregkh Exp $
+
+# Note: Cannot use external libsysfs with klibc ..
+USE_KLIBC="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.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	sys-apps/hotplug-base"
+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}
+
+	# patches go here...
+	# 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.gentoo
+	# (more for my own needs than anything else ...)
+	if [ "`md5sum < "${S}/etc/udev/udev.rules.gentoo"`" != \
+	     "2ad43ee9c7a5a0bec284725755403ee0  -" ]
+	then
+		echo
+		eerror "udev.rules.gentoo has been updated, please validate!"
+		die "udev.rules.gentoo has been updated, please validate!"
+	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 extras/volume_id"
+
+	# Do not work with emake
+	make EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		${myconf} || die
+}
+
+src_install() {
+	dobin udevinfo
+	dobin udevtest
+	into /
+	dosbin udev
+	dosbin udevd
+	dosbin udevsend
+	dosbin wait_for_sysfs
+	dosbin extras/scsi_id/scsi_id
+	dosbin extras/volume_id/udev_volume_id
+	dosym /sbin/udev /sbin/udevstart
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+	doexe extras/scsi-devfs.sh
+
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_024 udev.conf
+
+	# For devfs style layout
+	insinto /etc/udev/rules.d/
+	newins etc/udev/udev.rules.gentoo 50-udev.rules
+
+	# Our own custom udev.permissions
+	insinto /etc/udev/permissions.d/
+	newins etc/udev/udev.permissions.gentoo 50-udev.permissions
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# set up symlinks in /etc/hotplug.d/default
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug
+	dosym ../../../sbin/wait_for_sysfs /etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+
+	# set up the /etc/dev.d directory tree
+	dodir /etc/dev.d/default
+	dodir /etc/dev.d/net
+	exeinto /etc/dev.d/net
+	doexe etc/dev.d/net/hotplug.dev
+
+	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,RFC-dev.d}
+	newdoc extras/volume_id/README README_volume_id
+}
+
+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
+
+	# delete the old udev.hotplug symlink if it is present
+	if [ -f "${ROOT}/etc/hotplug.d/default/udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+}