Stop installing 80-net-name-slot.rules. Pass --without-python to avoid sphinx.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 56 insertions, 82 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 0b8e4b9c052a..53811f82698e 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.844 2013/03/06 20:13:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.845 2013/03/08 22:45:03 ssuominen Exp $
+
+  08 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+  Stop installing 80-net-name-slot.rules. Pass --without-python to avoid
+  dev-python/sphinx.
 
   06 Mar 2013; Raúl Porcel <armin76@gentoo.org> udev-197-r8.ebuild:
   m68k/s390/sh/sparc stable wrt #457568
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c368e7512841..dc6b9b552a29 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -12,14 +12,18 @@ DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c998
 EBUILD udev-171-r10.ebuild 16093 SHA256 37ef3115e14d68f23cfb7cf620423b72b460dba04b36f20f6646607381e2fb40 SHA512 3b392d78a30e1a7cb6c085aae7b876c107a920b777194e475b6e10f9f09231dd3cd69b76b501d2354b7a032582ccefee861d4fbbe2bce5aa7a65fd3310b87d84 WHIRLPOOL f2a7b62bdf984121bd9cc8127ec3e912792a3affe1c097bc7c765a4822720a574412c4d18895e4c705b9bf6fbd8dcc3c554516bf2a8cae28018e39dad8601959
 EBUILD udev-197-r8.ebuild 15057 SHA256 854d75fdb78b73399cb6f096c26cfbc640d8ca077fc62b1c63f5e9f6de62f36c SHA512 9e4da40b18bc6da38ccedc6675558672c1d7d73144fde6204fbaeea5f5080fd985429da0f54429613c98e8e9802505f9ce456874c143e5017e191a3df6875964 WHIRLPOOL 4485b8c1096f016f3bbcc96aa7ad119b3ca44604827afd9f1aa6c23172a66705f67522662539b9626b138a79833082d5979fa795777de25e128b7fd125e5e1e4
 EBUILD udev-197-r9.ebuild 15212 SHA256 1b9dc8d16bbdb52b2ca1325c0d3397ed639078c51e29d6c4cd58c02ab6caa688 SHA512 dd2c962b4ddc1a93f4e08bdd44d0d7f28bb7f70fac4b285960651bdd21cf4dc4557672d3c2ae117fe7cdc517bcdf3be160b85d0afa822a2ff5df2663e5b516eb WHIRLPOOL af82ee89a2d3822406858a0b499fadb5ec20bad1a40b6c2babeeae6bfa1b7a1b536131833884fe067590e19250953c74033db923d8cdf25d186ceae765f8b1b2
-EBUILD udev-9999.ebuild 14556 SHA256 8fae4f72ada382e66307e07bdd68e7071b70b34aa0476f0f6aaff2b0aea58b08 SHA512 56bcd4970f3cb920c7f7599cc5a17ae0482c08d4991ea9e0d1e860d4e81bf53c402d92aaa158c38fadccd058c7a6b3b5fb1d9ca916469d34e8cba01b26a3604a WHIRLPOOL b5d8a397671b0833d2184d478de3e1b35ab0920776f04c8e7c1a8ce96b4006c769f1031759fe84c6f0ce98b807fadad2997ddbfd3a925cd7c256e203f5cc7cb7
-MISC ChangeLog 60185 SHA256 02718470a20c2d231ce7e52de77799abca613bf71b013181c53c7ba8be89ef62 SHA512 488a10fa48ab9104b56ba1aee6cfa30df3d6bb46d6b403e9c5ad667728f0b2728488ec5247903117962551f60acb2b19c772309c06426cae2d75d5f54acc7676 WHIRLPOOL 571672674feb1102b97631d7ce2cc3d9279d81e849d51f45a2a988b49439012ecd842b6c095d931ee30a6ef24b33af5524ff191d5df1a36e81256601d2d67f17
+EBUILD udev-9999.ebuild 13140 SHA256 178905be026100b6247c4cdf874f4d0df9d6f9aebae70e122f6b13ce4c7f9aca SHA512 d86009e475063cd3d013cfd8e97bd50999076445f41f9ed338e3ae18e87adfec008bad150fa86eb88b4e992ed5e5a95bc27d489e9c4da13e8e303d6d43c54bcc WHIRLPOOL 28ba8be4794be1254aae0a94f325fb3fc7d4ebb047fc32dcabf53349422965e83dc1b585a6c8ef827a6364d7b681a90302f07e46d205c9b52f612c0684304a9d
+MISC ChangeLog 60354 SHA256 9197d60e8016a031a91661017be1bca6591dceb17242fd5338b1dd3247be2f1f SHA512 e67354c46a497ba03a2d011a10a5d31ee2d4459f14006606cea1a5383742f3ff42fe8109810ecb7fa50b32295e4206f6b8ea065fc587432d85a8fa414ac65908 WHIRLPOOL ac160d44a86af3a3b797011b727f35388d831fea03c9a041d6f082354523c88696e5fce24f3c5256f0eafcea9b928bccfd2b6e96f3386274c6eb862f01b03610
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1098 SHA256 69d8c28e0c2439c252068ae2e0141a9bad7b05e65b9dec27aa2dd3feb4f2393c SHA512 87354f467c3f2ed005a10652a2f80ffda010fbc0c6fb88436b906c92f4cf1543ed1a6cf4a49c93f15c6fea3ba0dcd108e1e120954f7b0860e7ac90072d2b3d67 WHIRLPOOL 9c01df67041d2093e5a2ee4a9ad65df613cdcb163bc366c8592e8e2be84b176da13198261a012687188918c906291d765856665806efe03b8dfb22a5b4eb6834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE3o3UACgkQuQc30/atMkBjtACcCWRLhzOrfX3zofM4PMqcGlqV
-EcQAmgNRid4NgWRxBffPhxBPTN4Cjirg
-=1PzZ
+iQEcBAEBCAAGBQJROml7AAoJEEdUh39IaPFNeUcH/1YjuaLWVVnWLJeLNpZz0m0v
+hCgUF69tObkEeAlM/rLTgd54g4syX3OLFqu297GulGG9T6FzYw3KrxVQXac1aC0p
+hK/Yh25QSMUoET+zlzVM+rbEA/vsudgGx5F0EVFY//6wDx1P/5qPlvilewnMM86s
+vcefwLBjna4nmP/LJNcLgi00NmnqY7eHOpP5OJ7humff79qzY/uWAPWmjWjcKk4Y
+uoSXObeT8z3555RPr1E0fROKt4kpLIi8HdNLpcJESs2mib7wo8ANNuFNNx9aaAGR
+AD7/HRWzl+nKBRwzY+UA1gK+OyVrD8EfoJygG7k7WNMwU1VdvYYS/Wdi8Sp8Xxo=
+=8LTR
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 3fff325740f9..7dd0b917f77a 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.180 2013/03/02 01:20:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.181 2013/03/08 22:45:03 ssuominen Exp $
 
 EAPI=4
 
@@ -18,8 +18,7 @@ else
 	if [[ -n "${patchset}" ]]
 		then
 				SRC_URI="${SRC_URI}
-					http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.bz2
-					http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.bz2"
+					http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.bz2"
 			fi
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
@@ -69,8 +68,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<sec-policy/selinux-base-2.20120725-r10"
 
 PDEPEND=">=virtual/udev-197-r1
-	hwdb? ( >=sys-apps/hwids-20130114[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-19-r1 )"
+	hwdb? ( >=sys-apps/hwids-20130302[udev] )
+	openrc? ( >=sys-fs/udev-init-scripts-23 )"
 
 S=${WORKDIR}/systemd-${PV}
 
@@ -125,6 +124,20 @@ pkg_setup()
 
 src_prepare()
 {
+	if ! [[ ${PV} = 9999* ]]; then
+		# secure_getenv() disable for non-glibc systems wrt bug #443030
+		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then
+			eerror "The line count for secure_getenv() failed, see bug #443030"
+			die
+		fi
+
+		# gperf disable if keymaps are not requested wrt bug #452760
+        if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
+			eerror "The line count for gperf references failed, see bug 452760"
+			die
+		fi
+	fi
+
 	# backport some patches
 	if [[ -n "${patchset}" ]]
 	then
@@ -133,11 +146,9 @@ src_prepare()
 
 	# These are missing from upstream 50-udev-default.rules
 	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Propably unrequired, check how it is with OSS/OSS4, then remove
-	SUBSYSTEM=="snd", GROUP="audio"
 	# Gentoo specific usb group
 	SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	# Keep this for Linux 2.6.32 support wrt #457868
+	# Keep this for Linux 2.6.32 kernels with accept4() support like .60 wrt #457868
 	SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
 	EOF
 
@@ -158,7 +169,7 @@ src_prepare()
 	version_is_at_least 4.6 $(gcc-version) || \
 		sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h
 
-	# change rules back to group uucp instead of dialout for now
+	# change rules back to group uucp instead of dialout for now wrt #454556
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
 		-i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
@@ -177,20 +188,6 @@ src_prepare()
 		elibtoolize
 	fi
 
-	if [[ ${PV} = 9999* ]]; then
-		# secure_getenv() disable for non-glibc systems wrt bug #443030
-		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 23 ]]; then
-			eerror "The line count for secure_getenv() failed, see bug #443030"
-			die
-		fi
-
-		# gperf disable if keymaps are not requested wrt bug #452760
-		if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
-			eerror "The line count for gperf references failed, see bug 452760"
-			die
-		fi
-	fi
-
 	if ! use elibc_glibc; then #443030
 		echo '#define secure_getenv(x) NULL' >> config.h.in
 		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
@@ -214,6 +211,7 @@ src_configure()
 		--with-html-dir=/usr/share/doc/${PF}/html
 		--with-rootprefix=
 		--with-rootlibdir=/$(get_libdir)
+		--without-python
 		--disable-audit
 		--disable-coredump
 		--disable-hostnamed
@@ -358,10 +356,6 @@ src_install()
 	dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd
 	find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \
 		sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} +
-
-	docinto gentoo
-	dodoc "${FILESDIR}"/80-net-name-slot.rules
-	docompress -x /usr/share/doc/${PF}/gentoo/80-net-name-slot.rules
 }
 
 pkg_preinst()
@@ -395,23 +389,6 @@ pkg_postinst()
 {
 	mkdir -p "${ROOT}"run
 
-	net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
-	copy_net_rules() {
-		[[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
-	}
-
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 197 ]]; then
-		ewarn "Because this is a upgrade we disable the new predictable network interface"
-		ewarn "name scheme by default."
-		copy_net_rules
-	fi
-
-	if has_version sys-apps/biosdevname; then
-		ewarn "Because sys-apps/biosdevname is installed we disable the new predictable"
-		ewarn "network interface name scheme by default."
-		copy_net_rules
-	fi
-
 	# "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
@@ -424,20 +401,13 @@ pkg_postinst()
 	# people want reminders, I'll give them reminders.  Odds are they will
 	# just ignore them anyway...
 
-	# 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
+	# 64-device-mapper.rules is related to sys-fs/device-mapper which we block
+	# in favour of sys-fs/lvm2
+	old_dm_rules=${ROOT}etc/udev/rules.d/64-device-mapper.rules
+	if [[ -f ${old_dm_rules} ]]
 	then
-			rm -f "${ROOT}"etc/udev/rules.d/64-device-mapper.rules
-			einfo "Removed unneeded file 64-device-mapper.rules"
-	fi
-
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 189 ]]; then
-		ewarn
-		ewarn "Upstream has removed the persistent-cd rules"
-		ewarn "generator. If you need persistent names for these devices,"
-		ewarn "place udev rules for them in ${ROOT}etc/udev/rules.d."
+		rm -f "${old_dm_rules}"
+		einfo "Removed unneeded file ${old_dm_rules}"
 	fi
 
 	if ismounted /usr
@@ -459,15 +429,6 @@ pkg_postinst()
 		ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
 	fi
 
-	if [ -n "${net_rules}" ]; then
-			ewarn
-			ewarn "udev-197 and newer introduces a new method of naming network"
-			ewarn "interfaces. The new names are a very significant change, so"
-			ewarn "they are disabled by default on live systems."
-			ewarn "Please see the contents of ${net_rules} for more"
-			ewarn "information on this feature."
-	fi
-
 	local fstab="${ROOT}"etc/fstab dev path fstype rest
 	while read -r dev path fstype rest; do
 		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
@@ -489,22 +450,27 @@ pkg_postinst()
 		ewarn "Note that qfile can be found in app-portage/portage-utils"
 	fi
 
+	old_cd_rules=${ROOT}etc/udev/rules.d/70-persistent-cd.rules
 	old_net_rules=${ROOT}etc/udev/rules.d/70-persistent-net.rules
-	if [[ -f ${old_net_rules} ]]; then
-		ewarn "You still have ${old_net_rules} in place from previous udev release."
-		ewarn "Upstream has removed the possibility of renaming to existing"
-		ewarn "network interfaces. For example, it's not possible to assign based"
-		ewarn "on MAC address to existing interface eth0."
-		ewarn "See http://bugs.gentoo.org/453494 for more information."
-		ewarn "Rename your file to something else starting with 70- to silence"
-		ewarn "this warning."
-	fi
+	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+		if [[ -f ${old_rules} ]]
+		then
+			ewarn
+			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+			ewarn "rename it to something else starting with 70- to silence this"
+			ewarn "deprecation warning."
+		fi
+	done
+
+	ewarn
+	ewarn "We don't install ${ROOT}etc/udev/rules.d/80-net-name-slot.rules anymore"
+	ewarn "and the new predictable network interface names are used by default:"
+	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
 
 	ewarn
 	ewarn "You need to restart udev as soon as possible to make the upgrade go"
 	ewarn "into effect."
 	ewarn "The method you use to do this depends on your init system."
-	ewarn
 
 	preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)