Improve wording of devfs-compat message, Bug #301141. Sync udev-9999 to latest udev-151-r1.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

14 files changed, 74 insertions, 61 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e2a646bcc4e2..7a1708f9c060 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.525 2010/02/01 20:53:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.526 2010/02/07 20:32:51 zzam Exp $
+
+  07 Feb 2010; Matthias Schwarzott <zzam@gentoo.org> udev-141-r1.ebuild,
+  udev-145.ebuild, udev-145-r1.ebuild, udev-145-r2.ebuild,
+  udev-145-r3.ebuild, udev-146.ebuild, udev-146-r1.ebuild,
+  udev-146-r2.ebuild, udev-147-r1.ebuild, udev-149.ebuild,
+  udev-150-r1.ebuild, udev-151-r1.ebuild, udev-9999.ebuild:
+  Improve wording of devfs-compat message, Bug #301141. Sync udev-9999 to
+  latest udev-151-r1.
 
 *udev-151-r1 (01 Feb 2010)
 *udev-150-r1 (01 Feb 2010)
diff --git a/sys-fs/udev/udev-141-r1.ebuild b/sys-fs/udev/udev-141-r1.ebuild
index fc0fdb65d0d8..750348a5f07e 100644
--- a/sys-fs/udev/udev-141-r1.ebuild
+++ b/sys-fs/udev/udev-141-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141-r1.ebuild,v 1.3 2009/12/05 16:38:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141-r1.ebuild,v 1.4 2010/02/07 20:32:51 zzam Exp $
 
 #
 # Please do not remove this version:
@@ -452,7 +452,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-145-r1.ebuild b/sys-fs/udev/udev-145-r1.ebuild
index f44f60adf246..ad4806700fe7 100644
--- a/sys-fs/udev/udev-145-r1.ebuild
+++ b/sys-fs/udev/udev-145-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r1.ebuild,v 1.8 2009/10/29 19:41:57 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r1.ebuild,v 1.9 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -519,7 +519,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-145-r2.ebuild b/sys-fs/udev/udev-145-r2.ebuild
index 79a7b254a2f9..e435a06ec419 100644
--- a/sys-fs/udev/udev-145-r2.ebuild
+++ b/sys-fs/udev/udev-145-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r2.ebuild,v 1.3 2009/10/29 19:41:57 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r2.ebuild,v 1.4 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -526,7 +526,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-145-r3.ebuild b/sys-fs/udev/udev-145-r3.ebuild
index 6a1857fea392..e9acf4640752 100644
--- a/sys-fs/udev/udev-145-r3.ebuild
+++ b/sys-fs/udev/udev-145-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r3.ebuild,v 1.2 2009/10/29 19:41:57 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r3.ebuild,v 1.3 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -526,7 +526,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-145.ebuild b/sys-fs/udev/udev-145.ebuild
index 1ec391605a65..2681f510f1ed 100644
--- a/sys-fs/udev/udev-145.ebuild
+++ b/sys-fs/udev/udev-145.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145.ebuild,v 1.5 2009/10/02 11:30:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145.ebuild,v 1.6 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -470,7 +470,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-146-r1.ebuild b/sys-fs/udev/udev-146-r1.ebuild
index df4546195f87..dc5ae29de9b2 100644
--- a/sys-fs/udev/udev-146-r1.ebuild
+++ b/sys-fs/udev/udev-146-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r1.ebuild,v 1.10 2009/12/11 16:03:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r1.ebuild,v 1.11 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -526,7 +526,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-146-r2.ebuild b/sys-fs/udev/udev-146-r2.ebuild
index d9c5575d9a3e..cdecdf76af09 100644
--- a/sys-fs/udev/udev-146-r2.ebuild
+++ b/sys-fs/udev/udev-146-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r2.ebuild,v 1.1 2009/11/11 19:15:28 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r2.ebuild,v 1.2 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -551,7 +551,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-146.ebuild b/sys-fs/udev/udev-146.ebuild
index 41361ba2f9b4..db56f4efc621 100644
--- a/sys-fs/udev/udev-146.ebuild
+++ b/sys-fs/udev/udev-146.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146.ebuild,v 1.4 2009/10/29 19:41:57 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146.ebuild,v 1.5 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -522,7 +522,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-147-r1.ebuild b/sys-fs/udev/udev-147-r1.ebuild
index 4d73f40a2d23..bcc0d44a4e06 100644
--- a/sys-fs/udev/udev-147-r1.ebuild
+++ b/sys-fs/udev/udev-147-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-147-r1.ebuild,v 1.3 2009/12/04 17:51:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-147-r1.ebuild,v 1.4 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -554,7 +554,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-149.ebuild b/sys-fs/udev/udev-149.ebuild
index b85362f34169..18e7be07ce49 100644
--- a/sys-fs/udev/udev-149.ebuild
+++ b/sys-fs/udev/udev-149.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-149.ebuild,v 1.3 2009/12/30 08:54:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-149.ebuild,v 1.4 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -550,7 +550,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-150-r1.ebuild b/sys-fs/udev/udev-150-r1.ebuild
index f8c5fd6719c5..0c782a9f5933 100644
--- a/sys-fs/udev/udev-150-r1.ebuild
+++ b/sys-fs/udev/udev-150-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-150-r1.ebuild,v 1.1 2010/02/01 20:53:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-150-r1.ebuild,v 1.2 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -553,7 +553,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
diff --git a/sys-fs/udev/udev-151-r1.ebuild b/sys-fs/udev/udev-151-r1.ebuild
index 82b1c5a91c53..395565dc6007 100644
--- a/sys-fs/udev/udev-151-r1.ebuild
+++ b/sys-fs/udev/udev-151-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r1.ebuild,v 1.1 2010/02/01 20:53:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r1.ebuild,v 1.2 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
@@ -542,7 +542,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "devfs-compat use flag is enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
@@ -553,7 +553,7 @@ pkg_postinst() {
 
 	if use old-hd-rules; then
 		ewarn
-		ewarn "old-hd-rules use flag is enabled."
+		ewarn "old-hd-rules use flag is enabled (by default)."
 		ewarn "This adds the removed rules for /dev/hd* devices"
 		ewarn "Please migrate to the new libata."
 		ewarn "These rules will be removed in the future"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index ef17f0b52fa4..55c7000aa79e 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.24 2009/12/30 08:54:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.25 2010/02/07 20:32:51 zzam Exp $
 
 EAPI="1"
 
 inherit eutils flag-o-matic multilib toolchain-funcs linux-info
 
+#PATCHSET=${P}-gentoo-patchset-v1
+
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
 	EGIT_BRANCH="master"
 	inherit git autotools
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+	[[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
 fi
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -19,7 +22,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="selinux +devfs-compat -extras test"
+IUSE="selinux +devfs-compat +old-hd-rules -extras test"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
@@ -52,7 +55,8 @@ if [[ ${PV} == "9999" ]]; then
 fi
 
 # required kernel options
-CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
+CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
+	~!IDE"
 
 # We need the lib/rcscripts/addon support
 PROVIDE="virtual/dev-manager"
@@ -132,6 +136,13 @@ src_unpack() {
 	cd "${S}"
 
 	# patches go here...
+
+	# backport some patches
+	if [[ -n "${PATCHSET}" ]]; then
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
+	  	      EPATCH_FORCE="yes" epatch
+	fi
+
 	if ! use devfs-compat; then
 		# see Bug #269359
 		epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff
@@ -151,11 +162,15 @@ src_unpack() {
 		then
 			echo
 			eerror "50-udev-default.rules has been updated, please validate!"
-			eerror "md5sum=${MD5}"
+			eerror "md5sum: ${MD5}"
 			die "50-udev-default.rules has been updated, please validate!"
 		fi
 	fi
 
+	if use old-hd-rules; then
+		epatch "${FILESDIR}"/udev-151-readd-hd-rules.diff
+	fi
+
 	sed_libexec_dir \
 		rules/rules.d/50-udev-default.rules \
 		rules/rules.d/78-sound-card.rules \
@@ -188,24 +203,10 @@ src_compile() {
 }
 
 src_install() {
-	local scriptdir="${FILESDIR}/147"
+	local scriptdir="${FILESDIR}/151"
 
 	into /
 	emake DESTDIR="${D}" install || die "make install failed"
-	# without this code, multilib-strict is angry
-	if [[ "$(get_libdir)" != "lib" ]]; then
-		# check if this code is needed, bug #281338
-		if [[ -d "${D}/lib" ]]; then
-			# we can not just rename /lib to /lib64, because
-			# make install creates /lib64 and /lib
-			einfo "Moving lib to $(get_libdir)"
-			mkdir -p "${D}/$(get_libdir)"
-			mv "${D}"/lib/* "${D}/$(get_libdir)/"
-			rmdir "${D}"/lib
-		else
-			einfo "There is no ${D}/lib, move code can be deleted."
-		fi
-	fi
 
 	exeinto "${udev_libexec_dir}"
 	newexe "${FILESDIR}"/net-130-r1.sh net.sh	|| die "net.sh not installed properly"
@@ -291,10 +292,6 @@ src_install() {
 	if use extras; then
 		dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
 	fi
-
-	cd docs/writing_udev_rules
-	mv index.html writing_udev_rules.html
-	dohtml *.html
 }
 
 pkg_preinst() {
@@ -542,7 +539,7 @@ pkg_postinst() {
 
 	if use devfs-compat; then
 		ewarn
-		ewarn "You have devfs-compat use flag enabled."
+		ewarn "devfs-compat use flag is enabled (by default)."
 		ewarn "This enables devfs compatible device names."
 		ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
 		ewarn "then please migrate over to using the device names"
@@ -551,6 +548,14 @@ pkg_postinst() {
 		ewarn "For reference see Bug #269359."
 	fi
 
+	if use old-hd-rules; then
+		ewarn
+		ewarn "old-hd-rules use flag is enabled (by default)."
+		ewarn "This adds the removed rules for /dev/hd* devices"
+		ewarn "Please migrate to the new libata."
+		ewarn "These rules will be removed in the future"
+	fi
+
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
 	elog "         fixing known issues visit:"