Version bumped.

Package-Manager: portage-2.1.2.7

4 files changed, 331 insertions, 5 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9aea449f6063..4e1fb36eed41 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.302 2007/05/05 21:24:57 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.303 2007/05/10 20:35:04 zzam Exp $
+
+*udev-111 (10 May 2007)
+
+  10 May 2007; Matthias Schwarzott <zzam@gentoo.org> +udev-111.ebuild:
+  Version bumped.
 
   05 May 2007; Roy Marples <uberlord@gentoo.org> files/udev-start-110-r1.sh:
   Work with dash again.
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 974c36c70164..9c2b246f75c7 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 SHA1 fbdeedb8b7a638c9d930f1e405aa83e55d9d2eec SHA256 63602afdbefafa4eb0b3301685e47dec5cc206b66765e733f9bcc6afe2a5d31b
 MD5 17c291f5c6e624792d02dd304fb8177e files/05-udev-early.rules-078 288
 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 files/05-udev-early.rules-078 288
@@ -353,6 +356,7 @@ DIST udev-107.tar.bz2 189101 RMD160 ebc2722e0306aea3f3c0cd828861a61021609ac7 SHA
 DIST udev-108.tar.bz2 187460 RMD160 cfc3885bdbb1a3611118c8503efe3ffe472b0f2d SHA1 4f1746dcfe51436a43b32c4db9af04f018a62bab SHA256 0956fd6e7388cbb9c3431db302e52f8ee03d7fad8a159359597878058d8632ec
 DIST udev-109.tar.bz2 188252 RMD160 8700365b2ea744e19f0133615a652ca85726d890 SHA1 d2fe21ecec90824518feb3e7c5fb3ee050b7790c SHA256 d16886d1d1791331f6cf949338b3c5aaf9f57c5a5b141531efa61c8b881b3330
 DIST udev-110.tar.bz2 188708 RMD160 6ad83cfa386a7eedb79fc642eca438071a396580 SHA1 29014f65eb0d42b1836928fa4114a2ebbf58ec0b SHA256 14532a4a563ad99c4631b5c3a1b4950337c3137d91a87825d6ae24b953f652ca
+DIST udev-111.tar.bz2 190020 RMD160 bb3f1c2b1e24092b42507b663eceffe17f8a4a06 SHA1 910e8f31835528ec45cd59ba4a00f88c7f93670e SHA256 ec47cc46b15838321c31589d7bdbdcf553c0ea4f406edc6f239cb20a3732c233
 EBUILD udev-079-r2.ebuild 7538 RMD160 855d8af681bf6ca8e38dcc3881b1c468d599bdfb SHA1 c4271b48dea89ca9a0e9860e9ede29a54a04275e SHA256 b972caef4241ca892aa25387dc56264a81b52c51821588b834a6f013c2984d1c
 MD5 b5b0e32721933ece54da4280b05386c5 udev-079-r2.ebuild 7538
 RMD160 855d8af681bf6ca8e38dcc3881b1c468d599bdfb udev-079-r2.ebuild 7538
@@ -449,10 +453,14 @@ EBUILD udev-110.ebuild 9829 RMD160 3452835fc9d94da4b5266498509c84ee8ea79811 SHA1
 MD5 d3bf2a664ff303283108edd767cae6a5 udev-110.ebuild 9829
 RMD160 3452835fc9d94da4b5266498509c84ee8ea79811 udev-110.ebuild 9829
 SHA256 5677205d17d3401184e097d04ec97ddfcff0cc6c9bd73cfac400a457a1ddb204 udev-110.ebuild 9829
-MISC ChangeLog 58199 RMD160 24cfcb694fab9d4a2bbbdf2ba60a49af9d505a23 SHA1 8ad15e87786a5113ab7a80544c5ac0bbb490a0dd SHA256 ba45eeb379e3b106cc034107a2d11a59232a3bc45e4567745f2556c71c3a9ba2
-MD5 6f7a8ad30677fc63176bdcf206611fbf ChangeLog 58199
-RMD160 24cfcb694fab9d4a2bbbdf2ba60a49af9d505a23 ChangeLog 58199
-SHA256 ba45eeb379e3b106cc034107a2d11a59232a3bc45e4567745f2556c71c3a9ba2 ChangeLog 58199
+EBUILD udev-111.ebuild 9967 RMD160 bb97abf987e7c050dc9879c92d9587089a45b04b SHA1 fff469de8e1e683d9a35fd0af3d509857b2bff9d SHA256 649b5e5339dca8e9c06b3e20c9f331af032d87d9ebd4ce53df6b3a8a3025f48e
+MD5 384db345c02c0dc23af69684efdcdbdc udev-111.ebuild 9967
+RMD160 bb97abf987e7c050dc9879c92d9587089a45b04b udev-111.ebuild 9967
+SHA256 649b5e5339dca8e9c06b3e20c9f331af032d87d9ebd4ce53df6b3a8a3025f48e udev-111.ebuild 9967
+MISC ChangeLog 58310 RMD160 2a1e23cd159a717c8ce0b0bbe57a015b7381d902 SHA1 6a322f38632196d2cbbd6f537ac8f1a318cd27e7 SHA256 2154dfcbf76caeda3349c1e804123e0f81cd50f439f9f241999d74754f49ad42
+MD5 e587f99795be474835115a1b57d31bc5 ChangeLog 58310
+RMD160 2a1e23cd159a717c8ce0b0bbe57a015b7381d902 ChangeLog 58310
+SHA256 2154dfcbf76caeda3349c1e804123e0f81cd50f439f9f241999d74754f49ad42 ChangeLog 58310
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -529,3 +537,13 @@ SHA256 69a1572d54ff5ba74652f37125d187171cc62f7d1cce3a09c4c11be16112a482 files/di
 MD5 2bed01dff144a7f267cc55a2eeb748e4 files/digest-udev-110-r1 229
 RMD160 88d77d0fa4c3c670326891749d674ef3c73a4c94 files/digest-udev-110-r1 229
 SHA256 69a1572d54ff5ba74652f37125d187171cc62f7d1cce3a09c4c11be16112a482 files/digest-udev-110-r1 229
+MD5 f972e05a59a06d7a8f0558e95c815023 files/digest-udev-111 229
+RMD160 e3d3502313bf0cc5c20e675bc2ed2dfc7a26487f files/digest-udev-111 229
+SHA256 e9b70d3341d67047bbc63a8b60a403fffce01a30974814a50e4e05aa15d80603 files/digest-udev-111 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGQ4H+t2vP6XvVdOcRArVNAKDC3UmF/M/IvloS7jd11M0WtOLAOwCdGNbI
+/XvOqOpFvXRPy2LxOYdAEK0=
+=FTBE
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-111 b/sys-fs/udev/files/digest-udev-111
new file mode 100644
index 000000000000..6cefddeda901
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-111
@@ -0,0 +1,3 @@
+MD5 bd2a94e3ed243e6a3d501a5c8afc4b54 udev-111.tar.bz2 190020
+RMD160 bb3f1c2b1e24092b42507b663eceffe17f8a4a06 udev-111.tar.bz2 190020
+SHA256 ec47cc46b15838321c31589d7bdbdcf553c0ea4f406edc6f239cb20a3732c233 udev-111.tar.bz2 190020
diff --git a/sys-fs/udev/udev-111.ebuild b/sys-fs/udev/udev-111.ebuild
new file mode 100644
index 000000000000..52c2f0304277
--- /dev/null
+++ b/sys-fs/udev/udev-111.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-111.ebuild,v 1.1 2007/05/10 20:35:04 zzam Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-apps/coldplug"
+RDEPEND="${DEPEND} ${RDEPEND}
+	>=sys-apps/baselayout-1.12.5"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	#epatch ${FILESDIR}/${P}-udev_volume_id.patch
+	epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch
+	EPATCH_OPTS="-p1" epatch ${FILESDIR}/${PN}-110-root-link-1.diff
+
+	# 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 ...)
+	MD5=`md5sum < "${S}/etc/udev/gentoo/50-udev.rules"`
+	MD5=${MD5/  -/}
+	if [ "${MD5}" != "04a8f3303a2b172affbed26973745f26" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+	local myconf=
+	local extras="extras/ata_id \
+				  extras/cdrom_id \
+				  extras/edd_id \
+				  extras/firmware \
+				  extras/floppy \
+				  extras/path_id \
+				  extras/scsi_id \
+				  extras/usb_id \
+				  extras/volume_id \
+				  extras/rule_generator \
+				  extras/root_link"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	echo "get_libdir = $(get_libdir)"
+	emake \
+		EXTRAS="${extras}" \
+		udevdir="/dev/" \
+		CROSS_COMPILE=${mycross} \
+		OPTFLAGS="" \
+		${myconf} || die
+}
+
+src_install() {
+	# we install everything by "hand" and don't rely on the udev Makefile to do
+	# it for us (why? it's easier that way...)
+	dobin udevinfo		|| die "Required binary not installed properly"
+	dobin udevtest		|| die "Required binary not installed properly"
+	dobin udevmonitor	|| die "Required binary not installed properly"
+	into /
+	dosbin udevd		|| die "Required binary not installed properly"
+	dosbin udevstart	|| die "Required binary not installed properly"
+	dosbin udevtrigger	|| die "Required binary not installed properly"
+	dosbin udevcontrol	|| die "Required binary not installed properly"
+	dosbin udevsettle	|| die "Required binary not installed properly"
+
+	# Helpers
+	exeinto /lib/udev
+	doexe extras/ata_id/ata_id		|| die "Required helper not installed properly"
+	doexe extras/volume_id/vol_id	|| die "Required helper not installed properly"
+	doexe extras/scsi_id/scsi_id	|| die "Required helper not installed properly"
+	doexe extras/usb_id/usb_id		|| die "Required helper not installed properly"
+	doexe extras/path_id/path_id	|| die "Required helper not installed properly"
+	doexe extras/cdrom_id/cdrom_id	|| die "Required helper not installed properly"
+	doexe extras/edd_id/edd_id		|| die "Required helper not installed properly"
+	doexe extras/rule_generator/write_cd_rules	|| die "Required helper not installed properly"
+	doexe extras/rule_generator/write_net_rules	|| die "Required helper not installed properly"
+	doexe extras/rule_generator/rule_generator.functions	|| die "Required helper not installed properly"
+	doexe extras/root_link/get_dir_major_minor || die "Required helper not installed properly"
+	keepdir /lib/udev/state
+	keepdir /lib/udev/devices
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym ../lib/udev/vol_id /sbin/vol_id
+	dosym ../lib/udev/scsi_id /sbin/scsi_id
+
+	# vol_id library (needed by mount and HAL)
+	dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so*
+	# move the .a files to /usr/lib
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a  "${D}"/usr/$(get_libdir)/
+
+	# handle static linking bug #4411
+	gen_usr_ldscript libvolume_id.so
+
+	# save pkgconfig info
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins extras/volume_id/lib/*.pc
+
+	#exeinto /etc/udev/scripts
+	exeinto /lib/udev
+	#doexe extras/ide-devfs.sh
+	#doexe extras/scsi-devfs.sh
+	#doexe extras/raid-devfs.sh
+	doexe extras/floppy/create_floppy_devices	|| die "Required binary not installed properly"
+	doexe extras/firmware/firmware.sh			|| die "Required binary not installed properly"
+	newexe ${FILESDIR}/net-104-r10.sh net.sh	|| die "Required binary not installed properly"
+	newexe ${FILESDIR}/modprobe-105.sh modprobe.sh	|| die "Required binary not installed properly"
+
+	# Our udev config file
+	insinto /etc/udev
+	newins ${FILESDIR}/udev.conf.post_108 udev.conf
+
+	# Our rules files
+	insinto /etc/udev/rules.d/
+	doins etc/udev/gentoo/??-*.rules
+	#newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules
+	#newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules
+	#doins ${FILESDIR}/95-udev-late.rules
+	# Special rules for device-mapper
+	#newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.rules
+	# Use upstream's persistent rules for devices
+	doins etc/udev/rules.d/60-*.rules
+	doins extras/rule_generator/75-*.rules || die "rules not installed properly"
+
+	# scsi_id configuration
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# all of the man pages
+	doman *.7
+	doman *.8
+	doman extras/ata_id/ata_id.8
+	doman extras/edd_id/edd_id.8
+	doman extras/scsi_id/scsi_id.8
+	doman extras/volume_id/vol_id.8
+	doman extras/cdrom_id/cdrom_id.8
+	# create a extra symlink for udevcontrol
+	dosym udevd.8 /usr/share/man/man8/udevcontrol.8
+
+	# our udev hooks into the rc system
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-110-r1.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-110-r1.sh udev-stop.sh
+
+	# needed to compile latest Hal
+	insinto /usr/include
+	doins extras/volume_id/lib/libvolume_id.h
+
+	dodoc ChangeLog FAQ README TODO RELEASE-NOTES
+	dodoc docs/{overview,udev_vs_devfs}
+	dodoc docs/writing_udev_rules/*
+
+	newdoc extras/volume_id/README README_volume_id
+
+	insinto /etc/modprobe.d
+	newins ${FILESDIR}/blacklist-110 blacklist
+	doins ${FILESDIR}/pnp-aliases
+
+	if use s390; then
+		# s390 does not has persistent mac addresses
+		# and we only have persistence rules for mac.
+		# For now just remove the rules file.
+		rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules
+	fi
+
+}
+
+pkg_preinst() {
+	if [[ -d ${ROOT}/lib/udev-state ]] ; then
+		mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
+		rm -r "${ROOT}"/lib/udev-state
+	fi
+
+	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
+
+	# delete the old wait_for_sysfs.hotplug symlink if it is present
+	if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ]
+	then
+		rm -f ${ROOT}/etc/hotplug.d/default/10-udev.hotplug
+	fi
+
+	# is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind)
+	coldplug_stale=""
+	if [ -f "${ROOT}/etc/init.d/coldplug" ]
+	then
+		coldplug_stale="1"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == "/" ]] ; then
+		# check if root of init-process is identical to ours
+		if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then
+			einfo "restarting udevd now."
+			if [[ -n $(pidof udevd) ]] ; then
+				killall -15 udevd &>/dev/null
+				sleep 1
+				killall -9 udevd &>/dev/null
+			fi
+			/sbin/udevd --daemon
+		fi
+	fi
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	if [[ ${coldplug_stale} == "1" ]] ; then
+		ewarn "A stale coldplug init script found. You should run:"
+		ewarn
+		ewarn "      rc-update del coldplug"
+		ewarn "      rm -f /etc/init.d/coldplug"
+		ewarn
+		ewarn "udev now provides its own coldplug functionality."
+	fi
+
+	# delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
+	if has_version "=sys-fs/udev-103-r3"; then
+		if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
+		then
+			ewarn "Deleting stray 40-scsi-hotplug.rules"
+			ewarn "installed by sys-fs/udev-103-r3"
+			rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules
+		fi
+	fi
+
+	# Removing some device-nodes we thought we need some time ago
+	if [[ -d "${ROOT}"/lib/udev/devices ]]; then
+		rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
+	fi
+
+	# Removing some old file
+	if has_version "<sys-fs/udev-104-r5"; then
+		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net
+	fi
+
+	if has_version "<sys-fs/udev-106-r5"; then
+		if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then
+			rm -f ${ROOT}/etc/udev/rules.d/95-net.rules
+		fi
+	fi
+
+	# Try to remove /etc/dev.d as that is obsolete
+	if [[ -d "${ROOT}"/etc/dev.d ]]; then
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d
+		if [[ -d "${ROOT}"/etc/dev.d ]]; then
+			ewarn "You still have the directory /etc/dev.d on your system."
+			ewarn "This is no longer used by udev and can be removed."
+		fi
+	fi
+
+	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"
+}