Update to level of udev-141-r1. Update for changed configure-script. Patch out gtk-doc stuff, else autotools fail without gtk. Note about needed util-linux for it libblkid. udev no longer installs libvolume_id and vol_id binary. Lift minimal required kernel version to 2.6.25. Disable new udev-extras for now, they need a lot of dependencies.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 84 insertions, 30 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 8ea90de2c1a6..0e2ed8c66ef7 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.470 2009/06/17 13:29:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.471 2009/06/17 13:52:39 zzam Exp $
+
+  17 Jun 2009; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+  Update to level of udev-141-r1. Update for changed configure-script. Patch
+  out gtk-doc stuff, else autotools fail without gtk. Note about needed
+  util-linux for it libblkid. udev no longer installs libvolume_id and
+  vol_id binary. Lift minimal required kernel version to 2.6.25. Disable new
+  udev-extras for now, they need a lot of dependencies.
 
   17 Jun 2009; Jeroen Roovers <jer@gentoo.org> udev-141-r1.ebuild:
   Stable for HPPA (bug #254616).
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index dee39afa9102..edd715d7698f 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 136/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b
 AUX 136/shell-compat-addon.sh 930 RMD160 c96a77a2085698e4ca3636994d1b6d07326e4b5f SHA1 d696a1ff942d31b493d385cff27bc9cbacd3fa47 SHA256 94b1fe1f5ba892c82798cec6f15b5c5c76e1902ef2d13701ddfbb54f19079af9
 AUX 136/udev-dev-tarball.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60
@@ -50,6 +53,13 @@ EBUILD udev-124-r1.ebuild 10678 RMD160 2e1a77893a7da44e303a8d5106c2324328824301
 EBUILD udev-124-r2.ebuild 11032 RMD160 ab5d492c150c8627628f16bbcae00b97f0a03523 SHA1 03c059b69c16695bd40f4cb7db53b7c18448465d SHA256 3fc41904dbafe66b4669e3ebdb327c5f50f43b148e29cccb786f0be10d8702aa
 EBUILD udev-141-r1.ebuild 13023 RMD160 ac7e1148dd14ee5315e7d3d2da45cd3a31b52abb SHA1 5803d0b73f84d2c0e24a3580cc8459c4d24656fe SHA256 0d6868c0ac752a3d86d4d0598dda40d20c17282c8ef098e292d41e0b4ab6aefd
 EBUILD udev-141.ebuild 12475 RMD160 1364106ed528939c5cec48dff87ed819d11d5b2c SHA1 b38d34e7b8172105ccc5c8b25b11d8e0a3a37cdc SHA256 984b627d2d9e0a7930437f68077d6355f84a2677e2a72d47cc8b167dbec367aa
-EBUILD udev-9999.ebuild 12197 RMD160 8d86be142fa5331878af7bccd024a109b9b99d09 SHA1 0c0d525d38942b4f703b9fcfe2ed82eb3ed57d85 SHA256 1e3b54fda19c0707e0839703c5ffcf00b6e6d5b4a8286a7271e9dc6258024b20
-MISC ChangeLog 96714 RMD160 b6235b2ce1794dfbe8a43f4fc7a74b9335146a36 SHA1 113d5fd593af85e98fa33e7a3e5938dffd6dd10a SHA256 8f999a04f6b21aa62c3514d45ab4eacbd05f237724d4f83218264c00a8b937f7
+EBUILD udev-9999.ebuild 13329 RMD160 a67b09307c14015a521693d799cb392f75e85b31 SHA1 073bbc744ab812ca91fffda11f13e1499ab81f61 SHA256 9b4356cd721fef4b7b6ba69f1a9a68236b319594c014f9149be4f1f299207abe
+MISC ChangeLog 97140 RMD160 962d85b165a23bf0d63c6f8187447bfd269255da SHA1 f0fe5794feb32d1c2ba6fbd0f6ec42ce5b02a8eb SHA256 7939b5e57fd272a5b6d88bffdffed2d5a24d701d96d5523d2616c997532d1a3c
 MISC metadata.xml 321 RMD160 b6a66379406f8f27dd953fd2777aa05bee284360 SHA1 8a644877ad8b515b6c9248b8fe9d3d2ea559384f SHA256 688e0a4dce9eb213ef842225fd9acd1b33cd96b3905809d8b79d186dd1f47399
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko49TEACgkQt2vP6XvVdOfBnwCfbzT0SsV8jP1gFC8D55F/7Qof
+vYoAnjqS7m4ehrvDoABlyfwueShDjzJo
+=aqah
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 7628cbdac551..49504e870530 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 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.8 2009/05/06 23:52:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.9 2009/06/17 13:52:39 zzam Exp $
+
+EAPI="1"
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -17,17 +19,20 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="selinux"
+IUSE="selinux +devfs-compat -doc"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )"
+# >=sys-apps/util-linux-2.16 should provide libblkid
+
+# for compiling the extras udev needs a lot more depends (see README)
+
+DEPEND="${COMMON_DEPEND}"
 
 if [[ ${PV} == "9999" ]]; then
 	# for documentation processing with xsltproc
-	DEPEND="${COMMON_DEPEND}
+	DEPEND="${DEPEND}
 		app-text/docbook-xsl-stylesheets
 		app-text/docbook-xml-dtd"
-else
-	DEPEND="${COMMON_DEPEND}"
 fi
 
 RDEPEND="${COMMON_DEPEND}
@@ -39,7 +44,7 @@ RDEPEND="${COMMON_DEPEND}
 PROVIDE="virtual/dev-manager"
 
 pkg_setup() {
-	udev_helper_dir="/$(get_libdir)/udev"
+	udev_libexec_dir="/$(get_libdir)/udev"
 
 	# comparing kernel version without linux-info.eclass to not pull
 	# virtual/linux-sources
@@ -49,7 +54,7 @@ pkg_setup() {
 	local KV_MINOR=$(get_version_component_range 2 ${KV})
 	local KV_MICRO=$(get_version_component_range 3 ${KV})
 
-	local KV_min_micro=15 KV_min_micro_reliable=22
+	local KV_min_micro=25 KV_min_micro_reliable=25
 	KV_min=2.6.${KV_min_micro}
 	KV_min_reliable=2.6.${KV_min_micro_reliable}
 
@@ -76,8 +81,8 @@ pkg_setup() {
 	fi
 }
 
-sed_helper_dir() {
-	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+sed_libexec_dir() {
+	sed -e "s#/lib/udev#${udev_libexec_dir}#" -i "$@"
 }
 
 src_unpack() {
@@ -90,6 +95,10 @@ src_unpack() {
 	cd "${S}"
 
 	# patches go here...
+	if ! use devfs-compat; then
+		# see Bug #269359
+		epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff
+	fi
 
 	# change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
@@ -101,7 +110,7 @@ src_unpack() {
 		# (more for my own needs than anything else ...)
 		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
 		MD5=${MD5/  -/}
-		if [[ ${MD5} != 980aeafcd2f2d057945cf3ddf2ae884e ]]
+		if [[ ${MD5} != b5c2f014a48a53921de37c4e469aab96 ]]
 		then
 			echo
 			eerror "50-udev-default.rules has been updated, please validate!"
@@ -110,14 +119,21 @@ src_unpack() {
 		fi
 	fi
 
-	sed_helper_dir \
+	sed_libexec_dir \
 		rules/rules.d/50-udev-default.rules \
+		rules/rules.d/78-sound-card.rules \
 		extras/rule_generator/write_*_rules \
-		udev/udev-util.c \
-		udev/udev-rules.c \
-		udev/udevd.c || die "sed failed"
+		|| die "sed failed"
 
 	if [[ ${PV} == 9999 ]]; then
+		if ! use doc; then
+			sed -e '/docs\/Makefile/d' \
+				-e '/GTK_DOC_CHECK/d' \
+				-i.orig configure.ac
+			sed -e 's/SUBDIRS =.*/SUBDIRS =/' \
+				-e 's/docs//' \
+				-i.orig libudev/Makefile.am
+		fi
 		eautoreconf
 	fi
 }
@@ -128,10 +144,13 @@ src_compile() {
 	econf \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--exec-prefix= \
-		--with-libdir-name=$(get_libdir) \
+		--sbindir=/sbin \
+		--libdir=/usr/$(get_libdir) \
+		--with-rootlibdir=/$(get_libdir) \
+		--libexecdir="${udev_libexec_dir}" \
 		--enable-logging \
-		$(use_with selinux)
+		$(use_with selinux) \
+		--disable-extras
 
 	emake || die "compiling udev failed"
 }
@@ -149,7 +168,7 @@ src_install() {
 		rmdir "${D}"/lib
 	fi
 
-	exeinto "${udev_helper_dir}"
+	exeinto "${udev_libexec_dir}"
 	newexe "${FILESDIR}"/net-130-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"
@@ -161,13 +180,12 @@ src_install() {
 	doexe "${scriptdir}"/shell-compat-addon.sh \
 		|| die "shell-compat.sh not installed properly"
 
-	keepdir "${udev_helper_dir}"/state
-	keepdir "${udev_helper_dir}"/devices
+	keepdir "${udev_libexec_dir}"/state
+	keepdir "${udev_libexec_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
+	dosym "..${udev_libexec_dir}/scsi_id" /sbin/scsi_id
 
 	# Add gentoo stuff to udev.conf
 	echo "# If you need to change mount-options, do it in /etc/fstab" \
@@ -178,7 +196,7 @@ src_install() {
 
 	# Now installing rules
 	cd "${S}"/rules
-	insinto "${udev_helper_dir}"/rules.d/
+	insinto "${udev_libexec_dir}"/rules.d/
 
 	# Our rules files
 	doins gentoo/??-*.rules
@@ -220,8 +238,10 @@ src_install() {
 	newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
 
 	# convert /lib/udev to real used dir
-	sed_helper_dir \
+	sed_libexec_dir \
 		"${D}/$(get_libdir)"/rcscripts/addons/*.sh \
+		"${D}/${udev_libexec_dir}"/write_root_link_rule \
+		"${D}"/etc/conf.d/udev \
 		"${D}"/etc/init.d/udev* \
 		"${D}"/etc/modprobe.d/*
 
@@ -231,16 +251,22 @@ src_install() {
 	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() {
+	local f dir=${ROOT}/etc/modprobe.d/
+	for f in pnp-aliases blacklist; do
+		if [[ -f $dir/$f && ! -f $dir/$f.conf ]]
+		then
+			elog "Moving $dir/$f to $f.conf"
+			mv -f "$dir/$f" "$dir/$f.conf"
+		fi
+	done
+
 	if [[ -d ${ROOT}/lib/udev-state ]]
 	then
 		mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
@@ -430,6 +456,17 @@ pkg_postinst() {
 	ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
 	ewarn "as for other directories."
 
+	if use devfs-compat; then
+		ewarn
+		ewarn "You have devfs-compat use flag enabled."
+		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"
+		ewarn "/dev/md*, /dev/loop* and /dev/ram*."
+		ewarn "The devfs-compat rules will be removed in the future."
+		ewarn "For reference see Bug #269359."
+	fi
+
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
 	elog "         fixing known issues visit:"