Replace use of install-man7 and install-man8 targets with "doman" line in attempt of ensuring we don't hit race w/ build-sys attempting to regenerated the manpages needlessly wrt #480924 by Markos Chandras

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

4 files changed, 37 insertions, 23 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 8e640c14bdda..4e0cbcbd911d 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # 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.958 2013/08/13 21:49:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.959 2013/08/16 16:28:40 ssuominen Exp $
+
+  16 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
+  udev-9999.ebuild:
+  Replace use of install-man7 and install-man8 targets with "doman" line in
+  attempt of ensuring we don't hit race w/ build-sys attempting to regenerated
+  the manpages needlessly wrt #480924 by Markos Chandras
 
   13 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index f277ce0fb822..688f0a3e3d8a 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -6,9 +6,9 @@ DIST systemd-206.tar.xz 2340536 SHA256 4c993de071118ea1df7ffc4be26ef0b0d78354ef1
 DIST udev-204-patches-2.tar.xz 1824 SHA256 d693c79b93865dd4f3092f5f9e69221a494d286f15dcc5418de1e09120289404 SHA512 e5004a8bdaca6ead9bd5f345ff86c94b05579cb3aaa032782dc13e1a1d574ef65e294c01b44143f78517db6f64fb630470c082f43b6989134a8e68f48d444e6a WHIRLPOOL ba21f3d8f4964da79476102eb82c1b5ffd7e91b5d60be705cb9784fc2150dba3faf4afe7718e2f9dfc5cc7e79644bf21b8312fec328a733e056eb60dc0269222
 DIST udev-206-patches-2.tar.xz 1840 SHA256 02643ba4a3c4c5312a2f4c22e06925509d923955046de260468d696d1b9a5672 SHA512 cd316356d1b23ed3c3047d7129cda6ed26bb0334c4becc802b727edf40e026fb5ae228075eb7143b3071887ce1dd493326d6b071058c5f862372b616cc731fc1 WHIRLPOOL 0685afcd08ace9f67d143b275dc724d540a2c2204b6f52cf60ad2195f5dbd665b20775ed40f70816d9ccdb2bf354f60e026ef4e781cf9dcccd93ff29121a6cb1
 EBUILD udev-204.ebuild 13475 SHA256 5604664100abcd19d5e849e4b2ea4501706b38fa8da18389a6f147c419593661 SHA512 dc53345e87d722594a3182b2dc991938f03d89d8ab703134334a36f53340dba2112536153cd9c5ffc56ba7d57dc0e11e0afaab40c97d48700186cf5748ef635a WHIRLPOOL 0e50da3273399f8d8e5b6ddab71eca233d0993dcfa7928c90aba2644c96340a1045bfa8208f4006965c1dc466316eb90a946bd4157e71eaadc6c032180771d25
-EBUILD udev-206-r3.ebuild 15682 SHA256 af78ad456bce9b952e2ab4897403e108e355c44493b1532fa8a610ac4411c470 SHA512 e03205b352fb8622f342b5f0a12081088add7cc47164aa43a4dc14196cb78abf26fc66aa178a40aafd358764720f5e8209cf2c2d3197ebc8f3b30d99827b67de WHIRLPOOL abecd956c78b7fd80d09766cb9e67f6d1fb71194f307be7feaf432b1c569744514308c2ac0e80ba17cc733c354950c59bc732556031d7544959d8003b4815ed0
-EBUILD udev-9999.ebuild 15681 SHA256 4ec13bd51b7ba8f264d09370edce1475191cccd3c7e76636763a4a538f42ab53 SHA512 2dfdb19889696d46cb15eff878e66fb39deae746751ae06e0d86b46696c431d7c4e6dcab536d004a885f6b691247a5cd68811b520cd5e035719e5bb20af2c2d4 WHIRLPOOL 9f5466c5f50dc3d20065d059f197a5c918be48d5056cd4f0a5366d608be8c42318dd058422194e5f9c8a2916ae09eea297291f1bff1e1247d04d3b0d23633a29
-MISC ChangeLog 34393 SHA256 6fce3c699b3e028d776ba88e7fbaad58074acc8af5b98db257727b077c1864ac SHA512 ce414a711b400fc306a5be08a636e57723789df5994c2a9ee71bf1823301e20caa688bc14ae8420427b0a885dd35b690c6b8c1c07da0792763dfbf4412225c0d WHIRLPOOL 052f726811a2b08f5181e2730c503d2a3841146b2decf1ded5d2dc6da8acf5c07d018bb27dec68b1288ee98934482af312fb0e71b3c6b3afe8cd08b7e166285f
+EBUILD udev-206-r3.ebuild 15806 SHA256 a7593fbf316853caa4f6f89103a0115185ff681627975bf02d1cf36476ad5563 SHA512 8ec497982ffeef09a95969aa1884b7cf9ad7a2efd8f86e8bd276d3c1a8a423c4acc1c1d4d6cc3b5ac42c1398a8dead914a9428edfc68925427071b88454e774f WHIRLPOOL 143b0555a6f61dd777390681d1e46f45b86f9e77635d3dc4c0418f6c3a3579b69f9c979413759b1fecb4b54ae56a71a4b672cd87bd222e71201ee18034f102ab
+EBUILD udev-9999.ebuild 15805 SHA256 39b0195e927f0393ded0f7142b1585480df87946d1f433dac45af1d3ba0c4c56 SHA512 1a7a6ca3ac4d138edff4477c41748a87a4be71ff761c763c6548bd575f81ceba23165179147a0a6c45b13a59d6723a1be5d8f63fdefb27dcb35189a1e34074a9 WHIRLPOOL 2eab57368774cd90628b8f1bdb0e85c0358388eacd297e9572fddb1b4935e62e652180bb9beae8a07f7a71972603f8db13abc1a23596383d4884c05ec5a28cc4
+MISC ChangeLog 34700 SHA256 1a217dc60a4de135336260f32c3a7846776de85ecac1f0a5c0b602e6f88f7e38 SHA512 0d316435af4845d84b25ef6ab061d3da61ab6d1f3d19fff095457c70e0bb160588a3eaa0358b170a3284bf27a65dcebbcd3912ae624d183a9863d94ccfcf8459 WHIRLPOOL a6e4adfa3844ddbdc0d2941eed46a4e6d61979513c5992ef59f0ce0a2d9cbd7ecef7de6ff68a9c5cf400a55f5f766a95e05793c7b244b65957ed7b41ab00d91f
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -17,11 +17,11 @@ MISC metadata.xml 804 SHA256 2489d91db9d09f0d411b17dff6c8a595fb48ca65e8b6abcbdf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSCql0AAoJEEdUh39IaPFNvOMH/Ryg7an7iuJCqfd4k8sAB5Ft
-WdYJcN4n2hmaUaFgieJh+Z6c92iSSoOipAxsBgapPrhASh1qbkqSP4W7Ek74NRNc
-NTGtIESnUveGGhHZlf9AYBqkge+1yzg7uUFZPSw75EeaMwsANl4U3FtvoAy8fLLw
-21h1JtNLBvsdff4Q0na9/LD8O7shPZ9rVtoNmB2EgbqM7QcmeQI+o4DOdCGAXGaL
-ZZoH3mbciavLFyl8b9irX7LzVIQIImiPVoAy1AQFL1aZWRRT5WcNWdycEuw4CKdw
-ZuxP/qVj+tixNdXOoIxIl4D0Z/Y6vhYQZWzVNty4/rmx9R1LkkawPpNY8kGytEc=
-=Sc76
+iQEcBAEBCAAGBQJSDlKdAAoJEEdUh39IaPFN/h4IAIpKaRQXkDmcLIF9eBDCCd6Y
+Wm433ecTfp+EgLuDLR+8mO4yKW23TpP3kMqLl6e4z74jMWwHkhyBx8dpFzom5lpL
+I6qf9ah1MPjCSrSddcgVIqnbtOoN5pjZDK1qfWO3ojKSraG2u2/hUY34LXFSIBkh
+nS1fDTd3GnEokGmIatoDIsRlNTOLchWcGGgHY6fPTikfoQICO0ijh58ohumn2a/r
+oEhqrZTV5BkpxB5TMk8Pjund74J066HUA8YysfUEwfh/cbwmzQrGFUR30HhDuitW
+PN80gXc+9R9mEcs9q32yTz9var82USiOdcRjM72MEddu4lHP9gNzB0OjpnRbrM4=
+=IlUb
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-206-r3.ebuild b/sys-fs/udev/udev-206-r3.ebuild
index f0b8641bd82a..3b201164acbe 100644
--- a/sys-fs/udev/udev-206-r3.ebuild
+++ b/sys-fs/udev/udev-206-r3.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-206-r3.ebuild,v 1.7 2013/08/13 21:49:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.8 2013/08/16 16:28:40 ssuominen Exp $
 
 EAPI=5
 
@@ -232,6 +232,12 @@ multilib_src_configure() {
 		--disable-machined
 		--disable-xattr
 	)
+	# Use pregenerated copies when possible wrt #480924
+	if ! [[ ${PV} = 9999* ]]; then
+		econf_args+=(
+			--disable-manpages
+		)
+	fi
 	if multilib_is_native_abi; then
 		econf_args+=(
 			--with-rootlibdir=/$(get_libdir)
@@ -325,8 +331,6 @@ multilib_src_install() {
 			install-dist_udevconfDATA
 			install-dist_udevrulesDATA
 			install-girDATA
-			install-man7
-			install-man8
 			install-pkgconfiglibDATA
 			install-sharepkgconfigDATA
 			install-typelibsDATA
@@ -346,9 +350,6 @@ multilib_src_install() {
 			rootlibexec_PROGRAMS=systemd-udevd
 			rootbin_PROGRAMS=udevadm
 			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
-			MANPAGES="man/udev.7 man/udevadm.8 \
-					man/systemd-udevd.service.8"
-			MANPAGES_ALIAS=""
 			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
 			INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
 					$(sysconfdir)/udev/hwdb.d'
@@ -396,6 +397,9 @@ multilib_src_install_all() {
 		"${D}"/lib/udev/rules.d/99-systemd.rules \
 		"${D}"/usr/share/doc/${PF}/LICENSE.*
 
+	# install-man7, install-man8 targets are unreliable wrt #480924
+	doman man/{udev.7,udevadm.8,systemd-udevd.service.8}
+
 	# see src_prepare() for content of these files
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 5ed1bce7b9ea..a6c73338c583 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.253 2013/08/13 21:49:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.254 2013/08/16 16:28:40 ssuominen Exp $
 
 EAPI=5
 
@@ -232,6 +232,12 @@ multilib_src_configure() {
 		--disable-machined
 		--disable-xattr
 	)
+	# Use pregenerated copies when possible wrt #480924
+	if ! [[ ${PV} = 9999* ]]; then
+		econf_args+=(
+			--disable-manpages
+		)
+	fi
 	if multilib_is_native_abi; then
 		econf_args+=(
 			--with-rootlibdir=/$(get_libdir)
@@ -325,8 +331,6 @@ multilib_src_install() {
 			install-dist_udevconfDATA
 			install-dist_udevrulesDATA
 			install-girDATA
-			install-man7
-			install-man8
 			install-pkgconfiglibDATA
 			install-sharepkgconfigDATA
 			install-typelibsDATA
@@ -346,9 +350,6 @@ multilib_src_install() {
 			rootlibexec_PROGRAMS=systemd-udevd
 			rootbin_PROGRAMS=udevadm
 			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
-			MANPAGES="man/udev.7 man/udevadm.8 \
-					man/systemd-udevd.service.8"
-			MANPAGES_ALIAS=""
 			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
 			INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
 					$(sysconfdir)/udev/hwdb.d'
@@ -396,6 +397,9 @@ multilib_src_install_all() {
 		"${D}"/lib/udev/rules.d/99-systemd.rules \
 		"${D}"/usr/share/doc/${PF}/LICENSE.*
 
+	# install-man7, install-man8 targets are unreliable wrt #480924
+	doman man/{udev.7,udevadm.8,systemd-udevd.service.8}
+
 	# see src_prepare() for content of these files
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules