Version bumped.

Package-Manager: portage-2.1.5.4

3 files changed, 376 insertions, 5 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index ca67f1796763..613eba18728a 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.386 2008/06/09 19:42:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.387 2008/06/12 05:55:08 zzam Exp $
+
+*udev-123 (12 Jun 2008)
+
+  12 Jun 2008; Matthias Schwarzott <zzam@gentoo.org> +udev-123.ebuild:
+  Version bumped.
 
 *udev-122-r1 (09 Jun 2008)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b8936ff3d536..00eb4f0042c3 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -78,6 +78,7 @@ DIST udev-119.tar.bz2 201836 RMD160 b827a1a5697fa32e43dec0a08081e92e2eddda52 SHA
 DIST udev-120.tar.bz2 203285 RMD160 a03e36e55953b296eaefaac242b1e5f1adda5254 SHA1 cef4c26390d158abcca135023cd88686271e8bc7 SHA256 6e2d07bf09f0c5d494b9139b2aa194ed7534bf7fb6f4dd732ed0cb725cde7b23
 DIST udev-121.tar.bz2 206790 RMD160 8b22e419eb926fa28c4c694bc8db895cb3506c06 SHA1 d194517d9466e302519a301d6c1e2579247692e1 SHA256 8ed32bf37539904e8b8eec7dafe9e5705734d574960d123f916eecbc44712b43
 DIST udev-122.tar.bz2 207332 RMD160 0e6737d26eb245b3438c1f26e2350de8cc780aee SHA1 4079b2d5149b8f532c1d2e54182380605f634806 SHA256 c1214ca514c6175129534e9d5ba6dfa55d4f3613f5cb68ae3f36788275720e00
+DIST udev-123.tar.bz2 208362 RMD160 2d2226c04623b1683b7c61318f87d662b30e886f SHA1 3eb775321c7bbfcb3d936e571c7a440cb970e9bf SHA256 c4f91af776030801bc39c23678a1916830690132aec632be97f118d4e9fee96d
 EBUILD udev-114-r1.ebuild 8816 RMD160 d2a452752aa4a4cfe553d9182b9b624c6df861dd SHA1 dc781d45759efbfb695bc613c535bc5ab5d02c7c SHA256 77595d8e14f232b1d941d37e9e064fc19eaaf61859ab8da0018de3cef9c557aa
 EBUILD udev-114-r2.ebuild 9303 RMD160 755b62df4a003f60b90e774d634639618086ab71 SHA1 62ba06fd2430813a706a1fb8cd429455e71c5d7b SHA256 d19dd1c12b032a4107c4e9f4c03aa90071198563e3fe602baffd86341fb5a688
 EBUILD udev-114.ebuild 8733 RMD160 53c0f674b1c6ad2377b11a4b26c85648f90ff23c SHA1 00f7da1a1f3c93149437d987ca8f0d8359279175 SHA256 843cccf1aded2f888c99c0a87065700e55b97b4c817304b88bc27132978c83bc
@@ -98,12 +99,13 @@ EBUILD udev-120.ebuild 9863 RMD160 a64b7c4e56a24220f35217cebe2809af2bcacd44 SHA1
 EBUILD udev-121.ebuild 9913 RMD160 56c886bdaa0e3daac0b3238b8f89b534c5b447eb SHA1 551de0443de1186e78520ce3b385b0bf907f27c0 SHA256 91cb26651a7f21a199cd7f50190a5a29b1afa7fc13e48cdb43ca3aa1a6191253
 EBUILD udev-122-r1.ebuild 10396 RMD160 8c3a30b17e4da39f39178cc6363f7816f8a0b3a8 SHA1 309592bcb494706815c59f752464113bfa65dd8a SHA256 3f30ca077a444bf3e6f3bad68b4a1cc89aa72f91971f85934e1f4aa30b7bbead
 EBUILD udev-122.ebuild 9860 RMD160 dc70d72489d33cb182d059cc9b33f9ebf147d576 SHA1 069b7baf6db75f0b53b5f6eb83fd4f5e9edc3027 SHA256 339638594a0e81bff3f0c006e26478cbb3f893ee37c4d1b05ad0c643113c7dc1
-MISC ChangeLog 77505 RMD160 8a9ac00d1ee06bbafcaa08bc3c348433743775f6 SHA1 85002653d8efabdfba941a6b9d6e74e4a36439a9 SHA256 ffafbd8a7c722aac37248bc946d75485046dc383a8c2c127dc09cadf1a2a584a
+EBUILD udev-123.ebuild 10398 RMD160 2178aa2864bee0ec8ac432b051315c7b1697e401 SHA1 731f8e6fcb17c7266e8e9892534cb6baae12db74 SHA256 9c5dbb396cb34a89af070fa227eef8a96eae3bbe320d4fbf5bca969c89c695fe
+MISC ChangeLog 77620 RMD160 131904c3fea42601031e61f23e56d5185c0e2034 SHA1 00a3aa94c842ffd9689e00d887c367aba83abb73 SHA256 1ba12614f05adeb3ed543d8e838ceed2954031fe7eae7ebd98b9af149c960001
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhNh5cACgkQt2vP6XvVdOc+zACfUx19D6L5PKTGhGUjFMf7xzPn
-v/sAoIYQcawZB8RfLznjTCo0XGPzVQew
-=CNnc
+iEYEARECAAYFAkhQukMACgkQt2vP6XvVdOeC+QCgj10oKla+/nJ7ILGpaw/BSpLY
+P8AAn3MYeSGyrjbnFNaD78oTzL9Jv7dp
+=FhOB
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-123.ebuild b/sys-fs/udev/udev-123.ebuild
new file mode 100644
index 000000000000..da9dc28cd5c9
--- /dev/null
+++ b/sys-fs/udev/udev-123.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-123.ebuild,v 1.1 2008/06/12 05:55:08 zzam Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
+
+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
+	!<sys-fs/device-mapper-1.02.19-r1"
+RDEPEND="${DEPEND} ${RDEPEND}
+	>=sys-apps/baselayout-1.12.5"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+pkg_setup() {
+	udev_helper_dir="/$(get_libdir)/udev"
+
+	myconf=
+	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/collect \
+			extras/rule_generator"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# comparing kernel version without linux-info.eclass to not pull
+	# virtual/linux-sources
+
+	local KV=$(uname -r)
+	local KV_MAJOR=$(get_major_version ${KV})
+	local KV_MINOR=$(get_version_component_range 2 ${KV})
+	local KV_MICRO=$(get_version_component_range 3 ${KV})
+
+	local ok=0
+	if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 && ${KV_MICRO} -ge 18 ]]
+	then
+		ok=1
+	fi
+
+	if [[ ${ok} == 0 ]]
+	then
+		ewarn
+		ewarn "${P} does not support Linux kernel before version 2.6.15!"
+		ewarn "If you want to use udev reliable you should update"
+		ewarn "to at least kernel version 2.6.18!"
+		ewarn
+		ebeep
+	fi
+}
+
+sed_helper_dir() {
+	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	# Bug #223757, Bug #208578
+	epatch "${FILESDIR}/${PN}-122-rules-update.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
+	# Do not require xmlto to refresh manpages
+	sed -ie 's|$(MAN_PAGES)||g' Makefile
+
+	# Make sure there is no sudden changes to upstream rules file
+	# (more for my own needs than anything else ...)
+	MD5=$(md5sum < "${S}/etc/udev/rules.d/50-udev-default.rules")
+	MD5=${MD5/  -/}
+	if [[ ${MD5} != db44f7e02100f57a555d48e2192c3f8d ]]
+	then
+		echo
+		eerror "50-udev-default.rules has been updated, please validate!"
+		die "50-udev-default.rules has been updated, please validate!"
+	fi
+
+	sed_helper_dir \
+		etc/udev/rules.d/50-udev-default.rules \
+		extras/rule_generator/write_*_rules \
+		udev_rules_parse.c \
+		udev_rules.c
+
+	# Use correct multilib dir
+	sed -i extras/volume_id/lib/Makefile \
+		-e "/ =/s-/lib-/$(get_libdir)-"
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+
+	if [[ -z ${extras} ]]; then
+		eerror "Variable extras is unset!"
+		eerror "It seems you suffer from Bug #190994"
+		die "Variable extras is unset!"
+	fi
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	emake \
+		EXTRAS="${extras}" \
+		libudevdir=${udev_helper_dir} \
+		CROSS_COMPILE=${mycross} \
+		OPTFLAGS="" \
+		${myconf} || die "compiling udev failed"
+}
+
+src_install() {
+	into /
+	emake \
+		DESTDIR="${D}" \
+		libudevdir=${udev_helper_dir} \
+		EXTRAS="${extras}" \
+		${myconf} \
+		install || die "make install failed"
+
+	exeinto "${udev_helper_dir}"
+	newexe "${FILESDIR}"/net-118-r1.sh net.sh	|| die "net.sh not installed properly"
+	newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
+		|| die "move_tmp_persistent_rules.sh not installed properly"
+	doexe "${FILESDIR}"/write_root_link_rule \
+		|| die "write_root_link_rule not installed properly"
+	newexe "${FILESDIR}"/shell-compat-118-r3.sh shell-compat.sh \
+		|| die "shell-compat.sh not installed properly"
+
+	keepdir "${udev_helper_dir}"/state
+	keepdir "${udev_helper_dir}"/devices
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym "..${udev_helper_dir}/vol_id" /sbin/vol_id
+	dosym "..${udev_helper_dir}/scsi_id" /sbin/scsi_id
+
+	# vol_id library (needed by mount and HAL)
+	into /
+	rm "${D}/$(get_libdir)"/libvolume_id.so* 2>/dev/null
+	dolib extras/volume_id/lib/*.so* || die "Failed installing libvolume_id.so"
+	into /usr
+	dolib extras/volume_id/lib/*.a || die "Failed installing libvolume_id.a"
+
+	# handle static linking bug #4411
+	rm -f "${D}/usr/$(get_libdir)/libvolume_id.so"
+	gen_usr_ldscript libvolume_id.so
+
+	# Add gentoo stuff to udev.conf
+	echo "# If you need to change mount-options, do it in /etc/fstab" \
+	>> "${D}"/etc/udev/udev.conf
+
+	# Now installing rules
+	cd etc/udev
+	insinto /etc/udev/rules.d/
+
+	# Our rules files
+	doins gentoo/??-*.rules
+	doins packages/40-alsa.rules
+
+	# Adding arch specific rules
+	if [[ -f packages/40-${ARCH}.rules ]]
+	then
+		doins "packages/40-${ARCH}.rules"
+	fi
+	cd "${S}"
+
+	# our udev hooks into the rc system
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-122-r1.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-118-r2.sh udev-stop.sh
+
+	# The udev-post init-script
+	newinitd "${FILESDIR}"/udev-postmount-initd-111-r2 udev-postmount
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/blacklist-110 blacklist
+	doins "${FILESDIR}"/pnp-aliases
+
+	# convert /lib/udev to real used dir
+	sed_helper_dir \
+		"${D}/$(get_libdir)"/rcscripts/addons/*.sh \
+		"${D}"/etc/init.d/udev* \
+		"${D}"/etc/modprobe.d/*
+
+	# documentation
+	dodoc ChangeLog FAQ README TODO RELEASE-NOTES
+	dodoc docs/{overview,udev_vs_devfs}
+
+	cd docs/writing_udev_rules
+	mv index.html writing_udev_rules.html
+	dohtml *.html
+
+	cd "${S}"
+
+	newdoc extras/volume_id/README README_volume_id
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > 20udev
+	doenvd 20udev
+}
+
+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 &&
+	     ! -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() {
+	# 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" &&
+		[[ -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
+
+	# 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 2>/dev/null
+	fi
+
+	if has_version "<sys-fs/udev-106-r5" &&
+		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
+	then
+		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
+	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 2>/dev/null
+		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
+
+	# 64-device-mapper.rules now gets installed by sys-fs/device-mapper
+	# remove it if user don't has sys-fs/device-mapper installed
+	if has_version "<sys-fs/udev-113" &&
+		[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
+		! has_version sys-fs/device-mapper
+	then
+			rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
+			einfo "Removed unneeded file 64-device-mapper.rules"
+	fi
+
+	# requested in Bug #225033:
+	elog
+	elog "persistent-net does assigning fixed names to network devices."
+	elog "If you have problems with persistent-net rules,"
+	elog "just delete the rules file"
+	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
+	elog "and then trigger udev by either running"
+	elog "\tudevadm trigger --subsystem-match=net"
+	elog "or by rebooting."
+	elog
+	elog "This may number your devices in a different way than it is now."
+
+	if [[ ${ROOT} == / ]]
+	then
+		# check if root of init-process is identical to ours
+		if [[ -r /proc/1/root && /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
+
+	ewarn "If you build an initramfs including udev, then please"
+	ewarn "make sure that the /sbin/udevadm binary gets included,"
+	ewarn "as the helper apps udevinfo, udevtrigger, ... are now"
+	ewarn "only symlinks to udevadm."
+
+	ewarn
+	ewarn "mount options for directory /dev are no longer"
+	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
+	ewarn "as for other directories."
+
+	elog
+	elog "For more information on udev on Gentoo, writing udev rules, and"
+	elog "         fixing known issues visit:"
+	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}