060 release

(Portage version: 2.0.51.22-r1)

5 files changed, 249 insertions, 22 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 4d3eca3dd3bf..cc91942b922b 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/udev
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.112 2005/07/01 23:23:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.113 2005/07/03 07:11:11 gregkh Exp $
+
+*udev-060 (03 Jul 2005)
+
+  03 Jul 2005; Greg Kroah-Hartman <gregkh@gentoo.org>
+  +files/udev.conf.post_059, +udev-060.ebuild:
+  060 release
+  
+  This one should actually boot, unlike 059, sorry about that...
 
   01 Jul 2005; Markus Rothe <corsair@gentoo.org> udev-058.ebuild:
   Stable on ppc64
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 26fbdb1c99b4..4d990ab230eb 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,29 +1,21 @@
-MD5 7f59495ae7dd268fe374638d4239079b udev-045.ebuild 3615
-MD5 7857aad3c85f55c0746507043e3fa47f udev-056.ebuild 4377
-MD5 9af93dad21d2ff85f634ecb39f0af0aa udev-051.ebuild 4130
+MD5 7e68c36eedef01d61a99d4226d131ff6 ChangeLog 20996
+MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
+MD5 43820d124485c872fbebc855051bbe4a udev-030.ebuild 3525
 MD5 ad7f104f4824231e45897b36cfff0581 udev-042.ebuild 3586
-MD5 b62145b3a3eb49eb69836b75beacc80a udev-058.ebuild 5174
+MD5 25f1af337b85b7197018a28d19db0f25 udev-043.ebuild 3600
+MD5 7f59495ae7dd268fe374638d4239079b udev-045.ebuild 3615
+MD5 1f9c2481a04538c99447456dd6df748f udev-046.ebuild 4010
+MD5 734eefbe0bf866154f11124f78596d38 udev-048.ebuild 4112
 MD5 b24405e7998500c213a44f09fcf63ec6 udev-049.ebuild 4112
-MD5 43820d124485c872fbebc855051bbe4a udev-030.ebuild 3525
 MD5 54817f566409d4a266a1a58e29048219 udev-050.ebuild 4100
-MD5 1f9c2481a04538c99447456dd6df748f udev-046.ebuild 4010
+MD5 9af93dad21d2ff85f634ecb39f0af0aa udev-051.ebuild 4130
 MD5 38af6b79b013d3c7dae75ab01f45e5ec udev-052.ebuild 4405
-MD5 734eefbe0bf866154f11124f78596d38 udev-048.ebuild 4112
-MD5 25f1af337b85b7197018a28d19db0f25 udev-043.ebuild 3600
-MD5 7e68c36eedef01d61a99d4226d131ff6 ChangeLog 20996
-MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 3df57bc94979e0ddf2c0866b9ed6e205 udev-059.ebuild 5794
 MD5 3de3909c1f443636bd5a548226b7dd2f udev-054.ebuild 4405
-MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
-MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
-MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
-MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
-MD5 6b567c4f93075da2ae54aa4512173624 files/udev.conf.post_050 1070
-MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
-MD5 6df9e08cd088f74720689640de2ffcd6 files/udev.rules-018 4365
-MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
-MD5 7b0a35c905183730e4dfdcf29f5a1816 files/udev-050-udev_volume_id.patch 388
-MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
+MD5 7857aad3c85f55c0746507043e3fa47f udev-056.ebuild 4377
+MD5 b62145b3a3eb49eb69836b75beacc80a udev-058.ebuild 5174
+MD5 3df57bc94979e0ddf2c0866b9ed6e205 udev-059.ebuild 5794
+MD5 dfd4e59171d1a581e42c0343b2248f08 udev-060.ebuild 5794
+MD5 691dace731323137de690d8f677c582f files/digest-udev-060 61
 MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
 MD5 cd839ae6d648dfcaa93ae36c53d7e365 files/digest-udev-042 61
 MD5 34ef6b0a15a8c5a92bc6c7abdb1e6021 files/digest-udev-043 61
@@ -38,4 +30,15 @@ MD5 1660cf98741ba7320f48a350362c74ba files/digest-udev-054 61
 MD5 ce48708bcbf9e1e3fcfb02c02e412f54 files/digest-udev-056 61
 MD5 69f45078068718e7c200b067da9a50e6 files/digest-udev-058 61
 MD5 38f3e2a01ee1ecea5233bf47176fe9fd files/digest-udev-059 61
+MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
+MD5 7b0a35c905183730e4dfdcf29f5a1816 files/udev-050-udev_volume_id.patch 388
+MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
+MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
+MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
+MD5 6b567c4f93075da2ae54aa4512173624 files/udev.conf.post_050 1070
 MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
+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 ad6b18e0e5f432e992435766f47f426c files/udev.conf.post_059 730
diff --git a/sys-fs/udev/files/digest-udev-060 b/sys-fs/udev/files/digest-udev-060
new file mode 100644
index 000000000000..cc5765969f86
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-060
@@ -0,0 +1 @@
+MD5 e0dfdbf34d88d17213562573a9dc1a32 udev-060.tar.bz2 432639
diff --git a/sys-fs/udev/files/udev.conf.post_059 b/sys-fs/udev/files/udev.conf.post_059
new file mode 100644
index 000000000000..84b81b29f20c
--- /dev/null
+++ b/sys-fs/udev/files/udev.conf.post_059
@@ -0,0 +1,21 @@
+# /etc/udev/udev.conf:  main config file for udev
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.conf.post_059,v 1.1 2005/07/03 07:11:11 gregkh Exp $
+#
+# This file can be used to override some of udev's default values
+# for where it looks for files, and where it places device nodes.
+
+
+# udev_root - where in the filesystem to place the device nodes
+udev_root="/dev/"
+
+# udev_db - The name and location of the udev database.
+#           NOTE: this should be somewhere that is writable before
+#                 / is mounted rw, like /dev ...
+udev_db="/dev/.udevdb"
+
+# udev_rules - The name and location of the udev rules file
+udev_rules="/etc/udev/rules.d/"
+
+# udev_log - set to "yes" if you want logging
+udev_log="no"
+
diff --git a/sys-fs/udev/udev-060.ebuild b/sys-fs/udev/udev-060.ebuild
new file mode 100644
index 000000000000..706577e4c24c
--- /dev/null
+++ b/sys-fs/udev/udev-060.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-060.ebuild,v 1.1 2005/07/03 07:11:11 gregkh Exp $
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static selinux"
+
+DEPEND="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"
+
+if use static
+then
+	USE_KLIBC=true
+else
+	USE_KLIBC=false
+fi
+export USE_KLIBC
+
+
+pkg_setup() {
+	[ "${USE_KLIBC}" = "true" ] && check_KV
+
+	return 0
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# patches go here...
+	#epatch ${FILESDIR}/${P}-udev_volume_id.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/gentoo/udev.rules"`" != \
+	     "b1c532da9d4b29e54d42f370fc06350e  -" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+}
+
+src_compile() {
+	local myconf=
+	local extras="extras/scsi_id extras/volume_id extras/ata_id extras/run_directory"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	# Do not work with emake
+	make \
+		EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		CROSS=${mycross} \
+		${myconf} || die
+}
+
+src_install() {
+	dobin udevinfo
+	dobin udevtest
+	into /
+	dosbin udev
+	dosbin udevd
+	dosbin udevsend
+	dosbin udevstart
+	dosbin extras/run_directory/udev_run_devd
+	dosbin extras/run_directory/udev_run_hotplugd
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+	doexe extras/scsi-devfs.sh
+	doexe extras/cdsymlinks.sh
+	doexe extras/dvb.sh
+	doexe extras/ata_id/ata_id
+	doexe extras/volume_id/vol_id
+	doexe extras/scsi_id/scsi_id
+
+
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_059 udev.conf
+	doins extras/cdsymlinks.conf
+
+	# For devfs style layout
+	insinto /etc/udev/rules.d/
+	newins etc/udev/gentoo/udev.rules 50-udev.rules
+
+	# Our own custom udev.permissions
+	#insinto /etc/udev/permissions.d/
+	#newins etc/udev/gentoo/udev.permissions 50-udev.permissions
+
+	# scsi_id configuration
+	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
+
+	# 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 RELEASE-NOTES
+	dodoc docs/{overview,udev_vs_devfs,RFC-dev.d,libsysfs.txt}
+	dodoc docs/persistent_naming/* docs/writing_udev_rules/*
+
+	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 [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug
+	fi
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
+	then
+		killall -15 udevd &>/dev/null
+		sleep 1
+		killall -9 udevd &>/dev/null
+	fi
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+	ewarn "Note: If you are upgrading from a version of udev prior to 046"
+	ewarn "      and you rely on the output of udevinfo for anything, please"
+	ewarn "      either run 'udevstart' now, or reboot, in order to get a"
+	ewarn "      up-to-date udev database."
+	ewarn " "
+	ewarn "Note: If you are upgrading from a version of udev prior to 050"
+	ewarn "      and you had written some custom permissions rules, please"
+	ewarn "      realize that the permission rules are now part of the main"
+	ewarn "      udev rules files and are not stand-alone anymore.  This means"
+	ewarn "      you need to rewrite them."
+	ewarn " "
+	ewarn "Note: If you are upgrading from a version of udev prior to 057"
+	ewarn "      and you have written custom rules, and rely on the etc/dev.d/"
+	ewarn "      functionality, please read the RELEASE-NOTES file for details"
+	ewarn "      on what has changed with this feature, and how to change your"
+	ewarn "      rules to work properly."
+	ewarn " "
+	ewarn "Note: If you are upgrading from a version of udev prior to 059"
+	ewarn "      and you have written custom rules, and rely on the etc/dev.d/"
+	ewarn "      functionality, or the etc/hotplug.d functionality, or just"
+	ewarn "      want to write some very cool and power udev rules, please "
+	ewarn "      read the RELEASE-NOTES file for details on what has changed"
+	ewarn "      with this feature, and how to change your rules to work properly."
+
+	einfo " "
+	einfo "For more information on udev on Gentoo, writing udev rules, and"
+	einfo "         fixing known issues visit: "
+	einfo "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}