version bump

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

3 files changed, 375 insertions, 5 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 934aeb2198fe..1d1768421157 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.641 2012/02/07 15:39:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.642 2012/02/08 04:26:59 williamh Exp $
+
+*udev-181 (08 Feb 2012)
+
+  08 Feb 2012; William Hubbs <williamh@gentoo.org> +udev-181.ebuild:
+  version bump
 
   07 Feb 2012; Jeroen Roovers <jer@gentoo.org> udev-171-r5.ebuild:
   Stable for HPPA (bug #399717).
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 63f7258b7f09..1ee65ac56397 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -117,6 +117,7 @@ DIST udev-171-testsys.tar.bz2 155001 RMD160 c73d2e52bcca8cd84f9467f8e26ef6efaf57
 DIST udev-171.tar.bz2 597937 RMD160 5b8f9f1e7ba353c58fef851f6f4e1f4c468540b4 SHA1 8b851f0e8681020b89a76a1e7a0273814fa2b24b SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e
 DIST udev-175.tar.bz2 616780 RMD160 3e568f3137e4f768be2122382b57bf1ceac2385c SHA1 2ef42ca4b11e6b9d0d5c7f47da39eb2e64695e44 SHA256 4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab
 DIST udev-180.tar.bz2 798731 RMD160 42b7a9ff0cb841be61dba91663b774a4c26f8424 SHA1 d6a64b5d81373b23b89584945989391e6a9dad99 SHA256 839c8af5de6d1075303f8d15ddfd8b0b00e5e55caff3198a0beb2fbd13940577
+DIST udev-181.tar.bz2 800616 RMD160 99950b938ea72708c6d4af103c36a7de23573b24 SHA1 766a0761314a0c958b657421d09b0b53c2083b82 SHA256 cfe5e2fdfe2488534740070236a7b0afdb961a0de4e07e1eb3847cda0c8fcafc
 DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 RMD160 826fe14de7cd4d60688dbc2a35daa38377b2e706 SHA1 d27d615d48133dc4411cdc47e3edfed04a78b385 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef
 DIST udev-gentoo-scripts-6.tar.bz2 16242 RMD160 f6ba565ca36cd12a5ed07fdffda0f5dc864c271a SHA1 5891ac0550db26112cc180904ce46f3be43f950a SHA256 d319dd8a5496361561344c1c190dde1b9ffc0023a29875647a407ed577f2727f
 DIST udev-gentoo-scripts-7.tar.bz2 16248 RMD160 51d58ff81f24dc5eb5c696c54739cc4048503295 SHA1 261ee037dec7f3a4abee22e5bd31522cc69d01e0 SHA256 cef8d47fe3b023c40dde621e0c91a9d38b7e7b83de5bae53e71a9027dfc65de7
@@ -134,14 +135,15 @@ EBUILD udev-164-r2.ebuild 15102 RMD160 7ed8900771e83abbd3f2a14dd880d5c7462310f2
 EBUILD udev-171-r5.ebuild 15552 RMD160 f08ad652b28d250f08cabb7f3ed31bcba3e18db4 SHA1 b724b1a580c19d711b7042361431f336abb8ef13 SHA256 03f5ee8b4a20c09dc3c7f903c48c215b92c0ac0710f768bd080cd11fca181e45
 EBUILD udev-175-r1.ebuild 12652 RMD160 12df1ef9e4a3bdf7b77e54e9a9bcbbefa473d97b SHA1 955f3175a290f52cb4e3621da1054acdfc686ab5 SHA256 3896f79f3025c1669712bc8902d09438829e11a9c132fc8f1524776b96a5802c
 EBUILD udev-180.ebuild 9796 RMD160 b7dfc4a33ca01142ac3c2de1e43e6906f7c77b0d SHA1 8e1f89bc548982758b74e2a126df22c77342618d SHA256 2dd439f0340011f647ab585ef315c604c2dbb59e04024b3a2fc6c25650b9e9ac
+EBUILD udev-181.ebuild 9796 RMD160 d319c1feade63d16bbbcc7aa4bc430428e3add63 SHA1 0f60d00de7930d843b7150354b293d5fea89d417 SHA256 51008a2668c24229ea74da9eac12b632d7f33695bae57f0e361fef4e35a0e7ea
 EBUILD udev-9999.ebuild 9837 RMD160 690b58f67af6532d1805e331fefaa82bd86e0f26 SHA1 6e78d5d151080c05836b5e730a68481bcfa5ce45 SHA256 006cf9b961d1ba5730e02f8d03b53deca1761881e21ebcc4d2c0d16df76e0799
-MISC ChangeLog 24099 RMD160 c40c4abfcd62e4622b04623ce14fed4aed6be763 SHA1 9b372ce4bacfac3637bae26e06afe014cffc7411 SHA256 f2ed26e5dfd4690d1c35bbf73da3aa76966f9dc0e6eab2197fca527f4f2feef3
+MISC ChangeLog 24214 RMD160 99b794f9c8d04327bb7ad048475c7d16e29bc2f7 SHA1 aaeee79cb14b9ceda285d9e6bc7eadd69f4fbda3 SHA256 a7af982d31cda717321d71749cb1ace38012621eaf59d3f1add58551aa1e169a
 MISC ChangeLog-2009 105929 RMD160 0c1dd5616962702fb0e85e4f9572fa27b0ee9d0f SHA1 d5635636ae54db968b8405a66be7d20c8d3f99ae SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8xRaoACgkQVWmRsqeSphOCqwCeN+qAdSYkqbh6Bu2gI12MOHgj
-2ywAmwWPzOGoNdqG/Yfto3gWCo5DUxqa
-=DqSp
+iEYEARECAAYFAk8x+awACgkQblQW9DDEZThABACeMlV/l8SOeM7S0tj2reRZ4qdz
+RqwAnj8rgnbDxjAJD+dRguNX543pgQen
+=Ap78
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-181.ebuild b/sys-fs/udev/udev-181.ebuild
new file mode 100644
index 000000000000..bf344273d1dd
--- /dev/null
+++ b/sys-fs/udev/udev-181.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-181.ebuild,v 1.1 2012/02/08 04:26:59 williamh Exp $
+
+EAPI=4
+
+KV_min=2.6.34
+# patchversion=1
+udev_rules_md5=ebc2cf422aa9e46cf7d9a555670412ba
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
+
+[[ ${PV} == "9999" ]] && vcs="git-2 autotools"
+inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool
+
+if [[ ${PV} != "9999" ]]
+then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+	if [[ -n "${patchversion}" ]]
+	then
+		patchset=${P}-patchset-${patchversion}
+		SRC_URI="${SRC_URI} mirror://gentoo/${patchset}.tar.bz2"
+	fi
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
+	keymap floppy edd doc static-libs"
+
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+	acl? ( sys-apps/acl dev-libs/glib:2 )
+	gudev? ( dev-libs/glib:2 )
+	introspection? ( dev-libs/gobject-introspection )
+	~sys-apps/kmod-5
+	>=sys-apps/util-linux-2.20
+	>=sys-libs/glibc-2.10"
+
+DEPEND="${COMMON_DEPEND}
+	keymap? ( dev-util/gperf )
+	dev-util/pkgconfig
+	virtual/os-headers
+	!<sys-kernel/linux-headers-2.6.34"
+
+if [[ $PV == "9999" ]]
+then
+	RESTRICT="test? ( userpriv )"
+	IUSE="${IUSE} test"
+	DEPEND="${DEPEND}
+		dev-util/gtk-doc
+		test? ( app-text/tree )"
+else
+	DEPEND="${DEPEND}
+	doc? ( dev-util/gtk-doc )"
+fi
+
+RDEPEND="${COMMON_DEPEND}
+	hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils[-zlib] )
+	acl? ( sys-apps/coreutils[acl] )
+	sys-fs/udev-init-scripts
+	!sys-apps/coldplug
+	!<sys-fs/lvm2-2.02.45
+	!sys-fs/device-mapper
+	>=sys-apps/baselayout-1.12.5"
+
+# required kernel options
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~HOTPLUG ~INOTIFY_USER ~NET ~PROC_FS
+	~SIGNALFD ~SYSFS ~TMPFS_POSIX_ACL
+	~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+
+udev_check_KV()
+{
+	if kernel_is lt ${KV_min//./ }
+	then
+		return 1
+	fi
+	return 0
+}
+
+pkg_setup()
+{
+	linux-info_pkg_setup
+
+	# always print kernel version requirements
+	ewarn
+	ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+
+	if ! udev_check_KV
+	then
+		eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
+	fi
+
+	KV_FULL_SRC=${KV_FULL}
+	get_running_version
+	if ! udev_check_KV
+	then
+		eerror
+		eerror "udev cannot be restarted after emerging,"
+		eerror "as your running kernel version (${KV_FULL}) is too old."
+		eerror "You really need to use a newer kernel after a reboot!"
+		NO_RESTART=1
+	fi
+}
+
+src_prepare()
+{
+	# backport some patches
+	if [[ -n "${patchset}" ]]
+	then
+		EPATCH_SOURCE="${WORKDIR}/${patchset}" EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" epatch
+	fi
+
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
+		-i rules/{rules.d,arch}/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	if [ ! -e configure ]
+	then
+		gtkdocize --copy || die "gtkdocize failed"
+		eautoreconf
+	else
+		# Make sure there are no sudden changes to upstream rules file
+		# (more for my own needs than anything else ...)
+		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
+		MD5=${MD5/  -/}
+		if [[ ${MD5} != ${udev_rules_md5} ]]
+		then
+			eerror "50-udev-default.rules has been updated, please validate!"
+			eerror "md5sum: ${MD5}"
+			die "50-udev-default.rules has been updated, please validate!"
+		fi
+		elibtoolize
+	fi
+}
+
+src_configure()
+{
+	filter-flags -fprefetch-loop-arrays
+	econf \
+		--with-rootprefix=/ \
+		--libdir=/usr/$(get_libdir) \
+		--libexecdir=/lib \
+		$(use_enable static-libs static) \
+		$(use_with selinux) \
+		$(use_enable debug) \
+		$(use_enable rule_generator) \
+		$(use_enable hwdb) \
+		--with-pci-ids-path=/usr/share/misc/pci.ids \
+		--with-usb-ids-path=/usr/share/misc/usb.ids \
+		$(use_enable acl udev_acl) \
+		$(use_enable gudev) \
+		$(use_enable introspection) \
+		$(use_enable keymap) \
+		$(use_enable floppy) \
+		$(use_enable edd) \
+		$(use_enable doc gtk-doc) \
+		$(systemd_with_unitdir)
+}
+
+src_install()
+{
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
+
+	# documentation
+	dodoc ChangeLog README TODO
+
+	if use keymap
+	then
+		dodoc src/extras/keymap/README.keymap.txt
+	fi
+
+	# udevadm is now in /usr/bin.
+	dosym /usr/bin/udevadm /sbin/udevadm
+
+	# create symlinks for these utilities to /sbin
+	# where multipath-tools expect them to be (Bug #168588)
+	dosym "/lib/udevd/scsi_id" /sbin/scsi_id
+
+	# Now install rules
+	insinto /lib/udev/rules.d/
+
+	# support older kernels
+	doins rules/misc/30-kernel-compat.rules
+
+	# add arch specific rules
+	if [[ -f rules/arch/40-${ARCH}.rules ]]
+	then
+		doins "rules/arch/40-${ARCH}.rules"
+	fi
+}
+
+# 19 Nov 2008
+fix_old_persistent_net_rules()
+{
+	local rules="${ROOT}"/etc/udev/rules.d/70-persistent-net.rules
+	[[ -f ${rules} ]] || return
+
+	elog
+	elog "Updating persistent-net rules file"
+
+	# Change ATTRS to ATTR matches, Bug #246927
+	sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
+
+	# Add KERNEL matches if missing, Bug #246849
+	sed -ri \
+		-e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
+		"${rules}"
+}
+
+# See Bug #129204 for a discussion about restarting udevd
+restart_udevd()
+{
+	if [[ ${NO_RESTART} = "1" ]]
+	then
+		ewarn "Not restarting udevd, as your kernel is too old!"
+		return
+	fi
+
+	# need to merge to our system
+	[[ ${ROOT} = / ]] || return
+
+	# check if root of init-process is identical to ours (not in chroot)
+	[[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return
+
+	# abort if there is no udevd running
+	[[ -n $(pidof udevd) ]] || return
+
+	# abort if no /run/udev exists
+	[[ -e /run/udev ]] || return
+
+	elog
+	elog "restarting udevd now."
+
+	killall -15 udevd &>/dev/null
+	sleep 1
+	killall -9 udevd &>/dev/null
+
+	/lib/udev/udevd --daemon
+	sleep 3
+	if [[ ! -n $(pidof udevd) ]]
+	then
+		eerror "FATAL: udev died, please check your kernel is"
+		eerror "new enough and configured correctly for ${P}."
+		eerror
+		eerror "Please have a look at this before rebooting."
+		eerror "If in doubt, please downgrade udev back to your old version"
+	fi
+}
+
+# This function determines if a directory is a mount point.
+# It was lifted from dracut.
+ismounted()
+{
+	while read a m a; do
+		[ "$m" = "$1" ] && return 0
+	done < "${ROOT}"/proc/mounts
+	return 1
+}
+
+pkg_postinst()
+{
+	mkdir -p "${ROOT}"/run
+	fix_old_persistent_net_rules
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT}"/dev/loop 2>/dev/null
+	if [[ -d "${ROOT}"/dev/loop ]]
+	then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	restart_udevd
+
+	# people want reminders, I'll give them reminders.  Odds are they will
+	# just ignore them anyway...
+
+	# Removing some device-nodes we thought we need some time ago, 25 Jan 2007
+	if [[ -d ${ROOT}/lib/udev/devices ]]
+	then
+		rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
+	fi
+
+	# Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007
+	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, 27 Jun 2007
+	if [[ -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 assigns fixed names to network devices."
+	elog "If you have problems with the persistent-net rules,"
+	elog "just delete the rules file"
+	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
+	elog "then reboot."
+	elog
+	elog "This may however number your devices in a different way than they are now."
+
+	ewarn
+	ewarn "If you build an initramfs including udev, then please"
+	ewarn "make sure that the /usr/bin/udevadm binary gets included,"
+	ewarn "and your scripts changed to use it,as it replaces the"
+	ewarn "old helper apps udevinfo, udevtrigger, ..."
+
+	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."
+
+	ewarn
+	ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
+	ewarn "then please migrate over to using the device names"
+	ewarn "/dev/md*, /dev/loop* and /dev/ram*."
+	ewarn "The devfs-compat rules have been removed."
+	ewarn "For reference see Bug #269359."
+
+	ewarn
+	ewarn "Rules for /dev/hd* devices have been removed"
+	ewarn "Please migrate to libata."
+
+	ewarn
+	ewarn "action_modeswitch has been removed by upstream."
+	ewarn "Please use sys-apps/usb_modeswitch."
+
+	if ismounted /usr
+	then
+		ewarn
+		ewarn "Your system has /usr on a separate partition. This means"
+		ewarn "you will need to use an initramfs to pre-mount /usr before"
+		ewarn "udev runs."
+		ewarn "This must be set up before your next reboot, or you may"
+		ewarn "experience failures which are very difficult to troubleshoot."
+		ewarn "For a more detailed explanation, see the following URL:"
+		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
+	fi
+
+	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"
+}