Fix parallel make problem with creation of systemd-udevd.8 manpage alias wrt #467346 by Jaroslav Rakhmatoullin

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

5 files changed, 32 insertions, 24 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index ad060c735581..e27ad6e839a3 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # 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.910 2013/04/24 19:45:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.911 2013/04/27 11:10:43 ssuominen Exp $
+
+  27 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> udev-200.ebuild,
+  udev-202.ebuild, udev-9999.ebuild:
+  Fix parallel make problem with creation of systemd-udevd.8 manpage alias wrt
+  #467346 by Jaroslav Rakhmatoullin
 
   24 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> -udev-171-r10.ebuild,
   -udev-201.ebuild, metadata.xml:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 2929b41009b5..15cdad3b779c 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -9,10 +9,10 @@ DIST udev-197-patches-5.tar.bz2 4009 SHA256 bc497ec33de05cceb40ad23f5c64965438c7
 DIST udev-200-patches-1.tar.xz 1712 SHA256 8e1ca63b27a4db7a6d3d76cb700ff88a48404c471795b1994b791460d59b8c71 SHA512 3aadfe615d7dc48adfc2e43a03a2ce9e008da0672acb7c18f917d8b50e2c2e39b9a7c47c36f5474b0de22716541ac83532b1a8dd08d17af003d0d30ac811881e WHIRLPOOL d49f610aeba4b19f4a337e3533815e8648fb5324cd6926570949f67645d150acfb39833ae62af855ff1bfb5c1791f687b4e14328a9b7de1e65e5e09d0308c4f4
 DIST udev-202-patches-1.tar.xz 1284 SHA256 96a028e2039d1ead42dd7949625a2f39a851bc26cc62a3fc944382b25d95e21f SHA512 c6f6f2af6c1899d8e39286cc5e9cc81f6add197ccee5f079be0bb3c20c51eea72d7534a1e9c8686d1325aebfce7f95aace81d0624179961fc97ccd2205db6a4b WHIRLPOOL 844a4a5286d579e0a9de73be676d5a73d49ed3e17725457fe52952152f6390bec491f5ec9e0523507ee17438d6c95b77986048864bef0264f7d06569542a77cf
 EBUILD udev-197-r8.ebuild 15057 SHA256 854d75fdb78b73399cb6f096c26cfbc640d8ca077fc62b1c63f5e9f6de62f36c SHA512 9e4da40b18bc6da38ccedc6675558672c1d7d73144fde6204fbaeea5f5080fd985429da0f54429613c98e8e9802505f9ce456874c143e5017e191a3df6875964 WHIRLPOOL 4485b8c1096f016f3bbcc96aa7ad119b3ca44604827afd9f1aa6c23172a66705f67522662539b9626b138a79833082d5979fa795777de25e128b7fd125e5e1e4
-EBUILD udev-200.ebuild 13516 SHA256 721725afc10d29af3112ce89d7402056392845c7228706cef14c0b76c2cb986b SHA512 e09a32c748f71cdc293a3fa63c7c03a2c912d4a8abe11b48cfd6f11b5726b522063b2568ea88b7674323941179c5b557ea287c0b40ad19eb7321bbf655db53e4 WHIRLPOOL ee98415a599f68fa21971eeef1e1d0d4e90db7a6237b20d8dea9f494dddfc27c3fb7141783359326cdb7d6794b400c4223d6f191fb58c630ac996a07fa17a235
-EBUILD udev-202.ebuild 13471 SHA256 30827070d7f73194550ee68a5dce8a162d179e2c51d421c0a99fe8e18a0927c0 SHA512 336fcda60b7d4208b7d8bb03b8a5e2f3b39625b14ae65e522373f1a5b239cc9914b112b3a032bc186d461f2564b4b654e71bae0c94d058e4336ed09393c6c8aa WHIRLPOOL 14aa62b110d0085175669d7cf7e0854919e2d09764fff567f128585e454070788f9d09cfdc2779e5753e0a18d3f6306ce7d33547ddbb6489328cde46d1b1408f
-EBUILD udev-9999.ebuild 13473 SHA256 07fdbae56df6788254df967002c26f22c594ade406251904a7de1c0d54799abe SHA512 c9580721bef86cda6497cc6f1e2492bc6678458af6c0f29bada7eb6836ec740b3d8f3ba054529e7437671f967586ceb046fe299b7764dbf69348f0ce07038df6 WHIRLPOOL a75f10194ef84ce68f32e35b7a3dc129fa08296565728e009ef02ae736a8bba8575502b3a40f48e32ae1f7502f1e932473be46cd41139678b5cbc1458524d200
-MISC ChangeLog 25949 SHA256 c1138dc87715abdc9f6429147a341c05f9f83ddd34a346e874190c629180d7e8 SHA512 06c7a779b13ca05ccff73175254d9f31b369e25c07c4d150417681fd02a7b13ff06e286457ecdc6752078406a0a1c253c11c712cf5eb07bde9104e05bc4c3464 WHIRLPOOL 0e0f7c60696827a6e88f96730b9cdeceaf4f7a712762d72d957a65f694aebe3860267cb5168c34e029ca3b203d440bd82595c7ca65693866681271ce256d8bf5
+EBUILD udev-200.ebuild 13602 SHA256 132c46b1cb398e17d3e9479ba6e6c0a96ccfbceaa867cd0b2c68004db8c52736 SHA512 3b8ebc3f7dc4263188edf2db529f6bb108433cb82c0dc3e35967b1b4ade60fe2a2106f7ab6febece842a8325f00aef13a0fe15d57b26f9b745237351b021924a WHIRLPOOL 742c5092c7fe211aef1d747642ab50f508c4cdfec8263830ccf76b65adb76e50bee5bff727d63c8492b937f3288dbe0749532c8145941b948c9e0d03c2556d23
+EBUILD udev-202.ebuild 13551 SHA256 9a255cf06c236c9e8e7adf8df26a1e926524251fe8c7d5a9b60a575a3104719f SHA512 19942dea12bc0ca811445e1f99e75deeb53ec0bbea6be428d51fa43d4e6409410da9757fb6d61d39d394d92a6483a648d9147a38662b7b28e02d2b9dbd04a906 WHIRLPOOL b2b3a475f629fc6a4d3fe50f869829432506835bdebbcb4d440286c6af71a41885e0efa1630824ad2c87bc0fb53ae060f02eb7cd1fa19cc2800b9068c2d0b121
+EBUILD udev-9999.ebuild 13553 SHA256 f4590d20da3ab10785999a5e246af7396404f2d13ca6e84763b579168b70a865 SHA512 faf8a24c454f5caa81f52c5c9f4126ef591f9a0c72810dad8ac138e95c94b50848ca6dc0379003ab8ac039609c8e494621f9edb9afc6c8063eb5223fb0e10ab9 WHIRLPOOL 2b276f781ed8d8089778b7bcdfa95a6bfd6d95413a3456ed9bbd216c90f8cc505b1f4dbae2098854683a1cc0e32eaf70afc20b13dc5d12fb8e86d36806ad5df7
+MISC ChangeLog 26173 SHA256 3982d2a0e729cdada697f947b82fd7f18d93cd882948b75f0b82e29bfb462664 SHA512 6ef02972ab44b17e55588d2017a9fcb8ea396c61e3d709adc855edfa87dcda8684d9f0711ae3daf80eae5082bd167cc4d389aee7ec8e549e815db0f1a6b1521c WHIRLPOOL 8bb4385c84835639fee20e711f8d2e427be85187df4e448f8b74394a48bc71ea2f1b693ccc11f0df37579361a3d78fa45c0772ddd0fabd651223427a0ead6dfd
 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
@@ -21,11 +21,11 @@ MISC metadata.xml 726 SHA256 3a229c7b2f88da5884a450d4744b911ee85fc0cc787ba3ed6e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJReDX3AAoJEEdUh39IaPFN+iUH/icDq/488yI66xNUhgXlmUrk
-FbvHa+0duLH7N2jt5PWaI+zz/GrN7Wng/7on9NM6zcDb2H631r0b4S/6FAdiqAZp
-EbxMMxLWbidy4COrt+4WjCSfc1qXCPTncd4QnSDVOkh1w6t/cSeT34bcMeUq9mt7
-TYuo4Sf58hdHGtrUsL+4lBl59xlO/K+loJoPcEhjqIyXeiCUVvsC4cpUx3eAN9AG
-n36+bPC7E8jTGOJN8rMnK9jiE//YTtevbA/l+ddmx1HaILfFG5PmINoJLDWf1MNb
-UP61EMYKbZEuunligijAP4C0ulZR5fTJw6AGQB/fSkmEsrGPsdRCneJw2XC26uo=
-=O45r
+iQEcBAEBCAAGBQJRe7HaAAoJEEdUh39IaPFN/EIH/0ls4SLUwqPUROoOJ0g7okgW
+Xn/rcm2wUh9M96skGusRqxcULsGwkfyLjJ/rLOG2CN2UCUW61CUpBqwxRd783NHu
+ZLClVYOTKSWotvPbGUMA40z1IHc9V6eJHh2kD2v3jQYExUU2/d2YoiKmYKPUXuKm
+WOEFNOHQJjj+HyAF85pt938pv0Vy8a+SGG9Sge393jhDaWXjONQLQeLFdLW1W4+y
+aBgdXD6cvU3i2gAMx2uIlLkr5DeF9skFTTWZkSvIpQ+I6Pfrt5Ab4zDP4NCSI2LU
+se7SuhC8lMHcPDkejOT2w2d1yLAVOp+r5ZOEJVKq7nQRkunmGoX/3r3oDe112Hs=
+=B3mx
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-200.ebuild b/sys-fs/udev/udev-200.ebuild
index d898968936ab..3ec03368b541 100644
--- a/sys-fs/udev/udev-200.ebuild
+++ b/sys-fs/udev/udev-200.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-200.ebuild,v 1.20 2013/04/22 11:52:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-200.ebuild,v 1.21 2013/04/27 11:10:43 ssuominen Exp $
 
 EAPI=5
 
@@ -185,8 +185,9 @@ src_prepare() {
 		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
 	fi
 
-	# link udevd(8) to systemd-udevd.service(8) manpage
+	# link udevd(8) and systemd-udevd(8) manpages to systemd-udevd.service(8) manpage
 	echo '.so systemd-udevd.service.8' > "${T}"/udevd.8
+	echo '.so systemd-udevd.service.8' > "${T}"/systemd-udevd.8
 }
 
 src_configure() {
@@ -266,7 +267,6 @@ src_compile() {
 		mtd_probe
 		man/udev.7
 		man/udevadm.8
-		man/systemd-udevd.8
 		man/systemd-udevd.service.8
 	)
 	use keymap && targets+=( keymap )
@@ -320,7 +320,7 @@ src_install() {
 		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
 		MANPAGES="man/udev.7 man/udevadm.8 \
 				man/systemd-udevd.service.8"
-		MANPAGES_ALIAS="man/systemd-udevd.8"
+		MANPAGES_ALIAS=""
 		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
 		INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
 				$(sysconfdir)/udev/hwdb.d'
@@ -342,6 +342,7 @@ src_install() {
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
 	doman "${T}"/udevd.8
+	doman "${T}"/systemd-udevd.8
 
 	# install udevadm compatibility symlink
 	dosym {../bin,sbin}/udevadm
diff --git a/sys-fs/udev/udev-202.ebuild b/sys-fs/udev/udev-202.ebuild
index 784dbbfb222a..841adb8f6699 100644
--- a/sys-fs/udev/udev-202.ebuild
+++ b/sys-fs/udev/udev-202.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-202.ebuild,v 1.1 2013/04/19 09:35:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-202.ebuild,v 1.2 2013/04/27 11:10:43 ssuominen Exp $
 
 EAPI=5
 
@@ -186,8 +186,9 @@ src_prepare() {
 		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
 	fi
 
-	# link udevd(8) to systemd-udevd.service(8) manpage
+	# link udevd(8) and systemd-udevd(8) manpages to systemd-udevd.service(8) manpage
 	echo '.so systemd-udevd.service.8' > "${T}"/udevd.8
+	echo '.so systemd-udevd.service.8' > "${T}"/systemd-udevd.8
 }
 
 src_configure() {
@@ -263,7 +264,6 @@ src_compile() {
 		mtd_probe
 		man/udev.7
 		man/udevadm.8
-		man/systemd-udevd.8
 		man/systemd-udevd.service.8
 	)
 	use keymap && targets+=( keymap )
@@ -316,7 +316,7 @@ src_install() {
 		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
 		MANPAGES="man/udev.7 man/udevadm.8 \
 				man/systemd-udevd.service.8"
-		MANPAGES_ALIAS="man/systemd-udevd.8"
+		MANPAGES_ALIAS=""
 		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
 		INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
 				$(sysconfdir)/udev/hwdb.d'
@@ -338,6 +338,7 @@ src_install() {
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
 	doman "${T}"/udevd.8
+	doman "${T}"/systemd-udevd.8
 
 	# install udevadm compatibility symlink
 	dosym {../bin,sbin}/udevadm
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 71f36e0b4e5a..07c80ce6b241 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.224 2013/04/19 09:35:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.225 2013/04/27 11:10:43 ssuominen Exp $
 
 EAPI=5
 
@@ -186,8 +186,9 @@ src_prepare() {
 		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
 	fi
 
-	# link udevd(8) to systemd-udevd.service(8) manpage
+	# link udevd(8) and systemd-udevd(8) manpages to systemd-udevd.service(8) manpage
 	echo '.so systemd-udevd.service.8' > "${T}"/udevd.8
+	echo '.so systemd-udevd.service.8' > "${T}"/systemd-udevd.8
 }
 
 src_configure() {
@@ -263,7 +264,6 @@ src_compile() {
 		mtd_probe
 		man/udev.7
 		man/udevadm.8
-		man/systemd-udevd.8
 		man/systemd-udevd.service.8
 	)
 	use keymap && targets+=( keymap )
@@ -316,7 +316,7 @@ src_install() {
 		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
 		MANPAGES="man/udev.7 man/udevadm.8 \
 				man/systemd-udevd.service.8"
-		MANPAGES_ALIAS="man/systemd-udevd.8"
+		MANPAGES_ALIAS=""
 		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
 		INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
 				$(sysconfdir)/udev/hwdb.d'
@@ -338,6 +338,7 @@ src_install() {
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
 	doman "${T}"/udevd.8
+	doman "${T}"/systemd-udevd.8
 
 	# install udevadm compatibility symlink
 	dosym {../bin,sbin}/udevadm