031 release

4 files changed, 170 insertions, 16 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 87dba16a136f..3c1cf0e87807 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.62 2004/09/03 19:16:59 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.63 2004/09/10 21:40:12 gregkh Exp $
+
+*udev-031 (10 Sep 2004)
+
+  10 Sep 2004; Greg Kroah-Hartman <gregkh@gentoo.org> +udev-031.ebuild:
+  031 release
+  No more udev_volume_id as it doesn't build :(
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> udev-025-r1.ebuild,
   udev-030.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index bde2638054ba..37b97a1577b6 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,28 +1,30 @@
-MD5 bc3f367bdb02695c19e553d0916af35f ChangeLog 12326
+MD5 64fc4b9c721739ca630358505e3b2aa0 udev-027.ebuild 3516
+MD5 f53d0727017870308c62237193c981ed ChangeLog 12484
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 c7a089cfa585cc48d2570f1350c17dc6 udev-024-r1.ebuild 3720
-MD5 54343e889ed8e1685908d27c9633dbb3 udev-025-r1.ebuild 3811
+MD5 43108b1317adc4dabce5dc33766006a3 udev-029.ebuild 3517
 MD5 61627f421ee2c1603a7feda4a6a31787 udev-026-r1.ebuild 3518
-MD5 64fc4b9c721739ca630358505e3b2aa0 udev-027.ebuild 3516
 MD5 1ed5a700a2b2209de427b7449633f330 udev-028.ebuild 3516
-MD5 43108b1317adc4dabce5dc33766006a3 udev-029.ebuild 3517
 MD5 ed6e41ef2de5d98b3fa022ffebd8e476 udev-030.ebuild 3524
-MD5 882b525738c554bce2449356cd1fb9c5 files/digest-udev-024-r1 61
-MD5 63c1b792a1470ccaa74195f5debacd2f files/digest-udev-025-r1 61
-MD5 a691746515d05e3574c0a26b4cc6f0cc files/digest-udev-026-r1 61
+MD5 23765c0c973e9614c100ecae43f22295 udev-031.ebuild 3617
+MD5 c7a089cfa585cc48d2570f1350c17dc6 udev-024-r1.ebuild 3720
+MD5 54343e889ed8e1685908d27c9633dbb3 udev-025-r1.ebuild 3811
 MD5 e7511f848411dc5e0cf7f768e48d940f files/digest-udev-027 61
-MD5 05b440530066098b69f77ae477fbc74d files/digest-udev-028 61
 MD5 6d7c7441686712fb1845375857306560 files/digest-udev-029 61
+MD5 a691746515d05e3574c0a26b4cc6f0cc files/digest-udev-026-r1 61
+MD5 05b440530066098b69f77ae477fbc74d files/digest-udev-028 61
+MD5 7ce9bba52fe0dc39b7b2ced37200fce2 files/udev.conf.post_024 1189
 MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
+MD5 cd92c9e177215e4622cfb5b4d4534b72 files/digest-udev-031 61
 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 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
-MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
-MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
-MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
-MD5 6df9e08cd088f74720689640de2ffcd6 files/udev.rules-018 4365
-MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
+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 882b525738c554bce2449356cd1fb9c5 files/digest-udev-024-r1 61
+MD5 63c1b792a1470ccaa74195f5debacd2f files/digest-udev-025-r1 61
diff --git a/sys-fs/udev/files/digest-udev-031 b/sys-fs/udev/files/digest-udev-031
new file mode 100644
index 000000000000..21106cc4a3f9
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-031
@@ -0,0 +1 @@
+MD5 6b8ff268db0832ee68f39e411294d3ad udev-031.tar.bz2 388457
diff --git a/sys-fs/udev/udev-031.ebuild b/sys-fs/udev/udev-031.ebuild
new file mode 100644
index 000000000000..fecd5193b4df
--- /dev/null
+++ b/sys-fs/udev/udev-031.ebuild
@@ -0,0 +1,145 @@
+# 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-031.ebuild,v 1.1 2004/09/10 21:40:12 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-FAQ"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+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"`" != \
+	     "ff28abea57b791ccf798938b0c05fd5e  -" ]
+	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"  volume_id has build issues...
+	local extras="extras/scsi_id"
+
+	# Device-mapper support?
+	if false
+	then
+		extras="${extras} extras/multipath"
+	fi
+
+	# Do not work with emake
+	make EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		${myconf} || die
+}
+
+src_install() {
+	dobin udevinfo udevtest
+	into /
+	dosbin udev udevd udevsend
+	dosbin extras/scsi_id/scsi_id
+	dosym /sbin/udev /sbin/udevstart
+#	dosbin extras/volume_id/udev_volume_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
+	doexe extras/scsi-devfs.sh
+
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_024 udev.conf
+#	newins etc/udev/udev.rules udev.rules.example
+	# 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
+#	doins ${FILESDIR}/udev.permissions
+#	doins etc/udev/udev.permissions
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udevsend /etc/hotplug.d/default/udev.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}
+}
+
+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
+}